Change to always use project language for generating documents

novelwriter/core/docbuild.py

@@ -248,13 +248,9 @@ class NWBuildDocument:
     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 @@ class NWBuildDocument:
 
         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/tohtml.py

@@ -31,7 +31,7 @@ from pathlib import Path
 
 from novelwriter import CONFIG
 from novelwriter.common import formatTimeStamp
-from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, nwHtmlUnicode, trConst
+from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, nwHtmlUnicode
 from novelwriter.core.project import NWProject
 from novelwriter.core.tokenizer import Tokenizer, stripEscape
 
@@ -456,12 +456,8 @@ class ToHtml(Tokenizer):
 
     def _formatSynopsis(self, text: str) -> str:
         """Apply HTML formatting to 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"
+        sSynop = self._localLookup("Synopsis")
+        return f"<p class='comment'><span class='synopsis'>{sSynop}:</span> {text}</p>\n"
 
     def _formatComments(self, text: str) -> str:
         """Apply HTML formatting to comments."""
@@ -477,11 +473,7 @@ class ToHtml(Tokenizer):
         if not valid or not bits or bits[0] not in nwLabels.KEY_NAME:
             return ""
 
-        if self._genMode == self.M_PREVIEW:
-            result = f"<span class='tags'>{trConst(nwLabels.KEY_NAME[bits[0]])}:</span> "
-        else:
-            result = f"<span class='tags'>{self._localLookup(nwLabels.KEY_NAME[bits[0]])}:</span> "
-
+        result = f"<span class='tags'>{self._localLookup(nwLabels.KEY_NAME[bits[0]])}:</span> "
         if len(bits) > 1:
             if bits[0] == nwKeyWords.TAG_KEY:
                 result += f"<a name='tag_{bits[1]}'>{bits[1]}</a>"

novelwriter/core/tokenizer.py

@@ -167,9 +167,6 @@ class Tokenizer(ABC):
         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]),