refactor: simplify localization

Author: AndyLnd

bin/translations_download.ts

@@ -26,7 +26,7 @@ import AdmZip from 'adm-zip';
 import sortJson from 'sort-json';
 
 const rootDir = path.resolve(__dirname, '..');
-const destinationPath = path.join(rootDir, 'electron/locale');
+const destinationPath = path.join(rootDir, 'electron/src/locale');
 const zipDir = path.join(rootDir, 'temp/i18n');
 const zipPath = path.join(zipDir, 'wire-desktop.zip');
 

crowdin.yaml

@@ -2,6 +2,6 @@ project_id: 342373
 base_path: .
 
 files:
-  - source: 'electron/locale/en-US.json'
+  - source: 'electron/src/locale/en-US.json'
     translation: '%locale%.json'
     update_option: 'update_as_unapproved'

electron/src/global.ts

@@ -23,7 +23,7 @@ import type {Data as OpenGraphResult} from 'open-graph';
 import type {Static as amplify} from 'amplify';
 
 import type * as EnvironmentUtil from './runtime/EnvironmentUtil';
-import type {i18nStrings, SupportedI18nLanguage} from './locale/locale';
+import type {i18nStrings, SupportedI18nLanguage} from './locale';
 
 declare global {
   interface Window {

electron/src/lib/CertificateVerifyProcManager.ts

@@ -22,7 +22,7 @@ import {BrowserWindow, Certificate, Request as CertificateVerifyRequest, dialog}
 import * as fs from 'fs-extra';
 import * as path from 'path';
 
-import {getText} from '../locale/locale';
+import {getText} from '../locale';
 import {getLogger} from '../logging/getLogger';
 import * as EnvironmentUtil from '../runtime/EnvironmentUtil';
 

electron/src/lib/showDialog.ts

@@ -18,7 +18,7 @@
  */
 
 import {dialog, MessageBoxSyncOptions} from 'electron';
-import * as locale from '../locale/locale';
+import * as locale from '../locale';
 
 export const showDialog = (message: string, title: string, type?: string): void => {
   const options: MessageBoxSyncOptions = {

electron/locale/ar-SA.json electron/src/locale/ar-SA.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "إزالة الحساب",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/bn-BD.json electron/src/locale/bn-BD.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Remove Account",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/ca-ES.json electron/src/locale/ca-ES.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Remove Account",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/cs-CZ.json electron/src/locale/cs-CZ.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Odebrat účet",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/da-DK.json electron/src/locale/da-DK.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Fjern konto",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/de-DE.json electron/src/locale/de-DE.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Konto entfernen",
   "menuEnableSpellChecking": "Rechtschreibprüfung aktivieren",
   "menuCopyPicture": "Bild kopieren",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} Konten bereits aktiv",
   "wrapperAddAccountErrorTitleSingular": "Konto bereits aktiv",
   "wrapperAddAccountErrorMessagePlural": "Sie können nur mit {{maximumAccounts}} Konten gleichzeitig angemeldet sein. Melden Sie sich von einem Konto ab, um ein weiteres hinzuzufügen.",

electron/locale/el-GR.json electron/src/locale/el-GR.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Κατάργηση Λογαριασμού",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/en-US.json electron/src/locale/en-US.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Remove Account",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/es-ES.json electron/src/locale/es-ES.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Eliminar Cuenta",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/et-EE.json electron/src/locale/et-EE.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Eemalda konto",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/fa-IR.json electron/src/locale/fa-IR.json

@@ -67,7 +67,7 @@
   "menuVideoCall": "تماس تصویری",
   "menuView": "نمایش",
   "menuWindow": "پنجره",
-  "noInternet": "No Internet",
+  "noInternet": "اینترنت وصل نیست",
   "proxyPromptHeadline": "پروکسی به نام کاربری و رمز عبور احتیاج دارد.",
   "proxyPromptPassword": "گذرواژه",
   "proxyPromptTitle": "احراز هویت پروکسی",
@@ -90,14 +90,13 @@
   "wrapperRemoveAccount": "حذف حساب کاربری",
   "menuEnableSpellChecking": "فعال کردن غلط گیر املایی",
   "menuCopyPicture": "کپی تصویر",
-
- "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
-  "wrapperAddAccountErrorTitleSingular": "Account already active",
-  "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",
-  "wrapperAddAccountErrorMessageSingular": "You can only be logged in with one account at once. Log out from this one to add another.",
+  "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} حساب کاربری در حال حاضر فعال است",
+  "wrapperAddAccountErrorTitleSingular": "حساب کاربری در حال حاضر فعال است.",
+  "wrapperAddAccountErrorMessagePlural": "شما حداکثر میتوانید با {{maximumAccounts}} وارد شوید. برای افزودن حساب جدید، از یکی از آنها خارج شوید.",
+  "wrapperAddAccountErrorMessageSingular": "شما فقط میتوانید با یک حساب کاربری وارد شوید. از این حساب کاربری خارج شوید تا بتوانید حساب کاربری جدیدی بیفزایید.",
   "promptOK": "تایید",
   "promptCancel": "لغو",
-  "promptWarning": "Warning",
-  "promptError": "Error",
-  "urlBlockedPromptText": "A potentially unsafe URL has been blocked. If you still wish to open it, copy the URL and open the appropriate application."
+  "promptWarning": "هشدار",
+  "promptError": "خطا",
+  "urlBlockedPromptText": "یک لینک نا امن مسدود شد. اگر همچنان مایل به باز کردن آن هستید، آن را کپی کرده و در نرم افزار دیگری باز کنید."
 }

electron/locale/fi-FI.json electron/src/locale/fi-FI.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Poista tili",
   "menuEnableSpellChecking": "Käytä oikolukua",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} tiliä jo käytössä",
   "wrapperAddAccountErrorTitleSingular": "Tili on jo aktiivinen",
   "wrapperAddAccountErrorMessagePlural": "Voit kirjautua sisään vain {{maximumAccounts}} tililtä kerralla. Kirjaudu ulos tästä lisätäksesi toisen.",

electron/locale/fr-FR.json electron/src/locale/fr-FR.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Supprimer le compte ",
   "menuEnableSpellChecking": "Activer le correcteur orthographique",
   "menuCopyPicture": "Copier l'image",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} comptes déjà actifs",
   "wrapperAddAccountErrorTitleSingular": "Compte déjà actif",
   "wrapperAddAccountErrorMessagePlural": "Vous pouvez être connecté·e à {{maximumAccounts}} comptes en même temps. Déconnectez-vous de l'un d'entre eux pour en ajouter un autre.",

electron/locale/ga-IE.json electron/src/locale/ga-IE.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Remove Account",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/he-IL.json electron/src/locale/he-IL.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Remove Account",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/hi-IN.json electron/src/locale/hi-IN.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Remove Account",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/hr-HR.json electron/src/locale/hr-HR.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Ukloni račun",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/hu-HU.json electron/src/locale/hu-HU.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Fiók eltávolítása",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Kép másolása",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",

electron/locale/id-ID.json electron/src/locale/id-ID.json

@@ -90,7 +90,6 @@
   "wrapperRemoveAccount": "Menghapus akun",
   "menuEnableSpellChecking": "Enable Spell Checking",
   "menuCopyPicture": "Copy Picture",
-
   "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active",
   "wrapperAddAccountErrorTitleSingular": "Account already active",
   "wrapperAddAccountErrorMessagePlural": "You can only be logged in with {{maximumAccounts}} accounts at once. Log out from one to add another.",