Skip to content

Commit e0ad0d6

Browse files
committed
i18n: improve language strings and logging
- Add emojis and unify UI message style - Switch all format strings to positional printf (%n$s) - Replace hardcoded log messages with language keys - Align en_US and zh_CN translations
1 parent a0d889c commit e0ad0d6

4 files changed

Lines changed: 199 additions & 187 deletions

File tree

module/lang/lang_en_US.sh

Lines changed: 92 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -3,131 +3,137 @@
33
# ================================
44

55
# --- General ---
6-
TXT_SERVICE_START="=== Starting font module monitor task ==="
7-
TXT_START_MONITOR="Starting monitoring of other font modules..."
8-
TXT_MONITOR_DONE="Font module monitoring completed"
9-
TXT_NO_CONFLICT=" No conflicting font modules detected"
6+
TXT_SERVICE_START="🚀 === Starting font module monitor task ==="
7+
TXT_START_MONITOR="📹 Starting monitoring of other font modules..."
8+
TXT_MONITOR_DONE="Font module monitoring completed"
9+
TXT_NO_CONFLICT=" No conflicting font modules detected"
1010

11-
TXT_LOCK_BUSY=" Another instance is running, skipping this run"
12-
TXT_SERVICE_BUSY=" Another instance is running, exiting service"
11+
TXT_LOCK_BUSY=" Another instance is running, skipping this run"
12+
TXT_SERVICE_BUSY=" Another instance is running, exiting service"
1313

14-
TXT_ERROR_COMMON_MISSING="Error: common_functions.sh not found!"
15-
TXT_API_TOO_LOW="Android version too low, skipping font injection"
16-
TXT_ERROR_API_LEVEL="Error: API level not set."
14+
TXT_API_TOO_LOW="⏬ Android version too low, skipping font injection"
15+
TXT_ERROR_API_LEVEL="❌ Error: API level not set."
1716

1817
# --- Font XML ---
19-
TXT_XML_NEW="Detected new font XML from module %s: %s/%s."
20-
TXT_XML_UPDATE="Detected updated font XML from module %s: %s/%s, reprocessing."
21-
TXT_XML_RECREATE="Detected recreated font XML from module %s: %s/%s."
18+
TXT_XML_NEW="🆕️ Detected new font XML from module %1$s: %2$s/%3$s."
19+
TXT_XML_UPDATE="♻️ Detected updated font XML from module %1$s: %2$s/%3$s, reprocessing."
20+
TXT_XML_RECREATE="🔁 Detected recreated font XML from module %1$s: %2$s/%3$s."
2221

23-
TXT_XML_BACKUP_FAIL=" Backup failed: %s, skipping"
24-
TXT_XML_COPY_FAIL=" Copy failed: %s"
22+
TXT_XML_BACKUP_FAIL=" Backup failed: %1$s, skipping"
23+
TXT_XML_COPY_FAIL=" Copy failed: %1$s"
2524

26-
TXT_XML_INJECT_OK=" Injected font configuration into %s"
27-
TXT_XML_REPLACED="Replaced %s %s/%s and re-injected fonts."
25+
TXT_XML_INJECT_OK=" Injected font configuration into %1$s"
26+
TXT_XML_REPLACED="Replaced %1$s %2$s/%3$s and re-injected fonts."
2827

2928
# --- Error messages ---
30-
TXT_ERROR_COPY=" Copy failed: from %s to %s"
31-
TXT_ERROR_WRITE=" Write failed: %s"
32-
TXT_ERROR_PROCESS=" Process failed: %s"
33-
TXT_ERROR_MOVE=" Move failed: from %s to %s"
29+
TXT_ERROR_COPY=" Copy failed: from %1$s to %2$s"
30+
TXT_ERROR_WRITE=" Write failed: %1$s"
31+
TXT_ERROR_PROCESS=" Process failed: %1$s"
32+
TXT_ERROR_MOVE=" Move failed: from %1$s to %2$s"
3433

35-
TXT_XML_FORMAT_WARN=" ⚠ Warning: %s format may be invalid, skipping."
36-
TXT_XML_NOT_FOUND=" File not found: %s"
37-
TXT_XML_FRAGMENT_MISSING=" Font fragment configuration missing"
38-
TXT_XML_NONE=" No other font XML modules found"
34+
TXT_XML_FORMAT_WARN=" Warning: %1$s format may be invalid, skipping."
35+
TXT_XML_NOT_FOUND=" File not found: %1$s"
36+
TXT_XML_FRAGMENT_MISSING=" Font fragment configuration missing"
37+
TXT_XML_NONE=" ℹ️ No other font XML modules found"
3938

