Merge branch 'main' into scoprix

.github/workflows/auto-assign-pr.yml

@@ -16,4 +16,4 @@ jobs:
   assign-author:
     runs-on: ubuntu-latest
     steps:
-      - uses: toshimaru/auto-author-assign@v2.0.1
+      - uses: toshimaru/auto-author-assign@v2.1.0

.github/workflows/build-additives.yml

@@ -0,0 +1,41 @@
+name: Build additives
+
+on:
+  push
+  # Allow to be run manually
+  #workflow_dispatch:
+  #schedule:
+  #- cron: "0 19 * * *"
+
+jobs:
+  update-assets:
+    if: github.repository_owner == 'openfoodfacts'
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Upgrade assets
+      run: chmod +x knowledge_panels/build_html.py && knowledge_panels/build_html.py
+
+    - name: Check for uncommitted changes
+      id: check-changes
+      uses: mskri/[email protected]
+
+    - name: Create Pull Request
+      if: steps.check-changes.outputs.outcome == failure()
+      id: cpr
+      uses: peter-evans/create-pull-request@v6
+      with:
+        base: develop
+        commit-message: Automated update of additives HTML files
+        committer: GitHub <[email protected]>
+        author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+        signoff: false
+        branch: auto-update-assets
+        delete-branch: true
+        title: 'chore: Update assets'
+        body: |
+          Automated update of additives HTML files

.github/workflows/check_includes.yml

@@ -16,7 +16,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
 

.github/workflows/crowdin-per-language.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Matrix
-      uses: crowdin/github-action@v1.15.1
+      uses: crowdin/github-action@v1.20.2
       with:
          upload_translations: false # default is false
          download_translations: true

.github/workflows/crowdin.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: crowdin action
-      uses: crowdin/github-action@v1.15.1
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_translations: false # default is false
         # Use this option to upload translations for a single specified language

.github/workflows/label.yml

@@ -21,6 +21,6 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/preprod-deploy.yml

@@ -15,11 +15,12 @@ concurrency:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    # same concurrency as off-server staging deployment
     environment: off-net
     concurrency: off-net
     steps:
     - name: Checkout git repository
-      uses: appleboy/[email protected].0 # v0.1.4
+      uses: appleboy/[email protected].3
       with:
         host: ${{ secrets.HOST }}
         username: ${{ secrets.USERNAME }}
@@ -37,3 +38,17 @@ jobs:
           git fetch --depth 1
           # Checkout current commit SHA
           git checkout -qf ${{ github.sha }}
+    # we need to restart staging backend to see deployed changes
+    - name: Restart staging backend
+      uses: appleboy/[email protected]
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+        key: ${{ secrets.SSH_PRIVATE_KEY }}
+        proxy_host: ${{ secrets.PROXY_HOST }}
+        proxy_username: ${{ secrets.USERNAME }}
+        proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
+        script: |
+          # Go to repository directory and restart backend
+          cd off-net
+          docker compose restart backend

.github/workflows/release-please.yml

@@ -7,7 +7,7 @@
    release-please:
      runs-on: ubuntu-latest
      steps:
-       - uses: GoogleCloudPlatform/release-please-action@v3.7.13
+       - uses: GoogleCloudPlatform/release-please-action@v4.1.0
          with:
            token: ${{ secrets.GITHUB_TOKEN }}
            release-type: simple

.gitignore

@@ -1,4 +1,5 @@
 products_stats_*.html
 .venv
 knowledge_panels/responses
-__pycache__
+__pycache__
+.DS_Store

CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+## 1.0.0 (2024-02-13)
+
+
+### Features
+
+* Create privacy.html ([8cf043c](https://github.com/openfoodfacts/openfoodfacts-web/commit/8cf043cc0c056b87d728f42aa45aed639d451350))
+* follow-open-food-facts.html ([#526](https://github.com/openfoodfacts/openfoodfacts-web/issues/526)) ([268a958](https://github.com/openfoodfacts/openfoodfacts-web/commit/268a95823453cd807d8eb6c09488c565cd44c740))
+* legal-and-privacy-emails ([#505](https://github.com/openfoodfacts/openfoodfacts-web/issues/505)) ([fe95a62](https://github.com/openfoodfacts/openfoodfacts-web/commit/fe95a62510dac87c042b2498525079c921345ee8))
+* logos for Open Beauty Facts ([#540](https://github.com/openfoodfacts/openfoodfacts-web/issues/540)) ([4bf5c87](https://github.com/openfoodfacts/openfoodfacts-web/commit/4bf5c876f1bed47a5511c191a4ee9e35cbb7cb52))
+* update Nutri-Score based on SpF recos ([fdb1a5a](https://github.com/openfoodfacts/openfoodfacts-web/commit/fdb1a5ad3ad1b123ca7acc4d75990d97a44fd025))
+
+
+### Bug Fixes
+
+* ADEME partner added ([#510](https://github.com/openfoodfacts/openfoodfacts-web/issues/510)) ([467b25b](https://github.com/openfoodfacts/openfoodfacts-web/commit/467b25ba79eb4c592d8c6a537a1217ccd2f050be))
+* fixes for issues spotted by [@galnaf](https://github.com/galnaf) in privacy.html ([a0a2772](https://github.com/openfoodfacts/openfoodfacts-web/commit/a0a2772b8842bfc9365db0ce311b2475f4ffa3e1))
+* legal.html ([0f9fc8a](https://github.com/openfoodfacts/openfoodfacts-web/commit/0f9fc8a952226292049944fa6434a07a606ccd93))
+* OBF Symbolic links Italian ([#542](https://github.com/openfoodfacts/openfoodfacts-web/issues/542)) ([fa21864](https://github.com/openfoodfacts/openfoodfacts-web/commit/fa2186438489bd9a85e6abfd6cab918666507e94))
+* privacy urls ([103abd2](https://github.com/openfoodfacts/openfoodfacts-web/commit/103abd2475f74f8c5c0ff0d1925f4e0eac6df5fa))
+* udpate GSOC page ([#532](https://github.com/openfoodfacts/openfoodfacts-web/issues/532)) ([3032104](https://github.com/openfoodfacts/openfoodfacts-web/commit/3032104c787681985ed33198757e287c54a89671))

README.md

@@ -20,6 +20,10 @@ https://crowdin.com/project/openfoodfacts
 * Once the pull request gets approved and merged, it will be deployed on the test server
 * Deployment to production is still manual
 
+## Requirements
+* Do not hotlink ressources like images, JS or CSS. They need to be commited to the repository. Please organize resources in folders.
+
+
 ## Deployment
 
 ### Actual prod (no docker)

crowdin.yml

@@ -1342,3 +1342,37 @@ files:
         sr: sr_RS
         ku: kmr_TR
         kmr: kmr
+  - source: /lang/en/texts/privacy.html
+    translation: /lang/%two_letters_code%/texts/privacy.html
+    languages_mapping:
+      two_letters_code:
+        zh-HK: zh_HK
+        zh-CN: zh_CN
+        en-AU: en_AU
+        en-GB: en_GB
+        pt-BR: pt_BR
+        pt-PT: pt_PT
+        nl-BE: nl_BE
+        nl-NL: nl_NL
+        zh-TW: zh_TW
+        sr-CS: sr_CS
+        sr: sr_RS
+        ku: kmr_TR
+        kmr: kmr
+  - source: /knowledge_panels/additives/world-en.yml
+    translation: /knowledge_panels/additives/world-%two_letters_code%.yml
+    languages_mapping:
+      two_letters_code:
+        zh-HK: zh_HK
+        zh-CN: zh_CN
+        en-AU: en_AU
+        en-GB: en_GB
+        pt-BR: pt_BR
+        pt-PT: pt_PT
+        nl-BE: nl_BE
+        nl-NL: nl_NL
+        zh-TW: zh_TW
+        sr-CS: sr_CS
+        sr: sr_RS
+        ku: kmr_TR
+        kmr: kmr

html/images/cop26/podcast/t.txt

@@ -0,0 +1 @@
+