Update dependencies

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

diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts
index ff367b2793b9378673b64a80546f303472fb4a1e..27b911b756055bd62501e78b8a093466d4ae4207 100644 (file)
--- a/shared/models/i18n/i18n.ts
+++ b/shared/models/i18n/i18n.ts
@@ -1,11 +1,13 @@
 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',
+
   'ca-ES': 'Català',
   'cs-CZ': 'Čeština',
   'de-DE': 'Deutsch',
   'el-GR': 'ελληνικά',
-  'en-US': 'English',
   'eo': 'Esperanto',
   'es-ES': 'Español',
   'eu-ES': 'Euskara',
@@ -67,11 +69,11 @@ export function peertubeTranslate (str: string, translations?: { [ id: string ]:
 
 const possiblePaths = POSSIBLE_LOCALES.map(l => '/' + l)
 export function is18nPath (path: string) {
-  return possiblePaths.indexOf(path) !== -1
+  return possiblePaths.includes(path)
 }
 
 export function is18nLocale (locale: string) {
-  return POSSIBLE_LOCALES.indexOf(locale) !== -1
+  return POSSIBLE_LOCALES.includes(locale)
 }
 
 export function getCompleteLocale (locale: string) {
@@ -83,7 +85,7 @@ export function getCompleteLocale (locale: string) {
 }
 
 export function getShortLocale (locale: string) {
-  if (locale.indexOf('-') === -1) return locale
+  if (locale.includes('-') === false) return locale
 
   return locale.split('-')[0]
 }