diff --git a/admin/app/config.router.js b/admin/app/config.router.js index 70b62686..c8e7a696 100644 --- a/admin/app/config.router.js +++ b/admin/app/config.router.js @@ -13,11 +13,11 @@ app $rootScope.$state = $state; $transitions.onStart( { }, function(trans) { if ($location.$$path.indexOf('login')==-1) { - if ($window.localStorage.getItem("currentUser")){ - currentUser = JSON.parse($window.localStorage.getItem("currentUser")); + if ($window.localStorage.getItem("myems_admin_ui_current_user")){ + currentUser = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); } if (currentUser == undefined || currentUser.is_admin === false) { - $window.localStorage.removeItem("currentUser"); + $window.localStorage.removeItem("myems_admin_ui_current_user"); return $state.target("login.login"); } else { $rootScope.pageTitle = trans.to().data.pageTitle; diff --git a/admin/app/controllers/login/login.controller.js b/admin/app/controllers/login/login.controller.js index e048ef15..c2021c1e 100644 --- a/admin/app/controllers/login/login.controller.js +++ b/admin/app/controllers/login/login.controller.js @@ -15,9 +15,9 @@ app.controller('LoginController', function ( $scope.dataLoading = false; $scope.isFullScreen = false; - $scope.language = $window.localStorage.getItem("language") || 'zh-cn'; + $scope.language = $window.localStorage.getItem("myems_admin_ui_language") || "zh_CN"; $scope.fullScreenTitle = "FULLSCREEN"; - $scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser")); + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); // login section start $scope.login = function (user) { $scope.dataLoading = true; @@ -30,10 +30,10 @@ app.controller('LoginController', function ( body: $translate.instant('TOASTER.LOGIN_SUCCESS'), showCloseButton: true, }); - $window.localStorage.setItem("currentUser", JSON.stringify(response.data)); + $window.localStorage.setItem("myems_admin_ui_current_user", JSON.stringify(response.data)); $location.path('/settings/space'); - $scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser")); + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); } else if (angular.isDefined(response.status) && response.status === 400 || response.status === 404) { toaster.pop({ type: "error", @@ -64,7 +64,7 @@ app.controller('LoginController', function ( body: $translate.instant('TOASTER.LOGIN_SUCCESS'), showCloseButton: true, }); - $window.localStorage.removeItem("currentUser"); + $window.localStorage.removeItem("myems_admin_ui_current_user"); $location.path('/login'); } else { toaster.pop({ @@ -73,7 +73,7 @@ app.controller('LoginController', function ( body: $translate.instant(response.data.description), showCloseButton: true, }); - $window.localStorage.removeItem("currentUser"); + $window.localStorage.removeItem("myems_admin_ui_current_user"); $location.path('/login'); } }); @@ -202,7 +202,7 @@ app.controller('LoginController', function ( $scope.changeLanguage = function (langKey) { $translate.use(langKey); $scope.language = langKey; - $window.localStorage.setItem("language", langKey); + $window.localStorage.setItem("myems_admin_ui_language", langKey); }; // web message alarm section start diff --git a/admin/app/controllers/main.controller.js b/admin/app/controllers/main.controller.js index 1c0caab5..4d1f5f21 100644 --- a/admin/app/controllers/main.controller.js +++ b/admin/app/controllers/main.controller.js @@ -5,7 +5,7 @@ app.controller('MainController', [ $rootScope.$on("handleReLogin",function(){ $timeout(function(){ - $window.localStorage.removeItem("currentUser"); + $window.localStorage.removeItem("myems_admin_ui_current_user"); $location.path('/login'); },2000) }); diff --git a/admin/app/controllers/settings/costcenter/costfile.controller.js b/admin/app/controllers/settings/costcenter/costfile.controller.js index b1896188..f62ebf01 100644 --- a/admin/app/controllers/settings/costcenter/costfile.controller.js +++ b/admin/app/controllers/settings/costcenter/costfile.controller.js @@ -9,7 +9,7 @@ app.controller('CostFileController', function ( toaster, SweetAlert) { - $scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser")); + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostFiles = function () { CostFileService.getAllCostFiles(function (response) { diff --git a/admin/app/controllers/settings/knowledgefile/knowledgefile.controller.js b/admin/app/controllers/settings/knowledgefile/knowledgefile.controller.js index 1d710015..776c8bd9 100644 --- a/admin/app/controllers/settings/knowledgefile/knowledgefile.controller.js +++ b/admin/app/controllers/settings/knowledgefile/knowledgefile.controller.js @@ -8,7 +8,7 @@ app.controller('KnowledgeFileController', function ( toaster, SweetAlert) { - $scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser")); + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllKnowledgeFiles = function () { KnowledgeFileService.getAllKnowledgeFiles(function (response) { diff --git a/admin/app/controllers/settings/meter/offlinemeterfile.controller.js b/admin/app/controllers/settings/meter/offlinemeterfile.controller.js index 273d731e..0fec0a43 100644 --- a/admin/app/controllers/settings/meter/offlinemeterfile.controller.js +++ b/admin/app/controllers/settings/meter/offlinemeterfile.controller.js @@ -9,7 +9,7 @@ app.controller('OfflineMeterFileController', function( toaster, SweetAlert) { - $scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser")); + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllOfflineMeterFiles = function() { OfflineMeterFileService.getAllOfflineMeterFiles(function (response) { diff --git a/admin/app/controllers/users/user/user.controller.js b/admin/app/controllers/users/user/user.controller.js index 6ae6a2ba..bd15f5cf 100644 --- a/admin/app/controllers/users/user/user.controller.js +++ b/admin/app/controllers/users/user/user.controller.js @@ -9,7 +9,7 @@ app.controller('UserController', function ($scope, $translate, SweetAlert) { - $scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser")); + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllUsers = function () { UserService.getAllUsers(function (response) { if (angular.isDefined(response.status) && response.status === 200) { diff --git a/admin/app/translations.js b/admin/app/translations.js index a6196927..999df8cd 100644 --- a/admin/app/translations.js +++ b/admin/app/translations.js @@ -985,7 +985,7 @@ function config($translateProvider) { WECHAT_MESSAGE_NOT_FOUND: 'Wechat Message Not Found', }, }) - .translations('zh-cn', { + .translations('zh_CN', { MY_EMS_NAME: 'MyEMS', LANGUAGE: '语 言', FULLSCREEN: '全屏显示', @@ -2959,7 +2959,7 @@ function config($translateProvider) { }, }) ; - var lang = window.localStorage.getItem("language") || "zh-cn"; + var lang = window.localStorage.getItem("admin_ui_language") || "zh_CN"; $translateProvider.preferredLanguage(lang); diff --git a/admin/views/login/login.html b/admin/views/login/login.html index 069f81eb..df4ebf08 100644 --- a/admin/views/login/login.html +++ b/admin/views/login/login.html @@ -22,7 +22,7 @@
diff --git a/web/src/Main.js b/web/src/Main.js index aef302ea..e2b6aec3 100644 --- a/web/src/Main.js +++ b/web/src/Main.js @@ -23,7 +23,7 @@ const Main = props => { const [navbarCollapsed, setNavbarCollapsed] = useState(false); const [navbarStyle, setNavbarStyle] = useState(getItemFromStore('navbarStyle', settings.navbarStyle)); - const [language, setLanguage] = useState(getItemFromStore('language', settings.language)); + const [language, setLanguage] = useState(getItemFromStore('myems_web_ui_language', settings.language)); const toggleModal = () => setIsOpenSidePanel(prevIsOpenSidePanel => !prevIsOpenSidePanel); const value = { @@ -100,9 +100,9 @@ const Main = props => { setItemToStore('navbarStyle', navbarStyle); // eslint-disable-next-line }, [navbarStyle]); - + useEffect(() => { - setItemToStore('language', language); + setItemToStore('myems_web_ui_language', language); i18n.changeLanguage(language) // eslint-disable-next-line }, [language]); diff --git a/web/src/components/MyEMS/auth/LoginForm.js b/web/src/components/MyEMS/auth/LoginForm.js index 9ef72197..f9d0f595 100644 --- a/web/src/components/MyEMS/auth/LoginForm.js +++ b/web/src/components/MyEMS/auth/LoginForm.js @@ -113,7 +113,7 @@ const LoginForm = ({ setRedirect, hasLabel, layout, t }) => { value={language} onChange={({ target }) => setLanguage(target.value)} > - + diff --git a/web/src/components/side-panel/SidePanelModal.js b/web/src/components/side-panel/SidePanelModal.js index 9947ecf1..bcfc0235 100644 --- a/web/src/components/side-panel/SidePanelModal.js +++ b/web/src/components/side-panel/SidePanelModal.js @@ -220,7 +220,7 @@ const SidePanelModal = ({ autoShow, showOnce, autoShowDelay, cookieExpireTime, p

{t('Switch between languages')}

- + diff --git a/web/src/config.js b/web/src/config.js index 12ac70f6..ab88fad3 100644 --- a/web/src/config.js +++ b/web/src/config.js @@ -16,6 +16,6 @@ export const settings = { currency: '$', isNavbarVerticalCollapsed: false, navbarStyle: 'transparent', - language: 'zh_cn' + language: 'zh_CN' //en, de, zh_CN }; export default { version, navbarBreakPoint, topNavbarBreakpoint, settings, APIBaseURL }; diff --git a/web/src/i18n.js b/web/src/i18n.js index c202b14a..f10b33f6 100644 --- a/web/src/i18n.js +++ b/web/src/i18n.js @@ -102,7 +102,7 @@ const resources = { "Switch between styles for your vertical navbar": "Switch between styles for your vertical navbar", "Language": "Language", "Switch between languages": "Switch between languages", - "language-zh_cn": "简体中文", + "language-zh_CN": "简体中文", "language-en": "English", "language-de": "Deutsch", "Like What You See?": "Like What You See?", @@ -848,7 +848,7 @@ const resources = { "Switch between styles for your vertical navbar": "Wechseln Sie zwischen den Stilen für Ihre vertikale Navigationsleiste", "Language": "Sprache", "Switch between languages": "Zwischen den Sprachen wechseln", - "language-zh_cn": "简体中文", + "language-zh_CN": "简体中文", "language-en": "English", "language-de": "Deutsch", "Like What You See?": "Wie was du siehst?", @@ -1499,7 +1499,7 @@ const resources = { } }, - zh_cn: { + zh_CN: { translation: { // routes "Dashboard": "总览", @@ -1597,7 +1597,7 @@ const resources = { "Switch between styles for your vertical navbar": "切换垂直导航栏的样式", "Language": "语言", "Switch between languages": "切换语言", - "language-zh_cn": "简体中文", + "language-zh_CN": "简体中文", "language-en": "English", "language-de": "Deutsch", "Like What You See?": "喜欢这个系统?", @@ -2254,7 +2254,7 @@ i18n .use(initReactI18next) // passes i18n down to react-i18next .init({ resources, - lng: "zh_cn", + lng: "zh_CN", keySeparator: false, // we do not use keys in form messages.welcome