Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix i18n bug for certain constants (#2247)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-02-16 19:25:10 +01:00
committed by GitHub
parent cd1c7a3b0b a6be3f9081
commit 3ff4cc462f
6 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/constants.py
+4 -2
View File
@@ -23,6 +23,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
""" """
from __future__ import annotations from __future__ import annotations
from typing import Literal
from PyQt5.QtCore import QT_TRANSLATE_NOOP, QCoreApplication from PyQt5.QtCore import QT_TRANSLATE_NOOP, QCoreApplication
from novelwriter.enum import ( from novelwriter.enum import (
@@ -30,9 +32,9 @@ from novelwriter.enum import (
) )
def trConst(text: str) -> str: def trConst(text: str, context: Literal["Constant", "Stats", "Shape"] = "Constant") -> str:
"""Wrapper function for locally translating constants.""" """Wrapper function for locally translating constants."""
return QCoreApplication.translate("Constant", text) return QCoreApplication.translate(context, text)
class nwConst: class nwConst:
novelwriter/dialogs/projectsettings.py
+1 -1
View File
@@ -409,7 +409,7 @@ class _StatusPage(NFixedPage):
def buildMenu(menu: QMenu, items: dict[nwStatusShape, str]) -> None: def buildMenu(menu: QMenu, items: dict[nwStatusShape, str]) -> None:
for shape, label in items.items(): for shape, label in items.items():
icon = NWStatus.createIcon(self._iPx, iColor, shape) icon = NWStatus.createIcon(self._iPx, iColor, shape)
action = menu.addAction(icon, trConst(label)) action = menu.addAction(icon, trConst(label, "Shape"))
action.triggered.connect(qtLambda(self._selectShape, shape)) action.triggered.connect(qtLambda(self._selectShape, shape))
self._icons[shape] = icon self._icons[shape] = icon
novelwriter/gui/itemdetails.py
+3 -3
View File
@@ -65,9 +65,9 @@ class GuiItemDetails(QWidget):
fntValue = self.font() fntValue = self.font()
fntValue.setPointSizeF(0.9*fPt) fntValue.setPointSizeF(0.9*fPt)
trStats1 = trConst(nwLabels.STATS_NAME[nwStats.CHARS]) trStats1 = trConst(nwLabels.STATS_NAME[nwStats.CHARS], "Stats")
trStats2 = trConst(nwLabels.STATS_NAME[nwStats.WORDS]) trStats2 = trConst(nwLabels.STATS_NAME[nwStats.WORDS], "Stats")
trStats3 = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS]) trStats3 = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS], "Stats")
# Label # Label
self.labelName = QLabel(self.tr("Label"), self) self.labelName = QLabel(self.tr("Label"), self)
novelwriter/gui/mainmenu.py
+1 -1
View File
@@ -601,7 +601,7 @@ class GuiMainMenu(QMenuBar):
self.mInsField = self.insMenu.addMenu(self.tr("Word/Character Count")) self.mInsField = self.insMenu.addMenu(self.tr("Word/Character Count"))
for field in nwStats.ALL_FIELDS: for field in nwStats.ALL_FIELDS:
value = nwShortcode.FIELD_VALUE.format(field) value = nwShortcode.FIELD_VALUE.format(field)
action = self.mInsField.addAction(trConst(nwLabels.STATS_NAME[field])) action = self.mInsField.addAction(trConst(nwLabels.STATS_NAME[field], "Stats"))
action.triggered.connect(qtLambda(self.requestDocInsertText.emit, value)) action.triggered.connect(qtLambda(self.requestDocInsertText.emit, value))
# Insert > Breaks and Vertical Space # Insert > Breaks and Vertical Space
novelwriter/gui/outline.py
+3 -3
View File
@@ -815,9 +815,9 @@ class GuiOutlineDetails(QScrollArea):
bFont = SHARED.theme.guiFontB bFont = SHARED.theme.guiFontB
trStats1 = trConst(nwLabels.STATS_NAME[nwStats.CHARS]) trStats1 = trConst(nwLabels.STATS_NAME[nwStats.CHARS], "Stats")
trStats2 = trConst(nwLabels.STATS_NAME[nwStats.WORDS]) trStats2 = trConst(nwLabels.STATS_NAME[nwStats.WORDS], "Stats")
trStats3 = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS]) trStats3 = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS], "Stats")
# Details Area # Details Area
self.titleLabel = QLabel(self.tr("Title"), self) self.titleLabel = QLabel(self.tr("Title"), self)
novelwriter/tools/manuscript.py
+11 -11
View File
@@ -1037,17 +1037,17 @@ class _StatsWidget(QWidget):
hPx = CONFIG.pxInt(12) hPx = CONFIG.pxInt(12)
vPx = CONFIG.pxInt(4) vPx = CONFIG.pxInt(4)
trAllChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS]) trAllChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS], "Stats")
trTextChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS_TEXT]) trTextChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS_TEXT], "Stats")
trTitleChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS_TITLE]) trTitleChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS_TITLE], "Stats")
trParagraphCount = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS]) trParagraphCount = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS], "Stats")
trTitleCount = trConst(nwLabels.STATS_NAME[nwStats.TITLES]) trTitleCount = trConst(nwLabels.STATS_NAME[nwStats.TITLES], "Stats")
trAllWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_ALL]) trAllWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_ALL], "Stats")
trTextWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_TEXT]) trTextWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_TEXT], "Stats")
trTitleWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_TITLE]) trTitleWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_TITLE], "Stats")
trAllWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS]) trAllWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS], "Stats")
trTextWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS_TEXT]) trTextWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS_TEXT], "Stats")
trTitleWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS_TITLE]) trTitleWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS_TITLE], "Stats")
# Minimal Form # Minimal Form
self.minWordCount = QLabel(self) self.minWordCount = QLabel(self)