From 9861d8ccc3065a4bf82126d552c13eddf4e58dc0 Mon Sep 17 00:00:00 2001 From: eugene Date: Wed, 25 Oct 2023 10:38:26 +0400 Subject: [PATCH] Update translations in ru-RU locale, refactor i18n sorting and translation strings --- src/app/engines/i18n.engine.ts | 10 +++++----- src/index-cli.ts | 2 +- src/locales/index.ts | 8 ++++---- src/locales/ru-RU.ts | 4 ++-- test/src/cli/cli-i18n.spec.ts | 16 ++++++++-------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/app/engines/i18n.engine.ts b/src/app/engines/i18n.engine.ts index b9f6b07b..1422d3f7 100644 --- a/src/app/engines/i18n.engine.ts +++ b/src/app/engines/i18n.engine.ts @@ -39,15 +39,15 @@ class I18nEngine { 'hu-HU': 'hu-HU', 'it-IT': 'it-IT', 'ja-JP': 'ja-JP', + 'ka-GE': 'ka-GE', 'ko-KR': 'ko-KR', 'nl-NL': 'nl-NL', 'pl-PL': 'pl-PL', 'pt-BR': 'pt-BR', + 'ru-RU': 'ru-RU', 'sk-SK': 'sk-SK', 'zh-CN': 'zh-CN', - 'zh-TW': 'zh-TW', - 'ru-RU': 'ru-RU', - 'ka-GE': 'ka-GE' + 'zh-TW': 'zh-TW' }; public fallbackLanguage = 'en-US'; @@ -67,15 +67,15 @@ class I18nEngine { i18next.addResources('hu-HU', 'translation', TRANSLATION_HU_HU); i18next.addResources('it-IT', 'translation', TRANSLATION_IT_IT); i18next.addResources('ja-JP', 'translation', TRANSLATION_JA_JP); + i18next.addResources('ka-GE', 'translation', TRANSLATION_KA_GE); i18next.addResources('ko-KR', 'translation', TRANSLATION_KO_KR); i18next.addResources('nl-NL', 'translation', TRANSLATION_NL_NL); i18next.addResources('pl-PL', 'translation', TRANSLATION_PL_PL); i18next.addResources('pt-BR', 'translation', TRANSLATION_PT_BR); + i18next.addResources('ru-RU', 'translation', TRANSLATION_RU_RU); i18next.addResources('sk-SK', 'translation', TRANSLATION_SK_SK); i18next.addResources('zh-CN', 'translation', TRANSLATION_ZH_CN); i18next.addResources('zh-TW', 'translation', TRANSLATION_ZH_TW); - i18next.addResources('ru-RU', 'translation', TRANSLATION_RU_RU); - i18next.addResources('ka-GE', 'translation', TRANSLATION_KA_GE); } public translate(key: string): string { diff --git a/src/index-cli.ts b/src/index-cli.ts index 48c4a562..87490488 100644 --- a/src/index-cli.ts +++ b/src/index-cli.ts @@ -86,7 +86,7 @@ export class CliApplication extends Application { .option('--files [files]', 'Files provided by external tool, used for coverage test') .option( '--language [language]', - 'Language used for the generated documentation (bg-BG, de-DE, en-US, es-ES, fr-FR, hu-HU, it-IT, ja-JP, ko-KR, nl-NL, pl-PL, pt-BR, sk-SK, zh-CN, zh-TW, ru-RU, ka-GE)', + 'Language used for the generated documentation (bg-BG, de-DE, en-US, es-ES, fr-FR, hu-HU, it-IT, ja-JP, ka-GE, ko-KR, nl-NL, pl-PL, pt-BR, ru-RU, sk-SK, zh-CN, zh-TW)', COMPODOC_DEFAULTS.language ) .option( diff --git a/src/locales/index.ts b/src/locales/index.ts index 996af09d..d8e9cfbb 100644 --- a/src/locales/index.ts +++ b/src/locales/index.ts @@ -1,3 +1,4 @@ +export { TRANSLATION_BG_BG } from './bg-BG'; export { TRANSLATION_DE_DE } from './de-DE'; export { TRANSLATION_EN_US } from './en-US'; export { TRANSLATION_ES_ES } from './es-ES'; @@ -5,13 +6,12 @@ export { TRANSLATION_FR_FR } from './fr-FR'; export { TRANSLATION_HU_HU } from './hu-HU'; export { TRANSLATION_IT_IT } from './it-IT'; export { TRANSLATION_JA_JP } from './ja-JP'; +export { TRANSLATION_KA_GE } from './ka-GE'; +export { TRANSLATION_KO_KR } from './ko-KR'; export { TRANSLATION_NL_NL } from './nl-NL'; export { TRANSLATION_PL_PL } from './pl-PL'; export { TRANSLATION_PT_BR } from './pt-BR'; +export { TRANSLATION_RU_RU } from './ru-RU'; export { TRANSLATION_SK_SK } from './sk-SK'; export { TRANSLATION_ZH_CN } from './zh-CN'; export { TRANSLATION_ZH_TW } from './zh-TW'; -export { TRANSLATION_KO_KR } from './ko-KR'; -export { TRANSLATION_BG_BG } from './bg-BG'; -export { TRANSLATION_RU_RU } from './ru-RU'; -export { TRANSLATION_KA_GE } from './ka-GE'; diff --git a/src/locales/ru-RU.ts b/src/locales/ru-RU.ts index 025529af..044655e8 100644 --- a/src/locales/ru-RU.ts +++ b/src/locales/ru-RU.ts @@ -2,7 +2,7 @@ export const TRANSLATION_RU_RU = { accessors: 'Аксессор', arguments: 'Аргументы', bootstrap: 'Загрузчик', - branches: 'Ветви', + branches: 'Ветки', browse: 'Обзор', classe: 'Класс', classes: 'Классы', @@ -106,5 +106,5 @@ export const TRANSLATION_RU_RU = { variables: 'Переменные', yes: 'Да', zoomin: 'Приблизить', - zoomout: 'Удалить' + zoomout: 'Отдалить' }; diff --git a/test/src/cli/cli-i18n.spec.ts b/test/src/cli/cli-i18n.spec.ts index 88122259..c4511814 100644 --- a/test/src/cli/cli-i18n.spec.ts +++ b/test/src/cli/cli-i18n.spec.ts @@ -63,6 +63,10 @@ describe('CLI i18n', () => { return checkWcMenuFile('ja-JP', 'このドキュメントは以下を使用して生成されています'); }); + describe('with supported language - ka-GE', () => { + return checkWcMenuFile('ka-GE', 'დოკუმენტაცია დაგენერირდა გამოყენებით'); + }); + describe('with supported language - nl-NL', () => { return checkWcMenuFile('nl-NL', 'Documentatie gegenereed met'); }); @@ -71,6 +75,10 @@ describe('CLI i18n', () => { return checkWcMenuFile('pt-BR', 'Documentação gerada usando'); }); + describe('with supported language - ru-RU', () => { + return checkWcMenuFile('ru-RU', 'Документация создана с помощью'); + }); + describe('with supported language - sk-SK', () => { return checkWcMenuFile('sk-SK', 'Dokumentácia vytvorená pomocou'); }); @@ -83,14 +91,6 @@ describe('CLI i18n', () => { return checkWcMenuFile('zh-TW', '產生文件使用'); }); - describe('with supported language - ru-RU', () => { - return checkWcMenuFile('ru-RU', 'Документация создана с помощью'); - }); - - describe('with supported language - ka-GE', () => { - return checkWcMenuFile('ka-GE', 'დოკუმენტაცია დაგენერირდა გამოყენებით'); - }); - describe('with un-supported language', () => { let indexFile; before(function(done) {