From f92e52a4af84b45b79f2b2a4b60560f258e7ce4c Mon Sep 17 00:00:00 2001 From: Sergio Costas Date: Sun, 5 Jan 2025 15:09:53 +0100 Subject: [PATCH] Ensure translations are included in .deb Also fix debug and required programs dialogs, ensuring that all the text is shown. --- pyproject.toml | 8 ++++---- src/devedeng/choose_disc_type.py | 2 +- src/devedeng/devedeng.py | 8 +------- src/devedeng/end_job.py | 2 +- src/devedeng/error.py | 2 +- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index aef49f5..fca5108 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,6 +25,10 @@ license = {text = "GPLv3"} keywords = ["dvd", "video"] +[tool.setuptools-gettext] +source_dir = "po" +build_dir = "src/devedeng/data/locale" + [tool.setuptools.package-data] "devedeng.data.interface" = ["*.ui", "*.png", "*.svg"] "devedeng.data.pixmaps" = ["*.png", "*.mpg", "*.ogg"] @@ -37,10 +41,6 @@ keywords = ["dvd", "video"] "share/applications" = ["src/devedeng/data/devede_ng.desktop"] "share/icons/hicolor/scalable/apps" = ["src/devedeng/data/interface/devedeng_icon.svg"] -[tool.setuptools-gettext] -source_dir = "po" -build_dir = "src/devedeng/data/locale" - [project.scripts] devede_ng = "devedeng:devedeng.py" diff --git a/src/devedeng/choose_disc_type.py b/src/devedeng/choose_disc_type.py index 72ffbed..e2ed98c 100644 --- a/src/devedeng/choose_disc_type.py +++ b/src/devedeng/choose_disc_type.py @@ -242,7 +242,7 @@ class choose_disc_type(GObject.GObject): "program_list": text} final_text = text1 + text2 + text3 + text4 + text5 + text6 - textbuf.insert_at_cursor(final_text, len(final_text)) + textbuf.set_text(final_text) window.run() window.destroy() diff --git a/src/devedeng/devedeng.py b/src/devedeng/devedeng.py index 07e1b0b..a8c1fbc 100644 --- a/src/devedeng/devedeng.py +++ b/src/devedeng/devedeng.py @@ -38,16 +38,10 @@ if config_data is None: Gtk.init(sys.argv) -gettext.bindtextdomain(config_data.gettext_domain, config_data.share_locale) -try: - locale.setlocale(locale.LC_ALL, "") -except locale.Error: - pass locale.bindtextdomain(config_data.gettext_domain, config_data.share_locale) -gettext.textdomain(config_data.gettext_domain) +locale.textdomain(config_data.gettext_domain) gettext.install(config_data.gettext_domain, localedir=config_data.share_locale) - def py(): global config_data diff --git a/src/devedeng/end_job.py b/src/devedeng/end_job.py index 2dea2b5..347fd4b 100644 --- a/src/devedeng/end_job.py +++ b/src/devedeng/end_job.py @@ -35,7 +35,7 @@ class end_window: werror_window = builder.get_object("done") wburn = builder.get_object("button_burn") wdebug_buffer = builder.get_object("debug_buffer") - wdebug_buffer.insert_at_cursor(self.config.get_log()) + wdebug_buffer.set_text(self.config.get_log()) wtime = builder.get_object("label_time") hours = int(time_used / 3600) minutes = int((time_used / 60) % 60) diff --git a/src/devedeng/error.py b/src/devedeng/error.py index f9ca6e4..951a07b 100644 --- a/src/devedeng/error.py +++ b/src/devedeng/error.py @@ -32,7 +32,7 @@ class error_window: builder.connect_signals(self) werror_window = builder.get_object("dialog_error") wdebug_buffer = builder.get_object("debug_buffer") - wdebug_buffer.insert_at_cursor(self.config.get_log()) + wdebug_buffer.set_text(self.config.get_log()) werror_window.show_all() werror_window.run()