diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 543f41a97029e0bc4bd121845f836b71fe73bde0..f0f664a32960309373e1b03247fbd7c3a0f9260e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,4 +105,4 @@ funky: # - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then make push-locales; fi # only: # - develop -# - work-on-locales +# - master diff --git a/Makefile b/Makefile index 292821c56d0c7a74232aef17626c149561669dd5..df98faceb108c2d80a77a88c462b9f6fd2d6f82e 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,14 @@ locales: scripts/locales.sh push-locales: locales - zanata-cli -q -B push --errors + zanata-cli -q -B push --errors --project-version `git branch | grep \* | cut -d ' ' -f2-` pull-locales: - zanata-cli -q -B pull --min-doc-percent 50 + zanata-cli -q -B pull --min-doc-percent 50 --project-version `git branch | grep \* | cut -d ' ' -f2-` scripts/po2json.sh stats-locales: - zanata-cli -q stats + zanata-cli -q stats --project-version `git branch | grep \* | cut -d ' ' -f2-` push-trad-to-zanata: scripts/push-trad-to-zanata.sh $(filter-out $@,$(MAKECMDGOALS)) diff --git a/scripts/push-trad-to-zanata.sh b/scripts/push-trad-to-zanata.sh index b4520508eba9323e6163c78d60b45f6cc4144273..6c14107d43ddaaeb4338347df6ce986c2b2176f3 100755 --- a/scripts/push-trad-to-zanata.sh +++ b/scripts/push-trad-to-zanata.sh @@ -7,5 +7,5 @@ then else LOCALE=$(echo $FILE | sed -e "s@_@-@g") json2po -i locale/$FILE.json -t locale/en.json -o po/$FILE.po - zanata-cli -q -B push --push-type trans -l $LOCALE + zanata-cli -q -B push --push-type trans -l $LOCALE --project-version $(git branch | grep \* | cut -d ' ' -f2-) fi diff --git a/zanata.xml b/zanata.xml index 13e1bbe3973a2241406e40b425305f694d132053..d43394727b883e9c83345d29114cb8569915459e 100644 --- a/zanata.xml +++ b/zanata.xml @@ -2,7 +2,6 @@ <config xmlns="http://zanata.org/namespace/config/"> <url>https://trad.framasoft.org/</url> <project>framadate</project> - <project-version>master</project-version> <project-type>gettext</project-type> <src-dir>po</src-dir> <trans-dir>po</trans-dir>