Skip to content

Feat(Locales): Updated PluginBase and LocaleManager for minor improvements #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Core447 merged 3 commits into from
Nov 13, 2024
Merged

Feat(Locales): Updated PluginBase and LocaleManager for minor improvements #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3b55d0
Feat(LocaleManager): Made Plugin still be able to load if locale is n…
G4PLS Nov 9, 2024
94c4838
Feat(PluginBase): Updated locale_manager to either use legacy or new …
G4PLS Nov 9, 2024
dc78e94
Refactor(PluginBase): Changed use_legacy_locale from False to True as…
G4PLS Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions locales/LocaleManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import os
import csv
import locale
from loguru import logger as log

class LocaleManager:
def __init__(self, csv_path: str) -> None:
Expand All @@ -29,6 +30,10 @@ def __init__(self, csv_path: str) -> None:
self.load_csv()

def load_csv(self) -> None:
if not os.path.exists(self.csv_path):
log.error(f"No locales found at {self.csv_path}")
return

with open(self.csv_path, newline='') as csvfile:
reader = csv.reader(csvfile, delimiter=';', quotechar='"', skipinitialspace=True)
self.available_locales = next(reader)[1:]
Expand Down
9 changes: 7 additions & 2 deletions src/backend/PluginManager/PluginBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
# Import gtk modules
import gi

from locales.LocaleManager import LocaleManager

gi.require_version("Gtk", "4.0")
gi.require_version("Adw", "1")
from gi.repository import Gtk, Adw, Gdk
Expand All @@ -38,15 +40,18 @@ class PluginBase(rpyc.Service):
plugins = {}
disabled_plugins = {}

def __init__(self):
def __init__(self, use_legacy_locale: bool = True, legacy_dir: str = "locales"):
self.backend_connection: Connection = None
self.backend: netref = None
self.server: ThreadedServer = None

self.PATH = os.path.dirname(inspect.getfile(self.__class__))
self.settings_path: str = os.path.join(gl.DATA_PATH, "settings", "plugins", self.get_plugin_id_from_folder_name(), "settings.json") #TODO: Retrive from the manifest as well

self.locale_manager = LegacyLocaleManager(os.path.join(self.PATH, "locales"))
if use_legacy_locale:
self.locale_manager = LegacyLocaleManager(os.path.join(self.PATH, legacy_dir))
else:
self.locale_manager = LocaleManager(os.path.join(self.PATH, "locales.csv"))
self.locale_manager.set_to_os_default()

self.action_holders: dict = {}
Expand Down