Skip to content

Commit

Permalink
Merge branch 'develop' into feat/5986
Browse files Browse the repository at this point in the history
  • Loading branch information
monsieurtanuki authored Dec 9, 2024
2 parents 17f9960 + 91515ae commit 0df6ac4
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 22 deletions.
3 changes: 2 additions & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,10 @@ Prices:
- any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_proof_card.dart'
- any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/prices_card.dart'
- any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/product_price_add_page.dart'
- any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_add_product_card.dart'
- any-glob-to-any-file: 'packages/smooth_app/lib/pages/prices/price_scan_page.dart'
- any-glob-to-any-file: 'packages/smooth_app/lib/pages/onboarding/currency_selector.dart'
- any-glob-to-any-file: 'packages/smooth_app/lib/pages/onboarding/currency_selector_helper.dart'

router:
- changed-files:
- any-glob-to-any-file: 'packages/smooth_app/lib/pages/navigator/app_navigator.dart'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dartdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
run: pub global activate dartdoc && dartdoc

- name: Deploy API documentation to Github Pages
uses: JamesIves/github-pages-deploy-action@v4.7.1
uses: JamesIves/github-pages-deploy-action@v4.7.2
with:
BRANCH: gh-pages
FOLDER: packages/smooth_app/doc/api/
1 change: 1 addition & 0 deletions packages/smooth_app/assets/cache/impact-co2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions packages/smooth_app/lib/l10n/app_ar.arb
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"@Introduction screen": {},
"welcomeToOpenFoodFacts": "مرحبًا بكم في موقع Open Food Facts",
"@welcomeToOpenFoodFacts": {},
"whatIsOff": "OpenFoodFacts is a global non-profit powered by local communities.",
"whatIsOff": "Open Food Facts هي منظمة عالمية غير ربحية مدعومة من المجتمعات المحلية.",
"@whatIsOff": {
"description": "Description of Open Food Facts organization."
},
Expand All @@ -145,7 +145,7 @@
"@ecoCardUtility": {
"description": "Description of what a user can use the Eco data in a product for."
},
"server_error_open_new_issue": "No server response! You may open an issue with the following link.",
"server_error_open_new_issue": "لا يوجد استجابة من الخادم! يمكنك فتح مشكلة باستخدام الرابط التالي.",
"@user_management": {},
"sign_in_text": "Sign in to your Open Food Facts account to save your contributions",
"incorrect_credentials": "اسم المستخدم أو كلمة المرور غير صحيحة.",
Expand Down
30 changes: 15 additions & 15 deletions packages/smooth_app/lib/l10n/app_lt.arb
Original file line number Diff line number Diff line change
Expand Up @@ -3324,11 +3324,11 @@
"@product_page_pending_operations_banner_message": {
"description": "When a product has pending edits (being sent to the server), there is a message on the product page. Please keep the ** syntax to make the text bold."
},
"product_add_a_language": "Add a language",
"product_add_a_language": "Pridėti kalbą",
"@product_add_a_language": {
"description": "Button to add a language (eg: for photos) to a product"
},
"barcode_accessibility_label": "Barcode {barcode}",
"barcode_accessibility_label": "Brūkšninis kodas {barcode}",
"@barcode_accessibility_label": {
"description": "Accessibility label for a barcode image",
"placeholders": {
Expand All @@ -3337,23 +3337,23 @@
}
}
},
"carousel_close_tooltip": "Remove this product from the carousel",
"carousel_close_tooltip": "Pašalinti šį produktą iš karuselės",
"@carousel_close_tooltip": {
"description": "A message explaining the goal of the Close button on a card of the carousel"
},
"carousel_unsupported_header": "Unsupported barcode!",
"carousel_unsupported_header": "Nepalaikomas brūkšninis kodas!",
"@carousel_unsupported_header": {
"description": "A label on top of the carousel card when the barcode is not supported by the app"
},
"carousel_unsupported_title": "Ooops!",
"carousel_unsupported_text": "The barcode scanned is not supported by OpenFoodFacts!",
"carousel_error_header": "Error!",
"carousel_unsupported_title": "Oi!",
"carousel_unsupported_text": "Nuskaityto brūkšninio kodo „Open Food Facts“ nepalaiko!",
"carousel_error_header": "Klaida!",
"@carousel_error_header": {
"description": "A label on top of the carousel card when there is an error (mainly network issues)"
},
"carousel_error_title": "It's a bummer!",
"carousel_error_text_1": "We couldn't download information on this barcode:",
"carousel_error_text_2": "Please check your Internet connection or click this button:",
"carousel_error_title": "Koks nusivylimas!",
"carousel_error_text_1": "Mums nepavyko atsisiųsti informacijos apie šį brūkšninį kodą:",
"carousel_error_text_2": "Patikrinkite interneto ryšį arba spustelėkite šį mygtuką:",
"@carousel_error_text_2": {
"description": "Please keep the ** syntax to make the text bold"
},
Expand All @@ -3362,21 +3362,21 @@
"@carousel_unknown_product_header": {
"description": "A label on top of the carousel card when the product is not in the database (= it needs to be created)"
},
"carousel_unknown_product_title": "Congratulations!\nYou've found __the rare gem!__",
"carousel_unknown_product_title": "Sveikiname!\nJūs radote __retą brangakmenį!__",
"@carousel_unknown_product_title": {
"description": "Please keep the __ syntax to underline the text"
},
"carousel_unknown_product_text": "Our collaborative database contains more than **3 million products**, but this barcode doesn't exist: ",
"carousel_unknown_product_text": "Mūsų bendradarbiavimo duomenų bazėje yra daugiau negu **3 milijonai produktų**, tačiau šio brūkšninio kodo nėra: ",
"@carousel_unknown_product_text": {
"description": "Please keep the ** syntax to make the text bold"
},
"carousel_unknown_product_button": "Pridėti šį produktą",
"carousel_loading_header": "Loading information...",
"carousel_loading_header": "Įkeliama informacija...",
"@carousel_loading_header": {
"description": "A label on top of the carousel card when data about the product is loading"
},
"carousel_loading_title": "You've just scanned a product with the following barcode:",
"carousel_loading_text": "We are searching for it in our database of more than **3 million products!**",
"carousel_loading_title": "Ką tik nuskaitėte produktą su šiuo brūkšniniu kodu:",
"carousel_loading_text": "Mes jo ieškome savo duomenų bazėje, kurioje yra daugiau negu **3 milijonai produktų!**",
"@carousel_loading_text": {
"description": "Please keep the ** syntax to make the text bold"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/smooth_app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1076,10 +1076,10 @@ packages:
dependency: "direct main"
description:
name: openfoodfacts
sha256: "2a2076e5190e4b573ce5326cd4981ebdefa33c57c0507ca0057c57c12b79c47a"
sha256: c0d85d236aebc874b694bb0b52c34cee2d0d68169cffcec0d006605c2014ea04
url: "https://pub.dev"
source: hosted
version: "3.18.0"
version: "3.18.1"
openfoodfacts_flutter_lints:
dependency: "direct dev"
description:
Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ dependencies:
path: ../scanner/zxing


openfoodfacts: 3.18.0
openfoodfacts: 3.18.1
# openfoodfacts:
# path: ../../../openfoodfacts-dart

Expand Down

0 comments on commit 0df6ac4

Please sign in to comment.