Merge branch 'master' into gh-2994

retorquere · Sep 27, 2024 · 91f16d3 · 91f16d3
2 parents ebe6d0e + 336ee26
commit 91f16d3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/content/better-bibtex.ts b/content/better-bibtex.ts
@@ -221,14 +221,13 @@ function parseLibraryKeyFromCitekey(libraryKey) {
 
 $Patcher$.schedule(Zotero.API, 'getResultsFromParams', original => function Zotero_API_getResultsFromParams(params: Record<string, any>) {
   try {
-    if (params.itemKey) {
+    if (params.objectType === 'item' && params.objectKey) {
       const libraryID = params.libraryID || Zotero.Libraries.userLibraryID
-      params.itemKey = params.itemKey.map((itemKey: string) => {
-        const m = itemKey.match(/^(bbt:|@)(.+)/)
-        if (!m) return itemKey
+      const m = params.objectKey.match(/^(bbt:|@)(.+)/)
+      if (m) {
         const citekey = Zotero.BetterBibTeX.KeyManager.first({ where: { libraryID, citationKey: m[2] }})
-        return citekey?.itemKey || itemKey
-      })
+        if (citekey) params.objectKey = citekey.itemKey
+      }
     }
   }
   catch (err) {

diff --git a/locale/fr-FR/better-bibtex.ftl b/locale/fr-FR/better-bibtex.ftl
@@ -159,7 +159,7 @@ better-bibtex_preferences_auto-export_run =
 better-bibtex_preferences_auto-export_status = Statut
 better-bibtex_preferences_auto-export_status_done = Terminé
 better-bibtex_preferences_auto-export_status_error = Erreur
-better-bibtex_preferences_auto-export_status_preparing = preparing { $translator }, { $pending } exports pending
+better-bibtex_preferences_auto-export_status_preparing = préparation des exportations { $translator }, { $pending } en attente
 better-bibtex_preferences_auto-export_status_running = En cours...
 better-bibtex_preferences_auto-export_status_scheduled = Planifié
 better-bibtex_preferences_auto-export_target = Fichier de sortie

diff --git a/locale/zh-CN/better-bibtex.ftl b/locale/zh-CN/better-bibtex.ftl
@@ -159,7 +159,7 @@ better-bibtex_preferences_auto-export_run =
 better-bibtex_preferences_auto-export_status = 状态
 better-bibtex_preferences_auto-export_status_done = 已完成
 better-bibtex_preferences_auto-export_status_error = 错误
-better-bibtex_preferences_auto-export_status_preparing = preparing { $translator }, { $pending } exports pending
+better-bibtex_preferences_auto-export_status_preparing = 正在准备 { $translator }，待导出：{ $pending } 
 better-bibtex_preferences_auto-export_status_running = 运行中
 better-bibtex_preferences_auto-export_status_scheduled = 已预定
 better-bibtex_preferences_auto-export_target = 输出文件

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zotero-better-bibtex",
-  "version": "6.7.236",
+  "version": "6.7.238",
   "description": "Make Zotero useful for us LaTeX holdouts.",
   "homepage": "https://retorque.re/zotero-better-bibtex",
   "license": "ISC",