Skip to content

Commit 5a78ab9

Browse files
SevtingeSevtinge
committed
app: optimization language change
1 parent ba35a36 commit 5a78ab9

8 files changed

Lines changed: 76 additions & 33 deletions

File tree

‎app/build.gradle‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ static def getGitHash() {
2626
return "git rev-parse --short HEAD".execute().text.trim()
2727
}
2828

29+
static def getGitHashLong() {
30+
def process = "git rev-parse HEAD".execute()
31+
process.in.text.trim()
32+
}
33+
2934
android {
3035
compileSdk 34
3136

@@ -116,7 +121,7 @@ android {
116121
shrinkResources true
117122
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
118123
versionNameSuffix "_" + DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDateTime.now()) + "_b" + gitCode
119-
buildConfigField "String", "GIT_HASH", "\"${gitHash}\""
124+
buildConfigField "String", "GIT_HASH", "\"${gitHashLong}\""
120125
if (keyStoreFile != null) {
121126
signingConfig signingConfigs.hyperceiler
122127
}
@@ -126,14 +131,14 @@ android {
126131
shrinkResources true
127132
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
128133
versionNameSuffix "_" + DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDateTime.now()) + "_c" + gitCode
129-
buildConfigField "String", "GIT_HASH", "\"${gitHash}\""
134+
buildConfigField "String", "GIT_HASH", "\"${gitHashLong}\""
130135
if (keyStoreFile != null) {
131136
signingConfig signingConfigs.hyperceiler
132137
}
133138
}
134139
debug {
135140
versionNameSuffix "_" + DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDateTime.now()) + "_d" + gitCode
136-
buildConfigField "String", "GIT_HASH", "\"${gitHash}\""
141+
buildConfigField "String", "GIT_HASH", "\"${gitHashLong}\""
137142
if (keyStoreFile != null) {
138143
signingConfig signingConfigs.hyperceiler
139144
}

