diff options
author | 2018-01-10 23:18:26 +0100 | |
---|---|---|
committer | 2018-01-10 23:18:26 +0100 | |
commit | 2531a38e6f3239dd942e4b6f13b4865f70bffbd8 (patch) | |
tree | 64f2a8046b544d98fe9125ea499c040f67482e01 /src/containers/settings | |
parent | Merge remote-tracking branch 'origin/master' into develop (diff) | |
parent | Merge pull request #417 from meetfranz/i18n (diff) | |
download | ferdium-app-2531a38e6f3239dd942e4b6f13b4865f70bffbd8.tar.gz ferdium-app-2531a38e6f3239dd942e4b6f13b4865f70bffbd8.tar.zst ferdium-app-2531a38e6f3239dd942e4b6f13b4865f70bffbd8.zip |
Merge branch 'develop' of github.com:meetfranz/franz into develop
Diffstat (limited to 'src/containers/settings')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 9fa815a0a..1fa7ce8bc 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -109,7 +109,7 @@ export default class EditSettingsScreen extends Component { | |||
109 | const { intl } = this.context; | 109 | const { intl } = this.context; |
110 | 110 | ||
111 | const locales = []; | 111 | const locales = []; |
112 | Object.keys(APP_LOCALES).forEach((key) => { | 112 | Object.keys(APP_LOCALES).sort(Intl.Collator().compare).forEach((key) => { |
113 | locales.push({ | 113 | locales.push({ |
114 | value: key, | 114 | value: key, |
115 | label: APP_LOCALES[key], | 115 | label: APP_LOCALES[key], |