From 63506f7892ada9569f46730f85070e78ad3accb7 Mon Sep 17 00:00:00 2001 From: heliguy Date: Sun, 5 Jan 2025 22:20:05 -0500 Subject: [PATCH] Define _ for all files --- src/change_version_page/change_version_page.py | 3 +++ src/change_version_page/change_version_worker.py | 3 +++ src/gtk/attempt_install_dialog.py | 3 +++ src/gtk/error_toast.py | 3 +++ src/gtk/installation_chooser.py | 3 +++ src/gtk/sidebar_button.py | 3 +++ src/host_info.py | 2 ++ src/install_page/file_install_dialog.py | 3 +++ src/install_page/install_page.py | 3 +++ src/install_page/pending_page.py | 3 +++ src/install_page/result_row.py | 3 +++ src/install_page/results_page.py | 3 +++ src/install_page/select_page.py | 3 +++ src/main.py | 4 ++-- src/main_window/window.py | 2 ++ src/package_install_worker.py | 3 +++ src/packages_page/filters_page.py | 2 ++ src/packages_page/packages_page.py | 2 ++ src/packages_page/uninstall_dialog.py | 2 ++ src/properties_page/properties_page.py | 2 ++ src/remotes_page/add_remote_dialog.py | 3 +++ src/remotes_page/remote_row.py | 3 +++ src/remotes_page/remotes_page.py | 3 +++ src/snapshot_page/new_snapshot_dialog.py | 2 ++ src/snapshot_page/snapshot_box.py | 2 ++ src/snapshot_page/snapshot_page.py | 2 ++ src/snapshot_page/snapshots_list_page.py | 2 ++ src/snapshot_page/tar_worker.py | 2 ++ src/user_data_page/data_box.py | 2 ++ src/user_data_page/data_subpage.py | 2 ++ src/user_data_page/user_data_page.py | 3 +++ 31 files changed, 79 insertions(+), 2 deletions(-) diff --git a/src/change_version_page/change_version_page.py b/src/change_version_page/change_version_page.py index 154db83..8d556b5 100644 --- a/src/change_version_page/change_version_page.py +++ b/src/change_version_page/change_version_page.py @@ -4,6 +4,9 @@ from src.host_info import HostInfo from src.gtk.loading_status import LoadingStatus from src.change_version_page.change_version_worker import ChangeVersionWorker import subprocess +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/change_version_page/change_version_page.ui") diff --git a/src/change_version_page/change_version_worker.py b/src/change_version_page/change_version_worker.py index a1fee6f..549ec96 100644 --- a/src/change_version_page/change_version_worker.py +++ b/src/change_version_page/change_version_worker.py @@ -1,6 +1,9 @@ from gi.repository import GLib, Gio from src.host_info import HostInfo import subprocess, re +import gettext + +_ = gettext.gettext class ChangeVersionWorker: diff --git a/src/gtk/attempt_install_dialog.py b/src/gtk/attempt_install_dialog.py index bde6d40..306ec09 100644 --- a/src/gtk/attempt_install_dialog.py +++ b/src/gtk/attempt_install_dialog.py @@ -1,6 +1,9 @@ from gi.repository import Adw, Gtk from src.host_info import HostInfo from src.gtk.error_toast import ErrorToast +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/gtk/attempt_install_dialog.ui") diff --git a/src/gtk/error_toast.py b/src/gtk/error_toast.py index a2581bb..a22b894 100644 --- a/src/gtk/error_toast.py +++ b/src/gtk/error_toast.py @@ -1,4 +1,7 @@ from gi.repository import Adw, Gtk, Gdk, GLib +import gettext + +_ = gettext.gettext class ErrorToast: diff --git a/src/gtk/installation_chooser.py b/src/gtk/installation_chooser.py index eef716b..5ab767b 100644 --- a/src/gtk/installation_chooser.py +++ b/src/gtk/installation_chooser.py @@ -1,5 +1,8 @@ from gi.repository import Adw, Gtk from src.host_info import HostInfo +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/gtk/installation_chooser.ui") diff --git a/src/gtk/sidebar_button.py b/src/gtk/sidebar_button.py index d5601cd..5b910ca 100644 --- a/src/gtk/sidebar_button.py +++ b/src/gtk/sidebar_button.py @@ -1,5 +1,8 @@ from gi.repository import Gtk from src.host_info import HostInfo +import gettext + +_ = gettext.gettext class SidebarButton(Gtk.Button): diff --git a/src/host_info.py b/src/host_info.py index a033641..d982309 100644 --- a/src/host_info.py +++ b/src/host_info.py @@ -1,7 +1,9 @@ from gi.repository import Gio, Gtk, GLib, Gdk from src.gtk.error_toast import ErrorToast import subprocess, os, pathlib +import gettext +_ = gettext.gettext home = f"{pathlib.Path.home()}" icon_theme = Gtk.IconTheme.new() icon_theme.add_search_path(f"{home}/.local/share/flatpak/exports/share/icons") diff --git a/src/install_page/file_install_dialog.py b/src/install_page/file_install_dialog.py index dad76d7..080c31d 100644 --- a/src/install_page/file_install_dialog.py +++ b/src/install_page/file_install_dialog.py @@ -1,4 +1,7 @@ from gi.repository import Adw, Gtk +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/file_install_dialog.ui") diff --git a/src/install_page/install_page.py b/src/install_page/install_page.py index 84b2d8c..ab38b28 100644 --- a/src/install_page/install_page.py +++ b/src/install_page/install_page.py @@ -6,6 +6,9 @@ from src.gtk.sidebar_button import SidebarButton from src.gtk.loading_status import LoadingStatus from src.package_install_worker import PackageInstallWorker from src.gtk.error_toast import ErrorToast +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/install_page.ui") diff --git a/src/install_page/pending_page.py b/src/install_page/pending_page.py index 2d42a79..98af886 100644 --- a/src/install_page/pending_page.py +++ b/src/install_page/pending_page.py @@ -1,6 +1,9 @@ from gi.repository import Adw, Gtk from src.host_info import HostInfo from src.install_page.result_row import ResultRow +import gettext + +_ = gettext.gettext class AddedGroup(Adw.PreferencesGroup): diff --git a/src/install_page/result_row.py b/src/install_page/result_row.py index 1edee1e..4860624 100644 --- a/src/install_page/result_row.py +++ b/src/install_page/result_row.py @@ -1,5 +1,8 @@ from gi.repository import Adw, Gtk, GLib from enum import Enum +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/result_row.ui") diff --git a/src/install_page/results_page.py b/src/install_page/results_page.py index cf2b9c4..e4a15ee 100644 --- a/src/install_page/results_page.py +++ b/src/install_page/results_page.py @@ -4,6 +4,9 @@ from src.install_page.result_row import ResultRow from src.gtk.loading_status import LoadingStatus from src.gtk.error_toast import ErrorToast import subprocess +import gettext + +_ = gettext.gettext class AddedPackage: diff --git a/src/install_page/select_page.py b/src/install_page/select_page.py index 737630f..b1d2a85 100644 --- a/src/install_page/select_page.py +++ b/src/install_page/select_page.py @@ -4,6 +4,9 @@ from src.gtk.error_toast import ErrorToast from src.install_page.results_page import ResultsPage from src.gtk.sidebar_button import SidebarButton from src.install_page.file_install_dialog import FileInstallDialog +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/install_page/select_page.ui") diff --git a/src/main.py b/src/main.py index b645363..3aef120 100644 --- a/src/main.py +++ b/src/main.py @@ -20,8 +20,6 @@ import sys import gi -# import subprocess - gi.require_version("Gtk", "4.0") gi.require_version("Adw", "1") gi.require_version("Flatpak", "1.0") @@ -30,7 +28,9 @@ from gi.repository import Gtk, Gio, Adw, GLib, Flatpak from src.main_window.window import WarehouseWindow from src.const import Config from src.gtk.error_toast import ErrorToast +import gettext +_ = gettext.gettext class WarehouseApplication(Adw.Application): """The main application singleton class.""" diff --git a/src/main_window/window.py b/src/main_window/window.py index a735500..958fdce 100644 --- a/src/main_window/window.py +++ b/src/main_window/window.py @@ -25,7 +25,9 @@ from src.snapshot_page.snapshot_page import SnapshotPage from src.install_page.install_page import InstallPage from src.gtk.error_toast import ErrorToast from src.const import Config +import gettext +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/main_window/window.ui") class WarehouseWindow(Adw.ApplicationWindow): diff --git a/src/package_install_worker.py b/src/package_install_worker.py index 2510e0e..dd1df70 100644 --- a/src/package_install_worker.py +++ b/src/package_install_worker.py @@ -1,6 +1,9 @@ from gi.repository import Gio, GLib from src.host_info import HostInfo import subprocess, re +import gettext + +_ = gettext.gettext class PackageInstallWorker: diff --git a/src/packages_page/filters_page.py b/src/packages_page/filters_page.py index be0129e..ba087ab 100644 --- a/src/packages_page/filters_page.py +++ b/src/packages_page/filters_page.py @@ -1,6 +1,8 @@ from gi.repository import Adw, Gtk, Gio from src.host_info import HostInfo +import gettext +_ = gettext.gettext class FilterRow(Adw.ActionRow): __gtype_name__ = "FilterRow" diff --git a/src/packages_page/packages_page.py b/src/packages_page/packages_page.py index 89f6753..24aeca6 100644 --- a/src/packages_page/packages_page.py +++ b/src/packages_page/packages_page.py @@ -10,7 +10,9 @@ from src.gtk.loading_status import LoadingStatus from src.package_install_worker import PackageInstallWorker from src.change_version_page.change_version_worker import ChangeVersionWorker import subprocess, os +import gettext +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/packages_page/packages_page.ui") class PackagesPage(Adw.BreakpointBin): diff --git a/src/packages_page/uninstall_dialog.py b/src/packages_page/uninstall_dialog.py index 93348c9..f530b2b 100644 --- a/src/packages_page/uninstall_dialog.py +++ b/src/packages_page/uninstall_dialog.py @@ -1,5 +1,7 @@ from gi.repository import Adw, Gtk, GLib +import gettext +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/packages_page/uninstall_dialog.ui") class UninstallDialog(Adw.AlertDialog): diff --git a/src/properties_page/properties_page.py b/src/properties_page/properties_page.py index b7e0b05..76bb0e8 100644 --- a/src/properties_page/properties_page.py +++ b/src/properties_page/properties_page.py @@ -6,7 +6,9 @@ from src.packages_page.uninstall_dialog import UninstallDialog from src.gtk.loading_status import LoadingStatus from src.package_install_worker import PackageInstallWorker import subprocess, os +import gettext +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/properties_page/properties_page.ui") class PropertiesPage(Adw.NavigationPage): diff --git a/src/remotes_page/add_remote_dialog.py b/src/remotes_page/add_remote_dialog.py index e58c2c6..76ba343 100644 --- a/src/remotes_page/add_remote_dialog.py +++ b/src/remotes_page/add_remote_dialog.py @@ -4,6 +4,9 @@ from src.gtk.error_toast import ErrorToast from src.gtk.loading_status import LoadingStatus from src.gtk.installation_chooser import InstallationChooser import subprocess, re +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/remotes_page/add_remote_dialog.ui") diff --git a/src/remotes_page/remote_row.py b/src/remotes_page/remote_row.py index f57935b..dbace7a 100644 --- a/src/remotes_page/remote_row.py +++ b/src/remotes_page/remote_row.py @@ -2,6 +2,9 @@ from gi.repository import Adw, Gtk, GLib, Gio from src.host_info import HostInfo from src.gtk.error_toast import ErrorToast import subprocess +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/remotes_page/remote_row.ui") diff --git a/src/remotes_page/remotes_page.py b/src/remotes_page/remotes_page.py index 6d2cc97..622954d 100644 --- a/src/remotes_page/remotes_page.py +++ b/src/remotes_page/remotes_page.py @@ -5,6 +5,9 @@ from src.remotes_page.remote_row import RemoteRow from src.remotes_page.add_remote_dialog import AddRemoteDialog from src.gtk.loading_status import LoadingStatus import subprocess +import gettext + +_ = gettext.gettext class NewRemoteRow(Adw.ActionRow): diff --git a/src/snapshot_page/new_snapshot_dialog.py b/src/snapshot_page/new_snapshot_dialog.py index 65fe1da..f40f727 100644 --- a/src/snapshot_page/new_snapshot_dialog.py +++ b/src/snapshot_page/new_snapshot_dialog.py @@ -4,7 +4,9 @@ from src.gtk.loading_status import LoadingStatus from src.gtk.app_row import AppRow from src.snapshot_page.tar_worker import TarWorker import os, time +import gettext +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/snapshot_page/new_snapshot_dialog.ui") class NewSnapshotDialog(Adw.Dialog): diff --git a/src/snapshot_page/snapshot_box.py b/src/snapshot_page/snapshot_box.py index de7a012..bdbee46 100644 --- a/src/snapshot_page/snapshot_box.py +++ b/src/snapshot_page/snapshot_box.py @@ -3,7 +3,9 @@ from src.host_info import HostInfo from src.gtk.error_toast import ErrorToast from src.snapshot_page.tar_worker import TarWorker import os, subprocess, json +import gettext +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/snapshot_page/snapshot_box.ui") class SnapshotBox(Gtk.Box): diff --git a/src/snapshot_page/snapshot_page.py b/src/snapshot_page/snapshot_page.py index 8db8cdf..51bda96 100644 --- a/src/snapshot_page/snapshot_page.py +++ b/src/snapshot_page/snapshot_page.py @@ -9,7 +9,9 @@ from src.snapshot_page.new_snapshot_dialog import NewSnapshotDialog from src.snapshot_page.tar_worker import TarWorker from src.gtk.attempt_install_dialog import AttemptInstallDialog import os, subprocess +import gettext +_ = gettext.gettext class LeftoverSnapshotRow(Adw.ActionRow): __gtype_name__ = "LeftoverSnapshotRow" diff --git a/src/snapshot_page/snapshots_list_page.py b/src/snapshot_page/snapshots_list_page.py index 67f5140..30eafdb 100644 --- a/src/snapshot_page/snapshots_list_page.py +++ b/src/snapshot_page/snapshots_list_page.py @@ -5,7 +5,9 @@ from src.snapshot_page.snapshot_box import SnapshotBox from src.gtk.loading_status import LoadingStatus from .new_snapshot_dialog import NewSnapshotDialog import os +import gettext +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/snapshot_page/snapshots_list_page.ui") class SnapshotsListPage(Adw.NavigationPage): diff --git a/src/snapshot_page/tar_worker.py b/src/snapshot_page/tar_worker.py index 6d86b38..0e6a94b 100644 --- a/src/snapshot_page/tar_worker.py +++ b/src/snapshot_page/tar_worker.py @@ -2,7 +2,9 @@ from gi.repository import GLib, Gio from src.host_info import HostInfo from src.gtk.error_toast import ErrorToast import os, subprocess, json +import gettext +_ = gettext.gettext class TarWorker: def compress_thread(self, *args): diff --git a/src/user_data_page/data_box.py b/src/user_data_page/data_box.py index 467e59f..29c51dd 100644 --- a/src/user_data_page/data_box.py +++ b/src/user_data_page/data_box.py @@ -3,7 +3,9 @@ from src.host_info import HostInfo from src.gtk.error_toast import ErrorToast from src.gtk.attempt_install_dialog import AttemptInstallDialog import subprocess +import gettext +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/user_data_page/data_box.ui") class DataBox(Gtk.ListBox): diff --git a/src/user_data_page/data_subpage.py b/src/user_data_page/data_subpage.py index 7243ec4..8a639b8 100644 --- a/src/user_data_page/data_subpage.py +++ b/src/user_data_page/data_subpage.py @@ -2,7 +2,9 @@ from gi.repository import Gtk, GLib, Gio from src.host_info import HostInfo from src.user_data_page.data_box import DataBox from src.gtk.loading_status import LoadingStatus +import gettext +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/user_data_page/data_subpage.ui") class DataSubpage(Gtk.Stack): diff --git a/src/user_data_page/user_data_page.py b/src/user_data_page/user_data_page.py index 243f27e..345c205 100644 --- a/src/user_data_page/user_data_page.py +++ b/src/user_data_page/user_data_page.py @@ -6,6 +6,9 @@ from src.gtk.sidebar_button import SidebarButton from src.gtk.loading_status import LoadingStatus from src.gtk.attempt_install_dialog import AttemptInstallDialog import os, subprocess +import gettext + +_ = gettext.gettext @Gtk.Template(resource_path="/io/github/flattool/Warehouse/user_data_page/user_data_page.ui")