Skip to content

Fix a NSLocalizedStrings not using a literal value, leading to an export issue #19606

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

Merged
mokagio merged 2 commits into from
Nov 16, 2022
Merged

Fix a NSLocalizedStrings not using a literal value, leading to an export issue #19606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c47ad7e
Fix localization issue with NSLocalizedString not using literals
AliSoftware Nov 16, 2022
9249225
Update strings for localization
AliSoftware Nov 16, 2022
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
16 changes: 10 additions & 6 deletions ...dPress-to-Jetpack Migration/Common/Views/Configuration/MigrationHeaderConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,18 @@ private extension MigrationHeaderConfiguration {
comment: "Secondary description in the migration notifications screen")

static func welcomeSecondaryDescription(plural: Bool) -> String {
let siteWord = plural ? "sites" : "site"
let value = "We found your \(siteWord). Continue to transfer all your data and sign in to Jetpack automatically."
if plural {
let comment = "The plural form of the secondary description in the migration welcome screen"
return NSLocalizedString("migration.welcome.secondaryDescription.plural", value: value, comment: comment)
return NSLocalizedString(
"migration.welcome.secondaryDescription.plural",
value: "We found your sites. Continue to transfer all your data and sign in to Jetpack automatically.",
comment: "The plural form of the secondary description in the migration welcome screen"
)
} else {
let comment = "The singular form of the secondary description in the migration welcome screen"
return NSLocalizedString("migration.welcome.secondaryDescription.singular", value: value, comment: comment)
return NSLocalizedString(
"migration.welcome.secondaryDescription.singular",
value: "We found your site. Continue to transfer all your data and sign in to Jetpack automatically.",
comment: "The singular form of the secondary description in the migration welcome screen"
)
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions WordPress/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4818,11 +4818,11 @@
/* The primary description in the migration welcome screen */
"migration.welcome.primaryDescription" = "It looks like you’re switching from the WordPress app.";

/* No comment provided by engineer. */
"migration.welcome.secondaryDescription.plural" = "migration.welcome.secondaryDescription.plural";
/* The plural form of the secondary description in the migration welcome screen */
"migration.welcome.secondaryDescription.plural" = "We found your sites. Continue to transfer all your data and sign in to Jetpack automatically.";

/* No comment provided by engineer. */
"migration.welcome.secondaryDescription.singular" = "migration.welcome.secondaryDescription.singular";
/* The singular form of the secondary description in the migration welcome screen */
"migration.welcome.secondaryDescription.singular" = "We found your site. Continue to transfer all your data and sign in to Jetpack automatically.";

/* The title in the migration welcome screen */
"migration.welcome.title" = "Welcome to Jetpack!";
Expand Down