From ac4cb3444df5753da6e10f607466e232afa538a2 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Mar 2018 23:11:41 -0700 Subject: ui - add guard against unset locale --- ui/app/settings.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ui/app/settings.js') diff --git a/ui/app/settings.js b/ui/app/settings.js index 8764dcafe..171264ed4 100644 --- a/ui/app/settings.js +++ b/ui/app/settings.js @@ -108,11 +108,12 @@ class Settings extends Component { renderCurrentLocale () { const { updateCurrentLocale, currentLocale } = this.props const currentLocaleMeta = locales.find(locale => locale.code === currentLocale) + const currentLocaleName = currentLocaleMeta ? currentLocaleMeta.name || '' return h('div.settings__content-row', [ h('div.settings__content-item', [ h('span', 'Current Language'), - h('span.settings__content-description', `${currentLocaleMeta.name}`), + h('span.settings__content-description', `${currentLocaleName}`), ]), h('div.settings__content-item', [ h('div.settings__content-item-col', [ -- cgit From 085e7d7dec1cdd05069db1fb7afa797c6be2f6ad Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Mar 2018 23:19:07 -0700 Subject: ui - fix typo in settings --- ui/app/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/settings.js') diff --git a/ui/app/settings.js b/ui/app/settings.js index 171264ed4..ec24172e8 100644 --- a/ui/app/settings.js +++ b/ui/app/settings.js @@ -108,7 +108,7 @@ class Settings extends Component { renderCurrentLocale () { const { updateCurrentLocale, currentLocale } = this.props const currentLocaleMeta = locales.find(locale => locale.code === currentLocale) - const currentLocaleName = currentLocaleMeta ? currentLocaleMeta.name || '' + const currentLocaleName = currentLocaleMeta ? currentLocaleMeta.name : '' return h('div.settings__content-row', [ h('div.settings__content-item', [ -- cgit