novelWriter 2.6.2__tar.gz → 2.6.3__tar.gz

{novelwriter-2.6.2 → novelwriter-2.6.3}/CHANGELOG.md

@@ -1,5 +1,24 @@
 # novelWriter Changelog
 
+## Version 2.6.3 [2025-02-16]
+
+### Release Notes
+
+This is a patch release that fixes a translation issue that affected several labels on the user
+interface where the wrong or no translation was used. The bug affected all languages except for
+English.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fix retrieval of translation string for stats and shape constants. This particularly affected the
+  details panel below the project tree, some labels on the outline, the statics panel on the
+  Manuscript tool and the status icon shape menu in Project Settings. It also affected the
+  statistics submenu in the Insert menu. Issue #2246. PRs #2247 and #2249.
+
+----
+
 ## Version 2.6.2 [2025-02-16]
 
 ### Release Notes

{novelwriter-2.6.2 → novelwriter-2.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: novelWriter
-Version: 2.6.2
+Version: 2.6.3
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelwriter-2.6.2 → novelwriter-2.6.3}/novelWriter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: novelWriter
-Version: 2.6.2
+Version: 2.6.3
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelwriter-2.6.2 → novelwriter-2.6.3}/novelwriter/__init__.py

@@ -47,8 +47,8 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.6.2"
-__hexversion__ = "0x020602f0"
+__version__    = "2.6.3"
+__hexversion__ = "0x020603f0"
 __date__       = "2025-02-16"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"

{novelwriter-2.6.2 → novelwriter-2.6.3}/novelwriter/constants.py

@@ -35,6 +35,11 @@ def trConst(text: str) -> str:
     return QCoreApplication.translate("Constant", text)
 
 
+def trStats(text: str) -> str:
+    """Wrapper function for locally translating stats constants."""
+    return QCoreApplication.translate("Stats", text)
+
+
 class nwConst:
 
     # Date and Time Formats
