Merge pull request #28 from session-foundation/fix-auto-merge-submodule-pr

Fix auto push to main session-localisation pr

Author: Bilb

.github/workflows/check_for_crowdin_updates.yml

@@ -6,7 +6,7 @@ name: Check for Crowdin Updates
 
 on:
   schedule:
-    - cron: '0 0 * * 1'  # Every Monday at 12:00 AM UTC, which is 10:00 AM Melbourne time (AEST)
+    - cron: '0 0 * * 1' # Every Monday at 12:00 AM UTC, which is 10:00 AM Melbourne time (AEST)
   workflow_dispatch:
     inputs:
       UPDATE_PULL_REQUESTS:
@@ -31,10 +31,8 @@ env:
     This PR includes the latest translations from Crowdin
 
     Session uses the community-driven translation platform Crowdin for localization, anyone can contribute at https://getsession.org/translate
-  PR_TARGET_BRANCH: feature/update-crowdin-translations
 
 jobs:
-
   fetch_translations:
     name: Download translations from crowdin
     runs-on: ubuntu-latest
@@ -167,8 +165,6 @@ jobs:
           if-no-files-found: warn
           retention-days: 7
 
-
-
   build_localization_module:
     name: Build localization module strings
     needs: [parse_translations]
@@ -272,7 +268,6 @@ jobs:
             -x lint \
             -x test
 
-
   jobs_sync:
     name: Waiting for build jobs
 
@@ -285,6 +280,9 @@ jobs:
         run: echo "Nothing to do here"
 
   make_android_pr:
+    env:
+      PR_TARGET_BRANCH: feature/update-crowdin-translations
+
     name: Make Android PR
     needs: [jobs_sync]
     runs-on: ubuntu-latest
@@ -316,6 +314,8 @@ jobs:
           delete-branch: true
 
   make_localization_module_pr:
+    env:
+      PR_TARGET_BRANCH: main
     needs: [jobs_sync]
     name: Make Localization Module PR
     runs-on: ubuntu-latest
@@ -328,26 +328,28 @@ jobs:
           # don't provide a branch (ref) so it uses the default for that event
       - name: Checkout Localization Module
         uses: ./scripts/actions/checkout_localization_module
+        with:
+          token: ${{ secrets.CROWDIN_PR_TOKEN }}
 
       - uses: actions/download-artifact@v4
         with:
           name: session-localization
           # Download to /generated folder in localization module repo
           path: "${{ github.workspace }}/module/generated"
 
-      - name: Create Localization Module Pull Request
-        uses: peter-evans/create-pull-request@v6
+      - name: Push directly to ${{ env.PR_TARGET_BRANCH }}
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          path: 'module'
-          token: ${{ secrets.CROWDIN_PR_TOKEN }}
-          title: ${{ env.PR_TITLE }}
-          body: ${{ env.PR_DESCRIPTION }}
+          repository: module
+          commit_message: ${{ env.PR_TITLE }}
           branch: ${{ env.PR_TARGET_BRANCH }}
-          commit-message: ${{ env.PR_TITLE }}
-          delete-branch: true
-
+          commit_author: "github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
+          commit_user_name: github-actions[bot]
+          commit_user_email: github-actions[bot]@users.noreply.github.com
 
   make_ios_pr:
+    env:
+      PR_TARGET_BRANCH: feature/update-crowdin-translations
     needs: [jobs_sync]
     name: Make iOS PR
     runs-on: ubuntu-latest
@@ -370,11 +372,10 @@ jobs:
       - name: Create iOS Pull Request
         uses: peter-evans/create-pull-request@v6
         with:
-          path: 'ios'
+          path: "ios"
           token: ${{ secrets.CROWDIN_PR_TOKEN }}
           title: ${{ env.PR_TITLE }}
           body: ${{ env.PR_DESCRIPTION }}
           branch: ${{ env.PR_TARGET_BRANCH }}
           commit-message: ${{ env.PR_TITLE }}
           delete-branch: true
-

.github/workflows/notify_failure.yml

@@ -2,7 +2,7 @@ name: Discord Failure Notification
 
 on:
   workflow_run:
-    workflows: 
+    workflows:
       - "Check for Crowdin Updates"
       - "Test Failure Notification"
     types:

actions/checkout_localization_module/action.yml

@@ -1,5 +1,10 @@
 name: 'Setup for all'
 description: "Setup shared for all jobs"
+inputs:
+  token:
+    description: 'Token to use for checkout (required for push access)'
+    required: false
+    default: ${{ github.token }}
 runs:
   using: 'composite'
   steps:
@@ -9,6 +14,7 @@ runs:
           repository: 'session-foundation/session-localization'
           path: 'module'
           ref: 'main'
+          token: ${{ inputs.token }}
 
       - name: Remove existing strings
         shell: bash

crowdin/codegen_localization.py

@@ -58,6 +58,22 @@
     ("storevariant", "string"): "WithStoreVariant",
     ("min", "string"): "WithMin",
     ("max", "string"): "WithMax",
+    ("platform", "string"): "WithPlatform",
+    ("platform_account", "string"): "WithPlatformAccount",
+    ("platform_store", "string"): "WithPlatformStore",
+    ("device_type", "string"): "WithDeviceType",
+    ("action_type", "string"): "WithActionType",
+    ("current_plan_length", "string"): "WithCurrentPlanLength",
+    ("platform_store_other", "string"): "WithPlatformStoreOther",
+    ("price", "string"): "WithPrice",
+    ("percent", "string"): "WithPercent",
+    ("monthly_price", "string"): "WithMonthlyPrice",
+    ("build_variant", "string"): "WithBuildVariant",
+    ("activation_type", "string"): "WithActivationType",
+    ("entity", "string"): "WithEntity",
+    ("selected_plan_length_singular", "string"): "WithSelectedPlanLengthSingular",
+    ("selected_plan_length", "string"): "WithSelectedPlanLength",
+
 }
 
 LOCALE_KEY_MAPPING = {