Skip to content
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

p/utils: Rewrite install_locale function #1352

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

p/utils: Rewrite install_locale function #1352

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd21bb5
p/utils: Rewrite install_locale function
rockstorm101 May 11, 2023
2030474
p/utils: Simplify code and make local path absolute
rockstorm101 May 11, 2023
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
31 changes: 11 additions & 20 deletions printrun/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# along with Printrun. If not, see <http://www.gnu.org/licenses/>.

import os
import platform
import sys
import re
import gettext
Expand All @@ -35,27 +34,19 @@ def set_utf8_locale():
if encoding != 'UTF-8':
locale.setlocale(locale.LC_CTYPE, (lang, 'UTF-8'))

# Set up Internationalization using gettext
# searching for installed locales on /usr/share; uses relative folder if not
# found (windows)

def install_locale(domain):
shared_locale_dir = os.path.join(DATADIR, 'locale')
translation = None
lang = locale.getdefaultlocale()
osPlatform = platform.system()

if osPlatform == "Darwin":
# improvised workaround for macOS crash with gettext.translation, see issue #1154
if os.path.exists(shared_locale_dir):
gettext.install(domain, shared_locale_dir)
else:
gettext.install(domain, './locale')
# Set up Internationalization using gettext

local_path = Path(Path.cwd(), 'locale')
if gettext.find(domain, local_path) is not None:
# Install the translation found in the local directory
gettext.install(domain, local_path)
else:
if os.path.exists('./locale'):
translation = gettext.translation(domain, './locale', languages=[lang[0]], fallback= True)
else:
translation = gettext.translation(domain, shared_locale_dir, languages=[lang[0]], fallback= True)
translation.install()
# Install the translation found in system directories
# (or fallback to a dummy/empty one)
gettext.install(domain)


class LogFormatter(logging.Formatter):
def __init__(self, format_default, format_info):
Expand Down