From 1dbe7c29e2947d2114f25bc1e79c4abcf3a1a2cc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 15 Aug 2017 12:30:19 +0200 Subject: [PATCH] Python-i18n: prepare for move of API to libcalamares.utils, be less verbose --- CMakeModules/CalamaresAddTranslations.cmake | 1 - src/modules/dummypython/main.py | 4 ++-- src/modules/machineid/main.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeModules/CalamaresAddTranslations.cmake b/CMakeModules/CalamaresAddTranslations.cmake index 5c245ce68..9ac5ab2b6 100644 --- a/CMakeModules/CalamaresAddTranslations.cmake +++ b/CMakeModules/CalamaresAddTranslations.cmake @@ -99,7 +99,6 @@ function( install_calamares_gettext_translations ) set( INSTALLED_TRANSLATIONS "" ) foreach( lang ${CALAMARES_TRANSLATION_LANGUAGES} ) # Global set( lang_mo "${TRANSLATION_SOURCE_DIR}/${lang}/LC_MESSAGES/${TRANSLATION_FILENAME}" ) - message(STATUS " Examining ${lang_mo}") if( lang STREQUAL "en" ) message( STATUS " Skipping ${TRANSLATION_NAME} translations for en_US" ) else( EXISTS ${lang_mo} ) diff --git a/src/modules/dummypython/main.py b/src/modules/dummypython/main.py index dc4275f07..bcbe3f537 100644 --- a/src/modules/dummypython/main.py +++ b/src/modules/dummypython/main.py @@ -35,8 +35,8 @@ from time import gmtime, strftime, sleep import gettext _ = gettext.translation("calamares-python", - localedir=libcalamares.job.gettext_path, - languages=libcalamares.globalstorage.gettext_languages(), + localedir=libcalamares.utils.gettext_path, + languages=libcalamares.utils.gettext_languages(), fallback=True).gettext diff --git a/src/modules/machineid/main.py b/src/modules/machineid/main.py index 2e9ccae22..1641014f4 100644 --- a/src/modules/machineid/main.py +++ b/src/modules/machineid/main.py @@ -26,8 +26,8 @@ from libcalamares.utils import check_target_env_call, debug import gettext _ = gettext.translan getion("calamares-python", - localedir=libcalamares.job.gettext_path, - languages=libcalamares.globalstorage.gettext_languages(), + localedir=libcalamares.utils.gettext_path, + languages=libcalamares.utils.gettext_languages(), fallback=True).gettext