openstack/project-config
Code Issues Proposed changes

Simplify translation sync

Browse Source 
Since we do not store any pot files in git anymore, the optimization to
only push to the translation server if strings have changed, is not
possible anymore. Remove this code now, this includes removing
some git adds for pot files.

Change-Id: I28ad9edc49b0f840cd51354334d7ae08aadab87a
This commit is contained in:
Andreas Jaeger
2016-06-03 18:45:24 +02:00
parent 760861be62
commit e6cb1cd8b7
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins/scripts/common_translation_update.sh
View File

@@ -196,14 +196,11 @@ function setup_manuals {
fi
if [ ${IS_RST} -eq 1 ] ; then
tox -e generatepot-rst -- ${DOCNAME}
git add ${DocFolder}/${DOCNAME}/source/locale/${DOCNAME}.pot
ZANATA_RULES="$ZANATA_RULES -r ${ZanataDocFolder}/${DOCNAME}/source/locale/${DOCNAME}.pot ${DocFolder}/${DOCNAME}/source/locale/{locale_with_underscore}/LC_MESSAGES/${DOCNAME}.po"
else
# Update the .pot file
./tools/generatepot ${DOCNAME}
if [ -f ${DocFolder}/${DOCNAME}/locale/${DOCNAME}.pot ]; then
# Add all changed files to git
git add ${DocFolder}/${DOCNAME}/locale/${DOCNAME}.pot
ZANATA_RULES="$ZANATA_RULES -r ${ZanataDocFolder}/${DOCNAME}/locale/${DOCNAME}.pot ${DocFolder}/${DOCNAME}/locale/{locale_with_underscore}.po"
fi
fi

24
jenkins/scripts/upstream_translation_update.sh
View File

@@ -100,25 +100,13 @@ case "$PROJECT" in
;;
esac
# Add all changed files to git.
# Note that setup_manuals did the git add already, so we can skip it
# here.
if [[ ! $PROJECT =~ api-site|ha-guide|openstack-manuals|operations-guide|security-doc ]]; then
git add */locale/*
fi
if [ -d releasenotes/source/locale ] ; then
git add releasenotes/source/locale
fi
# The Zanata client works out what to send based on the zanata.xml file.
# Do not copy translations from other files for this change.
zanata-cli -B -e push --copy-trans False
# Move pot files to translation-source directory for publishing
copy_pot "$ALL_MODULES"
if [ $(git diff --cached | egrep -v "(POT-Creation-Date|^[\+\-]#|^\+{3}|^\-{3})" | egrep -c "^[\-\+]") -gt 0 ]; then
# The Zanata client works out what to send based on the zanata.xml file.
# Do not copy translations from other files for this change.
zanata-cli -B -e push --copy-trans False
# Move pot files to translation-source directory for publishing
copy_pot "$ALL_MODULES"
mv .translation-source translation-source
fi
mv .translation-source translation-source
# Tell finish function that everything is fine.
ERROR_ABORT=0