Merge branch 'develop' into pr/openfoodfacts#707-Organic-label-mockup

jncosideout · Oct 23, 2021 · 561fea1 · 561fea1
2 parents 69f0ad5 + 73dd7f5
commit 561fea1
Show file tree

Hide file tree

Showing 160 changed files with 804 additions and 26 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -2,7 +2,7 @@
  on:
    push:
      branches:
-       - develop
+       - disable-develop
  jobs:
    release-please:
      runs-on: ubuntu-latest

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,7 +1,7 @@
 name: Testing
 
 on:
-  pull_request:
+  push:
     branches:
       - '*'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,21 +6,21 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.492.0)
-    aws-sdk-core (3.119.1)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.502.0)
+    aws-sdk-core (3.121.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.46.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-kms (1.48.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.100.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-s3 (1.103.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.4)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     blockenspiel (0.5.0)
@@ -37,7 +37,7 @@ GEM
     dotenv (2.7.6)
     emoji_regex (3.2.2)
     excon (0.85.0)
-    faraday (1.7.0)
+    faraday (1.7.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -62,7 +62,7 @@ GEM
     faraday_middleware (1.1.0)
       faraday (~> 1.0)
     fastimage (2.2.5)
-    fastlane (2.192.0)
+    fastlane (2.194.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -103,7 +103,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-sentry (1.9.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.10.0)
+    google-apis-androidpublisher_v3 (0.11.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -134,13 +134,13 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (0.17.0)
+    googleauth (0.17.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
+      signet (~> 0.15)
     highline (2.0.3)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
@@ -170,8 +170,8 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.15.0)
-      addressable (~> 2.3)
+    signet (0.16.0)
+      addressable (~> 2.8)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
@@ -189,8 +189,8 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8)
+    unicode-display_width (1.8.0)
     versionomy (0.5.0)
       blockenspiel (~> 0.5)
     webrick (1.7.0)

diff --git a/Sources/Localization/aa.lproj/Localizable.strings b/Sources/Localization/aa.lproj/Localizable.strings
@@ -48,6 +48,16 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/ach.lproj/Localizable.strings b/Sources/Localization/ach.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/af.lproj/Localizable.strings b/Sources/Localization/af.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/ak.lproj/Localizable.strings b/Sources/Localization/ak.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/am.lproj/Localizable.strings b/Sources/Localization/am.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/ar.lproj/Localizable.strings b/Sources/Localization/ar.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "يتم تحميل المنتجات…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "تحميل الصورة…";

diff --git a/Sources/Localization/as.lproj/Localizable.strings b/Sources/Localization/as.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/ast.lproj/Localizable.strings b/Sources/Localization/ast.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/az.lproj/Localizable.strings b/Sources/Localization/az.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/be.lproj/Localizable.strings b/Sources/Localization/be.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/ber.lproj/Localizable.strings b/Sources/Localization/ber.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/bg.lproj/Localizable.strings b/Sources/Localization/bg.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Изображението се качва…";

diff --git a/Sources/Localization/bm.lproj/Localizable.strings b/Sources/Localization/bm.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/bn.lproj/Localizable.strings b/Sources/Localization/bn.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/bo.lproj/Localizable.strings b/Sources/Localization/bo.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/br.lproj/Localizable.strings b/Sources/Localization/br.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "O kargañ ar produ…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/bs.lproj/Localizable.strings b/Sources/Localization/bs.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/ca.lproj/Localizable.strings b/Sources/Localization/ca.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Carregant el producte…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Pujant la imatge…";

diff --git a/Sources/Localization/ce.lproj/Localizable.strings b/Sources/Localization/ce.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/chr.lproj/Localizable.strings b/Sources/Localization/chr.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/co.lproj/Localizable.strings b/Sources/Localization/co.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/crs.lproj/Localizable.strings b/Sources/Localization/crs.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Loading product…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Uploading image…";

diff --git a/Sources/Localization/cs.lproj/Localizable.strings b/Sources/Localization/cs.lproj/Localizable.strings
@@ -48,6 +48,11 @@
 
 "product-scanner.search.status" = "Načítání výrobku…";
 
+/* Accessibility label indicating the action when the flash is currently off. */
+"product-scanner.flash.off.accessibility.label" = "Turn flash on";
+/* Accessibility label indicating the action when the flash is currently on. */
+"product-scanner.flash.on.accessibility.label" = "Turn flash off";
+
 // Product Add
 /* Displayed when an image taken by the user is being uploaded to the server during the product creation process */
 "product-add.uploading-image-banner.title" = "Nahrávání obrázku…";