Merge branch 'develop'

MyEMS · May 15, 2024 · 62ebafd · 62ebafd
2 parents d2a48c3 + 27a174a
commit 62ebafd
Show file tree

Hide file tree

Showing 5 changed files with 1,120 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,12 +8,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - added new protocols dtu-rtu, dtu-tcp, dtu-mqtt and mqtt-zhongxian
 - added latest value to data source points table in myems-admin
 - added menus for plan functions in database
-- added energy plan reports (preview) in myems-web 
+- 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
 ### Changed
 - updated Distribution System in myems-web
 ### Fixed
-- fixed issues of optional svg textarea for equipment and combined equipment in myems-admin 
+- fixed issues of optional svg textarea for equipment and combined equipment in myems-admin
 ### Removed
 -
 

diff --git a/myems-web/src/components/MyEMS/auth/LoginForm.js b/myems-web/src/components/MyEMS/auth/LoginForm.js
@@ -189,6 +189,7 @@ const LoginForm = ({ setRedirect, hasLabel, layout, t }) => {
         <option value="tr">{t('language-tr')}</option>
         <option value="ms">{t('language-ms')}</option>
         <option value="id">{t('language-id')}</option>
+        <option value="id">{t('language-zh_TW')}</option>
       </CustomInput>
       <Row className="justify-content-center align-items-center">
         <Col xs="auto">

diff --git a/myems-web/src/components/side-panel/SidePanelModal.js b/myems-web/src/components/side-panel/SidePanelModal.js
@@ -238,6 +238,9 @@ const SidePanelModal = ({ autoShow, showOnce, autoShowDelay, cookieExpireTime, p
             <LanguageRadioBtn btnName={'ms'} />
             <LanguageRadioBtn btnName={'id'} />
           </ButtonGroup>
+          <ButtonGroup className="btn-block">
+            <LanguageRadioBtn btnName={'zh_TW'} />
+          </ButtonGroup>
         </div>
         <hr />
         <div className="text-center mt-5">

diff --git a/myems-web/src/config.js b/myems-web/src/config.js
@@ -1,7 +1,7 @@
 export const version = '4.4.0';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
-// export const APIBaseURL = 'http://127.0.0.1:8000';
+//export const APIBaseURL = 'http://127.0.0.1:8000';
 export const APIBaseURL = window.location.protocol + '//' + window.location.hostname + ':' + window.location.port + '/api';
 export const settings = {
   isFluid: true,
@@ -16,7 +16,7 @@ export const settings = {
   currency: '¥',
   isNavbarVerticalCollapsed: false,
   navbarStyle: 'transparent',
-  language: 'zh_CN', //zh_CN, en, de, fr, es, ru, ar, vi, th, tr, ms, id
+  language: 'zh_CN', //zh_CN, en, de, fr, es, ru, ar, vi, th, tr, ms, id, zh_TW
   showOnlineMap: false, // if you wnat to turn off online map feature, please set showOnlineMap to false
   mapboxToken: 'GET-YOUR-TOKEN-AT-MAPBOX.COM', // you can get access token at https://mapbox.com
   cookieExpireTime: 1000 * 60 * 60 //cookie expires time in milliseconds