Merge pull request #1371 from blabno/bugfix/1357-not-possible-to-sele…

…ct-english Not possible to select `English` anymore, if system locale is non-English
bisq-network · Feb 19, 2018 · 1723172 · 1723172
2 parents fbc2761 + 5471a8c
commit 1723172
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/common/src/main/java/io/bisq/common/locale/Res.java b/common/src/main/java/io/bisq/common/locale/Res.java
@@ -43,6 +43,8 @@ public class Res {
 
     static {
         GlobalSettings.localeProperty().addListener((observable, oldValue, newValue) -> {
+            if ("en".equalsIgnoreCase(newValue.getLanguage()))
+                newValue = Locale.ROOT;
             resourceBundle = ResourceBundle.getBundle("i18n.displayStrings", newValue, new UTF8Control());
         });
     }
@@ -141,4 +143,4 @@ public ResourceBundle newBundle(String baseName, @NotNull Locale locale, @NotNul
         }
         return bundle;
     }
-}
+}