Просмотр исходного кода

fix(i18n): update string formatting for download messages and theme management in English and Chinese

dat-bi 5 месяцев назад
Родитель
Сommit
c7bf1db161

+ 2 - 2
app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditViewModel.kt

@@ -53,7 +53,7 @@ class BookInfoEditViewModel(application: Application) : BaseViewModel(applicatio
         execute {
             book = appDb.bookDao.getBook(bookUrl)
             book?.let {
-                val selectedTypeIndex = when {
+                val selectedType = when {
                     it.isImage -> BookInfoEditType.IMAGE
                     it.isAudio -> BookInfoEditType.AUDIO
                     else -> BookInfoEditType.TEXT
@@ -68,7 +68,7 @@ class BookInfoEditViewModel(application: Application) : BaseViewModel(applicatio
                     remark = it.remark,
                     kindList = kinds,
                     originalKindList = kinds,
-                    selectedType = selectedTypeIndex,
+                    selectedType = selectedType,
                     fixedType = it.config.fixedType,
                     book = it
                 )

+ 15 - 1
app/src/main/res/values-zh-rCN/arrays.xml

@@ -7,6 +7,20 @@
         <item>文件</item>
     </string-array>
 
+    <string-array name="layout_type">
+        <item>列表</item>
+        <item>单列</item>
+        <item>双列</item>
+        <item>瀑布</item>
+        <item>三列</item>
+    </string-array>
+
+    <string-array name="rss_type">
+        <item>网页</item>
+        <item>图片</item>
+        <item>视频</item>
+    </string-array>
+
     <string-array name="group_style">
         <item>标签</item>
         <item>隐藏标签</item>
@@ -221,4 +235,4 @@
     </string-array>
 
     <string name="all_version">所有版本</string>
-</resources>
+</resources>

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

@@ -1273,7 +1273,7 @@
     <string name="about_heap_dump_not_found">未找到堆转储文件</string>
     <string name="about_download_info_incomplete">下载信息不完整</string>
     <string name="about_no_data">没有数据</string>
-    <string name="about_start_download">开始下载: %s</string>
+    <string name="about_start_download">开始下载: %1$s</string>
     <string name="crash_report">崩溃报告</string>
     <string name="crash_report_message">应用发生崩溃。报告问题时,请复制以下错误信息。</string>
     <string name="crash_report_empty">未找到崩溃信息。</string>
@@ -1351,9 +1351,9 @@
     <string name="theme_manage_name_hint">请输入主题名称</string>
     <string name="theme_manage_apply_theme">应用主题</string>
     <string name="theme_manage_apply">应用</string>
-    <string name="theme_manage_apply_message">确定应用主题「%s」?应用后需要重启才能完全生效。</string>
+    <string name="theme_manage_apply_message">确定应用主题「%1$s」?应用后需要重启才能完全生效。</string>
     <string name="theme_manage_delete_theme">删除主题</string>
-    <string name="theme_manage_delete_message">确定删除主题「%s」?此操作不可恢复。</string>
+    <string name="theme_manage_delete_message">确定删除主题「%1$s」?此操作不可恢复。</string>
     <string name="theme_manage_preview_day">日间</string>
     <string name="theme_manage_preview_night">夜间</string>
     <string name="theme_manage_edit_theme">编辑主题</string>
@@ -1606,7 +1606,7 @@
     <string name="read_aloud_preload">听书预加载数量</string>
     <string name="read_aloud_preload_summary">%d</string>
     <string name="audio_cache_clean_time">音频缓存保留时间(分钟)</string>
-    <string name="audio_cache_clean_time_summary">当前%d, 输入 0 代表退出即刻清理。</string>
+    <string name="audio_cache_clean_time_summary">当前%1$d, 输入 0 代表退出即刻清理。</string>
     <string name="show_swipe_animation">启用滑动时动画</string>
     <string name="click_image_way">点击图片行为</string>
     <string name="show_web_log">输出日志</string>

+ 4 - 4
app/src/main/res/values/strings.xml

@@ -1305,7 +1305,7 @@
     <string name="about_heap_dump_not_found">Heap dump file not found</string>
     <string name="about_download_info_incomplete">Update download information is incomplete</string>
     <string name="about_no_data">No update log available</string>
-    <string name="about_start_download">Downloading %s</string>
+    <string name="about_start_download">Downloading %1$s</string>
     <string name="crash_report">Crash report</string>
     <string name="crash_report_message">The app crashed. Copy the error information below when reporting the issue.</string>
     <string name="crash_report_empty">No crash information found.</string>
@@ -1383,9 +1383,9 @@
     <string name="theme_manage_name_hint">Enter a theme name</string>
     <string name="theme_manage_apply_theme">Apply Theme</string>
     <string name="theme_manage_apply">Apply</string>
-    <string name="theme_manage_apply_message">Apply theme \"%s\"? A restart is required for all changes to take effect.</string>
+    <string name="theme_manage_apply_message">Apply theme \"%1$s\"? A restart is required for all changes to take effect.</string>
     <string name="theme_manage_delete_theme">Delete Theme</string>
-    <string name="theme_manage_delete_message">Delete theme \"%s\"? This cannot be undone.</string>
+    <string name="theme_manage_delete_message">Delete theme \"%1$s\"? This cannot be undone.</string>
     <string name="theme_manage_preview_day">Day</string>
     <string name="theme_manage_preview_night">Night</string>
     <string name="theme_manage_edit_theme">Edit Theme</string>
@@ -1640,7 +1640,7 @@
     <string name="read_aloud_preload">Read-Aloud Preload Count</string>
     <string name="read_aloud_preload_summary">%d</string>
     <string name="audio_cache_clean_time">Audio Cache Retention Time (minutes)</string>
-    <string name="audio_cache_clean_time_summary">Current: %d. Enter 0 to clear immediately on exit.</string>
+    <string name="audio_cache_clean_time_summary">Current: %1$d. Enter 0 to clear immediately on exit.</string>
     <string name="show_swipe_animation">Enable Animation While Swiping</string>
     <string name="click_image_way">Image Tap Action</string>
     <string name="show_web_log">Output Logs</string>