diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt index 43de180be..2e44cc0c9 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt @@ -738,6 +738,9 @@ class AnalyzeRule( * 保存数据 */ fun put(key: String, value: String): String { + if (key == "bookName" || key == "title") { + Debug.log("≡变量 $key 在特定情况下会被覆盖,建议使用其他键名") + } chapter?.putVariable(key, value) ?: book?.putVariable(key, value) ?: ruleData?.putVariable(key, value) diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt index a54ebe686..5706cfb4d 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt @@ -39,6 +39,7 @@ import io.legado.app.help.http.postForm import io.legado.app.help.http.postJson import io.legado.app.help.http.postMultipart import io.legado.app.help.source.getShareScope +import io.legado.app.model.Debug import io.legado.app.utils.EncoderUtils import io.legado.app.utils.GSON import io.legado.app.utils.GSONStrict @@ -370,6 +371,9 @@ class AnalyzeUrl( } fun put(key: String, value: String): String { + if (key == "bookName" || key == "title") { + Debug.log("≡变量 $key 在特定情况下会被覆盖,建议使用其他键名") + } chapter?.putVariable(key, value) ?: ruleData?.putVariable(key, value) return value diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index d388aa98e..51049411d 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -820,7 +820,7 @@ Progreso de lectura sincronizado Sincronizar el progreso de la lectura al entrar y salir de la pantalla de lectura Mejora de Sincronización - Sincronizar el progreso en la nube al volver a entrar en la página (por ejemplo, tras apagar la pantalla o al regresar desde el fondo) o cuando la red esté disponible + Vuelve a sincronizar el progreso en la nube al regresar a la página (pantalla apagada, regreso desde segundo plano, etc.) o cuando la red esté disponible. Se pedirá confirmación antes de sincronizar el nuevo progreso. No se pudo marcar URL única Exportar lista de libros diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 2a921cabc..6f7672b66 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -823,7 +823,7 @@ Synchronous reading progress Synchronize reading progress when entering / exiting the reading interface 同期強化 - ページに再入力する時(スリープ解除やバックグラウンドから復帰など)、またはネットワークが利用可能になるとクラウド進捗を同期します + ページに再度入ったとき(画面オフ、バックグラウンドからの復帰など)やネットワークが利用可能になったときにクラウドの進捗を同期します。新しい進捗を同期する前に確認します。 Failed to create bookmark Single URL Export the list of books diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 9535cb619..b7d92b8b4 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -821,7 +821,7 @@ Progresso de leitura sincronizada Sincronizar o progresso da leitura ao entrar e sair da tela de leitura Aprimoramento de Sincronização - Sincronizar o progresso na nuvem ao reentrar na página (por exemplo, após desligar a tela ou ao retornar do fundo) ou quando a rede estiver disponível + Ressincroniza o progresso na nuvem ao retornar à página (tela desligada, retorno do segundo plano, etc.) ou quando a rede estiver disponível. Será solicitada confirmação antes de sincronizar o novo progresso. Falha ao marcar como favorito URL única Exportar a lista de livros diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a849cde7e..ed4d47a1f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -820,7 +820,7 @@ Đồng bộ tiến độ đọc Đồng bộ tiến độ đọc khi vào/ra giao diện đọc Tăng cường đồng bộ - Đồng bộ tiến độ trên đám mây khi vào lại trang (ví dụ: sau khi tắt màn hình, quay lại từ nền, v.v.) hoặc khi mạng khả dụng + Đồng bộ lại tiến trình trên đám mây khi quay lại trang (tắt màn hình, trở lại từ nền, v.v.) hoặc khi mạng khả dụng. Sẽ yêu cầu xác nhận trước khi đồng bộ tiến trình mới. Đồng bộ tiến độ thành công Không thể tạo dấu trang URL đơn diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e15fd55ce..b91887036 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -816,7 +816,7 @@ 同步閱讀進度 進入退出閱讀介面時同步閱讀進度 同步增強 - 重新進入頁面(熄屏、返回背景等)或者當網絡可用時同步雲端進度 + 重新進入頁面(息屏、從背景返回等)或網路恢復可用時同步雲端進度,同步新進度時會詢問 建立書籤失敗 單URL 導出書單 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ffff09702..4174b2118 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -819,7 +819,7 @@ 同步閱讀進度 進入退出閱讀介面時同步閱讀進度 同步增強 - 重新進入頁面(熄屏、背景返回等)或網路變為可用時同步雲端進度 + 重新進入頁面(息屏、從背景返回等)或網路恢復可用時同步雲端進度,同步新進度時會詢問 建立書籤失敗 單URL 匯出書單 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 1a36037fa..b58247bc5 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -827,7 +827,7 @@ 同步阅读进度 进入退出阅读界面时同步阅读进度 同步增强 - 重新进入页面(息屏、后台返回等)或者网络变为可用时同步云端进度 + 重新进入页面(息屏、后台返回等)或者网络变为可用时同步云端进度,同步新进度会询问 创建书签失败 单 URL 导出书单 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a09703484..f3e9e1a40 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -827,7 +827,7 @@ Synchronous reading progress Synchronize reading progress when entering / exiting the reading interface Sync Enhancement - Sync cloud progress when re-entering the page (e.g., after screen off, returning from background, etc.) or when the network becomes available + Sync cloud progress when re-entering the page (screen off, returning from background, etc.) or when the network becomes available. You will be prompted before syncing new progress. Sync progress success Failed to create bookmark Single URL