set default language locale

zom · Feb 13, 2018 · 2601e94 · 2601e94
1 parent 859a929
commit 2601e94
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/src/main/java/org/awesomeapp/messenger/Preferences.java b/app/src/main/java/org/awesomeapp/messenger/Preferences.java
@@ -8,6 +8,8 @@
 
 import org.awesomeapp.messenger.util.Languages;
 
+import java.util.Locale;
+
 import im.zom.messenger.R;
 
 
@@ -35,7 +37,7 @@ public class Preferences {
             OTR_MODE_REQUESTED,
             OTR_MODE_DISABLED
     };
-    public static final String DEFAULT_LANGUAGE = null;
+    public static final String DEFAULT_LANGUAGE = Locale.getDefault().getLanguage();
     public static final String DEFAULT_OTR_MODE = OTR_MODE_AUTO;
     public static final String DEFAULT_NOTIFICATION_RINGTONE_URI = "content://settings/system/notification_sound";
     public static final int DEFAULT_HEARTBEAT_INTERVAL = 1;

diff --git a/app/src/main/java/org/awesomeapp/messenger/util/Languages.java b/app/src/main/java/org/awesomeapp/messenger/util/Languages.java
@@ -80,6 +80,7 @@ private Languages(Activity activity) {
                     || locale.equals(Locale.ENGLISH))
                 localeSet.add(locale);
         }
+
         for (Locale locale : localeSet) {
             if (locale.equals(TIBETAN)) {
                 // include English name for devices without Tibetan font support