From 985cbe966ed2d193347d7015c176b9a95cd8e439 Mon Sep 17 00:00:00 2001 From: Heliguy Date: Sun, 27 Oct 2024 22:12:15 -0400 Subject: [PATCH] Fix many typos --- PLANNED & NOT PLANNED.md | 4 ++-- data/io.github.flattool.Warehouse.desktop.in | 4 ++-- po/warehouse.pot | 2 +- src/host_info.py | 14 +++++++------- src/packages_page/filters_page.py | 4 ++-- src/packages_page/packages_page.py | 4 ++-- src/properties_page/properties_page.blp | 2 +- src/properties_page/properties_page.py | 10 +++++----- src/remotes_page/remotes_page.py | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/PLANNED & NOT PLANNED.md b/PLANNED & NOT PLANNED.md index 4205bc5..f24ff71 100644 --- a/PLANNED & NOT PLANNED.md +++ b/PLANNED & NOT PLANNED.md @@ -1,4 +1,4 @@ -> This document exists to inform feature requesters, contributors, and anyone else who is curios on the state of Warehouse. Make sure to give this a read before requesting any new features. +> This document exists to inform feature requesters, contributors, and anyone else who is curious on the state of Warehouse. Make sure to give this a read before requesting any new features. # Features Being Worked On @@ -30,4 +30,4 @@ - Reading and leaving app reviews - Auto updates - Management of any non Flatpak packages -- Supporting any repackages (apart from nixpkgs should that arise) \ No newline at end of file +- Supporting any repackages (apart from nixpkgs should that arise) diff --git a/data/io.github.flattool.Warehouse.desktop.in b/data/io.github.flattool.Warehouse.desktop.in index 5768620..4fa9221 100644 --- a/data/io.github.flattool.Warehouse.desktop.in +++ b/data/io.github.flattool.Warehouse.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] -# Translators: Do not translate the applicaion name +# Translators: Do not translate the application name Name=Warehouse Exec=warehouse Icon=io.github.flattool.Warehouse @@ -9,4 +9,4 @@ Categories=GTK;System;Utility; StartupNotify=true Keywords=flatpak Comment=Manage all things Flatpak -X-Purism-FormFactor=Workstation;Mobile; \ No newline at end of file +X-Purism-FormFactor=Workstation;Mobile; diff --git a/po/warehouse.pot b/po/warehouse.pot index ad68e5b..a43fa77 100644 --- a/po/warehouse.pot +++ b/po/warehouse.pot @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Translators: Do not translate the applicaion name +#. Translators: Do not translate the application name #: data/io.github.flattool.Warehouse.desktop.in:4 msgid "Warehouse" msgstr "" diff --git a/src/host_info.py b/src/host_info.py index 8b352cd..9cac28d 100644 --- a/src/host_info.py +++ b/src/host_info.py @@ -195,7 +195,7 @@ class Flatpak: self.info["installation"] = installation self.is_eol = "eol=" in self.info["options"] - self.dependant_runtime = None + self.dependent_runtime = None self.failed_app_run = None self.failed_mask = None self.failed_uninstall = None @@ -256,7 +256,7 @@ class HostInfo: installations = [] masks = {} pins = {} - dependant_runtime_refs = [] + dependent_runtime_refs = [] @classmethod def get_flatpaks(this, callback=None): # Callback is a function to run after the host flatpaks are found @@ -267,7 +267,7 @@ class HostInfo: this.installations.clear() this.masks.clear() this.pins.clear() - this.dependant_runtime_refs.clear() + this.dependent_runtime_refs.clear() def thread(task, *args): @@ -354,7 +354,7 @@ class HostInfo: this.id_to_flatpak[package.info["id"]] = package this.ref_to_flatpak[package.info["ref"]] = package - # Dependant Runtimes + # Dependent Runtimes output = subprocess.run( ['flatpak-spawn', '--host', 'flatpak', 'list', '--columns=runtime,ref'], @@ -372,9 +372,9 @@ class HostInfo: continue runtime = split_line[0] - package.dependant_runtime = this.ref_to_flatpak[runtime] - if not runtime in this.dependant_runtime_refs: - this.dependant_runtime_refs.append(runtime) + package.dependent_runtime = this.ref_to_flatpak[runtime] + if not runtime in this.dependent_runtime_refs: + this.dependent_runtime_refs.append(runtime) except subprocess.CalledProcessError as cpe: this.main_window.toast_overlay.add_toast(ErrorToast(_("Could not load packages"), cpe.stderr).toast) diff --git a/src/packages_page/filters_page.py b/src/packages_page/filters_page.py index 9d69b8f..5fc58cf 100644 --- a/src/packages_page/filters_page.py +++ b/src/packages_page/filters_page.py @@ -133,7 +133,7 @@ class FiltersPage(Adw.NavigationPage): for row in self.runtime_rows: self.runtimes_group.remove(row) self.runtime_rows.clear() - if len(HostInfo.dependant_runtime_refs) < 2: + if len(HostInfo.dependent_runtime_refs) < 2: self.runtimes_group.set_visible(False) if self.runtimes_string != "all": self.runtimes_string = "all" @@ -142,7 +142,7 @@ class FiltersPage(Adw.NavigationPage): return - for j, ref in enumerate(HostInfo.dependant_runtime_refs): + for j, ref in enumerate(HostInfo.dependent_runtime_refs): row = FilterRow(ref) row.set_title(ref) row.check_button.set_active(ref in self.runtimes_string) diff --git a/src/packages_page/packages_page.py b/src/packages_page/packages_page.py index 2c9fd1f..3969cfb 100644 --- a/src/packages_page/packages_page.py +++ b/src/packages_page/packages_page.py @@ -111,7 +111,7 @@ class PackagesPage(Adw.BreakpointBin): visible = False if remotes_list != "all" and not f"{row.package.info['origin']}<>{row.package.info['installation']}" in remotes_list: visible = False - if runtimes_list != "all" and (row.package.is_runtime or row.package.dependant_runtime and not row.package.dependant_runtime.info["ref"] in runtimes_list): + if runtimes_list != "all" and (row.package.is_runtime or row.package.dependent_runtime and not row.package.dependent_runtime.info["ref"] in runtimes_list): visible = False row.set_visible(visible) @@ -187,7 +187,7 @@ class PackagesPage(Adw.BreakpointBin): row.check_button.connect("toggled", lambda *_, row=row: self.row_select_handler(row)) try: if not package.is_runtime: - row.eol_runtime_status_icon.set_visible(package.dependant_runtime.is_eol) + row.eol_runtime_status_icon.set_visible(package.dependent_runtime.is_eol) except Exception as e: self.packages_toast_overlay.add_toast(ErrorToast(_("Error getting Flatpak '{}'").format(package.info["name"]), str(e)).toast) diff --git a/src/properties_page/properties_page.blp b/src/properties_page/properties_page.blp index f800904..20ac808 100644 --- a/src/properties_page/properties_page.blp +++ b/src/properties_page/properties_page.blp @@ -97,7 +97,7 @@ template $PropertiesPage : Adw.NavigationPage { margin-bottom: 7; margin-start: 6; margin-end: 6; - label: _("This package is End Of Life, and will not recieve any security updates"); + label: _("This package is End Of Life, and will not receive any security updates"); styles ["heading", "error"] halign: center; hexpand: true; diff --git a/src/properties_page/properties_page.py b/src/properties_page/properties_page.py index 0d5fc01..c8ae9f4 100644 --- a/src/properties_page/properties_page.py +++ b/src/properties_page/properties_page.py @@ -97,10 +97,10 @@ class PropertiesPage(Adw.NavigationPage): self.trash_data_button.set_sensitive(has_path and self.package.info['id'] != "io.github.flattool.Warehouse") self.open_data_button.set_sensitive(has_path) - if not self.package.dependant_runtime is None: + if not self.package.dependent_runtime is None: self.runtime_row.set_visible(True) - self.runtime_row.set_subtitle(self.package.dependant_runtime.info["name"]) - self.eol_package_package_status_icon.set_visible(self.package.dependant_runtime.is_eol) + self.runtime_row.set_subtitle(self.package.dependent_runtime.info["name"]) + self.eol_package_package_status_icon.set_visible(self.package.dependent_runtime.is_eol) if has_path: self.trash_data_button.set_visible(False) @@ -254,11 +254,11 @@ class PropertiesPage(Adw.NavigationPage): def runtime_row_handler(self, *args): new_page = self.__class__() new_page.packages_page = self.packages_page - new_page.set_properties(self.package.dependant_runtime) + new_page.set_properties(self.package.dependent_runtime) self.nav_view.push(new_page) def open_app_handler(self, *args): - self.toast_overlay.add_toast(Adw.Toast(title=_("Openeing {}…").format(self.package.info["name"]))) + self.toast_overlay.add_toast(Adw.Toast(title=_("Opening {}…").format(self.package.info["name"]))) def callback(*args): if fail := self.package.failed_app_run: diff --git a/src/remotes_page/remotes_page.py b/src/remotes_page/remotes_page.py index 9357400..8f1b953 100644 --- a/src/remotes_page/remotes_page.py +++ b/src/remotes_page/remotes_page.py @@ -281,7 +281,7 @@ class RemotesPage(Adw.NavigationPage): self.search_entry.connect("search-changed", self.on_search) self.show_disabled_button.connect("toggled", self.show_disabled_handler) - # Appply + # Apply self.adding_view.set_content(LoadingStatus(_("Adding Remote"), _("This should only take a moment"))) self.loading_view.set_content(LoadingStatus(_("Loading Remotes"), _("This should only take a moment"))) for item in self.new_remotes: