From 2ed3666b9f02300e3bf675ee9bd54fdc3f74cb16 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 9 Nov 2023 17:17:46 +0100 Subject: [PATCH 1/2] Add keyword translations to the project language files for manuscript builds --- novelwriter/assets/i18n/project_en_GB.json | 10 ++++++++++ novelwriter/core/tohtml.py | 4 ++-- novelwriter/core/tomd.py | 4 ++-- novelwriter/core/toodt.py | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/novelwriter/assets/i18n/project_en_GB.json b/novelwriter/assets/i18n/project_en_GB.json index a0432c75..d29160b8 100644 --- a/novelwriter/assets/i18n/project_en_GB.json +++ b/novelwriter/assets/i18n/project_en_GB.json @@ -2,6 +2,16 @@ "Synopsis": "Synopsis", "Comment": "Comment", "Notes": "Notes", + "Tag": "Tag", + "Point of View": "Point of View", + "Focus": "Focus", + "Characters": "Characters", + "Plot": "Plot", + "Timeline": "Timeline", + "Locations": "Locations", + "Objects": "Objects", + "Entities": "Entities", + "Custom": "Custom", "0": "Zero", "1": "One", "2": "Two", diff --git a/novelwriter/core/tohtml.py b/novelwriter/core/tohtml.py index 66515b26..41201412 100644 --- a/novelwriter/core/tohtml.py +++ b/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 @@ -477,7 +477,7 @@ class ToHtml(Tokenizer): if not valid or not bits or bits[0] not in nwLabels.KEY_NAME: return "" - result = f"{trConst(nwLabels.KEY_NAME[bits[0]])}: " + result = f"{self._localLookup(nwLabels.KEY_NAME[bits[0]])}: " if len(bits) > 1: if bits[0] == nwKeyWords.TAG_KEY: result += f"{bits[1]}" diff --git a/novelwriter/core/tomd.py b/novelwriter/core/tomd.py index cc2e8696..d13e3b18 100644 --- a/novelwriter/core/tomd.py +++ b/novelwriter/core/tomd.py @@ -27,7 +27,7 @@ import logging from pathlib import Path -from novelwriter.constants import nwHeadFmt, nwLabels, trConst +from novelwriter.constants import nwHeadFmt, nwLabels from novelwriter.core.project import NWProject from novelwriter.core.tokenizer import Tokenizer @@ -209,7 +209,7 @@ class ToMarkdown(Tokenizer): result = "" if bits[0] in nwLabels.KEY_NAME: - result += f"**{trConst(nwLabels.KEY_NAME[bits[0]])}:** " + result += f"**{self._localLookup(nwLabels.KEY_NAME[bits[0]])}:** " if len(bits) > 1: result += ", ".join(bits[1:]) diff --git a/novelwriter/core/toodt.py b/novelwriter/core/toodt.py index c1165e30..6fe6f781 100644 --- a/novelwriter/core/toodt.py +++ b/novelwriter/core/toodt.py @@ -37,7 +37,7 @@ from datetime import datetime from novelwriter import __version__ from novelwriter.common import xmlIndent -from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, trConst +from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels from novelwriter.core.project import NWProject from novelwriter.core.tokenizer import Tokenizer, stripEscape @@ -572,7 +572,7 @@ class ToOdt(Tokenizer): if not valid or not bits or bits[0] not in nwLabels.KEY_NAME: return "", [] - rTxt = f"{trConst(nwLabels.KEY_NAME[bits[0]])}: " + rTxt = f"{self._localLookup(nwLabels.KEY_NAME[bits[0]])}: " rFmt = [(0, self.FMT_B_B), (len(rTxt) - 1, self.FMT_B_E)] if len(bits) > 1: if bits[0] == nwKeyWords.TAG_KEY: From 21dd2548312f7ad55bf90bb25f65365abe3ae63b Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 9 Nov 2023 17:24:39 +0100 Subject: [PATCH 2/2] Include already translated project translation files --- novelwriter/assets/i18n/project_de_DE.json | 10 ++++++++++ novelwriter/assets/i18n/project_en_US.json | 10 ++++++++++ novelwriter/assets/i18n/project_ja_JP.json | 12 +++++++++++- novelwriter/assets/i18n/project_nb_NO.json | 10 ++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/novelwriter/assets/i18n/project_de_DE.json b/novelwriter/assets/i18n/project_de_DE.json index b153ca64..6e595fe2 100644 --- a/novelwriter/assets/i18n/project_de_DE.json +++ b/novelwriter/assets/i18n/project_de_DE.json @@ -2,6 +2,16 @@ "Synopsis": "Synopsis", "Comment": "Kommentar", "Notes": "Notizen", + "Tag": "Schlagwort", + "Point of View": "Perspektive", + "Focus": "Mittelpunkt", + "Characters": "Charaktere", + "Plot": "Handlungen", + "Timeline": "Zeitleiste", + "Locations": "Schauplätze", + "Objects": "Objekte", + "Entities": "Organisationen", + "Custom": "Benutzerdefiniert", "0": "Null", "1": "Eins", "2": "Zwei", diff --git a/novelwriter/assets/i18n/project_en_US.json b/novelwriter/assets/i18n/project_en_US.json index a0432c75..d29160b8 100644 --- a/novelwriter/assets/i18n/project_en_US.json +++ b/novelwriter/assets/i18n/project_en_US.json @@ -2,6 +2,16 @@ "Synopsis": "Synopsis", "Comment": "Comment", "Notes": "Notes", + "Tag": "Tag", + "Point of View": "Point of View", + "Focus": "Focus", + "Characters": "Characters", + "Plot": "Plot", + "Timeline": "Timeline", + "Locations": "Locations", + "Objects": "Objects", + "Entities": "Entities", + "Custom": "Custom", "0": "Zero", "1": "One", "2": "Two", diff --git a/novelwriter/assets/i18n/project_ja_JP.json b/novelwriter/assets/i18n/project_ja_JP.json index 214a7ccb..82741577 100644 --- a/novelwriter/assets/i18n/project_ja_JP.json +++ b/novelwriter/assets/i18n/project_ja_JP.json @@ -1,7 +1,17 @@ { "Synopsis": "あらすじ", - "Comment": "コメント ", + "Comment": "コメント", "Notes": "ノート", + "Tag": "タグ", + "Point of View": "視点", + "Focus": "焦点", + "Characters": "キャラクター", + "Plot": "プロット", + "Timeline": "タイムライン", + "Locations": "場所", + "Objects": "オブジェクト", + "Entities": "エンティティ", + "Custom": "カスタム", "0": "零", "1": "一", "2": "二", diff --git a/novelwriter/assets/i18n/project_nb_NO.json b/novelwriter/assets/i18n/project_nb_NO.json index 39010cf2..a56541b9 100644 --- a/novelwriter/assets/i18n/project_nb_NO.json +++ b/novelwriter/assets/i18n/project_nb_NO.json @@ -2,6 +2,16 @@ "Synopsis": "Sammendrag", "Comment": "Kommentar", "Notes": "Notat", + "Tag": "Knagg", + "Point of View": "Perspektiv", + "Focus": "Fokus", + "Characters": "Karakterer", + "Plot": "Plott", + "Timeline": "Tidslinje", + "Locations": "Lokasjoner", + "Objects": "Objekter", + "Entities": "Enheter", + "Custom": "Annet", "0": "null", "1": "én", "2": "to",