napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Python-i18n: pygettext is deprecated

Browse Source 
- Use xgettext -L python instead
 - Mark _n as a plural-forms translation function
 - Explicit output to .pot files (instead of default .po)
This commit is contained in:
Adriaan de Groot 2017-08-31 04:09:48 -04:00
parent a4f4d417a2
commit 71fe0f6f03
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ci/txpush.sh
View File

@ -47,11 +47,7 @@ tx push --source --no-interactive -r calamares.fdo
# - python modules without lang/, which use one shared catalog # - python modules without lang/, which use one shared catalog
# #
# Arch PYGETTEXT="xgettext --keyword=_n:1,2 -L python"
# PYGETTEXT=/usr/lib/python3.5/Tools/i18n/pygettext.py
# Ubuntu
PYGETTEXT=pygettext3
SHARED_PYTHON="" SHARED_PYTHON=""
for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do
@ -59,7 +55,7 @@ for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do
if test -n "$FILES" ; then if test -n "$FILES" ; then
MODULE_NAME=$(basename ${MODULE_DIR}) MODULE_NAME=$(basename ${MODULE_DIR})
if [ -d ${MODULE_DIR}/lang ]; then if [ -d ${MODULE_DIR}/lang ]; then
${PYGETTEXT} -k _n -p ${MODULE_DIR}/lang -d ${MODULE_NAME} ${MODULE_DIR}/*.py ${PYGETTEXT} -p ${MODULE_DIR}/lang -d ${MODULE_NAME} -o ${MODULE_NAME}.pot ${MODULE_DIR}/*.py
if [ -f ${MODULE_DIR}/lang/${MODULE_NAME}.pot ]; then if [ -f ${MODULE_DIR}/lang/${MODULE_NAME}.pot ]; then
tx set -r calamares.${MODULE_NAME} --source -l en ${MODULE_DIR}/lang/${MODULE_NAME}.pot tx set -r calamares.${MODULE_NAME} --source -l en ${MODULE_DIR}/lang/${MODULE_NAME}.pot
tx push --source --no-interactive -r calamares.${MODULE_NAME} tx push --source --no-interactive -r calamares.${MODULE_NAME}
@ -71,7 +67,7 @@ for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do
done done
if test -n "$SHARED_PYTHON" ; then if test -n "$SHARED_PYTHON" ; then
${PYGETTEXT} -k _n -p lang -d python $SHARED_PYTHON ${PYGETTEXT} -p lang -d python -o python.pot $SHARED_PYTHON
tx set -r calamares.python --source -l en lang/python.pot tx set -r calamares.python --source -l en lang/python.pot
tx push --source --no-interactive -r calamares.python tx push --source --no-interactive -r calamares.python
fi fi