@@ -370,32 +375,32 @@ class nwLabels:
         nwBuildFmt.J_NWD:  ".json",
     }
     SHAPES_PLAIN = {
-        nwStatusShape.SQUARE:   QT_TRANSLATE_NOOP("Shape", "Square"),
-        nwStatusShape.TRIANGLE: QT_TRANSLATE_NOOP("Shape", "Triangle"),
-        nwStatusShape.NABLA:    QT_TRANSLATE_NOOP("Shape", "Nabla"),
-        nwStatusShape.DIAMOND:  QT_TRANSLATE_NOOP("Shape", "Diamond"),
-        nwStatusShape.PENTAGON: QT_TRANSLATE_NOOP("Shape", "Pentagon"),
-        nwStatusShape.HEXAGON:  QT_TRANSLATE_NOOP("Shape", "Hexagon"),
-        nwStatusShape.STAR:     QT_TRANSLATE_NOOP("Shape", "Star"),
-        nwStatusShape.PACMAN:   QT_TRANSLATE_NOOP("Shape", "Pacman"),
+        nwStatusShape.SQUARE:   QT_TRANSLATE_NOOP("Constant", "Square"),
+        nwStatusShape.TRIANGLE: QT_TRANSLATE_NOOP("Constant", "Triangle"),
+        nwStatusShape.NABLA:    QT_TRANSLATE_NOOP("Constant", "Nabla"),
+        nwStatusShape.DIAMOND:  QT_TRANSLATE_NOOP("Constant", "Diamond"),
+        nwStatusShape.PENTAGON: QT_TRANSLATE_NOOP("Constant", "Pentagon"),
+        nwStatusShape.HEXAGON:  QT_TRANSLATE_NOOP("Constant", "Hexagon"),
+        nwStatusShape.STAR:     QT_TRANSLATE_NOOP("Constant", "Star"),
+        nwStatusShape.PACMAN:   QT_TRANSLATE_NOOP("Constant", "Pacman"),
     }
     SHAPES_CIRCLE = {
-        nwStatusShape.CIRCLE_Q: QT_TRANSLATE_NOOP("Shape", "1/4 Circle"),
-        nwStatusShape.CIRCLE_H: QT_TRANSLATE_NOOP("Shape", "Half Circle"),
-        nwStatusShape.CIRCLE_T: QT_TRANSLATE_NOOP("Shape", "3/4 Circle"),
-        nwStatusShape.CIRCLE:   QT_TRANSLATE_NOOP("Shape", "Full Circle"),
+        nwStatusShape.CIRCLE_Q: QT_TRANSLATE_NOOP("Constant", "1/4 Circle"),
+        nwStatusShape.CIRCLE_H: QT_TRANSLATE_NOOP("Constant", "Half Circle"),
+        nwStatusShape.CIRCLE_T: QT_TRANSLATE_NOOP("Constant", "3/4 Circle"),
+        nwStatusShape.CIRCLE:   QT_TRANSLATE_NOOP("Constant", "Full Circle"),
     }
     SHAPES_BARS = {
-        nwStatusShape.BARS_1: QT_TRANSLATE_NOOP("Shape", "1 Bar"),
-        nwStatusShape.BARS_2: QT_TRANSLATE_NOOP("Shape", "2 Bars"),
-        nwStatusShape.BARS_3: QT_TRANSLATE_NOOP("Shape", "3 Bars"),
-        nwStatusShape.BARS_4: QT_TRANSLATE_NOOP("Shape", "4 Bars"),
+        nwStatusShape.BARS_1: QT_TRANSLATE_NOOP("Constant", "1 Bar"),
+        nwStatusShape.BARS_2: QT_TRANSLATE_NOOP("Constant", "2 Bars"),
+        nwStatusShape.BARS_3: QT_TRANSLATE_NOOP("Constant", "3 Bars"),
+        nwStatusShape.BARS_4: QT_TRANSLATE_NOOP("Constant", "4 Bars"),
     }
     SHAPES_BLOCKS = {
-        nwStatusShape.BLOCK_1: QT_TRANSLATE_NOOP("Shape", "1 Block"),
-        nwStatusShape.BLOCK_2: QT_TRANSLATE_NOOP("Shape", "2 Blocks"),
-        nwStatusShape.BLOCK_3: QT_TRANSLATE_NOOP("Shape", "3 Blocks"),
-        nwStatusShape.BLOCK_4: QT_TRANSLATE_NOOP("Shape", "4 Blocks"),
+        nwStatusShape.BLOCK_1: QT_TRANSLATE_NOOP("Constant", "1 Block"),
+        nwStatusShape.BLOCK_2: QT_TRANSLATE_NOOP("Constant", "2 Blocks"),
+        nwStatusShape.BLOCK_3: QT_TRANSLATE_NOOP("Constant", "3 Blocks"),
+        nwStatusShape.BLOCK_4: QT_TRANSLATE_NOOP("Constant", "4 Blocks"),
     }
     FILE_FILTERS = {
         "*.txt": QT_TRANSLATE_NOOP("Constant", "Text files"),

{novelwriter-2.6.2 → novelwriter-2.6.3}/novelwriter/gui/itemdetails.py

@@ -32,7 +32,7 @@ from PyQt5.QtWidgets import QGridLayout, QLabel, QWidget
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import elide
-from novelwriter.constants import nwLabels, nwStats, trConst
+from novelwriter.constants import nwLabels, nwStats, trConst, trStats
 from novelwriter.enum import nwChange
 from novelwriter.types import (
     QtAlignLeft, QtAlignLeftBase, QtAlignRight, QtAlignRightBase,
@@ -65,9 +65,9 @@ class GuiItemDetails(QWidget):
         fntValue = self.font()
         fntValue.setPointSizeF(0.9*fPt)
 
-        trStats1 = trConst(nwLabels.STATS_NAME[nwStats.CHARS])
-        trStats2 = trConst(nwLabels.STATS_NAME[nwStats.WORDS])
-        trStats3 = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS])
+        trStats1 = trStats(nwLabels.STATS_NAME[nwStats.CHARS])
+        trStats2 = trStats(nwLabels.STATS_NAME[nwStats.WORDS])
+        trStats3 = trStats(nwLabels.STATS_NAME[nwStats.PARAGRAPHS])
 
         # Label
         self.labelName = QLabel(self.tr("Label"), self)

{novelwriter-2.6.2 → novelwriter-2.6.3}/novelwriter/gui/mainmenu.py

@@ -35,7 +35,7 @@ from novelwriter import CONFIG, SHARED
 from novelwriter.common import openExternalPath, qtLambda
 from novelwriter.constants import (
     nwConst, nwKeyWords, nwLabels, nwShortcode, nwStats, nwStyles, nwUnicode,
-    trConst
+    trConst, trStats
 )
 from novelwriter.enum import nwDocAction, nwDocInsert, nwFocus, nwView
 from novelwriter.extensions.eventfilters import StatusTipFilter
@@ -601,7 +601,7 @@ class GuiMainMenu(QMenuBar):
         self.mInsField = self.insMenu.addMenu(self.tr("Word/Character Count"))
         for field in nwStats.ALL_FIELDS:
             value = nwShortcode.FIELD_VALUE.format(field)
