From f3a8e532f082a872d5755cc3ebbc1b446c9ac7eb Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Fri, 13 Dec 2024 15:03:19 +0100 Subject: [PATCH] Sprinkle in some localization (#2426) # Conflicts: # deltachat-ios/bqi.lproj/Localizable.strings # deltachat-ios/en.lproj/Localizable.strings # scripts/untranslated.xml --- DcWebxdcWidget/DcWebxdcWidget.swift | 4 ++-- deltachat-ios.xcodeproj/project.pbxproj | 4 ++-- deltachat-ios/Controller/FilesViewController.swift | 4 ++-- deltachat-ios/Controller/WebxdcViewController.swift | 4 ++-- deltachat-ios/en.lproj/Localizable.strings | 8 +++++--- scripts/untranslated.xml | 5 +++++ 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/DcWebxdcWidget/DcWebxdcWidget.swift b/DcWebxdcWidget/DcWebxdcWidget.swift index 4c98ced96..e95d989e0 100644 --- a/DcWebxdcWidget/DcWebxdcWidget.swift +++ b/DcWebxdcWidget/DcWebxdcWidget.swift @@ -156,7 +156,7 @@ struct DcWebxdcWidget: Widget { } } .supportedFamilies([.systemSmall, .systemMedium]) - .configurationDisplayName(String.localized("widget_most_recent_apps_title")) - .description(String.localized("widget_most_recent_apps_description")) + .configurationDisplayName(String.localized("ios_widget_apps_title")) + .description(String.localized("ios_widget_apps_description")) } } diff --git a/deltachat-ios.xcodeproj/project.pbxproj b/deltachat-ios.xcodeproj/project.pbxproj index 109d88bb2..8b17d4a88 100644 --- a/deltachat-ios.xcodeproj/project.pbxproj +++ b/deltachat-ios.xcodeproj/project.pbxproj @@ -2488,7 +2488,7 @@ INFOPLIST_FILE = DcWebxdcWidget/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = DcWebxdcWidget; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 merlinux GmbH. All rights reserved."; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -2527,7 +2527,7 @@ INFOPLIST_FILE = DcWebxdcWidget/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = DcWebxdcWidget; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 merlinux GmbH. All rights reserved."; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/deltachat-ios/Controller/FilesViewController.swift b/deltachat-ios/Controller/FilesViewController.swift index eb1aaa7d4..218e52f10 100644 --- a/deltachat-ios/Controller/FilesViewController.swift +++ b/deltachat-ios/Controller/FilesViewController.swift @@ -241,7 +241,7 @@ extension FilesViewController: UITableViewDelegate, UITableViewDataSource { if isOnHomescreen { children.append( UIAction.menuAction( - localizationKey: "remove_from_homescreen", + localizationKey: "ios_remove_from_home_screen", systemImageName: "rectangle.on.rectangle.slash", indexPath: indexPath, action: { _ in @@ -251,7 +251,7 @@ extension FilesViewController: UITableViewDelegate, UITableViewDataSource { } else { children.append( UIAction.menuAction( - localizationKey: "add_to_home_screen", + localizationKey: "ios_add_to_home_screen", systemImageName: "plus.rectangle.on.rectangle", indexPath: indexPath, action: { _ in diff --git a/deltachat-ios/Controller/WebxdcViewController.swift b/deltachat-ios/Controller/WebxdcViewController.swift index 56c930657..e3235255c 100644 --- a/deltachat-ios/Controller/WebxdcViewController.swift +++ b/deltachat-ios/Controller/WebxdcViewController.swift @@ -449,13 +449,13 @@ class WebxdcViewController: WebViewViewController { let homescreenAction: UIAlertAction if isOnHomescreen { - homescreenAction = UIAlertAction(title: String.localized("remove_from_homescreen"), style: .default) { [weak self] _ in + homescreenAction = UIAlertAction(title: String.localized("ios_remove_from_home_screen"), style: .default) { [weak self] _ in guard let self else { return } self.dcContext.removeWebxdcFromHomescreen(messageId: self.messageId) } } else { - homescreenAction = UIAlertAction(title: String.localized("add_to_home_screen"), style: .default) { [weak self] _ in + homescreenAction = UIAlertAction(title: String.localized("ios_add_to_home_screen"), style: .default) { [weak self] _ in guard let self else { return } self.dcContext.addWebxdcToHomescreenWidget(messageId: self.messageId) diff --git a/deltachat-ios/en.lproj/Localizable.strings b/deltachat-ios/en.lproj/Localizable.strings index 4903f6b59..80c6a110d 100644 --- a/deltachat-ios/en.lproj/Localizable.strings +++ b/deltachat-ios/en.lproj/Localizable.strings @@ -1063,6 +1063,8 @@ "backup_successful_explain_ios" = "You can find the backup in the \"Delta Chat\" folder using the \"Files\" app.\n\nMove the backup out of this folder to keep it when deleting Delta Chat."; "location_denied" = "Location access denied"; "location_denied_explain_ios" = "In the system settings, enable \"Privacy/Location Services\" and set \"Delta Chat/Location\" to \"Always\" and \"Precise\"."; -"widget_no_apps" = "In-Chat Utilities or Games will be shown here"; -"widget_most_recent_apps_title" = "Shortcuts"; -"widget_most_recent_apps_description" = "Shows the most recent In-Chat Utilities and Games"; +"ios_widget_no_apps" = "In-Chat Utilities or Games will be shown here"; +"ios_widget_apps_title" = "Shortcuts"; +"ios_widget_apps_description" = "Shortcuts to In-Chat Utilities and Games"; +"ios_remove_from_home_screen" = "Remove from Homescreen"; +"ios_add_to_home_screen" = "Add to Homescreen"; diff --git a/scripts/untranslated.xml b/scripts/untranslated.xml index defebba59..5f7f637d3 100644 --- a/scripts/untranslated.xml +++ b/scripts/untranslated.xml @@ -10,4 +10,9 @@ In-Chat Utilities or Games will be shown here Shortcuts Shows the most recent In-Chat Utilities and Games + In-Chat Utilities or Games will be shown here + Shortcuts + Shortcuts to In-Chat Utilities and Games + Remove from Homescreen + Add to Homescreen