Merge pull request slgobinath#706 from deltragon/typing-gettext

typing: import gettext instead of global function

Author: deltragon

ruff.toml

@@ -1,8 +1,5 @@
 target-version = "py310"
 
-# gettext
-builtins = ["_"]
-
 [lint]
 select = ["E", "W", "F", "D2", "D3", "D4"]
 ignore = [

safeeyes/__main__.py

@@ -21,21 +21,18 @@
 """
 
 import argparse
-import gettext
-import locale
 import logging
 import signal
 import sys
 
 import psutil
-from safeeyes import utility
+from safeeyes import utility, translations
+from safeeyes.translations import translate as _
 from safeeyes.model import Config
 from safeeyes.safeeyes import SafeEyes
 from safeeyes.safeeyes import SAFE_EYES_VERSION
 from safeeyes.rpc import RPCClient
 
-gettext.install("safeeyes", utility.LOCALE_PATH)
-
 
 def __running():
     """Check if SafeEyes is already running."""
@@ -68,21 +65,7 @@ def __running():
 
 def main():
     """Start the Safe Eyes."""
-    system_locale = gettext.translation(
-        "safeeyes",
-        localedir=utility.LOCALE_PATH,
-        languages=[utility.system_locale(), "en_US"],
-        fallback=True,
-    )
-    system_locale.install()
-    try:
-        # locale.bindtextdomain is required for Glade files
-        locale.bindtextdomain("safeeyes", utility.LOCALE_PATH)
-    except AttributeError:
-        logging.warning(
-            "installed python's gettext module does not support locale.bindtextdomain."
-            " locale.bindtextdomain is required for Glade files"
-        )
+    system_locale = translations.setup()
 
     parser = argparse.ArgumentParser(prog="safeeyes")
     group = parser.add_mutually_exclusive_group()

safeeyes/model.py

@@ -34,6 +34,7 @@
 from gi.repository import Gtk
 
 from safeeyes import utility
+from safeeyes.translations import translate as _
 
 
 class Break:

safeeyes/plugins/donotdisturb/dependency_checker.py

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from safeeyes import utility
+from safeeyes.translations import translate as _
 
 
 def validate(plugin_config, plugin_settings):

safeeyes/plugins/healthstats/dependency_checker.py

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from safeeyes import utility
+from safeeyes.translations import translate as _
 
 
 def validate(plugin_config, plugin_settings):

safeeyes/plugins/healthstats/plugin.py

@@ -21,6 +21,7 @@
 import croniter
 import datetime
 import logging
+from safeeyes.translations import translate as _
 
 context = None
 session = None

safeeyes/plugins/limitconsecutiveskipping/plugin.py

@@ -19,6 +19,7 @@
 """Limit how many breaks can be skipped or postponed in a row."""
 
 import logging
+from safeeyes.translations import translate as _
 
 context = None
 no_of_skipped_breaks = 0

safeeyes/plugins/notification/plugin.py

@@ -20,6 +20,7 @@
 
 import gi
 from safeeyes.model import BreakType
+from safeeyes.translations import translate as _
 
 gi.require_version("Notify", "0.7")
 from gi.repository import Notify

safeeyes/plugins/smartpause/dependency_checker.py

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from safeeyes import utility
+from safeeyes.translations import translate as _
 
 
 def validate(plugin_config, plugin_settings):

safeeyes/plugins/trayicon/dependency_checker.py

@@ -18,6 +18,7 @@
 
 from safeeyes import utility
 from safeeyes.model import PluginDependency
+from safeeyes.translations import translate as _
 
 import gi