X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Flanguage-chooser.component.ts;h=b42e41855902228dc91a5f7a2f4a3257bdcea3b4;hb=4e56f0fff12ab9840574e7a27277fc78b195b3e2;hp=fb74cdf19f2ff75219da0ea3ed55702440bc90a2;hpb=d3217560a611b94f888ecf3de93b428a7521d4de;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/language-chooser.component.ts b/client/src/app/menu/language-chooser.component.ts
index fb74cdf19..b42e41855 100644
--- a/client/src/app/menu/language-chooser.component.ts
+++ b/client/src/app/menu/language-chooser.component.ts
@@ -1,9 +1,7 @@
-import { Component, ElementRef, ViewChild, Inject, LOCALE_ID } from '@angular/core'
-import { I18N_LOCALES } from '../../../../shared'
+import { Component, ElementRef, Inject, LOCALE_ID, ViewChild } from '@angular/core'
+import { getDevLocale, isOnDevLocale, sortBy } from '@app/helpers'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { sortBy } from '@app/shared/misc/utils'
-import { getCompleteLocale } from '@shared/models/i18n'
-import { isOnDevLocale, getDevLocale } from '@app/shared/i18n/i18n-utils'
+import { getCompleteLocale, getShortLocale, I18N_LOCALES } from '@shared/core-utils/i18n'
 
 @Component({
   selector: 'my-language-chooser',
@@ -13,14 +11,14 @@ import { isOnDevLocale, getDevLocale } from '@app/shared/i18n/i18n-utils'
 export class LanguageChooserComponent {
   @ViewChild('modal', { static: true }) modal: ElementRef
 
-  languages: { id: string, label: string }[] = []
+  languages: { id: string, label: string, iso: string }[] = []
 
   constructor (
     private modalService: NgbModal,
     @Inject(LOCALE_ID) private localeId: string
   ) {
     const l = Object.keys(I18N_LOCALES)
-                    .map(k => ({ id: k, label: I18N_LOCALES[k] }))
+                    .map(k => ({ id: k, label: I18N_LOCALES[k], iso: getShortLocale(k) }))
 
     this.languages = sortBy(l, 'label')
   }
@@ -36,6 +34,7 @@ export class LanguageChooserComponent {
   getCurrentLanguage () {
     const english = 'English'
     const locale = isOnDevLocale() ? getDevLocale() : getCompleteLocale(this.localeId)
+
     if (locale) return I18N_LOCALES[locale] || english
     return english
   }