From e04e1432aee7fb80afb0dbc82b3428a9fd3ff848 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 5 Jun 2022 22:08:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/book/source/edit/BookSourceEditActivity.kt | 10 +++------- .../app/ui/rss/source/edit/RssSourceEditActivity.kt | 8 +++----- app/src/main/res/values-es-rES/strings.xml | 3 ++- app/src/main/res/values-ja-rJP/strings.xml | 3 ++- app/src/main/res/values-pt-rBR/strings.xml | 3 ++- app/src/main/res/values-zh-rHK/strings.xml | 3 ++- app/src/main/res/values-zh-rTW/strings.xml | 3 ++- app/src/main/res/values-zh/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 3 ++- 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index fdf694bb3..acc770fff 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -215,13 +215,8 @@ class BookSourceEditActivity : add(EditEntity("loginCheckJs", source?.loginCheckJs, R.string.login_check_js)) add(EditEntity("bookUrlPattern", source?.bookUrlPattern, R.string.book_url_pattern)) add(EditEntity("header", source?.header, R.string.source_http_header)) - add( - EditEntity( - "concurrentRate", - source?.concurrentRate, - R.string.source_concurrent_rate - ) - ) + add(EditEntity("variableComment", source?.variableComment, R.string.variable_comment)) + add(EditEntity("concurrentRate", source?.concurrentRate, R.string.concurrent_rate)) } //搜索 val sr = source?.getSearchRule() @@ -328,6 +323,7 @@ class BookSourceEditActivity : "header" -> source.header = it.value "bookSourceComment" -> source.bookSourceComment = it.value ?: "" "concurrentRate" -> source.concurrentRate = it.value + "variableComment" -> source.variableComment = it.value } } searchEntities.forEach { diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt index 01bd4bbe6..45cea1484 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt @@ -170,11 +170,8 @@ class RssSourceEditActivity : add(EditEntity("loginUi", source?.loginUi, R.string.login_ui)) add(EditEntity("loginCheckJs", source?.loginCheckJs, R.string.login_check_js)) add(EditEntity("header", source?.header, R.string.source_http_header)) - add( - EditEntity( - "concurrentRate", source?.concurrentRate, R.string.source_concurrent_rate - ) - ) + add(EditEntity("variableComment", source?.variableComment, R.string.variable_comment)) + add(EditEntity("concurrentRate", source?.concurrentRate, R.string.concurrent_rate)) add(EditEntity("sortUrl", source?.sortUrl, R.string.sort_url)) add(EditEntity("ruleArticles", source?.ruleArticles, R.string.r_articles)) add(EditEntity("ruleNextPage", source?.ruleNextPage, R.string.r_next)) @@ -207,6 +204,7 @@ class RssSourceEditActivity : "loginUi" -> source.loginUi = it.value "loginCheckJs" -> source.loginCheckJs = it.value "header" -> source.header = it.value + "variableComment" -> source.variableComment = it.value "concurrentRate" -> source.concurrentRate = it.value "sortUrl" -> source.sortUrl = it.value "ruleArticles" -> source.ruleArticles = it.value diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 5827eba82..49bd444fd 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -388,7 +388,7 @@ 源分组(sourceGroup) 自定义源分组 输入自定义源分组名称 - 并发率(concurrentRate) + 并发率(concurrentRate) 分类Url(sortUrl) 登录URL(loginUrl) 登录UI(loginUi) @@ -995,4 +995,5 @@ Fail to decode bitmap Image url is empty, check replacement rules + 变量说明(variableComment) diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 88570cfdc..324995eb8 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -392,7 +392,7 @@ 源分组(sourceGroup) 自定义源分组 输入自定义源分组名称 - 并发率(concurrentRate) + 并发率(concurrentRate) 分类Url(sortUrl) 登录URL(loginUrl) 登录UI(loginUi) @@ -998,4 +998,5 @@ Fail to decode bitmap Image url is empty, check replacement rules + 变量说明(variableComment) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ee55c893a..6fae8a053 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -390,7 +390,7 @@ 源分组(fonteGrupo) 自定义源分组 输入自定义源分组名称 - 并发率(taxaSimultânea) + 并发率(taxaSimultânea) 分类Url(ordenarUrl) 登录URL(loginUrl) 登UI(loginIU) @@ -998,4 +998,5 @@ Fail to decode bitmap Image url is empty, check replacement rules + 变量说明(variableComment) diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 22c20f729..8afa0fb70 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -388,7 +388,7 @@ 源URL (sourceUrl) 源分組 (sourceGroup) 分類 Url(sortUrl) - 並發率(concurrentRate) + 並發率(concurrentRate) 登錄 URL(loginUrl) 登錄UI(loginUi) 登錄檢查JS(loginCheckJs) @@ -995,4 +995,5 @@ 图片解码失败 图片链接为空，检查替换净化规则 + 变量说明(variableComment) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 963cff29e..2958a2c5a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -391,7 +391,7 @@ 源分組(sourceGroup) 自訂源分組 輸入自訂源分組名稱 - 並發率(concurrentRate) + 並發率(concurrentRate) 分類Url(sortUrl) 登入URL(loginUrl) 登入UI(loginUi) @@ -997,4 +997,5 @@ 图片解码失败 图片链接为空，检查替换净化规则 + 变量说明(variableComment) diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 345a0513c..c9bb20512 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -391,7 +391,7 @@ 源分组（sourceGroup） 自定义源分组 输入自定义源分组名称 - 并发率（concurrentRate） + 并发率（concurrentRate） 分类 URL（sortUrl） 登录 URL(loginUrl) 登录 UI（loginUi） @@ -997,4 +997,5 @@ 图片解码失败 图片链接为空，检查替换净化规则 + 变量说明(variableComment) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d6905d954..c81e399db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -392,7 +392,7 @@ 源分组(sourceGroup) 自定义源分组 输入自定义源分组名称 - 并发率(concurrentRate) + 并发率(concurrentRate) 分类Url(sortUrl) 登录URL(loginUrl) Login UI(loginUi) @@ -998,4 +998,5 @@ Fail to decode bitmap Image url is empty, check replacement rules + 变量说明(variableComment)