Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / models / i18n / i18n.ts

diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts
index c5de972ac685927b0d85463176863d872fcb333a..36688382dffade8b820344abf19561887336ca18 100644 (file)
--- a/shared/models/i18n/i18n.ts
+++ b/shared/models/i18n/i18n.ts
@@ -1,28 +1,53 @@
 export const LOCALE_FILES = [ 'player', 'server' ]
 
 export const I18N_LOCALES = {
+  // Always first to avoid issues when using express acceptLanguages function when no accept language header is set
   'en-US': 'English',
-  'fr-FR': 'Français',
-  'eu-ES': 'Euskara',
+
   'ca-ES': 'Català',
   'cs-CZ': 'Čeština',
-  'eo': 'Esperanto',
   'de-DE': 'Deutsch',
+  'el-GR': 'ελληνικά',
+  'eo': 'Esperanto',
   'es-ES': 'Español',
+  'eu-ES': 'Euskara',
+  'fi-FI': 'suomi',
+  'fr-FR': 'Français',
+  'gd': 'Gàidhlig',
+  'hu-HU': 'magyar',
+  'it-IT': 'Italiano',
+  'ja-JP': '日本語',
+  'nl-NL': 'Nederlands',
   'oc': 'Occitan',
-  'zh-Hant-TW': '中文 (繁體, 台灣)'
-  // 'pl-PL': 'Polski'
+  'pl-PL': 'Polski',
+  'pt-BR': 'Português (Brasil)',
+  'pt-PT': 'Português (Portugal)',
+  'ru-RU': 'русский',
+  'sv-SE': 'svenska',
+  'th-TH': 'ไทย',
+  'zh-Hans-CN': '简体中文（中国）',
+  'zh-Hant-TW': '繁體中文（台灣）'
 }
 
 const I18N_LOCALE_ALIAS = {
-  'en': 'en-US',
-  'fr': 'fr-FR',
-  'eu': 'eu-ES',
   'ca': 'ca-ES',
   'cs': 'cs-CZ',
   'de': 'de-DE',
-  'es': 'es-ES'
-  // 'pl': 'pl-PL'
+  'en': 'en-US',
+  'es': 'es-ES',
+  'eu': 'eu-ES',
+  'fi': 'fi-FI',
+  'fr': 'fr-FR',
+  'hu': 'hu-HU',
+  'nl': 'nl-NL',
+  'pl': 'pl-PL',
+  'pt': 'pt-PT',
+  'ru': 'ru-RU',
+  'sv': 'sv-SE',
+  'th': 'th-TH',
+  'zh': 'zh-Hans-CN',
+  'zh-CN': 'zh-Hans-CN',
+  'zh-TW': 'zh-Hant-TW'
 }
 
 export const POSSIBLE_LOCALES = Object.keys(I18N_LOCALES)
@@ -37,6 +62,8 @@ export function isDefaultLocale (locale: string) {
 }
 
 export function peertubeTranslate (str: string, translations?: { [ id: string ]: string }) {
+  // FIXME: remove disable rule when the client is upgraded to typescript 3.7
+  // eslint-disable-next-line
   return translations && translations[str] ? translations[str] : str
 }
 
@@ -64,7 +91,5 @@ export function getShortLocale (locale: string) {
 }
 
 export function buildFileLocale (locale: string) {
-  const completeLocale = getCompleteLocale(locale)
-
-  return completeLocale.replace(/-/g, '_')
+  return getCompleteLocale(locale)
 }