From 85cc2865b6a25afa2673e19bc1e0b0766ce6a02d Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 6 Sep 2019 09:33:35 -0400 Subject: [PATCH] show locale name for language selection --- jslib | 2 +- src/app/settings/options.component.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jslib b/jslib index b74ee7b3ee..255bd3962d 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit b74ee7b3ee823a820854623cc32c8522a09e9f4d +Subproject commit 255bd3962d268bec8f66411676049803bb29e0d3 diff --git a/src/app/settings/options.component.ts b/src/app/settings/options.component.ts index 7bc0296f42..3f87a9b53f 100644 --- a/src/app/settings/options.component.ts +++ b/src/app/settings/options.component.ts @@ -49,7 +49,11 @@ export class OptionsComponent implements OnInit { const localeOptions: any[] = []; i18nService.supportedTranslationLocales.forEach((locale) => { - localeOptions.push({ name: locale, value: locale }); + let name = locale; + if (i18nService.localeNames.has(locale)) { + name += (' - ' + i18nService.localeNames.get(locale)); + } + localeOptions.push({ name: name, value: locale }); }); localeOptions.sort(Utils.getSortFunction(i18nService, 'name')); localeOptions.splice(0, 0, { name: i18nService.t('default'), value: null });