|
@@ -15,6 +15,7 @@ import com.xplora.xponboarding.Data.DataManager;
|
|
|
import com.xplora.xponboarding.Model.BaseModel;
|
|
|
import com.xplora.xponboarding.R;
|
|
|
import com.xplora.xponboarding.Utils.Constant;
|
|
|
+import com.xplora.xponboarding.Utils.ResUtils;
|
|
|
|
|
|
import java.lang.reflect.Method;
|
|
|
import java.util.ArrayList;
|
|
@@ -49,17 +50,14 @@ public class OnboardingActivity extends BaseActivatedActivity {
|
|
|
}
|
|
|
|
|
|
private void initData() {
|
|
|
- mLanguageList = DataManager.getLanguageList();
|
|
|
+ //mLanguageList = DataManager.getLanguageList();
|
|
|
+ mLanguageList = new ArrayList<>();
|
|
|
+ mLanguageList.add("zh-CN");
|
|
|
String currentLanguage = DataManager.getCurrentLanguage();
|
|
|
|
|
|
for (String s : mLanguageList) {
|
|
|
boolean isOn = s.trim().equals(currentLanguage.trim());
|
|
|
- Locale locale;
|
|
|
- if (s.equals("sr")) {
|
|
|
- locale = new Locale.Builder().setLanguage("sr").setRegion("RS").setScript("latn").build();
|
|
|
- } else {
|
|
|
- locale = new Locale(s);
|
|
|
- }
|
|
|
+ Locale locale = ResUtils.getLocaleName(s);
|
|
|
String name = LocaleHelper.getDisplayName(locale, locale, true);
|
|
|
int endIndex = name.indexOf("(");
|
|
|
if (endIndex >= 0) {
|
|
@@ -111,12 +109,7 @@ public class OnboardingActivity extends BaseActivatedActivity {
|
|
|
if (position >= mLanguageList.size())
|
|
|
return;
|
|
|
String language = mLanguageList.get(position);
|
|
|
- Locale locale;
|
|
|
- if (language.equals("sr")) {
|
|
|
- locale = new Locale.Builder().setLanguage("sr").setRegion("RS").setScript("latn").build();
|
|
|
- } else {
|
|
|
- locale = new Locale(language);
|
|
|
- }
|
|
|
+ Locale locale = ResUtils.getLocaleName(language);
|
|
|
updateLanguage(locale);
|
|
|
}
|
|
|
|