4039
# --- Font binaries ---
41-
TXT_WARN_NO_SELF_FONTS="⚠ No font files found in this module's system/fonts, binary conflicts cannot be handled"
42-
TXT_BIN_NEW="Detected new conflicting font binary from module %s: %s/%s."
43-
TXT_BIN_UPDATE="Detected updated conflicting font binary from module %s: %s/%s."
44-
TXT_BIN_RECREATE="Detected recreated conflicting font binary from module %s: %s/%s."
40+
TXT_WARN_NO_SELF_FONTS=" No font files found in this module's system/fonts, binary conflicts cannot be handled"
41+
TXT_BIN_NEW="🆕️ Detected new conflicting font binary from module %1$s: %2$s/%3$s."
42+
TXT_BIN_UPDATE="♻️ Detected updated conflicting font binary from module %1$s: %2$s/%3$s."
43+
TXT_BIN_RECREATE="🔁 Detected recreated conflicting font binary from module %1$s: %2$s/%3$s."
4544

46-
TXT_BIN_BACKUP_OK="Removed and backed up: %s/%s/%s"
47-
TXT_BIN_BACKUP_FAIL=" Backup failed: %s, skipping"
48-
TXT_BIN_NONE=" No conflicting font binaries found"
45+
TXT_BIN_BACKUP_OK="Removed and backed up: %1$s/%2$s/%3$s"
46+
TXT_BIN_BACKUP_FAIL=" Backup failed: %1$s, skipping"
47+
TXT_BIN_NONE=" ℹ️ No conflicting font binaries found"
4948

5049
# --- Install phase ---
51-
TXT_INSTALL_XML_SCAN="Processing font XML files from other modules..."
52-
TXT_INSTALL_BIN_SCAN="Processing font binary files from other modules..."
53-
TXT_INSTALL_SYSTEM_XML="Scanning system font XML files..."
54-
TXT_INSTALL_DONE="- Installation completed, font conflicts resolved"
55-
TXT_INSTALL_PROCESS=" Processing: %s/%s"
56-
TXT_INSTALL_COPY_FAIL=" Copy failed: %s"
57-
TXT_SYSTEM_XML_NONE=" No system font XML files found"
50+
TXT_INSTALL_XML_SCAN="📄 Processing font XML files from other modules..."
51+
TXT_INSTALL_BIN_SCAN="📦 Processing font binary files from other modules..."
52+
TXT_INSTALL_SYSTEM_XML="🧩 Scanning system font XML files..."
53+
TXT_INSTALL_DONE="- Installation completed, font conflicts resolved"
54+
TXT_INSTALL_PROCESS=" ⚙️ Processing: %1$s/%2$s"
55+
TXT_INSTALL_COPY_FAIL=" Copy failed: %1$s"
56+
TXT_SYSTEM_XML_NONE=" ℹ️ No system font XML files found"
5857

5958
# --- Module lifecycle ---
60-
TXT_MODULE_FOUND=" Found module: %s"
61-
TXT_MODULE_REMOVED_XML="Module %s removed, cleaning XML backups (%s)."
62-
TXT_MODULE_REMOVED_BIN="Module %s removed, cleaning binary backups (%s)."
59+
TXT_MODULE_FOUND=" 🔍 Found module: %1$s"
60+
TXT_MODULE_REMOVED_XML="🧹 Module %1$s removed, cleaning XML backups (%2$s)."
61+
TXT_MODULE_REMOVED_BIN="🧹 Module %1$s removed, cleaning binary backups (%2$s)."
6362

6463
# --- Input detection ---
65-
TXT_KEYCHECK_DETECT="- Using keycheck for volume key detection (%s seconds)"
66-
TXT_GETEVENT_DETECT="- Using getevent for volume key detection (%s seconds)"
67-
TXT_NO_INPUT_METHOD="- No available input method detected"
64+
TXT_KEYCHECK_DETECT="- 🎚️ Using keycheck for volume key detection (%1$s seconds)"
65+
TXT_GETEVENT_DETECT="- 🎚️ Using getevent for volume key detection (%1$s seconds)"
66+
TXT_NO_INPUT_METHOD="- ℹ️ No available input method detected"
6867

