Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: add Russian translation #1591

Merged
merged 9 commits into from
Jul 21, 2021
Merged

feat: add Russian translation #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
670fcad
Improve transaction previews (#1505)
bassemmagdy Jun 16, 2021
cc11176
Revert "Improve transaction previews (#1505)" (#1539)
bassemmagdy Jun 17, 2021
a4f307e
Merge pull request #1581 from nemgrouplimited/integration
bassemmagdy Jul 8, 2021
24a9514
Create ru-RU.json
klimgeran Jul 12, 2021
ff681f9
feat: add russian lang
OlegMakarenko Jul 12, 2021
38ccc5b
Merge pull request #1 from klimgeran/patch-2
OlegMakarenko Jul 12, 2021
e845d9b
fix: ru locale
OlegMakarenko Jul 12, 2021
430a02d
feat: improve russian locale. add language to app config
OlegMakarenko Jul 12, 2021
6cc0fa0
fix: lint
OlegMakarenko Jul 12, 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
1 change: 1 addition & 0 deletions src/config/AppConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ const defaultAppConfig: AppConfig = {
{ value: 'en-US', label: 'English' },
{ value: 'zh-CN', label: '中文' },
{ value: 'ja-JP', label: '日本語' },
{ value: 'ru-RU', label: 'Русский' },
],
marketServerUrl: 'http://app.nemcn.io',
articlesFeedUrl: 'https://nemgrouplimited.github.io/symbol-news/',
Expand Down
9 changes: 7 additions & 2 deletions src/language/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,26 @@ import Vue from 'vue';
import zh_CN from '@/language/zh-CN.json';
import en_US from '@/language/en-US.json';
import ja_JP from '@/language/ja-JP.json';
import ru_RU from '@/language/ru-RU.json';

// external translation messages
import enValidationMessages from 'vee-validate/dist/locale/en.json';
import zh_CNValidationMessages from 'vee-validate/dist/locale/zh_CN.json';
import jaValidationMessages from 'vee-validate/dist/locale/ja.json';
import ruValidationMessages from 'vee-validate/dist/locale/ru.json';

const defaultLang = 'en-US';

const messages = {
'en-US': { ...en_US, validation: enValidationMessages.messages },
'zh-CN': { ...zh_CN, validation: zh_CNValidationMessages.messages },
'ja-JP': { ...ja_JP, validation: jaValidationMessages.messages },
'ru-RU': { ...ru_RU, validation: ruValidationMessages.messages },
};

const navLang = navigator.language;
const localLang = navLang === 'zh-CN' || navLang === 'en-US' ? navLang : false;
const lang = window.localStorage.getItem('locale') || localLang || 'en-US';
const localLang = Object.keys(messages).includes(navLang) ? navLang : false;
const lang = window.localStorage.getItem('locale') || localLang || defaultLang;

Vue.use(VueI18n);

Expand Down
Loading