Merge branch 'zanata-use-git-branch' into 'develop'
[zanata] Use git branch to specify the version of zanata's project See merge request framasoft/framadate!333
This commit is contained in:
commit
d0207ebb5b
@ -105,4 +105,4 @@ funky:
|
|||||||
# - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then make push-locales; fi
|
# - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then make push-locales; fi
|
||||||
# only:
|
# only:
|
||||||
# - develop
|
# - develop
|
||||||
# - work-on-locales
|
# - master
|
||||||
|
6
Makefile
6
Makefile
@ -2,14 +2,14 @@ locales:
|
|||||||
scripts/locales.sh
|
scripts/locales.sh
|
||||||
|
|
||||||
push-locales: locales
|
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:
|
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
|
scripts/po2json.sh
|
||||||
|
|
||||||
stats-locales:
|
stats-locales:
|
||||||
zanata-cli -q stats
|
zanata-cli -q stats --project-version `git branch | grep \* | cut -d ' ' -f2-`
|
||||||
|
|
||||||
push-trad-to-zanata:
|
push-trad-to-zanata:
|
||||||
scripts/push-trad-to-zanata.sh $(filter-out $@,$(MAKECMDGOALS))
|
scripts/push-trad-to-zanata.sh $(filter-out $@,$(MAKECMDGOALS))
|
||||||
|
@ -7,5 +7,5 @@ then
|
|||||||
else
|
else
|
||||||
LOCALE=$(echo $FILE | sed -e "s@_@-@g")
|
LOCALE=$(echo $FILE | sed -e "s@_@-@g")
|
||||||
json2po -i locale/$FILE.json -t locale/en.json -o po/$FILE.po
|
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
|
fi
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
<config xmlns="http://zanata.org/namespace/config/">
|
<config xmlns="http://zanata.org/namespace/config/">
|
||||||
<url>https://trad.framasoft.org/</url>
|
<url>https://trad.framasoft.org/</url>
|
||||||
<project>framadate</project>
|
<project>framadate</project>
|
||||||
<project-version>master</project-version>
|
|
||||||
<project-type>gettext</project-type>
|
<project-type>gettext</project-type>
|
||||||
<src-dir>po</src-dir>
|
<src-dir>po</src-dir>
|
||||||
<trans-dir>po</trans-dir>
|
<trans-dir>po</trans-dir>
|
||||||
|
Loading…
Reference in New Issue
Block a user