From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java b/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
index a10459d..d528e4e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java
@@ -28,7 +28,7 @@
*/
public class LocalManageUtil {
- public static final String cn = "cn";//涓枃
+ public static final String zh = "zh";//涓枃浣�
public static final String en = "en";//鑻辨枃
// private static Locale mLocale;
@@ -140,13 +140,15 @@
LanguageAdapter.ItemData zh = new LanguageAdapter.ItemData();
zh.setState(false);
zh.setTitle("绠�浣撲腑鏂�");
- zh.setLanguage(LocalManageUtil.cn);
+ zh.setLanguage(LocalManageUtil.zh);
list.add(zh);
LanguageAdapter.ItemData en = new LanguageAdapter.ItemData();
en.setState(false);
en.setTitle("English");
en.setLanguage(LocalManageUtil.en);
list.add(en);
+
+
return list;
}
@@ -189,7 +191,7 @@
// Locale locale = context.getResources().getConfiguration().locale;
// String language = locale.getLanguage();
String language = UserConfigManage.getInstance().getCurrentAppLanguage();
- return language.equals(cn);
+ return language.equals(zh);
}
public static List<NationBean> getNationBeans() {
--
Gitblit v1.8.0