‎app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/settings/ModuleSettingsFragment.java‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,24 +85,48 @@ public void initPrefs() {
8585
public boolean onPreferenceChange(@NonNull Preference preference, Object o) {
8686
String v = LanguageHelper.appLanguages[Integer.parseInt((String) o)];
8787
switch (v) {
88-
case "CN" -> {
88+
case "en" -> {
89+
LanguageHelper.setLanguage(getContext(), "en");
90+
getActivity().recreate();
91+
}
92+
case "zh_CN" -> {
8993
LanguageHelper.setLanguage(getContext(), "zh", "CN");
9094
getActivity().recreate();
9195
}
92-
case "TW" -> {
96+
case "zh_TW" -> {
9397
LanguageHelper.setLanguage(getContext(), "zh", "TW");
9498
getActivity().recreate();
9599
}
96-
case "HK" -> {
100+
case "zh_HK" -> {
97101
LanguageHelper.setLanguage(getContext(), "zh", "HK");
98102
getActivity().recreate();
99103
}
100-
case "en" -> {
101-
LanguageHelper.setLanguage(getContext(), "en");
104+
case "ja_JP" -> {
105+
LanguageHelper.setLanguage(getContext(), "ja", "JP");
102106
getActivity().recreate();
103107
}
104-
case "JP" -> {
105-
LanguageHelper.setLanguage(getContext(), "ja", "JP");
108+
case "ru_RU" -> {
109+
LanguageHelper.setLanguage(getContext(), "ru", "RU");
110+
getActivity().recreate();
111+
}
112+
case "es_ES" -> {
113+
LanguageHelper.setLanguage(getContext(), "es", "ES");
114+
getActivity().recreate();
115+
}
116+
case "pt_BR" -> {
117+
LanguageHelper.setLanguage(getContext(), "pt", "BR");
118+
getActivity().recreate();
119+
}
120+
case "in_ID" -> {
121+
LanguageHelper.setLanguage(getContext(), "in", "ID");
122+
getActivity().recreate();
123+
}
124+
case "tr_TR" -> {
125+
LanguageHelper.setLanguage(getContext(), "tr", "TR");
126+
getActivity().recreate();
127+
}
128+
case "vi_VN" -> {
129+
LanguageHelper.setLanguage(getContext(), "vi", "VN");
106130
getActivity().recreate();
107131
}
108132
}

‎app/src/main/java/com/sevtinge/hyperceiler/utils/LanguageHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
public class LanguageHelper {
2828
public static final String[] appLanguages = {
29-
"CN", "TW", "HK", "en", "JP"
29+
"en", "zh_CN", "zh_TW", "zh_HK", "ja_JP", "ru_RU", "es_ES", "pt_BR", "in_ID", "tr_TR", "vi_VN"
3030
};
3131

3232
public static void setLanguage(Context context, String language) {
@@ -61,7 +61,7 @@ public static String getLanguage(Context context) {
6161
if (country.isEmpty()) {
6262
return resources.getConfiguration().getLocales().get(0).getLanguage();
6363
}
64-
return country;
64+
return resources.getConfiguration().getLocales().get(0).getLanguage() + "_" + country;
6565
}
6666

6767
public static String newLanguage(String language, String country) {

‎app/src/main/res/values-ja-rJP/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<string name="new_cta_app_main_purpose">システムアプリの変更</string>
99
<string name="new_cta_app_all_purpose_title">HyperCeiler へようこそ。このアプリはシステムの機能強化をするために Xposed フレームワークを利用して対応アプリを改変します。使用中、より多くの機能を提供するために root/su 権限の許可を求める場合があります。お使いの root/su マネージャーにアクセスして許可してください。</string>
1010
<!--HyperCeiler Settings/About Page-->
11-
<string name="language">Japanese (日本語)</string>
11+
<string name="language">日本語</string>
1212
<string name="translator">AndroPlus</string>
1313
<string name="translator_url">https://github.com/AndroPlus-org</string>
1414
<string name="home">ホーム</string>

‎app/src/main/res/values-tr-rTR/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--Introduction to Xposed Modules-->
44
<string name="xposed_description">HyperOS/MIUI\'yi Yeniden Harika Hale Getirin!</string>
55
<!--HyperCeiler Settings/About Page-->
6-
<string name="language">İngilizce</string>
6+
<string name="language">Türkçe</string>
77
<string name="translator">can1gulle</string>
88
<string name="translator_url">https://github.com/can1gulle</string>
99
<string name="settings">Ayarlar</string>

‎app/src/main/res/values-zh-rCN/strings.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,7 @@
6969
<string name="settings_icon_medium">中部</string>
7070
<string name="settings_icon_down">底部</string>
7171
<string name="settings_icon_mode">图标样式</string>
72-
<string name="settings_app_language">软件语言</string>
73-
<string name="settings_app_zh">简体中文</string>
74-
<string name="settings_app_zh_hk">繁体中文(香港)</string>
75-
<string name="settings_app_zh_tw">繁体中文(台湾)</string>
76-
<string name="settings_app_en">英文</string>
77-
<string name="settings_app_jp">日语</string>
72+
<string name="settings_app_language">语言</string>
7873
<string name="settings_icon_miui_14">圆角矩形样式</string>
7974
<string name="settings_icon_miui_13">背景镂空样式</string>
8075
<string name="settings_reboot">重启作用域</string>

‎app/src/main/res/values/arrays.xml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,17 +155,24 @@
155155
<item>@string/settings_icon_miui_13</item>
156156
</string-array>
157157

158+
<string-array name="settings_icon_mode_value">
159+
<item>0</item>
160+
<item>1</item>
161+
</string-array>
162+
158163
<string-array name="settings_app_language">
159-
<item>@string/settings_app_zh</item>
164+
<item>@string/settings_app_en</item>
165+
<item>@string/settings_app_zh_cn</item>
160166
<item>@string/settings_app_zh_tw</item>
161167
<item>@string/settings_app_zh_hk</item>
162-
<item>@string/settings_app_en</item>
163-
<item>@string/settings_app_jp</item>
164-
</string-array>
168+
<item>@string/settings_app_ja_jp</item>
169+
<item>@string/settings_app_ru_ru</item>
170+
<item>@string/settings_app_es_es</item>
171+
<item>@string/settings_app_pt_br</item>
172+
<item>@string/settings_app_in_id</item>
173+
<item>@string/settings_app_tr_tr</item>
174+
<item>@string/settings_app_vi_vn</item>
165175

166-
<string-array name="settings_icon_mode_value">
167-
<item>0</item>
168-
<item>1</item>
169176
</string-array>
170177

171178
<string-array name="settings_app_language_value">
@@ -174,6 +181,12 @@
174181
<item>2</item>
175182
<item>3</item>
176183
<item>4</item>
184+
<item>5</item>
185+
<item>6</item>
186+
<item>7</item>
187+
<item>8</item>
188+
<item>9</item>
189+
<item>10</item>
177190
</string-array>
178191

179192
<array name="miui_volume_timer_segments">

‎app/src/main/res/values/strings.xml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,18 @@
9494
<string name="settings_icon_medium">Middle</string>
9595
<string name="settings_icon_down">Bottom</string>
9696
<string name="settings_icon_mode">Icon style</string>
97-
<string name="settings_app_zh">Chinese Simplified</string>
98-
<string name="settings_app_zh_tw">Chinese Traditional (Tai Wan)</string>
99-
<string name="settings_app_zh_hk">Chinese Traditional (Hong Kong)</string>
100-
<string name="settings_app_en">English</string>
101-
<string name="settings_app_jp">Japanese</string>
102-
<string name="settings_app_language">Software language</string>
97+
<string name="settings_app_en" translatable="false">English</string>
98+
<string name="settings_app_zh_cn" translatable="false">简体中文</string>
99+
<string name="settings_app_zh_tw" translatable="false">繁體中文 (台灣)</string>
100+
<string name="settings_app_zh_hk" translatable="false">繁體中文 (香港)</string>
101+
<string name="settings_app_ja_jp" translatable="false">日本語</string>
102+
<string name="settings_app_ru_ru" translatable="false">Русский</string>
103+
<string name="settings_app_es_es" translatable="false">Español</string>
104+
<string name="settings_app_pt_br" translatable="false">Português (Brasil)</string>
105+
<string name="settings_app_in_id" translatable="false">Bahasa Indonesia</string>
106+
<string name="settings_app_tr_tr" translatable="false">Türkçe</string>
107+
<string name="settings_app_vi_vn" translatable="false">Tiếng Việt</string>
108+
<string name="settings_app_language">Language</string>
103109
<string name="settings_icon_miui_14">Rounded rectangle style</string>
104110
<string name="settings_icon_miui_13">Background cutout style</string>
105111
<string name="settings_reboot">Restart the target app</string>

0 commit comments

Comments
 (0)