liuzhenxing1118 2 жил өмнө
parent
commit
ed78a8614b

+ 13 - 2
app/src/main/java/com/xplora/xponboarding/Activity/OnboardingActivity.java

@@ -54,7 +54,13 @@ public class OnboardingActivity extends BaseActivatedActivity {
 
         for (String s : mLanguageList) {
             boolean isOn = s.trim().equals(currentLanguage.trim());
-            String name = LocaleHelper.getDisplayName(new Locale(s), true);
+            Locale locale;
+            if (s.equals("sr")) {
+                locale = new Locale.Builder().setLanguage("sr").setRegion("RS").setScript("latn").build();
+            } else {
+                locale = new Locale(s);
+            }
+            String name = LocaleHelper.getDisplayName(locale, new Locale(s), true);
             BaseModel model = new BaseModel();
             model.title = name;
             model.isOn = isOn;
@@ -101,7 +107,12 @@ public class OnboardingActivity extends BaseActivatedActivity {
         if (position >= mLanguageList.size())
             return;
         String language = mLanguageList.get(position);
-        Locale locale = new Locale(language);
+        Locale locale;
+        if (language.equals("sr")) {
+            locale = new Locale.Builder().setLanguage("sr").setRegion("RS").setScript("latn").build();
+        } else {
+            locale = new Locale(language);
+        }
         updateLanguage(locale);
     }
 

+ 0 - 0
app/src/main/res/values-sr/strings.xml → app/src/main/res/values-b+sr+Latn/strings.xml