kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-23 04:27:46 +01:00
Code

Merge pull request #293 from dalf/fix-290

Browse Source 
[fix] translation: lock weblate only when there is an actual change of messages.pot
This commit is contained in:
Alexandre Flament 2021-09-06 20:00:19 +02:00 committed by GitHub
commit b57d776edb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/dev/translation.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 18 KiB

21
manage
View File

@ -239,16 +239,14 @@ weblate.push.translations() {
local messages_pot diff_messages_pot last_commit_hash last_commit_detail \ local messages_pot diff_messages_pot last_commit_hash last_commit_detail \
last_commit_message exitcode last_commit_message exitcode
messages_pot="${TRANSLATIONS_WORKTREE}/searx/translations/messages.pot"
( set -e ( set -e
# lock change on weblate
pyenv.cmd wlc lock
# get translations branch in git worktree (TRANSLATIONS_WORKTREE) # get translations branch in git worktree (TRANSLATIONS_WORKTREE)
weblate.translations.worktree weblate.translations.worktree
# update messages.pot in the master branch # update messages.pot in the master branch
build_msg BABEL 'extract messages from source files and generate POT file' build_msg BABEL 'extract messages from source files and generate POT file'
messages_pot="${TRANSLATIONS_WORKTREE}/searx/translations/messages.pot"
pyenv.cmd pybabel extract -F babel.cfg \ pyenv.cmd pybabel extract -F babel.cfg \
-o "${messages_pot}" \ -o "${messages_pot}" \
"searx/" "searx/"
@ -258,8 +256,25 @@ weblate.push.translations() {
git diff -- "searx/translations/messages.pot") git diff -- "searx/translations/messages.pot")
if ! echo "$diff_messages_pot" | grep -qE "[\+\-](msgid|msgstr)"; then if ! echo "$diff_messages_pot" | grep -qE "[\+\-](msgid|msgstr)"; then
build_msg BABEL 'no changes detected, exiting' build_msg BABEL 'no changes detected, exiting'
return 42
fi
return 0
)
exitcode=$?
if [ "$exitcode" -eq 42 ]; then
return 0 return 0
fi fi
if [ "$exitcode" ]; then
return $exitcode
fi
(
set -e
# lock change on weblate
# weblate may add commit(s) since the call to "weblate.translations.worktree".
# this is not a problem because after this line, "weblate.to.translations"
# calls again "weblate.translations.worktree" which calls "git pull"
pyenv.cmd wlc lock
# save messages.pot in the translations branch for later # save messages.pot in the translations branch for later
pushd "${TRANSLATIONS_WORKTREE}" pushd "${TRANSLATIONS_WORKTREE}"