diff --git a/scripts/release.pl b/scripts/release.pl index ff5c80a45ae..6671afbfc69 100755 --- a/scripts/release.pl +++ b/scripts/release.pl @@ -187,9 +187,10 @@ unless( defined $dopoint ) { run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' INSTALL.md", "could not update osgeo4w deps package" ) if $doltr; run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' INSTALL.md", "could not update osgeo4w deps package" ) unless $doltr; run( "cp -v images/splash/splash-${newmajor}.${newminor}rc.png images/splash/splash.png", "splash png switch failed" ); + run( "sed -i -e 's/r:qgis-application/r:$relbranch-qgis-application/' .tx/config", "update of transifex update failed" ); run( "git commit -n -a -m \"Release of $release ($newreleasename)\"", "release commit failed" ); run( "git tag $reltag -m 'Version $release'", "release tag failed" ); - run( "for i in \$(seq 20); do tx push -s --branch $relbranch && exit 0; echo \"Retry \$i/20...\"; done; exit 1", "push translation for $relbranch branch" ); + run( "for i in \$(seq 20); do tx push -s && exit 0; echo \"Retry \$i/20...\"; done; exit 1", "push translation for $relbranch branch" ); } else { if($newpatch == 1) { run( "cp -v images/splash/splash-${newmajor}.${newminor}.png images/splash/splash.png", "splash png switch failed" ); diff --git a/scripts/update_ts.sh b/scripts/update_ts.sh index 9603e98a030..c03e64820db 100755 --- a/scripts/update_ts.sh +++ b/scripts/update_ts.sh @@ -110,11 +110,6 @@ fi trap cleanup EXIT -branch=$(git name-rev --name-only HEAD) -if [[ "$branch" =~ ^release-[0-9]+_[0-9]+$ ]]; then - TX_FLAGS="--branch '${branch}'" -fi - echo Saving translations files="$files $(find python -name "*.ts")" [ $action = push ] && files="$files i18n/qgis_*.ts" @@ -124,7 +119,7 @@ if [ $action = push ]; then echo Pulling source from transifex... fail=1 for i in $(seq $retries); do - tx pull -s $TX_FLAGS && fail=0 && break + tx pull -s && fail=0 && break echo Retry $i/$retries... sleep 10 done @@ -149,7 +144,7 @@ elif [ $action = pull ]; then fail=1 for i in $(seq $retries); do - tx pull $o --minimum-perc=35 $TX_FLAGS && fail=0 && break + tx pull $o --minimum-perc=35 && fail=0 && break echo Retry $i/$retries... sleep 10 done @@ -198,9 +193,16 @@ EOF echo Updating appinfo files python3 scripts/appinfo2ui.py >src/app/appinfo-i18n.ui + echo Excluding qtermwidget translation files + tar --remove-files -cf src/plugins/grass/qtermwidget/translations.tar src/plugins/grass/qtermwidget/translations/ + echo Creating qmake project file $QMAKE -project -o qgis_ts.pro -nopwd $SRCDIR/src $SRCDIR/python $SRCDIR/i18n $textcpp + echo Restoring qtermwidget translation files + tar xf src/plugins/grass/qtermwidget/translations.tar + rm src/plugins/grass/qtermwidget/translations.tar + QT_INSTALL_HEADERS=$(qmake -query QT_INSTALL_HEADERS) echo "TR_EXCLUDE = ${QT_INSTALL_HEADERS% }/*" >>qgis_ts.pro @@ -216,7 +218,7 @@ if [ $action = push ]; then echo Pushing translation... fail=1 for i in $(seq $retries); do - tx push -s $TX_FLAGS && fail=0 && break + tx push -s && fail=0 && break echo Retry $i/$retries... sleep 10 done