Merge changes from 24.6.0.2 (#22978)

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -385,9 +385,11 @@ extension WordPressAppDelegate {
 
     func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
         DDLogInfo("\(self) \(#function)")
-
-        PushNotificationsManager.shared.handleNotification(userInfo as NSDictionary,
-                                                           completionHandler: completionHandler)
+        PushNotificationsManager.shared.application(
+            application,
+            didReceiveRemoteNotification: userInfo,
+            fetchCompletionHandler: completionHandler
+        )
     }
 
 }

WordPress/Classes/Utility/InteractiveNotificationsManager.swift

@@ -640,7 +640,7 @@ extension InteractiveNotificationsManager: UNUserNotificationCenterDelegate {
         let textInputResponse = response as? UNTextInputNotificationResponse
 
         // Analytics
-        PushNotificationsManager.shared.trackNotification(with: userInfo)
+        PushNotificationsManager.shared.trackNotification(with: userInfo, response: response)
 
         if handleAction(with: response.actionIdentifier,
                         category: response.notification.request.content.categoryIdentifier,

WordPress/Classes/Utility/PushNotificationsManager.swift

@@ -186,9 +186,6 @@ final public class PushNotificationsManager: NSObject {
             return
         }
 
-        // Analytics
-        trackNotification(with: userInfo)
-
         // Handling!
         let handlers = [handleSupportNotification,
                         handleAuthenticationNotification,
@@ -207,7 +204,18 @@ final public class PushNotificationsManager: NSObject {
     ///
     /// - Parameter userInfo: The Notification's Payload
     ///
-    func trackNotification(with userInfo: NSDictionary) {
+    func trackNotification(with userInfo: NSDictionary, response: UNNotificationResponse? = nil) {
+        let event: WPAnalyticsStat? = {
+            if let response {
+                return response.actionIdentifier == UNNotificationDefaultActionIdentifier ? .pushNotificationAlertPressed : nil
+            }
+            return .pushNotificationReceived
+        }()
+
+        guard let event else {
+            return
+        }
+
         var properties = [String: String]()
 
         if let noteId = userInfo.number(forKey: Notification.identifierKey) {
@@ -222,7 +230,6 @@ final public class PushNotificationsManager: NSObject {
             properties[Tracking.tokenKey] = theToken
         }
 
-        let event: WPAnalyticsStat = (applicationState == .background) ? .pushNotificationReceived : .pushNotificationAlertPressed
         WPAnalytics.track(event, withProperties: properties)
     }
 
@@ -391,6 +398,17 @@ extension PushNotificationsManager {
     }
 }
 
+// MARK: - Application Delegate
+
+extension PushNotificationsManager: UIApplicationDelegate {
+
+    public func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
+        let dictionary = userInfo as NSDictionary
+        self.trackNotification(with: dictionary)
+        self.handleNotification(dictionary, completionHandler: completionHandler)
+    }
+}
+
 // MARK: - Nested Types
 //
 extension PushNotificationsManager {

WordPress/Resources/ar.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-03-20 18:54:09+0000 */
+/* Translation-Revision-Date: 2024-04-04 14:54:08+0000 */
 /* 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)))); */
 /* Generator: GlotPress/4.0.1 */
 /* Language: ar */
@@ -1529,6 +1529,9 @@ translators: %s: Block name e.g. \"Image block\" */
 /* Title of a button. */
 "Clear search history" = "مسح محفوظات البحث";
 
+/* No comment provided by engineer. */
+"Clear selected color" = "مسح لون محدد";
+
 /* Label for size of media while it's being cleared. */
 "Clearing..." = "جاري المسح...";
 
@@ -10712,6 +10715,9 @@ but tapping on this button will remove their like from the post. */
 /* Error message informing the user that they are already following a blog in their reader. */
 "reader.error.already.subscribed.message" = "لقد اشتركت في هذه المدونة بالفعل.";
 
+/* Title for a button that allows user to manage their subscribed list from the filter sheet */
+"reader.filterSheet.button.manage" = "الإدارة";
+
 /* Title for a filter sheet on the Reader to filter the stream by blog */
 "reader.filterSheet.byBlog.title" = "التصفية حسب المدونة";
 
@@ -10739,9 +10745,15 @@ but tapping on this button will remove their like from the post. */
 /* Title for an empty filter sheet on the Reader for tags */
 "reader.filterSheet.empty.tags.title" = "لا توجد وسوم";
 
+/* Label displayed to the user while loading their selected interests */
+"reader.filterSheet.select.tags.following" = "جارٍ متابعة وسوم جديدة...";
+
 /* Screen title. Reader select interests title label text. */
 "reader.filterSheet.select.tags.title" = "الوسوم المقترحة";
 
+/* VoiceOver accessibility hint, informing the user the button can be used to follow a tag. */
+"reader.follow.button.accessibility.hint" = "يتابع الوسم.";
+
 /* A short message to inform the user data for their followed sites is being fetched.. */
 "reader.followed.blogs.loading" = "جارٍ إحضار المدونات...";
 
@@ -10931,6 +10943,51 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Verb. An option to unsubscribe from a blog. */
 "reader.post.menu.unsubscribe.blog" = "إلغاء الاشتراك من المدونة";
 
+/* Name for the Default color theme, used in the Reader's reading preferences. */
+"reader.preferences.color.default" = "افتراضي";
+
+/* Name for the Evening color theme, used in the Reader's reading preferences. */
+"reader.preferences.color.evening" = "المساء";
+
+/* Name for the OLED color theme, used in the Reader's reading preferences. */
+"reader.preferences.color.oled" = "OLED";
+
+/* Name for the Sepia color theme, used in the Reader's reading preferences. */
+"reader.preferences.color.sepia" = "بني";
+
+/* Name for the Soft color theme, used in the Reader's reading preferences. */
+"reader.preferences.color.soft" = "لين";
+
+/* Title for a button to save and apply the customized Reader Preferences settings when tapped. */
+"reader.preferences.control.doneButton" = "تم";
+
+/* Describes that the slider is used to customize the text size in the Reader. */
+"reader.preferences.control.sizeSlider.description" = "الحجم";
+
+/* Description text for the preview section of Reader Preferences */
+"reader.preferences.preview.body.description" = "القراءة هي أمر شخصي، نريد أن تكون لديك السيطرة اختر الأنماط الملائمة لك.";
+
+/* Text for a feedback link for the Reader Preferences feature */
+"reader.preferences.preview.body.feedbackLink" = "إرسال ملاحظات إلينا حول هذه الميزة";
+
+/* Footnote to be displayed in the preview section, noticing that the feature is in development. */
+"reader.preferences.preview.body.notice" = "لا تزال هذه الميزة قيد التطوير.";
+
+/* Example tag for preview */
+"reader.preferences.preview.tags.1" = "كلاب";
+
+/* Example tag for preview */
+"reader.preferences.preview.tags.2" = "ثعلب";
+
+/* Example tag for preview */
+"reader.preferences.preview.tags.3" = "التصميم";
+
+/* Example tag for preview */
+"reader.preferences.preview.tags.4" = "كتابة";
+
+/* Title text for a preview */
+"reader.preferences.preview.title" = "اختيار تفضيلات القراءة الخاصة بك";
+
 /* Button title. Tapping lets the user manage the blogs they follow. */
 "reader.reblog.manage.blogs" = "إدارة المدونات";
 
@@ -10943,6 +11000,15 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Title of a Reader tab showing Sites matching a user's search query */
 "reader.search.tab.blogs" = "مدونات";
 
+/* Screen title. Reader select interests title label text. */
+"reader.select.interests.follow.title" = "متابعة الوسوم";
+
+/* Label displayed to the user while loading their selected interests */
+"reader.select.interests.following" = "جارٍ متابعة وسوم جديدة...";
+
+/* Message shown when there are no new topics to follow. */
+"reader.select.tags.no.results.follow.title" = "لا توجد وسوم جديدة للمتابعة";
+
 /* Reader select interests subtitle label text */
 "reader.select.tags.subtitle" = "اختيار وسومك";
 
@@ -10976,6 +11042,15 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Button title. Tapping shows the Subscribe to Tags screen. */
 "reader.tags.discover.more.tags" = "اكتشاف مزيد من الوسوم";
 
+/* Verb. Button title. Follows a new tag. */
+"reader.tags.follow.button.title" = "متابعة";
+
+/* Verb. Button title. The user is following a tag. */
+"reader.tags.following.button.title" = "متابعة";
+
+/* Accessibility label for unsubscribing from a tag */
+"reader.tags.unfollow.accessibility.label" = "إلغاء متابعة %@";
+
 /* Label of the table view cell's delete button, when unsubscribing from a blog. */
 "reader.unsubscribe.button" = "إلغاء الاشتراك";
 
@@ -11720,6 +11795,9 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Second part of delete screen title stating [the site] will be unavailable in the future. */
 "will be unavailable in the future." = "لن يكون متوفرًا في المستقبل.";
 
+/* Title for the link for site creation guide. */
+"wordPressAuthenticatorDisplayStrings.default.siteCreationGuideButtonTitle" = "هل تريد بدء موقع جديد؟";
+
 /* This is a comma separated list of keywords used for spotlight indexing of the 'Help & Support' screen within the 'Me' tab */
 "wordpress, help, support, faq, questions, debug, logs, help center, contact" = "ووردبريس، المساعدة، الدعم، الأسئلة المتداولة، الأسئلة، كشف وتصحيح الأخطاء، السجلات، مركز التعليمات، الاتصال";
 

WordPress/Resources/de.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-04-03 12:54:09+0000 */
+/* Translation-Revision-Date: 2024-04-07 22:24:31+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/4.0.1 */
 /* Language: de */
@@ -11020,6 +11020,18 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Footnote to be displayed in the preview section, noticing that the feature is in development. */
 "reader.preferences.preview.body.notice" = "Diese Funktion befindet sich noch in der Entwicklung.";
 
+/* Example tag for preview */
+"reader.preferences.preview.tags.1" = "Hunde";
+
+/* Example tag for preview */
+"reader.preferences.preview.tags.2" = "Fuchs";
+
+/* Example tag for preview */
+"reader.preferences.preview.tags.3" = "Design";
+
+/* Example tag for preview */
+"reader.preferences.preview.tags.4" = "Schreiben";
+
 /* Title text for a preview */
 "reader.preferences.preview.title" = "Leseeinstellungen auswählen";
 

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -29776,6 +29776,7 @@
 				CURRENT_PROJECT_VERSION = "${VERSION_LONG}";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = PZYM8XX95Q;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = PZYM8XX95Q;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -29821,6 +29822,7 @@
 				PRODUCT_MODULE_NAME = WordPress;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Jetpack iOS Development";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Jetpack iOS Development";
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift-XcodeGenerated.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";

config/Version.internal.xcconfig

@@ -1,2 +1,2 @@
-VERSION_LONG = 24.6.0.20240404
+VERSION_LONG = 24.6.0.20240409
 VERSION_SHORT = 24.6

config/Version.public.xcconfig

@@ -1,2 +1,2 @@
-VERSION_LONG = 24.6.0.1
+VERSION_LONG = 24.6.0.2
 VERSION_SHORT = 24.6

fastlane/jetpack_metadata/de-DE/release_notes.txt

@@ -0,0 +1,3 @@
+Es wurden mehrere Probleme mit der Formatierung von markiertem Text behoben. Wir wissen nicht, wie's dir geht, aber wir finden das fantastisch.
+Wo wir gerade dabei waren: Wir haben Probleme behoben, wodurch auf dem Bildschirm für Einsichten mehrere Fehlermeldungen angezeigt wurden. Kein Drama, nur Daten.
+Außerdem sollte dir im Reader nun die aktuellste Version deiner Website angezeigt werden, keine ältere, zwischengespeicherte Version. Neuer ist immer besser.

fastlane/jetpack_metadata/fr-FR/release_notes.txt

@@ -0,0 +1,3 @@
+Nous avons corrigé un certain nombre de problèmes liés au formatage du texte en surbrillance. Nous ne savons pas ce que vous en pensez, mais pour nous, c’est le clou de la semaine.
+Tant qu’à faire, nous avons résolu les problèmes à l’origine de multiples messages d’erreur sur l’écran Tendances. Fini de ronchonner, juste des données.
+Vous devriez également voir la version la plus récente de votre site dans le lecteur, et non une version plus ancienne mise en cache. Quoi de mieux que la nouveauté ?

fastlane/jetpack_metadata/id/release_notes.txt

@@ -0,0 +1,3 @@
+Kami telah memperbaiki sejumlah masalah terkait pemformatan teks yang disorot. Kami harap ini jadi kabar gembira untuk Anda minggu ini.
+Kami juga berhasil memecahkan masalah yang menyebabkan munculnya beberapa pesan error di layar Wawasan. Apa pun masalahnya, kami punya solusinya.
+Anda kini bisa mengakses versi terkini situs Anda di pembaca, alih-alih versi lama yang tersimpan di cache. Rasakan pengalaman pengguna yang lebih optimal di situs versi terbaru Anda.

fastlane/jetpack_metadata/ja/release_notes.txt

@@ -0,0 +1,3 @@
+ハイライト表示されたテキストの書式に関する数件の問題を修正しました。 皆さんはどうだったかわかりませんが、これが私たちの今週のハイライトです。
+また、「統計概要」画面に複数のエラーメッセージが表示される問題も解決しました。 これで問題なくデータに集中できます。
+また、リブログにキャッシュされた古いバージョンではなく、最新バージョンのサイトが表示されるようになりました。 何事も新しいに越したことはありません。

fastlane/jetpack_metadata/ko/release_notes.txt

@@ -0,0 +1,3 @@
+강조 표시된 텍스트 서식과 관련된 몇 가지 문제를 해결했습니다. 모르긴 몰라도 그것이 이번 주의 하이라이트입니다.
+인사이트 화면에 여러 가지 오류 메시지가 표시되는 문제를 그동안에 해결했습니다. 드라마는 없고 데이터만 있습니다.
+리더에는 캐시된 이전 버전이 아니라 최신 버전의 사이트가 표시될 것입니다. 언제나 더 새로운 것이 더 좋습니다.

fastlane/jetpack_metadata/pt-BR/release_notes.txt

@@ -0,0 +1,3 @@
+Corrigimos uma série de problemas com formação de texto em destaque. Não sabemos sobre você, mas esse é o destaque da nossa semana.
+Enquanto fazíamos isso, solucionamos os problemas que causavam várias mensagens de erro na tela Informações. Sem drama, só dados.
+Pode ser que você também esteja vendo a versão mais atual do seu site no Leitor, e não a versão mais antiga e armazenada em cache. Quanto mais atual, melhor.

fastlane/jetpack_metadata/zh-Hans/release_notes.txt

@@ -0,0 +1,3 @@
+我们修复了一些与突出显示文本格式有关的问题。 我们尚不知道诸位的看法，但这是我们本周的重头戏。
+同时，我们还解决了导致“数据分析”屏幕上出现多条错误消息的问题。 没有闹剧，只有数据。
+此外，您还应该在阅读器中看到站点的最新版本，而不是较旧的缓存版本。 越新总归是越好。

fastlane/jetpack_metadata/zh-Hant/release_notes.txt

@@ -0,0 +1,3 @@
+我們修復了醒目文字格式的一些問題。 我們不認識你，但這是本週的重要特色。
+當時我們解決了在「洞察報告」畫面上造成多個錯誤訊息的問題。 只是資料，沒開玩笑。
+你也應該在閱讀器中查看網站的最新版本，不是舊的快取版本。 新的總是比較好。

fastlane/metadata/de-DE/release_notes.txt

@@ -0,0 +1 @@
+Wir haben eine Handvoll Probleme mit der Formatierung von hervorgehobenem Text behoben. Ich weiß nicht, wie es dir geht, aber das ist das Highlight unserer Woche.

fastlane/metadata/en-GB/release_notes.txt

@@ -0,0 +1 @@
+We fixed a handful of issues with highlighted text formatting. We don’t know about you, but that’s the highlight of our week.

fastlane/metadata/es-ES/release_notes.txt

@@ -0,0 +1 @@
+Hemos corregido un puñado de problemas relacionados con el resaltado de formatos de texto. No sabemos habrá sido la tuya, pero eso es lo más destacado de nuestra semana.

fastlane/metadata/fr-FR/release_notes.txt

@@ -0,0 +1 @@
+Nous avons corrigé un certain nombre de problèmes liés au formatage du texte en surbrillance. Nous ne savons pas ce que vous en pensez, mais pour nous, c’est le clou de la semaine.

fastlane/metadata/id/release_notes.txt

@@ -0,0 +1 @@
+Kami telah memperbaiki sejumlah masalah terkait pemformatan teks yang disorot. Kami harap ini jadi kabar gembira untuk Anda minggu ini.

fastlane/metadata/ja/release_notes.txt

@@ -0,0 +1 @@
+ハイライト表示されたテキストの書式に関する数件の問題を修正しました。 皆さんはどうだったかわかりませんが、これが私たちの今週のハイライトです。

fastlane/metadata/nl-NL/release_notes.txt

@@ -0,0 +1 @@
+We hebben een paar problemen met de opmaak van gemarkeerde tekst opgelost. We weten niet hoe het met jou zit, maar dat is het hoogtepunt van onze week.

fastlane/metadata/zh-Hans/release_notes.txt

@@ -0,0 +1 @@
+我们修复了一些与突出显示文本格式有关的问题。 我们尚不知道诸位的看法，但这是我们本周的重头戏。

fastlane/metadata/zh-Hant/release_notes.txt

@@ -0,0 +1 @@
+我們修復了醒目文字格式的一些問題。 我們不認識你，但這是本週的重要特色。