From def91e0994a51f2db534d7ace9a1f90654d5bb11 Mon Sep 17 00:00:00 2001 From: Marco Ciotola <848222@stud.unive.it> Date: Wed, 9 Oct 2024 10:32:17 +0200 Subject: [PATCH] taxonomy: italian translations and jam/marmalade separation (#10872) Adding more Italian translations, and fix some jam/marmalade references --- .github/workflows/pull_request.yml | 4 +- taxonomies/countries.txt | 2 +- taxonomies/food/ingredients.txt | 214 ++++++++++++------ taxonomies/labels.txt | 27 +-- taxonomies/origins.txt | 27 ++- .../ingredients/fr-marmelade.json | 12 +- 6 files changed, 186 insertions(+), 100 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 8ad6881346b01..b3c673ec35a61 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -92,7 +92,7 @@ jobs: - name: ensure branch origin/main is fetched run: git fetch --no-tags --prune --progress --no-recurse-submodules --depth=5 origin main - name: build taxonomies (should use cache) - run: make build_taxonomies + run: make build_taxonomies GITHUB_TOKEN="${{ secrets.TAXONOMY_CACHE_GITHUB_TOKEN }}" - name: check taxonomies run: make check_taxonomies - name: check perltidy @@ -117,7 +117,7 @@ jobs: - name: tests run: | make codecov_prepare - make COVER_OPTS='-e HARNESS_PERL_SWITCHES="-MDevel::Cover=+ignore,tests/"' tests + make COVER_OPTS='-e HARNESS_PERL_SWITCHES="-MDevel::Cover=+ignore,tests/"' tests GITHUB_TOKEN="${{ secrets.TAXONOMY_CACHE_GITHUB_TOKEN }}" - name: generate coverage results # even if tests failed if: always() diff --git a/taxonomies/countries.txt b/taxonomies/countries.txt index 48c4062b05fc9..5e69b11c585fe 100644 --- a/taxonomies/countries.txt +++ b/taxonomies/countries.txt @@ -44957,7 +44957,7 @@ ig: Obodoézè Nà Ofú ilo: Nagkaykaysa a Pagarian io: Unionita Rejio is: Bretland -it: Regno Unito, Regno Unito di Gran Bretagna e Irlanda del Nord, Gran Bretagna, Inghilterra, UK +it: Regno Unito, Regno Unito di Gran Bretagna e Irlanda del Nord, Gran Bretagna, UK ja: イギリス, 英国 jbo: ritygu'e jv: Britania Raya diff --git a/taxonomies/food/ingredients.txt b/taxonomies/food/ingredients.txt index 37f20ff64af67..79ddd2d76dcd4 100644 --- a/taxonomies/food/ingredients.txt +++ b/taxonomies/food/ingredients.txt @@ -413,6 +413,7 @@ wikidata:en: Q190156 wikipedia:en: https://en.wikipedia.org/wiki/Carotene #