Merge master

This commit is contained in:
Pieter Vander Vennet 2023-01-13 04:02:50 +01:00
commit a81dbb170e
39 changed files with 464 additions and 134 deletions

View file

@ -1,18 +0,0 @@
#! /usr/bin/env bash
# Automerge translations automatically fetches the translations from weblate
git fetch weblate-github
git merge --no-commit weblate-github/weblate-mapcomplete-layers weblate-github/weblate-mapcomplete-layer-translations weblate-github/weblate-mapcomplete-core
npm run generate:translations
if [ "$?" = "0" ]; then
# Translation generation went fine - commit
git add langs/
git add assets/
git commit -m "Merge weblate translations and regenerate translations"
git push
else
echo "Generation of translations failed!"
git merge --abort
fi