pull/1954/head
kunfei 3 years ago
parent 65136bca50
commit e04e1432ae
  1. 10
      app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
  2. 8
      app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt
  3. 3
      app/src/main/res/values-es-rES/strings.xml
  4. 3
      app/src/main/res/values-ja-rJP/strings.xml
  5. 3
      app/src/main/res/values-pt-rBR/strings.xml
  6. 3
      app/src/main/res/values-zh-rHK/strings.xml
  7. 3
      app/src/main/res/values-zh-rTW/strings.xml
  8. 3
      app/src/main/res/values-zh/strings.xml
  9. 3
      app/src/main/res/values/strings.xml

@ -215,13 +215,8 @@ class BookSourceEditActivity :
add(EditEntity("loginCheckJs", source?.loginCheckJs, R.string.login_check_js)) add(EditEntity("loginCheckJs", source?.loginCheckJs, R.string.login_check_js))
add(EditEntity("bookUrlPattern", source?.bookUrlPattern, R.string.book_url_pattern)) add(EditEntity("bookUrlPattern", source?.bookUrlPattern, R.string.book_url_pattern))
add(EditEntity("header", source?.header, R.string.source_http_header)) add(EditEntity("header", source?.header, R.string.source_http_header))
add( add(EditEntity("variableComment", source?.variableComment, R.string.variable_comment))
EditEntity( add(EditEntity("concurrentRate", source?.concurrentRate, R.string.concurrent_rate))
"concurrentRate",
source?.concurrentRate,
R.string.source_concurrent_rate
)
)
} }
//搜索 //搜索
val sr = source?.getSearchRule() val sr = source?.getSearchRule()
@ -328,6 +323,7 @@ class BookSourceEditActivity :
"header" -> source.header = it.value "header" -> source.header = it.value
"bookSourceComment" -> source.bookSourceComment = it.value ?: "" "bookSourceComment" -> source.bookSourceComment = it.value ?: ""
"concurrentRate" -> source.concurrentRate = it.value "concurrentRate" -> source.concurrentRate = it.value
"variableComment" -> source.variableComment = it.value
} }
} }
searchEntities.forEach { searchEntities.forEach {

@ -170,11 +170,8 @@ class RssSourceEditActivity :
add(EditEntity("loginUi", source?.loginUi, R.string.login_ui)) add(EditEntity("loginUi", source?.loginUi, R.string.login_ui))
add(EditEntity("loginCheckJs", source?.loginCheckJs, R.string.login_check_js)) add(EditEntity("loginCheckJs", source?.loginCheckJs, R.string.login_check_js))
add(EditEntity("header", source?.header, R.string.source_http_header)) add(EditEntity("header", source?.header, R.string.source_http_header))
add( add(EditEntity("variableComment", source?.variableComment, R.string.variable_comment))
EditEntity( add(EditEntity("concurrentRate", source?.concurrentRate, R.string.concurrent_rate))
"concurrentRate", source?.concurrentRate, R.string.source_concurrent_rate
)
)
add(EditEntity("sortUrl", source?.sortUrl, R.string.sort_url)) add(EditEntity("sortUrl", source?.sortUrl, R.string.sort_url))
add(EditEntity("ruleArticles", source?.ruleArticles, R.string.r_articles)) add(EditEntity("ruleArticles", source?.ruleArticles, R.string.r_articles))
add(EditEntity("ruleNextPage", source?.ruleNextPage, R.string.r_next)) add(EditEntity("ruleNextPage", source?.ruleNextPage, R.string.r_next))
@ -207,6 +204,7 @@ class RssSourceEditActivity :
"loginUi" -> source.loginUi = it.value "loginUi" -> source.loginUi = it.value
"loginCheckJs" -> source.loginCheckJs = it.value "loginCheckJs" -> source.loginCheckJs = it.value
"header" -> source.header = it.value "header" -> source.header = it.value
"variableComment" -> source.variableComment = it.value
"concurrentRate" -> source.concurrentRate = it.value "concurrentRate" -> source.concurrentRate = it.value
"sortUrl" -> source.sortUrl = it.value "sortUrl" -> source.sortUrl = it.value
"ruleArticles" -> source.ruleArticles = it.value "ruleArticles" -> source.ruleArticles = it.value

@ -388,7 +388,7 @@
<string name="source_group">源分组(sourceGroup)</string> <string name="source_group">源分组(sourceGroup)</string>
<string name="diy_source_group">自定义源分组</string> <string name="diy_source_group">自定义源分组</string>
<string name="diy_edit_source_group">输入自定义源分组名称</string> <string name="diy_edit_source_group">输入自定义源分组名称</string>
<string name="source_concurrent_rate">并发率(concurrentRate)</string> <string name="concurrent_rate">并发率(concurrentRate)</string>
<string name="sort_url">分类Url(sortUrl)</string> <string name="sort_url">分类Url(sortUrl)</string>
<string name="login_url">登录URL(loginUrl)</string> <string name="login_url">登录URL(loginUrl)</string>
<string name="login_ui">登录UI(loginUi)</string> <string name="login_ui">登录UI(loginUi)</string>
@ -995,4 +995,5 @@
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">Fail to decode bitmap</string> <string name="error_decode_bitmap">Fail to decode bitmap</string>
<string name="error_image_url_empty">Image url is empty, check replacement rules</string> <string name="error_image_url_empty">Image url is empty, check replacement rules</string>
<string name="variable_comment">变量说明(variableComment)</string>
</resources> </resources>

@ -392,7 +392,7 @@
<string name="source_group">源分组(sourceGroup)</string> <string name="source_group">源分组(sourceGroup)</string>
<string name="diy_source_group">自定义源分组</string> <string name="diy_source_group">自定义源分组</string>
<string name="diy_edit_source_group">输入自定义源分组名称</string> <string name="diy_edit_source_group">输入自定义源分组名称</string>
<string name="source_concurrent_rate">并发率(concurrentRate)</string> <string name="concurrent_rate">并发率(concurrentRate)</string>
<string name="sort_url">分类Url(sortUrl)</string> <string name="sort_url">分类Url(sortUrl)</string>
<string name="login_url">登录URL(loginUrl)</string> <string name="login_url">登录URL(loginUrl)</string>
<string name="login_ui">登录UI(loginUi)</string> <string name="login_ui">登录UI(loginUi)</string>
@ -998,4 +998,5 @@
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">Fail to decode bitmap</string> <string name="error_decode_bitmap">Fail to decode bitmap</string>
<string name="error_image_url_empty">Image url is empty, check replacement rules</string> <string name="error_image_url_empty">Image url is empty, check replacement rules</string>
<string name="variable_comment">变量说明(variableComment)</string>
</resources> </resources>

@ -390,7 +390,7 @@
<string name="source_group">源分组(fonteGrupo)</string> <string name="source_group">源分组(fonteGrupo)</string>
<string name="diy_source_group">自定义源分组</string> <string name="diy_source_group">自定义源分组</string>
<string name="diy_edit_source_group">输入自定义源分组名称</string> <string name="diy_edit_source_group">输入自定义源分组名称</string>
<string name="source_concurrent_rate">并发率(taxaSimultânea)</string> <string name="concurrent_rate">并发率(taxaSimultânea)</string>
<string name="sort_url">分类Url(ordenarUrl)</string> <string name="sort_url">分类Url(ordenarUrl)</string>
<string name="login_url">登录URL(loginUrl)</string> <string name="login_url">登录URL(loginUrl)</string>
<string name="login_ui">登UI(loginIU)</string> <string name="login_ui">登UI(loginIU)</string>
@ -998,4 +998,5 @@
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">Fail to decode bitmap</string> <string name="error_decode_bitmap">Fail to decode bitmap</string>
<string name="error_image_url_empty">Image url is empty, check replacement rules</string> <string name="error_image_url_empty">Image url is empty, check replacement rules</string>
<string name="variable_comment">变量说明(variableComment)</string>
</resources> </resources>

@ -388,7 +388,7 @@
<string name="source_url">源URL (sourceUrl)</string> <string name="source_url">源URL (sourceUrl)</string>
<string name="source_group">源分組 (sourceGroup)</string> <string name="source_group">源分組 (sourceGroup)</string>
<string name="sort_url">分類 Url(sortUrl)</string> <string name="sort_url">分類 Url(sortUrl)</string>
<string name="source_concurrent_rate">並發率(concurrentRate)</string> <string name="concurrent_rate">並發率(concurrentRate)</string>
<string name="login_url">登錄 URL(loginUrl)</string> <string name="login_url">登錄 URL(loginUrl)</string>
<string name="login_ui">登錄UI(loginUi)</string> <string name="login_ui">登錄UI(loginUi)</string>
<string name="login_check_js">登錄檢查JS(loginCheckJs)</string> <string name="login_check_js">登錄檢查JS(loginCheckJs)</string>
@ -995,4 +995,5 @@
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">图片解码失败</string> <string name="error_decode_bitmap">图片解码失败</string>
<string name="error_image_url_empty">图片链接为空,检查替换净化规则</string> <string name="error_image_url_empty">图片链接为空,检查替换净化规则</string>
<string name="variable_comment">变量说明(variableComment)</string>
</resources> </resources>

@ -391,7 +391,7 @@
<string name="source_group">源分組(sourceGroup)</string> <string name="source_group">源分組(sourceGroup)</string>
<string name="diy_source_group">自訂源分組</string> <string name="diy_source_group">自訂源分組</string>
<string name="diy_edit_source_group">輸入自訂源分組名稱</string> <string name="diy_edit_source_group">輸入自訂源分組名稱</string>
<string name="source_concurrent_rate">並發率(concurrentRate)</string> <string name="concurrent_rate">並發率(concurrentRate)</string>
<string name="sort_url">分類Url(sortUrl)</string> <string name="sort_url">分類Url(sortUrl)</string>
<string name="login_url">登入URL(loginUrl)</string> <string name="login_url">登入URL(loginUrl)</string>
<string name="login_ui">登入UI(loginUi)</string> <string name="login_ui">登入UI(loginUi)</string>
@ -997,4 +997,5 @@
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">图片解码失败</string> <string name="error_decode_bitmap">图片解码失败</string>
<string name="error_image_url_empty">图片链接为空,检查替换净化规则</string> <string name="error_image_url_empty">图片链接为空,检查替换净化规则</string>
<string name="variable_comment">变量说明(variableComment)</string>
</resources> </resources>

@ -391,7 +391,7 @@
<string name="source_group">源分组(sourceGroup)</string> <string name="source_group">源分组(sourceGroup)</string>
<string name="diy_source_group">自定义源分组</string> <string name="diy_source_group">自定义源分组</string>
<string name="diy_edit_source_group">输入自定义源分组名称</string> <string name="diy_edit_source_group">输入自定义源分组名称</string>
<string name="source_concurrent_rate">并发率(concurrentRate)</string> <string name="concurrent_rate">并发率(concurrentRate)</string>
<string name="sort_url">分类 URL(sortUrl)</string> <string name="sort_url">分类 URL(sortUrl)</string>
<string name="login_url">登录 URL(loginUrl)</string> <string name="login_url">登录 URL(loginUrl)</string>
<string name="login_ui">登录 UI(loginUi)</string> <string name="login_ui">登录 UI(loginUi)</string>
@ -997,4 +997,5 @@
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">图片解码失败</string> <string name="error_decode_bitmap">图片解码失败</string>
<string name="error_image_url_empty">图片链接为空,检查替换净化规则</string> <string name="error_image_url_empty">图片链接为空,检查替换净化规则</string>
<string name="variable_comment">变量说明(variableComment)</string>
</resources> </resources>

@ -392,7 +392,7 @@
<string name="source_group">源分组(sourceGroup)</string> <string name="source_group">源分组(sourceGroup)</string>
<string name="diy_source_group">自定义源分组</string> <string name="diy_source_group">自定义源分组</string>
<string name="diy_edit_source_group">输入自定义源分组名称</string> <string name="diy_edit_source_group">输入自定义源分组名称</string>
<string name="source_concurrent_rate">并发率(concurrentRate)</string> <string name="concurrent_rate">并发率(concurrentRate)</string>
<string name="sort_url">分类Url(sortUrl)</string> <string name="sort_url">分类Url(sortUrl)</string>
<string name="login_url">登录URL(loginUrl)</string> <string name="login_url">登录URL(loginUrl)</string>
<string name="login_ui">Login UI(loginUi)</string> <string name="login_ui">Login UI(loginUi)</string>
@ -998,4 +998,5 @@
<!-- string end --> <!-- string end -->
<string name="error_decode_bitmap">Fail to decode bitmap</string> <string name="error_decode_bitmap">Fail to decode bitmap</string>
<string name="error_image_url_empty">Image url is empty, check replacement rules</string> <string name="error_image_url_empty">Image url is empty, check replacement rules</string>
<string name="variable_comment">变量说明(variableComment)</string>
</resources> </resources>

Loading…
Cancel
Save