From 50522664502489909a80ebeab8b919a48abe92d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 8 Jun 2016 23:25:54 +0100 Subject: [PATCH] pull-trans: fix "Added translation" commits The weblate commits now take two forms: Translated using Weblate ($LANG) Added translation using Weblate ($LANG) Adapt the regex to reflect both, avoiding the latter form from screwing everything up. --- tools/pull-trans.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pull-trans.sh b/tools/pull-trans.sh index 7024f9d60..c1144081c 100755 --- a/tools/pull-trans.sh +++ b/tools/pull-trans.sh @@ -26,7 +26,7 @@ ref="${REMOTE}/${REMOTE_BRANCH}" diff="HEAD...$ref -- */values-*/strings.xml" authors=$(git log --format="%s %an" $diff | \ - sed 's/Translated using Weblate (\(.*\)) \(.*\)/\2||\1/' | sort -f -u | column -s '||' -t) + sed 's/.* using Weblate (\(.*\)) \(.*\)/\2||\1/' | sort -f -u | column -s '||' -t) git diff $diff | git apply