diff --git a/modules/jenkins/files/slave_scripts/propose_translation_update.sh b/modules/jenkins/files/slave_scripts/propose_translation_update.sh index da567cc09d..32b026d068 100755 --- a/modules/jenkins/files/slave_scripts/propose_translation_update.sh +++ b/modules/jenkins/files/slave_scripts/propose_translation_update.sh @@ -47,7 +47,7 @@ fi tx set --auto-local -r ${PROJECT}.${PROJECT}-translations "${PROJECT}/locale//LC_MESSAGES/${PROJECT}.po" --source-lang en --source-file ${PROJECT}/locale/${PROJECT}.pot -t PO --execute # Pull all upstream translations -tx pull -a +tx pull -a -f # Update the .pot file python setup.py extract_messages PO_FILES=`find ${PROJECT}/locale -name '*.po'` @@ -68,14 +68,4 @@ then $COMMIT_MSG EOF git review -t transifex/translations - - # Push .pot changes to transifex - tx --debug --traceback push -s - # Push translation changes to transifex - # Disable -e as we can live with failed translation pushes (failures - # occur when a translation file has no translations in it not really - # error worthy but they occur) - set +e - tx --debug --traceback push -t --skip - set -e fi diff --git a/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh b/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh index cf5e16f4a9..6f60f0793b 100755 --- a/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh +++ b/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh @@ -82,14 +82,8 @@ do fi done -if [ ! `git diff --cached --quiet HEAD --` ] -then - # Push .pot changes to transifex - tx --debug --traceback push -s -fi - # Pull all upstream translations -tx pull -a +tx pull -a -f for FILE in ${DocFolder}/* do diff --git a/modules/jenkins/files/slave_scripts/upstream_translation_update.sh b/modules/jenkins/files/slave_scripts/upstream_translation_update.sh index 59e5928ac3..d8bca8c123 100755 --- a/modules/jenkins/files/slave_scripts/upstream_translation_update.sh +++ b/modules/jenkins/files/slave_scripts/upstream_translation_update.sh @@ -28,8 +28,6 @@ if [ ! -d .tx ] ; then fi tx set --auto-local -r ${PROJECT}.${PROJECT}-translations "${PROJECT}/locale//LC_MESSAGES/${PROJECT}.po" --source-lang en --source-file ${PROJECT}/locale/${PROJECT}.pot -t PO --execute -# Pull all upstream translations -tx pull -a # Update the .pot file python setup.py extract_messages PO_FILES=`find ${PROJECT}/locale -name '*.po'` @@ -45,11 +43,4 @@ if [ ! `git diff-index --quiet HEAD --` ] then # Push .pot changes to transifex tx --debug --traceback push -s - # Push translation changes to transifex - # Disable -e as we can live with failed translation pushes (failures - # occur when a translation file has no translations in it not really - # error worthy but they occur) - set +e - tx --debug --traceback push -t --skip - set -e fi