6968
# --- cmap cleanup ---
7069
TXT_CMAP_TITLE="📌 Optional: cmap table cleanup"
71-
TXT_CMAP_DESC_1="If you encounter:"
72-
TXT_CMAP_DESC_2=" - Kaomoji (like ʕ•ᴥ•ʔ、(╯°□°)、 ๑⃙⃘´༥`๑⃙⃘ 、(ͼ̤͂ ͜ ͽ̤͂)✧) display abnormally"
73-
TXT_CMAP_DESC_3=" - Emoji shows as blank / squares / misaligned (like😀.png 、🤓:nerd face)"
70+
TXT_CMAP_DESC_1="📖 If you encounter:"
71+
TXT_CMAP_DESC_2=" - 😵 Kaomoji (like ʕ•ᴥ•ʔ、 (╯°□°)、 ๑⃙⃘´༥`๑⃙⃘ 、 (ͼ̤͂ ͜ ͽ̤͂)✧、 ٩(๑ᵒ̴̶̷͈᷄ᗨᵒ̴̶̷͈᷅)و) display abnormally"
72+
TXT_CMAP_DESC_3=" - 😀 Emoji shows as blank / squares / misaligned (like😀.png 、🤓:nerd face)"
7473
TXT_CMAP_DESC_4="👉 This is usually caused by font cmap conflicts"
75-
TXT_CMAP_DESC_5="⚠ This operation modifies module font files (safe & reversible)"
74+
TXT_CMAP_DESC_5=" This operation modifies module font files (safe & reversible)"
7675

7776
# --- Magisk ---
78-
TXT_MAGISK_MIRROR_UNAVAIL="⚠ Magisk mirror path unavailable, will use system path directly"
79-
TXT_MAGISK_CMD_UNAVAIL="⚠ Magisk command unavailable, will use system path directly"
77+
TXT_MAGISK_MIRROR_UNAVAIL=" Magisk mirror path unavailable, will use system path directly"
78+
TXT_MAGISK_CMD_UNAVAIL=" Magisk command unavailable, will use system path directly"
8079

81-
TXT_CMAP_CHOICE="Within 15 seconds:"
82-
TXT_CMAP_SKIP_HINT=" [+]Volume Up → Skip"
83-
TXT_CMAP_RUN_HINT=" [-]Volume Down → Run cleanup"
80+
TXT_CMAP_CHOICE="Within 15 seconds:"
81+
TXT_CMAP_SKIP_HINT=" ⬆️ [+]Volume Up → Skip"
82+
TXT_CMAP_RUN_HINT=" ⬇️ [-]Volume Down → Run cleanup"
8483

8584
TXT_CMAP_RUN="🚀 User chose to run cmap cleanup"
86-
TXT_CMAP_SKIP="↩ User chose to skip"
87-
TXT_CMAP_TIMEOUT="⏱ Timeout, skipped"
88-
TXT_CMAP_UNSUPPORTED=" Key detection not supported, skipped"
85+
TXT_CMAP_SKIP=" User chose to skip"
86+
TXT_CMAP_TIMEOUT=" Timeout, skipped"
87+
TXT_CMAP_UNSUPPORTED="ℹ️ Key detection not supported, skipped"
8988

9089
TXT_CMAP_START="🔧 Running font-cmap-cleaner..."
91-
TXT_CMAP_DONE=" font-cmap-cleaner completed"
92-
TXT_CMAP_FAIL="⚠ font-cmap-cleaner failed (exit=%s)"
93-
TXT_CMAP_COPY_FAIL=" Failed to copy font-cmap-tool"
94-
TXT_CMAP_CANNOT_RUN="⚠ font-cmap-cleaner cannot run on current system"
95-
TXT_CMAP_TOOL_PATH=" %s"
90+
TXT_CMAP_DONE=" font-cmap-cleaner completed"
91+
TXT_CMAP_FAIL=" font-cmap-cleaner failed (exit=%1$s)"
92+
TXT_CMAP_COPY_FAIL=" Failed to copy font-cmap-tool"
93+
TXT_CMAP_CANNOT_RUN=" font-cmap-cleaner cannot run on current system"
94+
TXT_CMAP_TOOL_PATH=" 📍 %1$s"
9695

9796
# --- ABI / tool ---
98-
TXT_ABI_PRIMARY="- Primary ABI: %s"
99-
TXT_ABI_LIST="- ABI list: %s"
100-
TXT_ABI_UNSUPPORTED="! Unsupported ABI: %s"
101-
TXT_CMAP_TOOL_MISSING="! font-cmap-cleaner binary not found or not executable"
102-
TXT_CMAP_TOOL_USING="- Using font-cmap-cleaner: %s"
97+
TXT_ABI_PRIMARY="- 🧬 Primary ABI: %1$s"
98+
TXT_ABI_LIST="- 🧬 ABI list: %1$s"
99+
TXT_ABI_UNSUPPORTED="! Unsupported ABI: %1$s"
100+
TXT_CMAP_TOOL_MISSING="! font-cmap-cleaner binary not found or not executable"
101+
TXT_CMAP_TOOL_USING="- 🔧 Using font-cmap-cleaner: %1$s"
103102

