Merge branch 'develop'

MyEMS · May 17, 2024 · 0bd4c9e · 0bd4c9e
2 parents 164f237 + 53e6db4
commit 0bd4c9e
Show file tree

Hide file tree

Showing 4 changed files with 1,627 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - added menus for plan functions in database
 - added energy plan reports (preview) in myems-web
 - added new tables for energy, billing and carbon in database
-- added language zh_TW to myems-web
+- added language zh_TW to myems-web and myems-admin
 ### Changed
 - updated Distribution System in myems-web
 - limit virtual meter normalization procedure to calculate at most one month records

diff --git a/myems-admin/app/controllers/login/login.controller.js b/myems-admin/app/controllers/login/login.controller.js
@@ -17,7 +17,7 @@ app.controller('LoginController', function (
 
 	$scope.dataLoading = false;
 	$scope.isFullScreen = false;
-	$scope.language = $window.localStorage.getItem("myems_admin_ui_language") || "zh_CN"; //zh_CN, en, de, fr, es, ru, ar, vi, th, tr, ms, id
+	$scope.language = $window.localStorage.getItem("myems_admin_ui_language") || "zh_CN"; //zh_CN, en, de, fr, es, ru, ar, vi, th, tr, ms, id, zh_TW
 	$scope.fullScreenTitle = "FULLSCREEN";
 	$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
 	// login section start