Merge branch 'main' into l10n_main

openfoodfacts · Sep 25, 2024 · 2fd3047 · 2fd3047
2 parents 819d90e + 689a669
commit 2fd3047
Show file tree

Hide file tree

Showing 23 changed files with 190 additions and 353 deletions.
diff --git a/.github/workflows/build-additives.yml b/.github/workflows/build-additives.yml
@@ -1,4 +1,4 @@
-name: Build additives
+name: Build HTML pages for additives knowledge cards
 
 on:
   push
@@ -27,7 +27,7 @@ jobs:
     - name: Create Pull Request
       if: steps.check-changes.outputs.outcome == failure()
       id: cpr
-      uses: peter-evans/create-pull-request@v6
+      uses: peter-evans/create-pull-request@v7
       with:
         base: develop
         commit-message: Automated update of additives HTML files

diff --git a/.github/workflows/crowdin-per-language.yml b/.github/workflows/crowdin-per-language.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Matrix
-      uses: crowdin/github-action@v2.0.0
+      uses: crowdin/github-action@v2.2.0
       with:
          upload_translations: false # default is false
          download_translations: true

diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: crowdin action
-      uses: crowdin/github-action@v2.0.0
+      uses: crowdin/github-action@v2.2.0
       with:
         upload_translations: false # default is false
         # Use this option to upload translations for a single specified language

diff --git a/.github/workflows/github-projects.yml b/.github/workflows/github-projects.yml
@@ -1,12 +1,16 @@
-name: Add bugs to the Marketing @ Open Food Facts GitHub Project
+name: Add bugs to the relevant Open Food Facts GitHub Projects
 
 on:
   issues:
     types:
       - opened
+      - edited
+      - transfered
+      - labeled
   pull_request:
     types:
       - opened
+      - edited
 jobs:
   add-to-project:
     name: Add issue to project
@@ -18,3 +22,93 @@ jobs:
           project-url: https://github.com/orgs/openfoodfacts/projects/24
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
           label-operator: AND
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/36 # Add issue to the open pet food facts project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 🐾 Open Pet Food Facts
+          label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/11 # Add issue to the open products facts project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 📸 Open Products Facts
+          label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/37 # Add issue to the open beauty facts project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 🧴 Open Beauty Facts
+          label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/4 # Add issue to the packaging project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 📦 Packaging
+          label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/25 # Add issue to the documentation project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 📚 Documentation
+          label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/5 # Add issue to the folksonomy project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 🏷️ Folksonomy Project
+          label-operator: OR         
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/44 # Add issue to the data quality project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 🧽 Data quality
+          label-operator: OR    
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/82 # Add issue to the search project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 🔎 Search
+          label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/41 # Add issue to the producer platform project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 🏭 Producers Platform
+          label-operator: OR    
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/19 # Add issue to the infrastructure project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: infrastructure
+          label-operator: OR   
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/92 # Add issue to the Nutri-Score project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 🚦 Nutri-Score
+          label-operator: OR   
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/132 # Add issue to the Top upvoted issues board
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: ⭐ top issue, 👍 Top 10 Issue!
+          label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/57 # Add issue to the Most impactful issues board
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: 🎯 P0, 🎯 P1
+          label-operator: OR
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/35 # Add issue to the ♿️ accessibility project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: ♿️ accessibility
+          label-operator: OR   
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/openfoodfacts/projects/133 # Add issue to the Releases project
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: autorelease:\pending
+          label-operator: OR   
diff --git a/.github/workflows/merge-conflict-autolabel.yml b/.github/workflows/merge-conflict-autolabel.yml
@@ -0,0 +1,20 @@
+name: '💥 Auto-Label Merge Conflicts on PRs'
+on:
+  push:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "💥 Merge Conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 5000
diff --git a/lang/ar/texts/ingredients-from-palm-oil.html b/lang/ar/texts/ingredients-from-palm-oil.html
diff --git a/lang/ar/texts/ingredients-that-may-be-from-palm-oil.html b/lang/ar/texts/ingredients-that-may-be-from-palm-oil.html
diff --git a/lang/ar/texts/ingredients.html b/lang/ar/texts/ingredients.html
diff --git a/lang/ca/texts/qui-som.html b/lang/ca/texts/qui-som.html
@@ -0,0 +1 @@
+who-we-are.html
diff --git a/lang/da/texts/hvem-vi-er.html b/lang/da/texts/hvem-vi-er.html
@@ -0,0 +1 @@
+who-we-are.html
diff --git a/lang/de/texts/wer-wir-sind.html b/lang/de/texts/wer-wir-sind.html
@@ -0,0 +1 @@
+who-we-are.html
diff --git a/lang/es/texts/quienes-somos.html b/lang/es/texts/quienes-somos.html
@@ -1 +1 @@
-./es/texts/who-we-are.html
+who-we-are.html
diff --git a/lang/et/texts/kes-me-oleme.html b/lang/et/texts/kes-me-oleme.html
@@ -0,0 +1 @@
+who-we-are.html
diff --git a/lang/eu/texts/nortzuk-gara.html b/lang/eu/texts/nortzuk-gara.html
@@ -0,0 +1 @@
+who-we-are.html