diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-06 20:46:42 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-06 20:52:37 +0100 |
| commit | f7f726538e33c7031b9d13f3fe1fbc257519d2a2 (patch) | |
| tree | e7485347fb7d507558473e13543fe252cd70ca2f | |
| parent | 71f008dfaa04805bafa41a046fe3170b41b6f03d (diff) | |
| download | Ishtar-f7f726538e33c7031b9d13f3fe1fbc257519d2a2.tar.bz2 Ishtar-f7f726538e33c7031b9d13f3fe1fbc257519d2a2.zip | |
Manage different branches in zanata
| -rw-r--r-- | Makefile.example | 5 | ||||
| -rw-r--r-- | zanata.xml | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.example b/Makefile.example index 06c580d4f..75c7ce73b 100644 --- a/Makefile.example +++ b/Makefile.example @@ -9,6 +9,7 @@ project=example_project apps="ishtar_common" "archaeological_operations" "archaeological_context_records" "archaeological_files" "archaeological_finds" "archaeological_warehouse" "archaeological_files_pdl" default_data='fr' version=`head -n 1 version.py | cut -d' ' -f2` +branch_name=`git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1/"` help: # Actions available: @@ -216,10 +217,10 @@ fixtures_files: > '../archaeological_files/fixtures/initial_data-'$(default_data)'.json' translations_push: makemessages - zanata-cli push + zanata-cli push --project-config zanata.xml --project-version $(branch_name) translations_pull: - zanata-cli pull + zanata-cli pull --project-config zanata.xml --project-version $(branch_name) readme_md_to_rst: pandoc --from=markdown --to=rst --output=README.rst README.md diff --git a/zanata.xml b/zanata.xml index 8e59ca707..3adbba1f6 100644 --- a/zanata.xml +++ b/zanata.xml @@ -2,7 +2,6 @@ <config xmlns="http://zanata.org/namespace/config/"> <url>https://translate.zanata.org/zanata/</url> <project>ishtar</project> - <project-version>master</project-version> <project-type>gettext</project-type> <src-dir>pot</src-dir> <trans-dir>translations</trans-dir> |