Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Privacy Pro translations #3656

Merged
merged 25 commits into from
Dec 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3157ba9
Add module for Subsctiption UserText strings
miasma13 Dec 2, 2024
97fe5a5
Support translations for SubscriptionUI package
miasma13 Dec 2, 2024
1dbc9c9
Add support for localising NetworkProtectionUI
miasma13 Dec 2, 2024
3cbdff4
Generate localizcles for NetworkProtectionUI
miasma13 Dec 2, 2024
51437d6
Extract missing VPN strings
miasma13 Dec 2, 2024
59cd892
Remove dead xcstrings reference from the project file.
samsymons Dec 2, 2024
f1cf08f
Fix how we build subscription renewal or expiry caption to better sup…
miasma13 Dec 5, 2024
f56912a
Import translations
miasma13 Dec 6, 2024
d3132d8
Make privacy pro alerts localizable
miasma13 Dec 6, 2024
702d708
Localize UserText+NetworkProtection
miasma13 Dec 6, 2024
e410efa
Split VPN copy used by main app and shared with VPN targets
miasma13 Dec 6, 2024
fbcdef2
Add Localizables for DuckDuckGoVPN target
miasma13 Dec 6, 2024
0b02e4b
Fix duplicated string identifiers
miasma13 Dec 6, 2024
b0ce5ab
Localize Notifications target
miasma13 Dec 6, 2024
bc7af06
Fix duplicated string ids
miasma13 Dec 6, 2024
7034f65
Update the export script
miasma13 Dec 6, 2024
7a4a930
Revert translating infoplist
miasma13 Dec 6, 2024
dde59d6
Merge branch 'release/1.118.0' into michal/update-pp-translations
miasma13 Dec 10, 2024
3206da5
Fix whitespace
miasma13 Dec 10, 2024
f6bc31a
Import translations
miasma13 Dec 11, 2024
b8689ca
Add localizable strings exclude for sandbox-test-tool
miasma13 Dec 11, 2024
4752b97
Remove stale strings
miasma13 Dec 11, 2024
9a67373
Make DBP strings localizable
miasma13 Dec 11, 2024
36435d5
Add en-US to module string catalogs to mitigate potential issue with …
miasma13 Dec 11, 2024
d30b5d5
Import PIR translations
miasma13 Dec 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix duplicated string ids
miasma13 committed Dec 6, 2024
commit bc7af061cafa2b7a34bdc089f47879fa2845badb
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ extension UserText {

// MARK: Location formatter

static let locationFormatterNearestLocation = NSLocalizedString("network.protection.vpn.location.formatter.nearest.location.descriptor", value: "Nearest Location", comment: "Nearest available location setting description")
static let locationFormatterNearestLocation = NSLocalizedString("network.protection.vpn.location.formatter.nearest.location", value: "Nearest Location", comment: "Nearest available location setting description")

static let locationFormatterNearestLocationDescriptor = NSLocalizedString("network.protection.vpn.location.formatter.nearest.location.descriptor", value: "(Nearest)", comment: "Description added after the nearest location in the VPN status view")

Original file line number Diff line number Diff line change
@@ -44,9 +44,9 @@ extension UserText {

static let networkProtectionNavBarStatusViewSendFeedback = NSLocalizedString("network.protection.navbar.status.view.send.feedback", value: "Send Feedback…", comment: "Menu item for 'Send Feedback' in the VPN status view that's shown in the navigation bar")

static let networkProtectionNavBarStatusMenuVPNSettings = NSLocalizedString("network.protection.status.menu.vpn.settings", value: "VPN Settings…", comment: "The status menu 'VPN Settings' menu item")
static let networkProtectionNavBarStatusViewVPNSettings = NSLocalizedString("network.protection.navbar.status.view.vpn.settings", value: "VPN Settings…", comment: "The status menu 'VPN Settings' menu item")

static let networkProtectionNavBarStatusMenuFAQ = NSLocalizedString("network.protection.status.menu.faq", value: "FAQs and Support…", comment: "The status menu 'FAQ' menu item")
static let networkProtectionNavBarStatusViewFAQ = NSLocalizedString("network.protection.navbar.status.view.faq", value: "FAQs and Support…", comment: "The status menu 'FAQ' menu item")
}

extension UserText {
38 changes: 25 additions & 13 deletions DuckDuckGo/Localizable.xcstrings
Original file line number Diff line number Diff line change
@@ -37024,50 +37024,50 @@
}
}
},
"network.protection.navbar.status.view.send.feedback" : {
"comment" : "Menu item for 'Send Feedback' in the VPN status view that's shown in the navigation bar",
"network.protection.navbar.status.view.faq" : {
"comment" : "The status menu 'FAQ' menu item",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Send Feedback…"
"value" : "FAQs and Support…"
}
}
}
},
"network.protection.status.button.tooltip" : {
"comment" : "The tooltip for NetP's nav bar button",
"network.protection.navbar.status.view.send.feedback" : {
"comment" : "Menu item for 'Send Feedback' in the VPN status view that's shown in the navigation bar",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "VPN"
"value" : "Send Feedback…"
}
}
}
},
"network.protection.status.menu.faq" : {
"comment" : "The status menu 'FAQ' menu item",
"network.protection.navbar.status.view.vpn.settings" : {
"comment" : "The status menu 'VPN Settings' menu item",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "FAQs and Support…"
"value" : "VPN Settings…"
}
}
}
},
"network.protection.status.menu.vpn.settings" : {
"comment" : "The status menu 'VPN Settings' menu item",
"network.protection.status.button.tooltip" : {
"comment" : "The tooltip for NetP's nav bar button",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "VPN Settings…"
"value" : "VPN"
}
}
}
@@ -37120,8 +37120,20 @@
}
}
},
"network.protection.vpn.location.formatter.nearest.location" : {
"comment" : "Nearest available location setting description",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Nearest Location"
}
}
}
},
"network.protection.vpn.location.formatter.nearest.location.descriptor" : {
"comment" : "Description added after the nearest location in the VPN status view\nNearest available location setting description",
"comment" : "Description added after the nearest location in the VPN status view",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Original file line number Diff line number Diff line change
@@ -133,11 +133,11 @@ final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
if UserDefaults.netP.networkProtectionOnboardingStatus == .completed {
return [
NetworkProtectionStatusView.Model.MenuItem(
name: UserText.networkProtectionNavBarStatusMenuVPNSettings, action: {
name: UserText.networkProtectionNavBarStatusViewVPNSettings, action: {
try? await appLauncher.launchApp(withCommand: VPNAppLaunchCommand.showSettings)
}),
NetworkProtectionStatusView.Model.MenuItem(
name: UserText.networkProtectionNavBarStatusMenuFAQ, action: {
name: UserText.networkProtectionNavBarStatusViewFAQ, action: {
try? await appLauncher.launchApp(withCommand: VPNAppLaunchCommand.showFAQ)
}),
NetworkProtectionStatusView.Model.MenuItem(
@@ -149,7 +149,7 @@ final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
} else {
return [
NetworkProtectionStatusView.Model.MenuItem(
name: UserText.networkProtectionNavBarStatusMenuFAQ, action: {
name: UserText.networkProtectionNavBarStatusViewFAQ, action: {
try? await appLauncher.launchApp(withCommand: VPNAppLaunchCommand.showFAQ)
}),
NetworkProtectionStatusView.Model.MenuItem(
4 changes: 2 additions & 2 deletions DuckDuckGoDBPBackgroundAgent/UserText.swift
Original file line number Diff line number Diff line change
@@ -21,6 +21,6 @@ import Foundation
final class UserText {
// MARK: - Status Menu

static let networkProtectionStatusMenuSendFeedback = NSLocalizedString("network.protection.status.menu.send.feedback", value: "Send Feedback…", comment: "The status menu 'Send Feedback' menu item")
static let networkProtectionStatusMenuOpenDuckDuckGo = NSLocalizedString("network.protection.status.menu.open.duckduckgo", value: "Open DuckDuckGo…", comment: "The status menu 'Open DuckDuckGo' menu item")
static let networkProtectionStatusMenuSendFeedback = NSLocalizedString("dbp.menu.send.feedback", value: "Send Feedback…", comment: "The status menu 'Send Feedback' menu item")
static let networkProtectionStatusMenuOpenDuckDuckGo = NSLocalizedString("dbp.open.duckduckgo", value: "Open DuckDuckGo…", comment: "The status menu 'Open DuckDuckGo' menu item")
Comment on lines +24 to +25
Copy link
Collaborator

@samsymons samsymons Dec 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something is strange here - it's a Network Protection string, but in a DBP file, with a DBP prefix. At the end of the day it should work as intended, but caught me off guard.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought it was a copy paste issue and fixed the string ID but completely missed the variable name. I see it is not used anywhere, maybe it was a placeholder to setup localizations. Since they are not used anywhere I will proceed and delete it.

}
14 changes: 13 additions & 1 deletion DuckDuckGoVPN/Localizable.xcstrings
Original file line number Diff line number Diff line change
@@ -121,8 +121,20 @@
}
}
},
"network.protection.vpn.location.formatter.nearest.location" : {
"comment" : "Nearest available location setting description",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Nearest Location"
}
}
}
},
"network.protection.vpn.location.formatter.nearest.location.descriptor" : {
"comment" : "Description added after the nearest location in the VPN status view\nNearest available location setting description",
"comment" : "Description added after the nearest location in the VPN status view",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {