Merge pull request #181 from willvincent/fix-lang-selection

Issue #170: Fix language selection
rafajaques · Oct 28, 2016 · 07b7276 · 07b7276
2 parents e37c11c + f24f90d
commit 07b7276
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/js/welcome.js b/app/js/welcome.js
@@ -33,7 +33,13 @@ $.each(i18n.fullLocaleList, (i, v) => {
 });
 
 // Try to figure out user's language
-$('#locales-list').val(app.getLocale() ? app.getLocale() : 'en');
+if (app.getLocale() in i18n.fullLocaleList) {
+  $('#locales-list').val(app.getLocale());
+} else if (app.getLocale().split('-')[0] in i18n.fullLocaleList) {
+  $('#locales-list').val(app.getLocale().split('-')[0]);
+} else {
+  $('#locales-list').val('en');
+}
 
 /* Go button action */
 $('#go').click(() => {