From cb2d7f675b950c7056254164c354365744827977 Mon Sep 17 00:00:00 2001 From: Arnaud Leene Date: Sun, 1 Aug 2021 18:23:14 +0200 Subject: [PATCH 1/9] Update Localizable.strings (#909) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Localizable.strings * Crowdin suggestion Normally, a barcode isn't found, discovered, etc., the default wording is 'detected' in this context, so maybe instead: >> "Barcode not detected. \nCenter the barcode in the screen.\nMake sure the barcode is well lit." / "Barcode not detected. \nCenter it on screen.\nMake sure it's well lit.". * Crowdin suggestion Yup, have to agree with you on that reasoning. Should be either: "Examples: Coca-Cola, Nestle, etc." or "Examples: Coca-Cola, Nestle,…". You might want to ping OFF about this. Very nice catch, by the way... :-) * Crowdin suggestion Again, as this action/feature doesn't require staff involvement, "we" isn't really warranted in this context: >> "Please add packaging information so that the Eco-score can be calculated" / "Please add packaging information to allow for Eco-score calculation". --- Sources/Localization/en.lproj/Localizable.strings | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/Localization/en.lproj/Localizable.strings b/Sources/Localization/en.lproj/Localizable.strings index 30a81f0629..c0f75af598 100644 --- a/Sources/Localization/en.lproj/Localizable.strings +++ b/Sources/Localization/en.lproj/Localizable.strings @@ -31,7 +31,7 @@ // Product Scanner "product-scanner.overlay.user-help" = "Scan the barcode of the product"; -"product-scanner.overlay.extended-user-help" = "Can't find a barcode. \nCenter the barcode in the screen.\nMake sure the barcode is well lit."; +"product-scanner.overlay.extended-user-help" = "Barcode not detected. \nCenter the barcode in the screen.\nMake sure the barcode is well lit."; /* Title of the view controller in which user can scan. Keep it short. */ "product-scanner.view-title" = "Scanner"; /* Banner message shown to the user when the server returned an error while trying to fetch a product given its barcode */ @@ -101,7 +101,7 @@ "product-add.titles.license-explaination" = "Note: the pictures you send are published under the free licence Creative Commons Attribution & ShareAlike."; "product-add.titles.product-info" = "Product Information"; -"product-add.label.brand-example" = "Examples: Coca-Cola, Nestle, etc…"; +"product-add.label.brand-example" = "Examples: Coca-Cola, Nestle, etc."; "product-add.label.product-name" = "Name"; "product-add.label.category" = "Category"; "product-add.label.quantity" = "Quantity"; @@ -215,7 +215,7 @@ "product-detail.environment.ecoscore.d" = "Strong impact on the environment"; "product-detail.environment.ecoscore.e" = "Very strong impact on the environment"; "product-detail.environment.ecoscore.unknown" = "Eco-score unknown"; -"product-detail.environment.ecoscore.incite" = "Please add packaging info, so we can calculate the Eco-score"; +"product-detail.environment.ecoscore.incite" = "Please add packaging information so that the Eco-score can be calculated"; // Nutrition levels "nutrition-level.title" = "Nutrient levels per 100 g/100mL"; From 12133c9b533ee38774ebfe40e87c8ce65c1d88f8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 1 Aug 2021 19:35:32 +0200 Subject: [PATCH 2/9] New Crowdin translations to review and merge (#903) * New Crowdin translations by Github Action * Apply suggestions from code review Co-authored-by: Crowdin Bot Co-authored-by: Pierre Slamich --- Sources/Localization/cs.lproj/Localizable.strings | 4 ++-- Sources/Localization/he.lproj/Localizable.strings | 2 +- Sources/Localization/lol.lproj/Localizable.strings | 8 ++++---- Sources/Localization/nl-BE.lproj/Localizable.strings | 4 ++-- .../Localization/nl-BE.lproj/PhotoLibrary.strings | 12 ++++++------ .../nl-BE.lproj/PhotoLibraryServices.strings | 4 ++-- Sources/Localization/nl-BE.lproj/PhotosUI.strings | 10 +++++----- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Sources/Localization/cs.lproj/Localizable.strings b/Sources/Localization/cs.lproj/Localizable.strings index 54bf66a579..478f9fd2f0 100644 --- a/Sources/Localization/cs.lproj/Localizable.strings +++ b/Sources/Localization/cs.lproj/Localizable.strings @@ -154,7 +154,7 @@ "product-detail.page-title.ingredients" = "Složení"; "product-detail.page-title.nutrition" = "Nutriční hodnoty"; "product-detail.page-title.nutrition-table" = "Výživové tabulky"; -"product-detail.page-title.environment-impact" = "Prostředí"; +"product-detail.page-title.environment-impact" = "Životní prostředí"; // Product detail summary info rows labels "product-detail.summary.barcode" = "Čárový kód"; @@ -184,7 +184,7 @@ "product-detail.ingredients.allergens-list.missing-infos" = "Tento produkt ještě nemá seznam přísad, a proto nelze detekci alergenu dokončit."; "product-detail.ingredients.allergens-list.offline-product" = "Tento produkt byl načten z offline databáze, a proto nebylo možné provést detekci alergenu."; "product-detail.ingredients.traces-list" = "Stopy"; -"product-detail.ingredients.additives-list" = "Přísady"; +"product-detail.ingredients.additives-list" = "Aditiva"; "product-detail.ingredients.palm-oil-ingredients" = "Suroviny z palmového oleje"; "product-detail.ingredients.possible-palm-oil-ingredients" = "Přísady, které mohou být z palmového oleje"; "product-detail.ingredients.vitamins-list" = "Vitamíny"; diff --git a/Sources/Localization/he.lproj/Localizable.strings b/Sources/Localization/he.lproj/Localizable.strings index ddef0d4d37..3d4a3eb36a 100644 --- a/Sources/Localization/he.lproj/Localizable.strings +++ b/Sources/Localization/he.lproj/Localizable.strings @@ -175,7 +175,7 @@ "product-detail.ingredients.nova.1" = "מזון עם עיבוד מזערי או נטול"; "product-detail.ingredients.nova.2" = "רכיבים קולינריים מעובדים"; "product-detail.ingredients.nova.3" = "מזון מעובד"; -"product-detail.ingredients.nova.4" = "מוצרי מזון ושתייה מעובדים ביותר"; +"product-detail.ingredients.nova.4" = "מוצרי מזון ושתייה אולטרה מעובדים"; "product-detail.ingredients.nova.unknown" = "לא ניתן לחשב את רמת ה־NOVA לעיבוד מזון"; "product-detail.ingredients.nova.incite" = "יש להוסיף מרכיבים ו/או קטגוריות כדי לחשב NOVA."; "product-detail.ingredients.ingredients-list" = "רשימת מרכיבים"; diff --git a/Sources/Localization/lol.lproj/Localizable.strings b/Sources/Localization/lol.lproj/Localizable.strings index 17dfbe6673..cc9d10d3a1 100644 --- a/Sources/Localization/lol.lproj/Localizable.strings +++ b/Sources/Localization/lol.lproj/Localizable.strings @@ -26,12 +26,12 @@ "product-search.error-view.title" = "crwdns154314:0crwdne154314:0"; "product-search.error-view.subtitle" = "crwdns154316:0crwdne154316:0"; "product-search.initial-view.slogan" = "crwdns154318:0crwdne154318:0"; -"product-search.initial-view.offline.title-loading" = "crwdns154320:0%dcrwdnd154320:0%%crwdne154320:0"; +"product-search.initial-view.offline.title-loading" = "crwdns154320:0%dcrwdne154320:0"; "product-search.initial-view.offline.subtitle" = "crwdns154322:0%dcrwdne154322:0"; // Product Scanner "product-scanner.overlay.user-help" = "crwdns154324:0crwdne154324:0"; -"product-scanner.overlay.extended-user-help" = "crwdns181586:0crwdne181586:0"; +"product-scanner.overlay.extended-user-help" = "crwdns187519:0crwdne187519:0"; /* Title of the view controller in which user can scan. Keep it short. */ "product-scanner.view-title" = "crwdns154328:0crwdne154328:0"; /* Banner message shown to the user when the server returned an error while trying to fetch a product given its barcode */ @@ -101,7 +101,7 @@ "product-add.titles.license-explaination" = "crwdns154422:0crwdne154422:0"; "product-add.titles.product-info" = "crwdns154424:0crwdne154424:0"; -"product-add.label.brand-example" = "crwdns154426:0crwdne154426:0"; +"product-add.label.brand-example" = "crwdns187521:0crwdne187521:0"; "product-add.label.product-name" = "crwdns154428:0crwdne154428:0"; "product-add.label.category" = "crwdns154430:0crwdne154430:0"; "product-add.label.quantity" = "crwdns154432:0crwdne154432:0"; @@ -215,7 +215,7 @@ "product-detail.environment.ecoscore.d" = "crwdns157394:0crwdne157394:0"; "product-detail.environment.ecoscore.e" = "crwdns157396:0crwdne157396:0"; "product-detail.environment.ecoscore.unknown" = "crwdns154596:0crwdne154596:0"; -"product-detail.environment.ecoscore.incite" = "crwdns154598:0crwdne154598:0"; +"product-detail.environment.ecoscore.incite" = "crwdns187523:0crwdne187523:0"; // Nutrition levels "nutrition-level.title" = "crwdns154600:0crwdne154600:0"; diff --git a/Sources/Localization/nl-BE.lproj/Localizable.strings b/Sources/Localization/nl-BE.lproj/Localizable.strings index 62dc483ea7..658384a1ca 100644 --- a/Sources/Localization/nl-BE.lproj/Localizable.strings +++ b/Sources/Localization/nl-BE.lproj/Localizable.strings @@ -176,7 +176,7 @@ "product-detail.ingredients.nova.2" = "Berwerkte ingrediënten"; "product-detail.ingredients.nova.3" = "Bewerkte levensmiddelen"; "product-detail.ingredients.nova.4" = "Ultra-bewerkte levensmiddelen en dranken"; -"product-detail.ingredients.nova.unknown" = "The NOVA level of food processing could not be calculated"; +"product-detail.ingredients.nova.unknown" = "Het voedselverwerkings-NOVA-niveau kon niet worden berekend"; "product-detail.ingredients.nova.incite" = "Voeg ingrediënten en / of categorieën toe om NOVA te berekenen."; "product-detail.ingredients.ingredients-list" = "Lijst van ingrediënten"; "product-detail.ingredients.allergens-list" = "Stoffen of producten die allergieën of intoleranties veroorzaken"; @@ -214,7 +214,7 @@ "product-detail.environment.ecoscore.c" = "Eco-score C"; "product-detail.environment.ecoscore.d" = "Eco-score D"; "product-detail.environment.ecoscore.e" = "Eco-score E"; -"product-detail.environment.ecoscore.unknown" = "Eco-score unknown"; +"product-detail.environment.ecoscore.unknown" = "Eco-score onbekend"; "product-detail.environment.ecoscore.incite" = "Please add packaging info, so we can calculate the Eco-score"; // Nutrition levels diff --git a/Sources/Localization/nl-BE.lproj/PhotoLibrary.strings b/Sources/Localization/nl-BE.lproj/PhotoLibrary.strings index d7c5f0bf66..5f7fcb2e86 100644 --- a/Sources/Localization/nl-BE.lproj/PhotoLibrary.strings +++ b/Sources/Localization/nl-BE.lproj/PhotoLibrary.strings @@ -7,10 +7,10 @@ */ "CANCEL" = "Annuleer"; "RETAKE" = "Opnieuw"; -"STREAM_SHARED_BY_ME_SUBTITLE" = "From You"; -"STREAM_SHARED_BY_SUBTITLE" = "From %@"; -"ALBUM_IMAGE_COUNT_FORMAT" = "%@ Photos"; -"ALBUM_VIDEO_COUNT_FORMAT" = "%@ Videos"; -"1_ALBUM_PHOTO" = "1 Photo"; -"1_ALBUM_VIDEO" = "1 Video"; +"STREAM_SHARED_BY_ME_SUBTITLE" = "Van jou"; +"STREAM_SHARED_BY_SUBTITLE" = "Van %@"; +"ALBUM_IMAGE_COUNT_FORMAT" = "%@ Foto's"; +"ALBUM_VIDEO_COUNT_FORMAT" = "%@ Video's"; +"1_ALBUM_PHOTO" = "1 foto"; +"1_ALBUM_VIDEO" = "1 video"; "ALBUM_TWO_TYPES_LABEL_COMMAS" = "%@, %@"; diff --git a/Sources/Localization/nl-BE.lproj/PhotoLibraryServices.strings b/Sources/Localization/nl-BE.lproj/PhotoLibraryServices.strings index 1026ce75b4..2af6745e89 100644 --- a/Sources/Localization/nl-BE.lproj/PhotoLibraryServices.strings +++ b/Sources/Localization/nl-BE.lproj/PhotoLibraryServices.strings @@ -6,5 +6,5 @@ */ "PHOTOS" = "Foto's"; -"CAMERA_ROLL" = "Camera roll"; -"ALL_SCREENSHOTS" = "Screenshots"; +"CAMERA_ROLL" = "Filmrol"; +"ALL_SCREENSHOTS" = "Schermafbeeldingen"; diff --git a/Sources/Localization/nl-BE.lproj/PhotosUI.strings b/Sources/Localization/nl-BE.lproj/PhotosUI.strings index 67c5ce92e0..2f08e0e91f 100644 --- a/Sources/Localization/nl-BE.lproj/PhotosUI.strings +++ b/Sources/Localization/nl-BE.lproj/PhotosUI.strings @@ -5,8 +5,8 @@ Created by arnaud on 19/12/2020. */ -"ALL_PHOTOS_IN_LIBRARY" = "Moments"; -"PXUserCollectionsSectionTitle" = "My Albums"; -"FULL_PHOTOS_GRID_ZOOM_LEVEL_TITLE" = "Moments"; -"NO_PHOTOS_OR_VIDEOS" = "No Photos or Videos"; -"EMPTY_ALBUM_LIST_MESSAGE_iPhone" = "You can take photos and videos using camera, or sync photos and videos onto your iPhone using iTunes"; +"ALL_PHOTOS_IN_LIBRARY" = "Momenten"; +"PXUserCollectionsSectionTitle" = "Mijn albums"; +"FULL_PHOTOS_GRID_ZOOM_LEVEL_TITLE" = "Momenten"; +"NO_PHOTOS_OR_VIDEOS" = "Geen foto's of video's"; +"EMPTY_ALBUM_LIST_MESSAGE_iPhone" = "Je kunt foto's en video's maken met de camera, of foto's en video's synchroniseren naar je iPhone met behulp van iTunes"; From 8d60492b947ba5096adf5d875a347fd12b48f1f9 Mon Sep 17 00:00:00 2001 From: Johandre Delgado Date: Fri, 27 Aug 2021 21:34:20 +0300 Subject: [PATCH 3/9] Optimise Settings screen for dynamic type (#908) (#910) Co-authored-by: Pierre Slamich --- .../SettingsTableViewController.swift | 10 + Sources/Views/Settings/Settings.storyboard | 1757 +++++++++-------- 2 files changed, 896 insertions(+), 871 deletions(-) diff --git a/Sources/ViewControllers/Settings/SettingsTableViewController.swift b/Sources/ViewControllers/Settings/SettingsTableViewController.swift index 3d79a7ce4b..75db9ce213 100644 --- a/Sources/ViewControllers/Settings/SettingsTableViewController.swift +++ b/Sources/ViewControllers/Settings/SettingsTableViewController.swift @@ -34,12 +34,14 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr @IBOutlet weak var creditsCell: UITableViewCell! @IBOutlet weak var contactCell: UITableViewCell! + @IBOutlet weak var bottomLink: UIButton! var dataManager: DataManagerProtocol! override func viewDidLoad() { super.viewDidLoad() self.title = "settings.tab-bar.item".localized + configureForDynamicType() } override func viewWillAppear(_ animated: Bool) { @@ -149,3 +151,11 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr controller.dismiss(animated: true, completion: nil) } } + +private extension SettingsTableViewController { + func configureForDynamicType() { + tableView.rowHeight = UITableView.automaticDimension + tableView.estimatedRowHeight = 200 + bottomLink.titleLabel?.adjustsFontForContentSizeCategory = true + } +} diff --git a/Sources/Views/Settings/Settings.storyboard b/Sources/Views/Settings/Settings.storyboard index bfae10c218..f1988badd7 100644 --- a/Sources/Views/Settings/Settings.storyboard +++ b/Sources/Views/Settings/Settings.storyboard @@ -1,11 +1,12 @@ - + - + + @@ -16,9 +17,9 @@ - - - + - - -