Merge changes from beta 19.6.0.1 + Editorialized release notes (wordp…

…ress-mobile#18293)

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/BlogDashboardViewController.swift

@@ -10,6 +10,7 @@ protocol BlogDashboardCardConfigurable {
 final class BlogDashboardViewController: UIViewController {
 
     var blog: Blog
+    private let embeddedInScrollView: Bool
 
     private lazy var viewModel: BlogDashboardViewModel = {
         BlogDashboardViewModel(viewController: self, blog: blog)
@@ -18,16 +19,26 @@ final class BlogDashboardViewController: UIViewController {
     lazy var collectionView: DynamicHeightCollectionView = {
         let collectionView = DynamicHeightCollectionView(frame: .zero, collectionViewLayout: createLayout())
         collectionView.translatesAutoresizingMaskIntoConstraints = false
+        if !embeddedInScrollView {
+            collectionView.refreshControl = refreshControl
+        }
         return collectionView
     }()
 
+    private lazy var refreshControl: UIRefreshControl = {
+        let refreshControl = UIRefreshControl()
+        refreshControl.addTarget(self, action: #selector(refreshControlPulled), for: .valueChanged)
+        return refreshControl
+    }()
+
     /// The "My Site" main scroll view
     var mySiteScrollView: UIScrollView? {
         return view.superview?.superview as? UIScrollView
     }
 
-    @objc init(blog: Blog) {
+    @objc init(blog: Blog, embeddedInScrollView: Bool) {
         self.blog = blog
+        self.embeddedInScrollView = embeddedInScrollView
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -93,6 +104,12 @@ final class BlogDashboardViewController: UIViewController {
         viewModel.loadCards()
     }
 
+    @objc func refreshControlPulled() {
+        pulledToRefresh { [weak self] in
+            self?.refreshControl.endRefreshing()
+        }
+    }
+
     func pulledToRefresh(completion: (() -> Void)? = nil) {
         viewModel.loadCards {
             completion?()
@@ -104,7 +121,7 @@ final class BlogDashboardViewController: UIViewController {
     }
 
     private func setupCollectionView() {
-        collectionView.isScrollEnabled = false
+        collectionView.isScrollEnabled = !embeddedInScrollView
         collectionView.backgroundColor = .listBackground
         DashboardCard.allCases.forEach {
             collectionView.register($0.cell, forCellWithReuseIdentifier: $0.cell.defaultReuseID)

WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Posts/BlogDashboardNextPostView.swift

@@ -26,6 +26,8 @@ class BlogDashboardNextPostView: UIView {
         titleLabel.text = "Create your first post"
         titleLabel.font = WPStyleGuide.notoBoldFontForTextStyle(.title3)
         titleLabel.adjustsFontForContentSizeCategory = true
+        titleLabel.adjustsFontSizeToFitWidth = true
+        titleLabel.minimumScaleFactor = 0.5
         titleLabel.accessibilityTraits = .button
         return titleLabel
     }()

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m

@@ -1536,7 +1536,7 @@ - (void)showStatsFromSource:(BlogDetailsNavigationSource)source
 
 - (void)showDashboard
 {
-    BlogDashboardViewController *controller = [[BlogDashboardViewController alloc] initWithBlog:self.blog];
+    BlogDashboardViewController *controller = [[BlogDashboardViewController alloc] initWithBlog:self.blog embeddedInScrollView:NO];
     controller.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;
     controller.extendedLayoutIncludesOpaqueBars = YES;
     [self showDetailViewController:controller sender:self];

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

@@ -760,7 +760,7 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
     ///         - blog: The blog to show the details of.
     ///
     private func showDashboard(for blog: Blog) {
-        let blogDashboardViewController = self.blogDashboardViewController ?? BlogDashboardViewController(blog: blog)
+        let blogDashboardViewController = self.blogDashboardViewController ?? BlogDashboardViewController(blog: blog, embeddedInScrollView: true)
         blogDashboardViewController.update(blog: blog)
         embedChildInStackView(blogDashboardViewController)
         self.blogDashboardViewController = blogDashboardViewController

WordPress/Jetpack/Resources/AppStoreStrings.po

@@ -38,20 +38,15 @@ msgctxt "app_store_keywords"
 msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
 msgstr ""
 
-msgctxt "v19.5-whats-new"
+msgctxt "v19.6-whats-new"
 msgid ""
-"We updated Comment Notifications with a spiffy new look and feel. (You might recognize it from My Site Comments!) The Quick Start design in your site menu and dashboard is rocking a new look, too.\n"
+"Big news, site fans—your My Site screen just got better. You’ll now see two new tabs you can switch between: Site Menu and Home.\n"
 "\n"
-"When you’re creating a new site and entering the domain name, you should now see a more accurate error message if you try to use non-English characters that aren’t letters or numbers. We also tweaked the upload error text in media upload blocks.\n"
+"The Home tab also contains handy cards with more information about your site, including drafts, scheduled posts, and today’s stats. Or, if you’re in a hurry, you can easily head over to another section of the app.\n"
 "\n"
-"Not sure if you’re looking at an image or a GIF in your Image block? No need to wonder anymore—animated GIFs now come with a GIF badge.\n"
+"We’re all about clear communication. That’s why we’ve added new error text to the photo upload process, just in case you try to upload a photo from your device without giving the app photo permission first.\n"
 "\n"
-"We also made a few bug fixes while we were under the hood.\n"
-"\n"
-"- Good news for all those orphan comments out there—we squashed a bug where comment replies got lost after their parent comments were unapproved.\n"
-"- When you switch between sites on an iPad, you won’t switch between sidebar nav items, too. You’ll be looking at the same menu item you left on the previous site.\n"
-"- Block setting changes to ordered lists now appear in the editor, not just in Preview.\n"
-"- We fixed a keyboard issue in the WP.com account creation process. If you start entering a magic link password and change your mind, you can dismiss the keyboard and move on with your day.\n"
+"Finally, when in-app notices pop up, they now fade out more smoothly when you don’t need them anymore. Exit stage left.\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of the first screenshot in the App Store.

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,4 +1,7 @@
-* [*] Enhances the exit animation of notices. [#18182]
-* [*] Media Permissions: display error message when using camera to capture photos and media permission not given [https://github.com/wordpress-mobile/WordPress-iOS/pull/18139]
-* [***] My Site: your My Site screen now has two tabs, "Site Menu" and "Home". Under "Home", you'll find contextual cards with some highlights of whats going on with your site. Check your drafts or scheduled posts, your today's stats or go directly to another section of the app. [#18240]
+Big news, site fans—your My Site screen just got better. You’ll now see two new tabs you can switch between: Site Menu and Home.
 
+The Home tab also contains handy cards with more information about your site, including drafts, scheduled posts, and today’s stats. Or, if you’re in a hurry, you can easily head over to another section of the app.
+
+We’re all about clear communication. That’s why we’ve added new error text to the photo upload process, just in case you try to upload a photo from your device without giving the app photo permission first.
+
+Finally, when in-app notices pop up, they now fade out more smoothly when you don’t need them anymore. Exit stage left.

WordPress/Resources/AppStoreStrings.po

@@ -45,20 +45,15 @@ msgctxt "app_store_keywords"
 msgid "blogger,writing,blogging,web,maker,online,store,business,make,create,write,blogs"
 msgstr ""
 
-msgctxt "v19.5-whats-new"
+msgctxt "v19.6-whats-new"
 msgid ""
-"We updated Comment Notifications with a spiffy new look and feel. (You might recognize it from My Site Comments!) The Quick Start design in your site menu and dashboard is rocking a new look, too.\n"
+"Big news, site fans—your My Site screen just got better. You’ll now see two new tabs you can switch between: Site Menu and Home.\n"
 "\n"
-"When you’re creating a new site and entering the domain name, you should now see a more accurate error message if you try to use non-English characters that aren’t letters or numbers. We also tweaked the upload error text in media upload blocks.\n"
+"The Home tab also contains handy cards with more information about your site, including drafts, scheduled posts, and today’s stats. Or, if you’re in a hurry, you can easily head over to another section of the app.\n"
 "\n"
-"Not sure if you’re looking at an image or a GIF in your Image block? No need to wonder anymore—animated GIFs now come with a GIF badge.\n"
+"We’re all about clear communication. That’s why we’ve added new error text to the photo upload process, just in case you try to upload a photo from your device without giving the app photo permission first.\n"
 "\n"
-"We also made a few bug fixes while we were under the hood.\n"
-"\n"
-"- Good news for all those orphan comments out there—we squashed a bug where comment replies got lost after their parent comments were unapproved.\n"
-"- When you switch between sites on an iPad, you won’t switch between sidebar nav items, too. You’ll be looking at the same menu item you left on the previous site.\n"
-"- Block setting changes to ordered lists now appear in the editor, not just in Preview.\n"
-"- We fixed a keyboard issue in the WP.com account creation process. If you start entering a magic link password and change your mind, you can dismiss the keyboard and move on with your day.\n"
+"Finally, when in-app notices pop up, they now fade out more smoothly when you don’t need them anymore. Exit stage left.\n"
 msgstr ""
 
 #. translators: This is a standard chunk of text used to tell a user what's new with a release when nothing major has changed.

WordPress/Resources/ar.lproj/Localizable.strings

@@ -1,6 +1,6 @@
 /* Translation-Revision-Date: 2022-03-24 17:54:07+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/3.0.0-alpha.2 */
+/* Generator: GlotPress/3.0.0-rc.3 */
 /* Language: ar */
 
 /* Message to ask the user to send us an email to clear their content. */
@@ -249,9 +249,6 @@ translators: Block name. %s: The localized block name */
 /* translators: %s: social link name e.g: \"Instagram\". */
 "%s has no URL set" = "ليس لدى %s عنوان URL معين";
 
-/* translators: %s: embed block variant's label e.g: \"Twitter\". */
-"%s link" = "%s رابط";
-
 /* translators: %s: embed block variant's label e.g: \"Twitter\". */
 "%s previews not yet available" = "معاينات %s غير متاحة حتى الآن";
 
@@ -888,7 +885,8 @@ translators: Block name. %s: The localized block name */
 /* No comment provided by engineer. */
 "Arrange your content into columns, add Call to Action buttons, and overlay images with text." = "قم بترتيب محتواك إلى أعمدة، وإضافة أزرار الدعوة إلى اتخاذ إجراء، وتراكب الصور باستخدام النص.";
 
-/* An example tag used in the login prologue screens. */
+/* An example tag used in the login prologue screens.
+   Art site intent topic */
 "Art" = "الفن";
 
 /* Message shown to users who have an old publicize connection to a facebook profile. */
@@ -1142,6 +1140,9 @@ translators: Block name. %s: The localized block name */
 /* Discoverability title for bullet list keyboard shortcut. */
 "Bullet List" = "قائمة النقاط";
 
+/* Business site intent topic */
+"Business" = "للشركات";
+
 /* Title of a prompt letting the user know that they must wait until the current aciton completes. */
 "Busy" = "مشغول";
 
@@ -1801,10 +1802,12 @@ translators: Block name. %s: The localized block name */
 "Content Structure\nBlocks: %li, Words: %li, Characters: %li" = "بنية المحتوى \nالمكوِّنات: %1$li، الكلمات: %2$li، الأحرف: %3$li";
 
 /* Apply changes localy to single block edition in the web block editor
+   Button to progress to the next step
    Continue button (used to finish editing the home page during site creation).
    The button title text when there is a next step for logging in or signing up.
    The default Jetpack view button title
-   Title for the continue button in the What's New page. */
+   Title for the continue button in the What's New page.
+   Title of the continue button for the Site Intent screen. */
 "Continue" = "المتابعة";
 
 /* Button title. Takes the user to the login with WordPress.com flow. */
@@ -2335,7 +2338,8 @@ translators: Block name. %s: The localized block name */
    Title for the Discussion Settings Screen */
 "Discussion" = "مناقشة";
 
-/* Accessibility label for the transparent space above the login dialog which acts as a button to dismiss the dialog.
+/* Accessibility label for button to dismiss a bottom sheet
+   Accessibility label for the transparent space above the login dialog which acts as a button to dismiss the dialog.
    Accessibility label for the transparent space above the signup dialog which acts as a button to dismiss the dialog.
    Action shown in a bottom notice to dismiss it.
    Action to show on alert when view asset fails.
@@ -4370,7 +4374,8 @@ translators: Block name. %s: The localized block name */
 /* Post Stats months and years header. */
 "Months and Years" = "شهور وسنوات";
 
-/* Accessibility label for the More button in Page List.
+/* Accessibility label for more button in dashboard quick start card.
+   Accessibility label for the More button in Page List.
    Accessibility label for the More button in Post List (compact view).
    Accessibility label for the More button on formatting toolbar.
    Accessibility label for the More button on Reader Cell
@@ -4464,7 +4469,8 @@ translators: Block name. %s: The localized block name */
 /* Example post title used in the login prologue screens. */
 "Museums to See In London" = "متاحف يجب رؤيتها في لندن";
 
-/* An example tag used in the login prologue screens. */
+/* An example tag used in the login prologue screens.
+   Music site intent topic */
 "Music" = "الموسيقى";
 
 /* Link to My Profile section
@@ -5205,7 +5211,8 @@ translators: %s: Select control button label e.g. \"Button width\" */
 "Pending review" = "في انتظار المراجعة";
 
 /* Noun. Title of the people management feature.
-   Noun. Title. Links to the people management feature. */
+   Noun. Title. Links to the people management feature.
+   People site intent topic */
 "People" = "أشخاص";
 
 /* Label for date periods. */
@@ -5390,7 +5397,8 @@ translators: %s: Select control button label e.g. \"Button width\" */
    Title for the plugin directory */
 "Plugins" = "الإضافات";
 
-/* An example tag used in the login prologue screens. */
+/* An example tag used in the login prologue screens.
+   Politics site intent topic */
 "Politics" = "السياسة";
 
 /* Header of section in Plugin Directory showing popular plugins
@@ -7704,7 +7712,8 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Cell title for the Top Level option case */
 "Top level" = "أعلى مستوى";
 
-/* Topic page title */
+/* Shortened version of the main title to be used in back navigation
+   Topic page title */
 "Topic" = "الموضوع";
 
 /* Used when a Reader Topic is not found for a specific id */
@@ -7799,7 +7808,8 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* No comment provided by engineer. */
 "Try another search term" = "تجربة مصطلح بحث آخر";
 
-/* Customize Insights button title */
+/* Customize Insights button title
+   Primary button title on the feature introduction view. */
 "Try it now" = "جرّبه الآن";
 
 /* The title of a notice telling users that the classic editor is deprecated and will be removed in a future version of the app. */
@@ -9345,6 +9355,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* This text is used when configuring the iOS widget and confirming the WordPress site the user wants the widget to be for */
 "ios-widget.s4dJhx" = "للتأكيد فقط، هل أردت \"${site}\"؟";
 
+/* This text is required by Apple to be part of the translations but is not shown to the users. You can use the English version verbatim without translation for this entry. */
+"ios-widget.tVvJ9c" = "تحديد هدف الموقع";
+
 /* Later today */
 "later today" = "في وقتٍ لاحقٍ اليوم";
 

WordPress/Resources/bg.lproj/Localizable.strings

@@ -1,6 +1,6 @@
 /* Translation-Revision-Date: 2021-11-26 17:31:27+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
-/* Generator: GlotPress/3.0.0-alpha.2 */
+/* Generator: GlotPress/3.0.0-rc.3 */
 /* Language: bg */
 
 /* Title of a list of buttons used for sharing content to other services. These buttons appear when the user taps a `More` button. */
@@ -616,10 +616,12 @@
 "Contact support" = "Връзка с отдела по поддръжка";
 
 /* Apply changes localy to single block edition in the web block editor
+   Button to progress to the next step
    Continue button (used to finish editing the home page during site creation).
    The button title text when there is a next step for logging in or signing up.
    The default Jetpack view button title
-   Title for the continue button in the What's New page. */
+   Title for the continue button in the What's New page.
+   Title of the continue button for the Site Intent screen. */
 "Continue" = "Напред";
 
 /* Menus alert button title to continue making changes. */
@@ -801,7 +803,8 @@
    Title for the Discussion Settings Screen */
 "Discussion" = "Дискусия";
 
-/* Accessibility label for the transparent space above the login dialog which acts as a button to dismiss the dialog.
+/* Accessibility label for button to dismiss a bottom sheet
+   Accessibility label for the transparent space above the login dialog which acts as a button to dismiss the dialog.
    Accessibility label for the transparent space above the signup dialog which acts as a button to dismiss the dialog.
    Action shown in a bottom notice to dismiss it.
    Action to show on alert when view asset fails.
@@ -1498,7 +1501,8 @@
 /* Post Stats months and years header. */
 "Months and Years" = "Месеци и години";
 
-/* Accessibility label for the More button in Page List.
+/* Accessibility label for more button in dashboard quick start card.
+   Accessibility label for the More button in Page List.
    Accessibility label for the More button in Post List (compact view).
    Accessibility label for the More button on formatting toolbar.
    Accessibility label for the More button on Reader Cell
@@ -1826,7 +1830,8 @@
 "Pending review" = "Очаква отзив";
 
 /* Noun. Title of the people management feature.
-   Noun. Title. Links to the people management feature. */
+   Noun. Title. Links to the people management feature.
+   People site intent topic */
 "People" = "Хора";
 
 /* Label for date periods. */
@@ -2753,7 +2758,8 @@
 /* Discoverability title for HTML keyboard shortcut. */
 "Toggle HTML Source " = "Включване на HTML";
 
-/* Topic page title */
+/* Shortened version of the main title to be used in back navigation
+   Topic page title */
 "Topic" = "Тема";
 
 /* Topics Filter Tab Title */