From: Dessalines Date: Sun, 1 Mar 2020 23:21:52 +0000 (-0500) Subject: Fix weblate deploy. X-Git-Url: http://these/git/%7B%60%24%7BarchiveTodayUrl%7D/%24%7B%60data:application/static/%24%7Bargs.thread.url%7D?a=commitdiff_plain;h=9c50d5f073661a189fadfa3f09450462f94fe6b6;p=lemmy.git Fix weblate deploy. --- diff --git a/docker/dev/deploy.sh b/docker/dev/deploy.sh index 94a2fa91..db2294fa 100755 --- a/docker/dev/deploy.sh +++ b/docker/dev/deploy.sh @@ -2,10 +2,8 @@ git checkout master # Import translations -wget "https://weblate.yerbamate.dev/download/lemmy/lemmy/?format=zip" -O /tmp/lemmy_l10n.zip -unzip -j -o /tmp/lemmy_l10n.zip -d ../../ui/translations/ -git add ../../ui/translations -rm /tmp/lemmy_l10n.zip +git fetch weblate +git merge weblate/master # Creating the new tag new_tag="$1"