104103
# --- Install UI ---
105-
TXT_INSTALL_TITLE="Unicode Font Set Installer"
104+
TXT_INSTALL_TITLE="🎨 Unicode Font Set Installer"
106105
TXT_INSTALL_HEADER="========================================"
107-
TXT_VERSION="Version: %s"
108-
TXT_INSTALL_COMPLETE="Installation completed!"
109-
TXT_REBOOT_REQUIRED="Please reboot your device to apply font configurations."
110-
TXT_GENERATE_CONFIG="Generating custom configuration file..."
111-
TXT_CONFIG_GENERATED="Custom configuration file generated: %s"
112-
TXT_CONFIG_INFO="You can edit this file to customize font priorities and coverage"
113-
TXT_CHECK_UPDATE="Checking for updates..."
114-
TXT_START_SERVICE="Starting font module service..."
106+
TXT_VERSION="🏷️ Version: %1$s"
107+
TXT_INSTALL_COMPLETE="🎉 Installation completed!"
108+
TXT_REBOOT_REQUIRED="🔄 Please reboot your device to apply font configurations."
109+
TXT_START_SERVICE="▶️ Starting font module service..."
115110

116111
# --- Lock ---
117-
TXT_LOCK_TIMEOUT=" Lock acquisition timeout (30s), possible deadlock"
112+
TXT_LOCK_TIMEOUT="⏰⚠️ Lock acquisition timeout (30s), possible deadlock"
118113

119114
# --- Installation steps ---
120-
TXT_STEP_1="1/4: Scanning font XML files from other modules..."
121-
TXT_STEP_2="2/4: Processing font binary files from other modules..."
122-
TXT_STEP_3="3/4: Processing system font XML files..."
123-
TXT_STEP_4="4/4: Completing installation preparations..."
115+
TXT_STEP_1="①📄 Scanning font XML files from other modules..."
116+
TXT_STEP_2="②📦 Processing font binary files from other modules..."
117+
TXT_STEP_3="③🧩 Processing system font XML files..."
118+
TXT_STEP_4="④✅ Completing installation preparations..."
124119
TXT_INSTALL_SEPARATOR="========================================"
125120

126-
# --- Common log messages ---
127-
TXT_LOG_WARNING="Warning: %s"
128-
TXT_LOG_ERROR="Error: %s"
129-
TXT_LOG_SUCCESS="Success: %s"
121+
# --- Log messages ---
122+
TXT_LOG_FILE_NOT_FOUND="❌ File not found: %1$s"
123+
TXT_LOG_FRAGMENT_NOT_FOUND="❌ Font fragment file not found: %1$s"
124+
TXT_LOG_INVALID_XML_FORMAT="❌ Invalid XML format: %1$s"
125+
TXT_LOG_COPY_FAILED="❌ Failed to copy %1$s to %2$s"
126+
TXT_LOG_WRITE_FAILED="❌ Failed to write temporary file %1$s"
127+
TXT_LOG_MISSING_COMMENTS="❌ Temporary file missing module comments: %1$s"
128+
TXT_LOG_REPLACE_FAILED="❌ Failed to replace %1$s with %2$s"
129+
TXT_LOG_PROCESS_FAILED="❌ Failed to process %1$s with awk"
130+
TXT_LOG_MOVE_FAILED="❌ Failed to move %1$s to %2$s"
131+
TXT_LOG_REMOVE_FAILED="⚠️ ailed to remove temporary file %1$s"
132+
TXT_LOG_OLD_FONTS_REMOVE_FAILED="⚠️ Failed to remove old fonts from %1$s"
133+
TXT_LOG_XML_PROCESSED="✅ Successfully processed font XML: %1$s"
134+
TXT_LOG_SHA1_WRITE_FAILED="❌ Failed to write SHA1 value to %1$s"
135+
TXT_LOG_SHA1_MOVE_FAILED="❌ Failed to move %1$s to %2$s"
130136

131137
# --- Language loader ---
132-
TXT_LANG_DEFAULT_MISSING="Default language file lang_en_US.sh not found"
133-
TXT_LANG_UNSUPPORTED="Unsupported language %s, using English"
138+
TXT_LANG_DEFAULT_MISSING="⚠️ Default language file lang_en_US.sh not found"
139+
TXT_LANG_UNSUPPORTED="⚠️ Unsupported language %1$s, using English"

0 commit comments

Comments
 (0)