Skip to content

Translation into Ukrainian #1845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Sep 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
edb2e2e
Ukrainian translation added
gtmizyuk Apr 22, 2021
c58de09
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Apr 23, 2021
86843f3
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk May 5, 2021
6676c22
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk May 8, 2021
202a9dc
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk May 21, 2021
a7a03b9
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jun 11, 2021
43a3ff9
availableLanguages in several lines
gtmizyuk Jun 13, 2021
a45e478
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jun 15, 2021
5fea698
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jun 28, 2021
da4b734
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jul 7, 2021
c7c4131
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jul 9, 2021
44c26bf
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jul 9, 2021
42ab0e4
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jul 12, 2021
3617dd9
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jul 12, 2021
4362566
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jul 15, 2021
3ae4545
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jul 19, 2021
6921996
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Jul 20, 2021
9ce2be5
Merge branch 'develop' into Ukrainian-Translation
gtmizyuk Sep 8, 2021
c301368
Fix linting errors, update language list to be alphabetical
catarak Sep 13, 2021
e2fc622
Merge branch 'develop' into Ukrainian-Translation
catarak Sep 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions client/components/Nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -671,30 +671,40 @@ class Nav extends React.PureComponent {
<button
onFocus={this.handleFocusForLang}
onBlur={this.handleBlur}
value="zh-CN"
value="ja"
onClick={(e) => this.handleLangSelection(e)}
>
简体中文
日本語
</button>
</li>
<li className="nav__dropdown-item">
<button
onFocus={this.handleFocusForLang}
onBlur={this.handleBlur}
value="ja"
value="pt-BR"
onClick={(e) => this.handleLangSelection(e)}
>
日本語
Português
</button>
</li>
<li className="nav__dropdown-item">
<button
onFocus={this.handleFocusForLang}
onBlur={this.handleBlur}
value="pt-BR"
value="uk-UA"
onClick={(e) => this.handleLangSelection(e)}
>
Português
Українська
</button>
</li>
<li className="nav__dropdown-item">
<button
onFocus={this.handleFocusForLang}
onBlur={this.handleBlur}
value="zh-CN"
onClick={(e) => this.handleLangSelection(e)}
>
简体中文
</button>
</li>
</ul>
Expand Down
6 changes: 5 additions & 1 deletion client/i18n.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import i18n from 'i18next';
import { initReactI18next } from 'react-i18next';
import Backend from 'i18next-http-backend';
import { enUS, es, ja, hi, ptBR, de, frCA, zhCN } from 'date-fns/locale';

import { enUS, es, ja, hi, ptBR, de, frCA, zhCN, uk } from 'date-fns/locale';

const fallbackLng = ['en-US'];
const availableLanguages = [
Expand All @@ -12,6 +13,7 @@ const availableLanguages = [
'hi',
'ja',
'pt-BR',
'uk-UA',
'zh-CN'
];

Expand All @@ -24,6 +26,7 @@ export function languageKeyToLabel(lang) {
hi: 'हिन्दी',
ja: '日本語',
'pt-BR': 'Português',
'uk-UA': 'Українська',
'zh-CN': '简体中文'
};
return languageMap[lang];
Expand All @@ -38,6 +41,7 @@ export function languageKeyToDateLocale(lang) {
hi,
ja,
'pt-BR': ptBR,
'uk-UA': uk,
'zh-CN': zhCN
};
return languageMap[lang];
Expand Down
Loading