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.

Sign up for GitHub

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 to use correct text on iOS 14 #2328

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Update to use correct text on iOS 14 #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions LocalPackages/SyncUI/Sources/SyncUI/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@
/* Options - Fetch Favicons Title */
"fetch.favicons.option.title" = "Auto-Download Icons";

/* Manually Enter Code View - Instruction with sync menu path and view text code menu item inserted */
"manually.enter.code.instruction" = "Go to Settings > Sync & Backup > Sync With Another Device and select Sync Menu Path in the DuckDuckGo App on another synced device and paste the code here to sync this device.";

/* Manually Enter Code View - Instruction with sync menu path and view text code menu item inserted */
"manually.enter.code.instruction.attributed" = "Go to %1$@ and select %2$@ in the DuckDuckGo App on another synced device and paste the code here to sync this device.";

Expand Down
1 change: 0 additions & 1 deletion LocalPackages/SyncUI/Sources/SyncUI/Views/Internal/UserText.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ struct UserText {
let localized = NSLocalizedString("manually.enter.code.instruction.attributed", bundle: Bundle.module, value: "Go to %@ and select %@ in the DuckDuckGo App on another synced device and paste the code here to sync this device.", comment: "Manually Enter Code View - Instruction with sync menu path and view text code menu item inserted")
return String(format: localized, syncMenuPath, menuItem)
}
static let manuallyEnterCodeInstruction = NSLocalizedString("manually.enter.code.instruction", bundle: Bundle.module, value: "Go to Settings > Sync & Backup > Sync With Another Device and select Sync Menu Path in the DuckDuckGo App on another synced device and paste the code here to sync this device.", comment: "Manually Enter Code View - Instruction with sync menu path and view text code menu item inserted")
static let syncMenuPath = NSLocalizedString("sync.menu.path", bundle: Bundle.module, value: "Settings > Sync & Backup > Sync With Another Device", comment: "Sync Menu Path")
static let viewTextCodeMenuItem = NSLocalizedString("view.text.code.menu.item", bundle: Bundle.module, value: "View Text Code", comment: "View Text Code menu item")

Expand Down
3 changes: 2 additions & 1 deletion LocalPackages/SyncUI/Sources/SyncUI/Views/PasteCodeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ public struct PasteCodeView: View {
.foregroundColor(.white.opacity(0.6))
.padding()
} else {
Text(UserText.manuallyEnterCodeInstruction)
Text(UserText.manuallyEnterCodeInstructionAttributed(syncMenuPath: UserText.syncMenuPath,
menuItem: UserText.viewTextCodeMenuItem))
.lineLimit(nil)
.multilineTextAlignment(.center)
.foregroundColor(.white.opacity(0.6))
Expand Down
Loading