Merge branch 'release' into update_i18n

vkbo · Feb 2, 2025 · 2e3beaf · 2e3beaf
2 parents 9e40676 + df6e577
commit 2e3beaf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/novelwriter/assets/manual_fr_FR.pdf b/novelwriter/assets/manual_fr_FR.pdf
diff --git a/novelwriter/config.py b/novelwriter/config.py
@@ -105,8 +105,11 @@ def __init__(self) -> None:
         self._qtTrans = {}
 
         # PDF Manual
-        pdfDocs = self._appPath / "assets" / "manual.pdf"
-        self.pdfDocs = pdfDocs if pdfDocs.is_file() else None
+        self._manuals: dict[str, Path] = {}
+        if (assets := self._appPath / "assets").is_dir():
+            for item in assets.iterdir():
+                if item.is_file() and item.stem.startswith("manual") and item.suffix == ".pdf":
+                    self._manuals[item.stem] = item
 
         # User Settings
         # =============
@@ -262,6 +265,10 @@ def __init__(self) -> None:
     def hasError(self) -> bool:
         return self._hasError
 
+    @property
+    def pdfDocs(self) -> Path | None:
+        return self._manuals.get(f"manual_{self.locale.name()}", self._manuals.get("manual"))
+
     @property
     def locale(self) -> QLocale:
         return self._dLocale

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -57,7 +57,7 @@ def resetConfigVars():
     CONFIG.backupOnClose = False
     CONFIG._homePath = _TMP_ROOT
     CONFIG._dLocale = QLocale("en_GB")
-    CONFIG.pdfDocs = _TMP_ROOT / "manual.pdf"
+    CONFIG._manuals = {"manual": _TMP_ROOT / "manual.pdf"}
     CONFIG.guiLocale = "en_GB"
     return
 

diff --git a/tests/test_gui/test_gui_mainmenu.py b/tests/test_gui/test_gui_mainmenu.py
@@ -45,8 +45,8 @@ def testGuiMainMenu_Slots(qtbot, monkeypatch, nwGUI, projPath):
     with monkeypatch.context() as mp:
         openUrl = MagicMock()
         mp.setattr(QDesktopServices, "openUrl", openUrl)
-        CONFIG.pdfDocs = projPath / "manual.pdf"
-        CONFIG.pdfDocs.touch()
+        CONFIG._manuals = {"manual": projPath / "manual.pdf"}
+        CONFIG._manuals["manual"].touch()
         nwGUI.mainMenu._openUserManualFile()
         assert openUrl.called is True
         assert "manual.pdf" in openUrl.call_args[0][0].url()