Locale

app/src/main/java/com/xplora/xpsettings/Activity/LanguageActivity.java

@@ -42,7 +42,6 @@ public class LanguageActivity extends BaseActivity {
         mLanguageList = DataManager.getLanguageList();
         String currentLanguage = DataManager.getCurrentLanguage();
         for (String s : mLanguageList) {
-            boolean isOn = s.trim().equals(currentLanguage.trim());
             Locale locale = ResUtils.getLocaleName(s);
             String name = LocaleHelper.getDisplayName(locale, locale, true);
             int endIndex = name.indexOf("(");
@@ -50,6 +49,11 @@ public class LanguageActivity extends BaseActivity {
                 name = name.substring(0, endIndex);
             }
 
+            //-, _ 不同，影响判断
+            String s1 = s.replace("-", "").replace("_", "").trim();
+            String c1 = currentLanguage.replace("-", "").replace("_", "").trim();
+            boolean isOn = s1.equals(c1);
+
             BaseModel model = new BaseModel();
             model.title = name;
             model.isOn = isOn;