From 2f5e7f20b543f2f0b0ae580b1c38d720399fe81f Mon Sep 17 00:00:00 2001 From: Frisk Date: Mon, 3 Aug 2020 15:27:24 +0200 Subject: [PATCH] Fix #137 --- src/discussions.py | 4 ++-- src/i18n.py | 8 ++++++-- src/misc.py | 7 ++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/discussions.py b/src/discussions.py index 1feb796..0699a6d 100644 --- a/src/discussions.py +++ b/src/discussions.py @@ -22,11 +22,11 @@ from src.configloader import settings from src.discussion_formatters import embed_formatter, compact_formatter from src.misc import datafile, messagequeue from src.session import session +from src.i18n import disc # Initialize translation -t = gettext.translation('discussions', localedir='locale', languages=[settings["lang"]]) -_ = t.gettext +_ = disc.gettext # Create a custom logger diff --git a/src/i18n.py b/src/i18n.py index 8cc6cad..24f8716 100644 --- a/src/i18n.py +++ b/src/i18n.py @@ -5,8 +5,12 @@ logger = logging.getLogger("rcgcdw.i18n") # Setup translation try: - lang = gettext.translation('rcgcdw', localedir='locale', languages=[settings["lang"]]) - disc = gettext.translation('discussions', localedir='locale', languages=[settings["lang"]]) + if settings["lang"] != "en": + lang = gettext.translation('rcgcdw', localedir='locale', languages=[settings["lang"]]) + disc = gettext.translation('discussions', localedir='locale', languages=[settings["lang"]]) + misc = gettext.translation('misc', localedir='locale', languages=[settings["lang"]]) + else: + lang, disc, misc = gettext.NullTranslations(), gettext.NullTranslations(), gettext.NullTranslations() except FileNotFoundError: logger.critical("No language files have been found. Make sure locale folder is located in the directory.") sys.exit(1) diff --git a/src/misc.py b/src/misc.py index ab87213..86ab81f 100644 --- a/src/misc.py +++ b/src/misc.py @@ -22,12 +22,9 @@ from urllib.parse import urlparse, urlunparse import requests from collections import defaultdict from src.configloader import settings -import gettext +from src.i18n import misc -# Initialize translation - -t = gettext.translation('misc', localedir='locale', languages=[settings["lang"]]) -_ = t.gettext +_ = misc.gettext # Create a custom logger