Add language setting to Project Settings

novelwriter/assets/i18n/project_nn_NO.json

@@ -2,6 +2,16 @@
   "Synopsis": "Samandrag",
   "Comment": "Kommentar",
   "Notes": "Notat",
+  "Tag": "Knagg",
+  "Point of View": "Perspektiv",
+  "Focus": "Fokus",
+  "Characters": "Karakterar",
+  "Plot": "Plott",
+  "Timeline": "Tidslinje",
+  "Locations": "Lokasjonar",
+  "Objects": "Objekt",
+  "Entities": "Eining",
+  "Custom": "Anna",
   "0": "null",
   "1": "ein",
   "2": "to",

novelwriter/core/buildsettings.py

@@ -64,7 +64,6 @@
     "text.includeKeywords":   (bool, False),
     "text.includeBodyText":   (bool, True),
     "text.addNoteHeadings":   (bool, True),
-    "format.buildLang":       (str, "en_GB"),
     "format.textFont":        (str, CONFIG.textFont),
     "format.textSize":        (int, 12),
     "format.lineHeight":      (float, 1.15, 0.75, 3.0),
@@ -107,7 +106,6 @@
     "text.addNoteHeadings":   QT_TRANSLATE_NOOP("Builds", "Add Titles for Notes"),
 
     "format.grpFormat":       QT_TRANSLATE_NOOP("Builds", "Text Format"),
-    "format.buildLang":       QT_TRANSLATE_NOOP("Builds", "Language"),
     "format.textFont":        QT_TRANSLATE_NOOP("Builds", "Font Family"),
     "format.textSize":        QT_TRANSLATE_NOOP("Builds", "Font Size"),
     "format.lineHeight":      QT_TRANSLATE_NOOP("Builds", "Line Height"),

novelwriter/core/coretools.py

@@ -353,11 +353,13 @@ def buildProject(self, data: dict) -> bool:
         projName = data.get("projName", lblNewProject)
         projTitle = data.get("projTitle", lblNewProject)
         projAuthor = data.get("projAuthor", "")
+        projLang = data.get("projLang", "en_GB")
 
         project.data.setUuid(None)
         project.data.setName(projName)
         project.data.setTitle(projTitle)
         project.data.setAuthor(projAuthor)
+        project.data.setLanguage(projLang)
         project.setDefaultStatusImport()
         project.session.startSession()
 

novelwriter/core/docbuild.py

@@ -248,13 +248,9 @@ def iterBuildNWD(self, path: Path | None, asJson: bool = False) -> Iterable[tupl
     def _setupBuild(self, bldObj: Tokenizer) -> dict:
         """Configure the build object."""
         # Get Settings
-        buildLang = self._build.getStr("format.buildLang")
         textFont  = self._build.getStr("format.textFont")
         textSize  = self._build.getInt("format.textSize")
 
-        # The language lookup dict is reloaded if needed
-        self._project.setProjectLang(buildLang)
-
         fontFamily = textFont or CONFIG.textFont
         bldFont = QFont(fontFamily, textSize)
         fontInfo = QFontInfo(bldFont)
@@ -287,7 +283,7 @@ def _setupBuild(self, bldObj: Tokenizer) -> dict:
 
         if isinstance(bldObj, ToOdt):
             bldObj.setColourHeaders(self._build.getBool("odt.addColours"))
-            bldObj.setLanguage(buildLang)
+            bldObj.setLanguage(self._project.data.language)
 
             scale = nwLabels.UNIT_SCALE.get(self._build.getStr("format.pageUnit"), 1.0)
             pW, pH = nwLabels.PAPER_SIZE.get(self._build.getStr("format.pageSize"), (-1.0, -1.0))

novelwriter/core/projectdata.py

@@ -152,14 +152,14 @@ def initCounts(self) -> tuple[int, int]:
         """Return the initial count of words for novel and note
         documents.
         """
-        return tuple(self._initCounts)
+        return self._initCounts[0], self._initCounts[1]
 
     @property
     def currCounts(self) -> tuple[int, int]:
         """Return the current count of words for novel and note
         documents.
         """
-        return tuple(self._currCounts)
+        return self._currCounts[0], self._currCounts[1]
 
     @property
     def lastHandle(self) -> dict[str, str | None]:

novelwriter/core/tohtml.py

@@ -456,11 +456,10 @@ def getStyleSheet(self) -> list[str]:
 
     def _formatSynopsis(self, text: str) -> str:
         """Apply HTML formatting to synopsis."""
+        sSynop = self._localLookup("Synopsis")
         if self._genMode == self.M_PREVIEW:
-            sSynop = self._trSynopsis
             return f"<p class='comment'><span class='synopsis'>{sSynop}:</span> {text}</p>\n"
         else:
-            sSynop = self._localLookup("Synopsis")
             return f"<p class='synopsis'><strong>{sSynop}:</strong> {text}</p>\n"
 
     def _formatComments(self, text: str) -> str:

novelwriter/core/tokenizer.py

@@ -167,9 +167,6 @@ def __init__(self, project: NWProject) -> None:
         self._localLookup = self._project.localLookup
         self.tr = partial(QCoreApplication.translate, "Tokenizer")
 
-        # Cached Translations
-        self._trSynopsis = self.tr("Synopsis")
-
         # Format RegEx
         self._rxMarkdown = [
             (QRegularExpression(nwRegEx.FMT_EI), [0, self.FMT_I_B, 0, self.FMT_I_E]),