Skip to content

Commit

Permalink
Fix sync UI localisation issues (#2225)
Browse files Browse the repository at this point in the history
Task/Issue URL: https://app.asana.com/0/0/1206628858529173/f

**Description**: Fix some UI issues arising when copy is longer, adds
some strings comments
  • Loading branch information
SabrinaTardio authored Feb 20, 2024
1 parent edb4ab2 commit 17057fc
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 59 deletions.
64 changes: 32 additions & 32 deletions DuckDuckGo/Common/Localizables/UserText.swift

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions DuckDuckGo/DataImport/View/FileImportView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,9 @@ struct FileImportView: View {
{
switch dataType {
case .bookmarks:
Text("Import Bookmarks")
Text("Import Bookmarks", comment: "Title of dialog with instruction for the user to import bookmarks from another browser")
case .passwords:
Text("Import Passwords")
Text("Import Passwords", comment: "Title of dialog with instruction for the user to import passwords from another browser")
}
}().bold()

Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/DataImport/View/ReportFeedbackView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ struct ReportFeedbackView: View {
Text("The version of the browser you are trying to import from", comment: "Data import failure Report dialog description of a report field providing version of a browser user is trying to import data from")
}
InfoItemView(model.error.localizedDescription) {
Text("Error message & code", comment: "")
Text("Error message & code", comment: "Title of the section of a dialog (form where the user can report feedback) where the error message and the error code are shown")
}
}
.padding(.bottom, 24)
Expand Down
51 changes: 41 additions & 10 deletions DuckDuckGo/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
}
},
"Address" : {

"comment" : "Title of the section of the Identities manager where the user can add/modify an address (street city etc,)"
},
"Address:" : {
"comment" : "Add Bookmark dialog bookmark url field heading"
Expand Down Expand Up @@ -986,7 +986,7 @@
}
},
"Birthday" : {

"comment" : "Title of the section of the Identities manager where the user can add/modify a date of birth"
},
"bitwarden.app.found" : {
"comment" : "Setup of the integration with Bitwarden app",
Expand All @@ -1013,6 +1013,7 @@
}
},
"bitwarden.connect.communication-info" : {
"comment" : "Warns users that all communication between the DuckDuckGo browser and the password manager Bitwarden is encrypted and doesn't leave the user device",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1024,6 +1025,7 @@
}
},
"bitwarden.connect.description" : {
"comment" : "Description for when the user wants to connect the browser to the password manager Bitwarned.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -1070,6 +1072,7 @@
}
},
"bitwarden.connecting" : {
"comment" : "It appears in a dialog when the users are connecting to Bitwardern and shows the status of the action, in this case we are in the progress of connecting the browser to the Bitwarden password maanger.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1081,6 +1084,7 @@
}
},
"bitwarden.error" : {
"comment" : "This message appears when the application is unable to find or connect to Bitwarden, indicating a connection issue.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1092,6 +1096,7 @@
}
},
"bitwarden.handshake.not.approved" : {
"comment" : "It appears in a dialog when the users are connecting to Bitwardern and shows the status of the action. This message indicates that the handshake process was not approved in the Bitwarden app.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -1151,6 +1156,7 @@
}
},
"bitwarden.integration.not.approved" : {
"comment" : "While the user tries to connect the DuckDuckGo Browser to password manager Bitwarden This message indicates that the integration with DuckDuckGo has not been approved in the Bitwarden app.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1174,6 +1180,7 @@
}
},
"bitwarden.missing.handshake" : {
"comment" : "While the user tries to connect the DuckDuckGo Browser to password manager Bitwarden This message indicates a missing handshake (a way for two devices or systems to say hello to each other and agree to communicate or exchange information).",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1196,6 +1203,7 @@
}
},
"bitwarden.old.version" : {
"comment" : "Message that warns user they need to update their password manager Bitwarden app vesion",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1207,6 +1215,7 @@
}
},
"bitwarden.preferences.complete-setup" : {
"comment" : "action option that prompts the user to complete the setup process in Bitwarden preferences",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1218,6 +1227,7 @@
}
},
"bitwarden.preferences.open-bitwarden" : {
"comment" : "Button to open Bitwarden app",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -1265,6 +1275,7 @@
}
},
"bitwarden.waiting.for.handshake" : {
"comment" : "While the user tries to connect the DuckDuckGo Browser to password manager Bitwarden This message indicates the system is waiting for the handshake (a way for two devices or systems to say hello to each other and agree to communicate or exchange information).",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1288,6 +1299,7 @@
}
},
"bitwarden.waiting.for.status.response" : {
"comment" : "It appears in a dialog when the users are connecting to Bitwardern and shows the status of the action, in this case that the application is currently waiting for a response from the Bitwarden service.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -1773,6 +1785,7 @@
"comment" : "Main Menu Window item"
},
"burner.homepage.description.1" : {
"comment" : "Descriptions of features Fire page. Provides information about browsing functionalities such as browsing without saving local history, signing in to a site with a different account, and troubleshooting websites.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1784,6 +1797,7 @@
}
},
"burner.homepage.description.2" : {
"comment" : "Descriptions of features Fire page. Provides information about browsing functionalities such as browsing without saving local history, signing in to a site with a different account, and troubleshooting websites.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1795,6 +1809,7 @@
}
},
"burner.homepage.description.3" : {
"comment" : "Descriptions of features Fire page. Provides information about browsing functionalities such as browsing without saving local history, signing in to a site with a different account, and troubleshooting websites.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -1806,6 +1821,7 @@
}
},
"burner.homepage.description.4" : {
"comment" : "This describes the functionality of one of out browser feature Fire Window, highlighting their isolation from other browser data and the automatic deletion of their data upon closure. Additionally, it emphasizes that fire windows offer the same level of tracking protection as other browsing windows.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -1979,7 +1995,7 @@
}
},
"Contact Info" : {

"comment" : "Title of the section of the Identities manager where the user can add/modify contact info (phone, email address)"
},
"copy" : {
"comment" : "Copy button",
Expand Down Expand Up @@ -2045,7 +2061,7 @@
}
},
"Country" : {

"comment" : "Title of the section of the Identities manager where the user can add/modify a country (US,UK, Italy etc...)"
},
"crash-report.description" : {
"comment" : "Description of the dialog where the user can send a crash report",
Expand Down Expand Up @@ -2195,6 +2211,7 @@
}
},
"default.browser.prompt.button" : {
"comment" : "represents a prompt message asking the user to make DuckDuckGo their default browser.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -2206,6 +2223,7 @@
}
},
"default.browser.prompt.message" : {
"comment" : "represents a prompt message asking the user to make DuckDuckGo their default browser.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -2888,7 +2906,7 @@
"comment" : "Main Menu View item"
},
"Error message & code" : {

"comment" : "Title of the section of a dialog (form where the user can report feedback) where the error message and the error code are shown"
},
"error.unknown.try.again" : {
"comment" : "Generic error message on a dialog for when the cause is not known.",
Expand Down Expand Up @@ -3749,6 +3767,7 @@
}
},
"home.page.empty.state.item.message" : {
"comment" : "This string represents the message for an empty state item on the home page, encouraging the user to keep browsing to see how many trackers were blocked",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -3760,6 +3779,7 @@
}
},
"home.page.empty.state.item.title" : {
"comment" : "This string represents the title for an empty state item on the home page, indicating that recently visited sites will appear here",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -3771,6 +3791,7 @@
}
},
"home.page.no.trackers.blocked" : {
"comment" : "This string represents a message on the home page indicating that no trackers were blocked",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -3782,6 +3803,7 @@
}
},
"home.page.no.trackers.found" : {
"comment" : "This string represents a message on the home page indicating that no trackers were found",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -3805,6 +3827,7 @@
}
},
"home.page.protection.summary.info" : {
"comment" : "This string represents a message in the protection summary on the home page, indicating that there is no recent activity",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -3834,10 +3857,10 @@
"comment" : "Menu item"
},
"Import Bookmarks" : {

"comment" : "Title of dialog with instruction for the user to import bookmarks from another browser"
},
"Import Passwords" : {
"comment" : "my comment"
"comment" : "Title of dialog with instruction for the user to import passwords from another browser"
},
"Import Results:" : {
"comment" : "Data Import result summary headline"
Expand Down Expand Up @@ -4695,7 +4718,7 @@
}
},
"main-menu.edit.paste-and-match-style" : {
"comment" : "Main Menu Edit item",
"comment" : "Main Menu Edit item - Action that allows the user to paste copy into a target document and the target document's style will be retained (instead of the source style)",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -4911,7 +4934,7 @@
}
},
"main-menu.file.open-location" : {
"comment" : "Main Menu File item",
"comment" : "Main Menu File item- Menu option that allows the user to connect to an address (type an address) on click the address bar of the browser is selected and the user can type.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -5856,6 +5879,7 @@
}
},
"open.settings" : {
"comment" : "This string represents a prompt or button label prompting the user to open system settings",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -7118,6 +7142,7 @@
}
},
"pm.lock-screen.duration" : {
"comment" : "Message about the duration for which autofill information remains unlocked on the lock screen.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -7873,6 +7898,7 @@
}
},
"preferences.about.unsupported-device-info1" : {
"comment" : "This string represents a message informing the user that DuckDuckGo is no longer providing browser updates for their version of macOS",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -8052,6 +8078,7 @@
}
},
"preferences.default-browser.button.make-default" : {
"comment" : "represents a prompt message asking the user to make DuckDuckGo their default browser.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -8270,6 +8297,7 @@
"comment" : "Main Menu History item"
},
"reopen.last.closed.tab" : {
"comment" : "This string represents an action to reopen the last closed tab in the browser",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand All @@ -8281,6 +8309,7 @@
}
},
"reopen.last.closed.window" : {
"comment" : "This string represents an action to reopen the last closed window in the browser",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -8316,6 +8345,7 @@
}
},
"restart.bitwarden.info" : {
"comment" : "This string represents a message informing the user that Bitwarden is not responding and prompts them to restart the application to initiate communication again.",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -9083,6 +9113,7 @@
}
},
"unsupported.device.info.alert.header" : {
"comment" : "his string represents the header for an alert informing the user that their version of macOS is no longer supported",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
Expand Down Expand Up @@ -9185,4 +9216,4 @@
}
},
"version" : "1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ extension UserText {
static func pmLockScreenDuration(duration: String) -> String {
let localized = NSLocalizedString("pm.lock-screen.duration",
value: "Your autofill info will remain unlocked until your computer is idle for %@.",
comment: "")
comment: "Message about the duration for which autofill information remains unlocked on the lock screen.")
return String(format: localized, duration)
}

Expand Down
Loading

0 comments on commit 17057fc

Please sign in to comment.