Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
nengyuanzhang committed Jan 21, 2025
2 parents 1b86e55 + ba8a311 commit f095dac
Show file tree
Hide file tree
Showing 3 changed files with 1,228 additions and 4 deletions.
1 change: 1 addition & 0 deletions myems-web/src/components/MyEMS/auth/LoginForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ const LoginForm = ({ setRedirect, hasLabel, layout, t }) => {
<option value="ms">{t('language-ms')}</option>
<option value="id">{t('language-id')}</option>
<option value="zh_TW">{t('language-zh_TW')}</option>
<option value="pt">{t('language-pt')}</option>
</CustomInput>
<Row className="justify-content-center align-items-center">
<Col xs="auto">
Expand Down
1 change: 1 addition & 0 deletions myems-web/src/components/side-panel/SidePanelModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ const SidePanelModal = ({ autoShow, showOnce, autoShowDelay, cookieExpireTime, p
</ButtonGroup>
<ButtonGroup className="btn-block">
<LanguageRadioBtn btnName={'zh_TW'} />
<LanguageRadioBtn btnName={'pt'} />
</ButtonGroup>
</div>
<hr />
Expand Down
Loading

0 comments on commit f095dac

Please sign in to comment.