-            action = self.mInsField.addAction(trConst(nwLabels.STATS_NAME[field]))
+            action = self.mInsField.addAction(trStats(nwLabels.STATS_NAME[field]))
             action.triggered.connect(qtLambda(self.requestDocInsertText.emit, value))
 
         # Insert > Breaks and Vertical Space

{novelwriter-2.6.2 → novelwriter-2.6.3}/novelwriter/gui/outline.py

@@ -42,7 +42,7 @@ from PyQt5.QtWidgets import (
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import checkInt, formatFileFilter
-from novelwriter.constants import nwKeyWords, nwLabels, nwStats, nwStyles, trConst
+from novelwriter.constants import nwKeyWords, nwLabels, nwStats, nwStyles, trConst, trStats
 from novelwriter.enum import nwChange, nwDocMode, nwItemClass, nwItemLayout, nwItemType, nwOutline
 from novelwriter.error import logException
 from novelwriter.extensions.configlayout import NColourLabel
@@ -815,9 +815,9 @@ class GuiOutlineDetails(QScrollArea):
 
         bFont = SHARED.theme.guiFontB
 
-        trStats1 = trConst(nwLabels.STATS_NAME[nwStats.CHARS])
-        trStats2 = trConst(nwLabels.STATS_NAME[nwStats.WORDS])
-        trStats3 = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS])
+        trStats1 = trStats(nwLabels.STATS_NAME[nwStats.CHARS])
+        trStats2 = trStats(nwLabels.STATS_NAME[nwStats.WORDS])
+        trStats3 = trStats(nwLabels.STATS_NAME[nwStats.PARAGRAPHS])
 
         # Details Area
         self.titleLabel = QLabel(self.tr("Title"), self)

{novelwriter-2.6.2 → novelwriter-2.6.3}/novelwriter/tools/manuscript.py

@@ -43,7 +43,7 @@ from PyQt5.QtWidgets import (
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import fuzzyTime
-from novelwriter.constants import nwLabels, nwStats, trConst
+from novelwriter.constants import nwLabels, nwStats, trStats
 from novelwriter.core.buildsettings import BuildCollection, BuildSettings
 from novelwriter.core.docbuild import NWBuildDocument
 from novelwriter.extensions.modified import NIconToggleButton, NIconToolButton, NToolDialog
@@ -1037,17 +1037,17 @@ class _StatsWidget(QWidget):
         hPx = CONFIG.pxInt(12)
         vPx = CONFIG.pxInt(4)
 
-        trAllChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS])
-        trTextChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS_TEXT])
-        trTitleChars = trConst(nwLabels.STATS_NAME[nwStats.CHARS_TITLE])
-        trParagraphCount = trConst(nwLabels.STATS_NAME[nwStats.PARAGRAPHS])
-        trTitleCount = trConst(nwLabels.STATS_NAME[nwStats.TITLES])
-        trAllWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_ALL])
-        trTextWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_TEXT])
-        trTitleWordChars = trConst(nwLabels.STATS_NAME[nwStats.WCHARS_TITLE])
-        trAllWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS])
-        trTextWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS_TEXT])
-        trTitleWords = trConst(nwLabels.STATS_NAME[nwStats.WORDS_TITLE])
+        trAllChars = trStats(nwLabels.STATS_NAME[nwStats.CHARS])
+        trTextChars = trStats(nwLabels.STATS_NAME[nwStats.CHARS_TEXT])
+        trTitleChars = trStats(nwLabels.STATS_NAME[nwStats.CHARS_TITLE])
+        trParagraphCount = trStats(nwLabels.STATS_NAME[nwStats.PARAGRAPHS])
+        trTitleCount = trStats(nwLabels.STATS_NAME[nwStats.TITLES])
+        trAllWordChars = trStats(nwLabels.STATS_NAME[nwStats.WCHARS_ALL])
+        trTextWordChars = trStats(nwLabels.STATS_NAME[nwStats.WCHARS_TEXT])
+        trTitleWordChars = trStats(nwLabels.STATS_NAME[nwStats.WCHARS_TITLE])
+        trAllWords = trStats(nwLabels.STATS_NAME[nwStats.WORDS])
+        trTextWords = trStats(nwLabels.STATS_NAME[nwStats.WORDS_TEXT])
+        trTitleWords = trStats(nwLabels.STATS_NAME[nwStats.WORDS_TITLE])
 
         # Minimal Form
         self.minWordCount = QLabel(self)