From dce222c8f7c9fb207e9d8074e80913f2f32b592e Mon Sep 17 00:00:00 2001 From: Antoine Metifeu Date: Thu, 8 Jul 2021 15:54:06 +0200 Subject: [PATCH 1/6] chore: configure crowdin action to upload source on master and feat/** branches Like the crowdin example : https://support.crowdin.com/versions-management/#merging-branches --- .github/workflows/crowdin.yml | 7 ++++--- .../panel/accountSubComponents/AccountHeader.vue | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index cc703281..aec796eb 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -2,7 +2,7 @@ name: Sync translations on: push: - branches: [ master, integration ] + branches: [ master, feat/** ] jobs: synchronize-with-crowdin: @@ -17,15 +17,16 @@ jobs: shell: bash run: | echo BRANCH=${GITHUB_REF#refs/heads/} >> $GITHUB_ENV + echo CROWDIN_BRANCH=$(echo "$GITHUB_REF" | sed -e 's/refs\/heads\///' -e 's/\//./g') >> $GITHUB_ENV - name: Crowdin action uses: crowdin/github-action@1.1.0 with: - download_translations: trueq + download_translations: true localization_branch_name: l10n/${{ env.BRANCH }} pull_request_title: New Crowdin translations for ${{ env.BRANCH }} branch pull_request_base_branch_name: ${{ env.BRANCH }} - crowdin_branch_name: ${{ env.BRANCH }} + crowdin_branch_name: ${{ env.CROWDIN_BRANCH }} config: crowdin.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/src/components/panel/accountSubComponents/AccountHeader.vue b/src/components/panel/accountSubComponents/AccountHeader.vue index 8c921cd4..61aa7774 100644 --- a/src/components/panel/accountSubComponents/AccountHeader.vue +++ b/src/components/panel/accountSubComponents/AccountHeader.vue @@ -25,7 +25,6 @@