diff --git a/config/params.php b/config/params.php index 930ad4aa..212d5a1d 100644 --- a/config/params.php +++ b/config/params.php @@ -3,6 +3,6 @@ return [ 'adminEmail' => 'admin@example.com', "maxLogs" => 100000, - "maxPicture" => 5, + "maxPicture" => 9999, "version" => "1.0.7" ]; diff --git a/controllers/CaptureLogsController.php b/controllers/CaptureLogsController.php index 7a65c41a..11579019 100644 --- a/controllers/CaptureLogsController.php +++ b/controllers/CaptureLogsController.php @@ -17,7 +17,7 @@ class CaptureLogsController extends Controller { public function init() { parent::init(); - Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : "vi-VI"; + Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : Yii::$app->language; if (Yii::$app->user->isGuest) return $this->redirect(['/site/login']); } diff --git a/controllers/ConfigController.php b/controllers/ConfigController.php index f44398be..6361cdc8 100644 --- a/controllers/ConfigController.php +++ b/controllers/ConfigController.php @@ -14,7 +14,7 @@ class ConfigController extends Controller { public function init() { parent::init(); - Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : "vi-VI"; + Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : Yii::$app->language; if (Yii::$app->user->isGuest) return $this->redirect(['/site/login']); } diff --git a/controllers/ControlLogsController.php b/controllers/ControlLogsController.php index 37eba873..0ea991be 100644 --- a/controllers/ControlLogsController.php +++ b/controllers/ControlLogsController.php @@ -19,7 +19,7 @@ class ControlLogsController extends Controller { public function init() { parent::init(); - Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : "vi-VI"; + Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : Yii::$app->language; if (Yii::$app->user->isGuest) return $this->redirect(['/site/login']); } diff --git a/controllers/ListManagementController.php b/controllers/ListManagementController.php index 924be0cf..aa0a4941 100644 --- a/controllers/ListManagementController.php +++ b/controllers/ListManagementController.php @@ -19,7 +19,7 @@ class ListManagementController extends Controller { public function init() { parent::init(); - Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : "vi-VI"; + Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : Yii::$app->language; if (Yii::$app->user->isGuest) return $this->redirect(['/site/login']); } diff --git a/controllers/UserController.php b/controllers/UserController.php index 6909776f..2f163ccc 100644 --- a/controllers/UserController.php +++ b/controllers/UserController.php @@ -19,7 +19,7 @@ class UserController extends Controller { public function init() { parent::init(); - Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : "vi-VI"; + Yii::$app->language = Yii::$app->session->get("language") ? Yii::$app->session->get("language")["name"] : Yii::$app->language; if (Yii::$app->user->isGuest) return $this->redirect(['/site/login']); diff --git a/messages/en/app.php b/messages/en/app.php index d9738965..6775a3dd 100644 --- a/messages/en/app.php +++ b/messages/en/app.php @@ -131,5 +131,7 @@ return [ "DANG_XU_LY" => "Loading ...", "THONG_BAO" => "Notify", "CO_LOI_XAY_RA_HAY_THU_LAI" => "An error occurred, check the network connection and try again", - "ENGINE_KHONG_HOAT_DONG" => "Engine is not running" + "ENGINE_KHONG_HOAT_DONG" => "Engine is not running", + "DANG_NHAP" => "Login", + "MAT_KHAU" => "Password" ]; diff --git a/messages/ja/app.php b/messages/ja/app.php index 0aac15b6..e4be8a65 100644 --- a/messages/ja/app.php +++ b/messages/ja/app.php @@ -131,5 +131,7 @@ return [ "DANG_XU_LY" => "処理中 ...", "THONG_BAO" => "報告", "CO_LOI_XAY_RA_HAY_THU_LAI" => "おそらくネットワーク接続が原因でエラーが発生しました。再試行してください", - "ENGINE_KHONG_HOAT_DONG" => "Engine不活動" + "ENGINE_KHONG_HOAT_DONG" => "Engine不活動", + "DANG_NHAP" => "ログイン", + "MAT_KHAU" => "パスワード" ]; diff --git a/messages/vi/app.php b/messages/vi/app.php index 91c00b80..a478ce09 100644 --- a/messages/vi/app.php +++ b/messages/vi/app.php @@ -131,5 +131,7 @@ return [ "DANG_XU_LY" => "Đang xử lý ...", "THONG_BAO" => "Thông báo", "CO_LOI_XAY_RA_HAY_THU_LAI" => "Có lỗi xảy ra, có thể do đường truyền mạng, xin vui lòng thử lại", - "ENGINE_KHONG_HOAT_DONG" => "Engine không hoạt động" + "ENGINE_KHONG_HOAT_DONG" => "Engine không hoạt động", + "DANG_NHAP" => "Đăng nhập", + "MAT_KHAU" => "Mật khẩu" ]; diff --git a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php index 0840ed11..8560f3d5 100644 --- a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php +++ b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php @@ -67,11 +67,10 @@ use yii\widgets\ActiveForm; "vi.png", "name" => "vi-VI", "description" => "Tiếng Việt"]; - if (Yii::$app->session->get("language")) { + if (Yii::$app->session->get("language")) $currentLanguage = Yii::$app->session->get("language"); - } else { + else Yii::$app->session->set("language", $currentLanguage); - } ?>