Merge branch 'main' of https://github.com/Dorako/pf2e-dorako-ui

Dorako · Feb 17, 2023 · 91f3166 · 91f3166
2 parents d060570 + 89be352
commit 91f3166
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/languages/fr.json b/languages/fr.json
@@ -205,6 +205,10 @@
             "dark-theme": "Dorako UI sombre"
           },
           "name": "Thème de l'application"
+        },
+        "enable-dark-theme-journals": {
+          "name": "Activer le thème sombre dans les journaux ?",
+          "hint": "N'affecte par les modules de journaux premium"
         }
       },
       "avatar": {
@@ -220,7 +224,7 @@
         },
         "hide-when-token-hidden": {
           "hint": "Cacher les avatars lorsque le jeton de l'orateur est caché",
-          "name": "Cacher l'avatar lorsque le jeton est caché"
+          "name": "Cacher l'avatar lorsque le jeton est caché ?"
         },
         "hide-gm-avatar-when-secret": {
           "name": "Cacher l'avatar sur jet secret ?",

diff --git a/modules/settings/migrations.js b/modules/settings/migrations.js
@@ -27,7 +27,7 @@ export default async function migrate() {
 }
 
 function findOldSettingValue(oldSettingKey) {
-  return oldSettings.find((setting) => setting.key.endsWith(oldSettingKey))?.value; // FIXME: key can be undefined
+  return oldSettings.find((setting) => setting?.key?.endsWith(oldSettingKey))?.value;
 }
 
 const migrations = {