Merge branch 'release/4.1.1'

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## v4.1.1 - 2024-09-27
+
+### Bug Fixes:
+
+* The Discord report was blank if the Discord language was set to anything other than English
+* INF numbers in legend / help window weren't showing the new ones implemented in v4.1.0
+
+
 ## v4.1.0 - 2024-09-26
 
 ### New Features:

bgstally/utils.py

@@ -30,9 +30,13 @@ def __(string: str, lang: str) -> str:
     Returns:
         str: Translated string
     """
-    l10n_path: str = join(bgstally.globals.this.plugin_dir, l10n.LOCALISATION_DIR)
     if lang == "" or lang is None: return _(string)
 
+    if appversion() < semantic_version.Version('5.12.0'):
+        l10n_path: str = join(bgstally.globals.this.plugin_dir, l10n.LOCALISATION_DIR)
+    else:
+        l10n_path: Path = Path(join(bgstally.globals.this.plugin_dir, l10n.LOCALISATION_DIR))
+
     contents: dict[str, str] = l10n.Translations.contents(lang=lang, plugin_path=l10n_path)
 
     if not contents:

bgstally/windows/legend.py

@@ -2,7 +2,7 @@
 from os import path
 from tkinter import PhotoImage, ttk
 
-from bgstally.constants import COLOUR_HEADING_1, FOLDER_ASSETS, FONT_HEADING_1
+from bgstally.constants import COLOUR_HEADING_1, FOLDER_ASSETS, FONT_HEADING_1, FONT_TEXT
 from bgstally.utils import _, __
 
 
@@ -72,7 +72,7 @@ def show(self):
         ttk.Label(frame_contents, text=" " + _("Primary INF. This is INF gained for the mission issuing faction.")).grid(row=current_row, column=1, sticky=tk.W); current_row += 1 # LANG: Label on legend window
         ttk.Label(frame_contents, text="🅢", font=("Helvetica", 24)).grid(row=current_row, column=0)
         ttk.Label(frame_contents, text=" " + _("Secondary INF. This is INF gained as a secondary effect of the mission, for example the destination faction for delivery missions.")).grid(row=current_row, column=1, sticky=tk.W); current_row += 1 # LANG: Label on legend window
-        ttk.Label(frame_contents, text="➊ ➋ ➌ ➍ ➎", font=("Helvetica", 14)).grid(row=current_row, column=0)
+        ttk.Label(frame_contents, text="1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣", font=FONT_TEXT).grid(row=current_row, column=0)
         ttk.Label(frame_contents, text=" " + _("Detailed INF split into + / ++ / +++ / ++++ / +++++ received from missions.")).grid(row=current_row, column=1, sticky=tk.W); current_row += 1 # LANG: Label on legend window
         ttk.Label(frame_contents, image=self.image_icon_bgs_cz).grid(row=current_row, column=0)
         ttk.Label(frame_contents, text=" " + _("On-ground Conflict Zone")).grid(row=current_row, column=1, sticky=tk.W); current_row += 1 # LANG: Label on legend window

load.py

@@ -9,7 +9,7 @@
 from bgstally.debug import Debug
 
 PLUGIN_NAME = "BGS-Tally"
-PLUGIN_VERSION = semantic_version.Version.coerce("4.1.0")
+PLUGIN_VERSION = semantic_version.Version.coerce("4.1.1")
 
 # Initialise the main plugin class
 bgstally.globals.this = this = BGSTally(PLUGIN_NAME, PLUGIN_VERSION)