Skip to content

Commit 4c003c1

Browse files
authored
Merge finalized release 21.5 (#19960)
2 parents 9222e29 + 3162d58 commit 4c003c1

40 files changed

+333
-114
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def shared_style_pods
9191
end
9292

9393
def gutenberg_pods
94-
gutenberg tag: 'v1.87.1'
94+
gutenberg tag: 'v1.87.2'
9595
end
9696

9797
def gutenberg(options)

Podfile.lock

Lines changed: 105 additions & 105 deletions
Large diffs are not rendered by default.

WordPress/Classes/ViewRelated/Blog/Blog List/BlogListViewController+SiteCreation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ extension BlogListViewController {
22
@objc
33
func launchSiteCreation() {
44
let source = "my_sites"
5-
JetpackFeaturesRemovalCoordinator.presentSiteCreationOverlayIfNeeded(in: self, source: source, onWillDismiss: {
5+
JetpackFeaturesRemovalCoordinator.presentSiteCreationOverlayIfNeeded(in: self, source: source, onDidDismiss: {
66
guard JetpackFeaturesRemovalCoordinator.siteCreationPhase() != .two else {
77
return
88
}

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
710710
}
711711

712712
func launchSiteCreation(source: String) {
713-
JetpackFeaturesRemovalCoordinator.presentSiteCreationOverlayIfNeeded(in: self, source: source, onWillDismiss: {
713+
JetpackFeaturesRemovalCoordinator.presentSiteCreationOverlayIfNeeded(in: self, source: source, onDidDismiss: {
714714
guard JetpackFeaturesRemovalCoordinator.siteCreationPhase() != .two else {
715715
return
716716
}

WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ extension WordPressAuthenticationManager: WordPressAuthenticatorDelegate {
387387

388388
epilogueViewController.onCreateNewSite = {
389389
let source = "login_epilogue"
390-
JetpackFeaturesRemovalCoordinator.presentSiteCreationOverlayIfNeeded(in: navigationController, source: source, onWillDismiss: {
390+
JetpackFeaturesRemovalCoordinator.presentSiteCreationOverlayIfNeeded(in: navigationController, source: source, onDidDismiss: {
391391
guard JetpackFeaturesRemovalCoordinator.siteCreationPhase() != .two else {
392392
return
393393
}

WordPress/Resources/ar.lproj/Localizable.strings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2023-01-12 13:54:07+0000 */
1+
/* Translation-Revision-Date: 2023-01-19 14:54:08+0000 */
22
/* Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5)))); */
33
/* Generator: GlotPress/4.0.0-alpha.3 */
44
/* Language: ar */
@@ -10129,6 +10129,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1012910129
/* Secondary button title in the migration notifications screen. */
1013010130
"migration.notifications.actions.secondary.title" = "التقرير لاحقًا";
1013110131

10132+
/* Footer for the migration notifications screen. */
10133+
"migration.notifications.footer" = "عندما يظهر التنبيه، انقر على \"سماح\" للاستمرار في تلقي كل تنبيهات ووردبريس الخاصة بك.";
10134+
1013210135
/* Highlighted text in the footer of the migration notifications screen. */
1013310136
"migration.notifications.footer.highlighted" = "السماح";
1013410137

WordPress/Resources/id.lproj/Localizable.strings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2023-01-12 10:54:07+0000 */
1+
/* Translation-Revision-Date: 2023-01-18 10:54:07+0000 */
22
/* Plural-Forms: nplurals=2; plural=n > 1; */
33
/* Generator: GlotPress/4.0.0-alpha.3 */
44
/* Language: id */
@@ -10129,6 +10129,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1012910129
/* Secondary button title in the migration notifications screen. */
1013010130
"migration.notifications.actions.secondary.title" = "Tentukan nanti";
1013110131

10132+
/* Footer for the migration notifications screen. */
10133+
"migration.notifications.footer" = "Saat peringatan muncul, ketuk Izinkan untuk terus menerima semua pemberitahuan WordPress.";
10134+
1013210135
/* Highlighted text in the footer of the migration notifications screen. */
1013310136
"migration.notifications.footer.highlighted" = "Izinkan";
1013410137

WordPress/Resources/it.lproj/Localizable.strings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2023-01-12 19:13:09+0000 */
1+
/* Translation-Revision-Date: 2023-01-18 17:47:23+0000 */
22
/* Plural-Forms: nplurals=2; plural=n != 1; */
33
/* Generator: GlotPress/4.0.0-alpha.3 */
44
/* Language: it */
@@ -10129,6 +10129,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
1012910129
/* Secondary button title in the migration notifications screen. */
1013010130
"migration.notifications.actions.secondary.title" = "Decidi più tardi";
1013110131

10132+
/* Footer for the migration notifications screen. */
10133+
"migration.notifications.footer" = "Quando viene visualizzato l'avviso, tocca Consenti per continuare a ricevere tutte le notifiche di WordPress.";
10134+
1013210135
/* Highlighted text in the footer of the migration notifications screen. */
1013310136
"migration.notifications.footer.highlighted" = "Consenti";
1013410137

config/Version.internal.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
VERSION_SHORT=21.5
22

33
// Internal long version example: VERSION_LONG=9.9.0.20180423
4-
VERSION_LONG=21.5.0.20230118
4+
VERSION_LONG=21.5.0.20230120

config/Version.public.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
VERSION_SHORT=21.5
22

33
// Public long version example: VERSION_LONG=9.9.0.0
4-
VERSION_LONG=21.5.0.2
4+
VERSION_LONG=21.5.0.3

0 commit comments

Comments
 (0)