From 97355672cd0956ef9c3c4da558a5de20fa01ed9f Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Mon, 16 Aug 2021 11:30:53 +0200 Subject: [translations] ./manage rename shell functions to integrate weblate Functions implemented to run *Weblate* workflows should use prefix 'weblate.': - babel.setup.translations.worktree --> weblate.translations.worktree Create git worktree ${TRANSLATIONS_WORKTREE} and checkout branch 'translations' from Weblate's counterpart (weblate) of the SearXNG (origin):: remote weblate https://weblate.bubu1.eu/git/searxng/searxng/ - babel.weblate.to.translations --> weblate.to.translations Update 'translations' branch of SearXNG (origin) with last additions from Weblate. - babel.translations.to.master --> weblate.translations.commit Update 'translations' branch of SearXNG (origin) with last additions from Weblate. Copy the changes to the master branch, compile translations and create a commit in the local branch (master) - babel.master.to.translations --> weblate.push.translations Push *translation changes* from SearXNG (origin) to Weblate's counterpart (weblate). Signed-off-by: Markus Heiser --- manage | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'manage') diff --git a/manage b/manage index 45523323f..a855512f5 100755 --- a/manage +++ b/manage @@ -123,7 +123,8 @@ buildenv() { TRANSLATIONS_WORKTREE="$CACHE/translations" -babel.setup.translations.worktree() { +weblate.translations.worktree() { + # Create git worktree ${TRANSLATIONS_WORKTREE} and checkout branch # 'translations' from Weblate's counterpart (weblate) of the SearXNG # (origin). @@ -147,7 +148,8 @@ babel.setup.translations.worktree() { ) } -babel.weblate.to.translations() { +weblate.to.translations() { + # Update 'translations' branch of SearXNG (origin) with last additions from # Weblate. @@ -168,7 +170,8 @@ babel.weblate.to.translations() { pyenv.cmd wlc commit # get the translations in a worktree - babel.setup.translations.worktree + weblate.translations.worktree + pushd "${TRANSLATIONS_WORKTREE}" git remote update weblate git merge weblate/translations @@ -178,7 +181,8 @@ babel.weblate.to.translations() { dump_return $? } -babel.translations.to.master() { +weblate.translations.commit() { + # Update 'translations' branch of SearXNG (origin) with last additions from # Weblate. Copy the changes to the master branch, compile translations and # create a commit in the local branch (master) @@ -187,12 +191,17 @@ babel.translations.to.master() { ( set -e # lock change on weblate pyenv.cmd wlc lock - babel.setup.translations.worktree + + # get translations branch in git worktree (TRANSLATIONS_WORKTREE) + weblate.translations.worktree existing_commit_hash=$(cd "${TRANSLATIONS_WORKTREE}"; git log -n1 --pretty=format:'%h') + # pull weblate commits - babel.weblate.to.translations + weblate.to.translations + # copy the changes to the master branch cp -rv --preserve=mode,timestamps "${TRANSLATIONS_WORKTREE}/searx/translations" "searx" + # compile translations build_msg BABEL 'compile translation catalogs into binary MO files' pyenv.cmd pybabel compile --statistics \ @@ -211,7 +220,7 @@ babel.translations.to.master() { dump_return $exitcode } -babel.master.to.translations() { +weblate.push.translations() { # Push *translation changes* from SearXNG (origin) to Weblate's counterpart # (weblate). @@ -235,7 +244,7 @@ babel.master.to.translations() { pyenv.cmd wlc lock # get translations branch in git worktree (TRANSLATIONS_WORKTREE) - babel.setup.translations.worktree + weblate.translations.worktree # update messages.pot in the master branch build_msg BABEL 'extract messages from source files and generate POT file' @@ -258,7 +267,7 @@ babel.master.to.translations() { popd # merge weblate commits into the translations branch - babel.weblate.to.translations + weblate.to.translations # restore messages.pot in the translations branch pushd "${TRANSLATIONS_WORKTREE}" -- cgit v1.2.3