From fa05de8c37ef201aaa78bb0e002550b24bc186d5 Mon Sep 17 00:00:00 2001
From: Kapitan <kapitan@mlesniak.pl>
Date: Mon, 3 Mar 2025 18:53:59 +0100
Subject: [PATCH] Fix translations

---
 Jenkinsfile                                            | 10 +++++-----
 kapitanbooru_uploader/I18N.py                          |  8 +++-----
 kapitanbooru_uploader/ImageBrowser.py                  |  2 +-
 .../locales/en/LC_MESSAGES/messages.po                 |  2 +-
 .../locales/pl/LC_MESSAGES/messages.po                 |  2 +-
 pyproject.toml                                         |  2 +-
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e13b4f9..9b06b99 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,12 +20,12 @@ pipeline {
         
         stage('Compile Translations') {
             steps {
-                // Find all .po files under kapitanbooru_uploader/locales and compile them to .mo
                 sh '''
-                find kapitanbooru_uploader/locales -name "*.po" -print0 | while IFS= read -r -d '' po; do
-                  mo=$(echo "$po" | sed 's/\\.po$/.mo/');
-                  msgfmt "$po" -o "$mo";
-                done
+                find kapitanbooru_uploader/locales -name "*.po" -exec sh -c '
+                    po="$0"
+                    mo="${po%.po}.mo"
+                    msgfmt "$po" -o "$mo"
+                ' {} \;
                 '''
             }
         }
diff --git a/kapitanbooru_uploader/I18N.py b/kapitanbooru_uploader/I18N.py
index 2d52d65..b353f18 100644
--- a/kapitanbooru_uploader/I18N.py
+++ b/kapitanbooru_uploader/I18N.py
@@ -1,16 +1,14 @@
 import gettext
 import locale
-import os
 from typing import Dict
-
+from importlib.resources import files
 
 class I18N:
     def __init__(self, locale_dir=None):
         # If no locale_dir is provided, use the locales folder relative to this file.
         if locale_dir is None:
-            current_dir = os.path.dirname(os.path.abspath(__file__))
-            locale_dir = os.path.join(current_dir, "locales")
-        self.locale_dir = locale_dir
+            locale_dir = files("kapitanbooru_uploader").joinpath("locales")
+        self.locale_dir = str(locale_dir)
         self.languages = {"en": "English", "pl": "Polski"}
         self.current_lang = "en"
         self.translations: Dict[str, str] = {}
diff --git a/kapitanbooru_uploader/ImageBrowser.py b/kapitanbooru_uploader/ImageBrowser.py
index 0d0ae9b..8632da3 100644
--- a/kapitanbooru_uploader/ImageBrowser.py
+++ b/kapitanbooru_uploader/ImageBrowser.py
@@ -139,7 +139,7 @@ class ImageBrowser(tk.Tk):
         super().__init__()
         self.title("Kapitanbooru Uploader")
         self.geometry("900x600")
-        self.version = "0.4.0"
+        self.version = "0.4.1"
 
         self.settings = Settings()
         self.tags_repo = TagsRepo(self.settings)
diff --git a/kapitanbooru_uploader/locales/en/LC_MESSAGES/messages.po b/kapitanbooru_uploader/locales/en/LC_MESSAGES/messages.po
index f676028..ffd0cff 100644
--- a/kapitanbooru_uploader/locales/en/LC_MESSAGES/messages.po
+++ b/kapitanbooru_uploader/locales/en/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Kapitanbooru Uploader 0.4.0\n"
+"Project-Id-Version: Kapitanbooru Uploader 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-03-02 00:39+0100\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/kapitanbooru_uploader/locales/pl/LC_MESSAGES/messages.po b/kapitanbooru_uploader/locales/pl/LC_MESSAGES/messages.po
index 110839b..2be191e 100644
--- a/kapitanbooru_uploader/locales/pl/LC_MESSAGES/messages.po
+++ b/kapitanbooru_uploader/locales/pl/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Kapitanbooru Uploader 0.4.0\n"
+"Project-Id-Version: Kapitanbooru Uploader 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-03-02 00:39+0100\n"
 "Language: pl\n"
diff --git a/pyproject.toml b/pyproject.toml
index cbd56e4..2be61cb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "kapitanbooru-uploader"
-version = "0.4.0"
+version = "0.4.1"
 description = "A GUI application for uploading images to KapitanBooru"
 authors = [
     {name = "Michał Leśniak", email = "kapitan@mlesniak.pl"}