From 0093009f03351bd4809548f7e0f174fce9c7cf91 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 May 2017 12:15:16 +0200 Subject: fix commit-ts target the pattern *_?? (meant to exclude *_untranslated) doesn't match ifw's translations without a country code, because they have only a language code. use two patterns instead. Change-Id: I5c0f67c339053281dfbee1bcd16b03ac6ca1b6e2 Reviewed-by: Katja Marttila --- src/sdk/sdk.pro | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/sdk') diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index 86973648e..6638e364d 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -56,18 +56,18 @@ exists($$LRELEASE) { isEqual(QMAKE_DIR_SEP, /) { commit-ts.commands = \ cd $$wd; \ - git add -N src/sdk/translations/*_??.ts && \ - for f in `git diff-files --name-only src/sdk/translations/*_??.ts`; do \ + git add -N src/sdk/translations/??.ts src/sdk/translations/??_??.ts && \ + for f in `git diff-files --name-only src/sdk/translations/??.ts src/sdk/translations/??_??.ts`; do \ $$LCONVERT -locations none -i \$\$f -o \$\$f; \ done; \ - git add src/sdk/translations/*_??.ts && git commit + git add src/sdk/translations/??.ts src/sdk/translations/??_??.ts && git commit } else { commit-ts.commands = \ cd $$wd && \ - git add -N src/sdk/translations/*_??.ts && \ - for /f usebackq %%f in (`git diff-files --name-only src/sdk/translations/*_??.ts`) do \ + git add -N src/sdk/translations/??.ts src/sdk/translations/??_??.ts && \ + for /f usebackq %%f in (`git diff-files --name-only src/sdk/translations/??.ts src/sdk/translations/??_??.ts`) do \ $$LCONVERT -locations none -i %%f -o %%f $$escape_expand(\\n\\t) \ - cd $$wd && git add src/sdk/translations/*_??.ts && git commit + cd $$wd && git add src/sdk/translations/??.ts src/sdk/translations/??_??.ts && git commit } QMAKE_EXTRA_TARGETS += commit-ts -- cgit v1.2.3