From 26d2a65bc22901ae0034a89d61e2df9a238986f5 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 6 Feb 2018 20:46:42 +0100 Subject: Manage different branches in zanata --- Makefile.example | 5 +++-- 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 @@ https://translate.zanata.org/zanata/ ishtar - master gettext pot translations -- cgit v1.2.3