Merge changes and fixes from beta 19.7.0.2 (#18463)

Author: mokagio

WordPress/Classes/ViewRelated/Site Creation/Site Name/SiteNameView.swift

@@ -24,6 +24,8 @@ class SiteNameView: UIView {
         label.adjustsFontForContentSizeCategory = true
         label.numberOfLines = Metrics.numberOfLinesInTitle
         label.textAlignment = .center
+        label.adjustsFontSizeToFitWidth = true
+        label.minimumScaleFactor = Metrics.titleMinimumScaleFactor
         return label
     }()
 
@@ -235,10 +237,22 @@ private extension SiteNameView {
 
     /// hides or shows titles based on the passed boolean parameter
     func hideTitlesIfNeeded() {
-        let isAccessibility = traitCollection.verticalSizeClass == .compact || traitCollection.preferredContentSizeCategory.isAccessibilityCategory
-        let isVerylarge = [UIContentSizeCategory.extraExtraLarge, UIContentSizeCategory.extraExtraExtraLarge].contains(traitCollection.preferredContentSizeCategory)
+        let isAccessibility = traitCollection.verticalSizeClass == .compact ||
+        traitCollection.preferredContentSizeCategory.isAccessibilityCategory
+
+        let isVerylarge = [
+            UIContentSizeCategory.extraExtraLarge,
+            UIContentSizeCategory.extraExtraExtraLarge
+        ].contains(traitCollection.preferredContentSizeCategory)
+
         titleLabelView.isHidden = isAccessibility
-        subtitleLabelView.isHidden = isAccessibility || isVerylarge
+
+        subtitleLabelView.isHidden = isAccessibility || isVerylarge || isIphoneSEorSmaller
+    }
+
+    var isIphoneSEorSmaller: Bool {
+        UIScreen.main.nativeBounds.height <= Metrics.smallerIphonesNativeBoundsHeight &&
+        UIScreen.main.nativeScale <= Metrics.nativeScale
     }
 }
 
@@ -264,18 +278,22 @@ private extension SiteNameView {
         // search bar
         static let searchbarHeight: CGFloat = 64
         // title and subtitle
-        static let numberOfLinesInTitle = 0
+        static let numberOfLinesInTitle = 3
         static let numberOfLinesInSubtitle = 0
         static let titlesInsets = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16)
+        static let verticalNameDisplayLimit = 32
+        static let titleMinimumScaleFactor: CGFloat = 0.75
         //continue button
         static let continueButtonStandardPadding: CGFloat = 16
         static let continueButtonAdditionaliPadPadding: CGFloat = 8
         static let continueButtonInsets = UIEdgeInsets(top: 16, left: 16, bottom: 16, right: 16)
         static func continueButtonViewFrame(_ accessoryWidth: CGFloat) -> CGRect {
             CGRect(x: 0, y: 0, width: accessoryWidth, height: 76)
         }
+        // native bounds height and scale of iPhone SE 3rd gen and iPhone 8
+        static let smallerIphonesNativeBoundsHeight: CGFloat = 1334
+        static let nativeScale: CGFloat = 2
     }
-
 }
 
 // MARK: search bar delegate

WordPress/Resources/ar.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2022-04-20 20:54:07+0000 */
+/* Translation-Revision-Date: 2022-04-25 15:46:19+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 */
 /* Language: ar */
@@ -8387,9 +8387,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* No comment provided by engineer. */
 "Use icon button" = "استخدام زر الأيقونة";
 
-/* Footer text for Invite Links section of the Invite People screen. */
-"Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted peo" = "استخدم هذا الرابط لضمّ أعضاء فريقك دون الحاجة إلى دعوتهم واحدًا تلو الآخر. سيتمكن أي شخص يزور عنوان الموقع هذا من الاشتراك في مؤسستك، حتى إذا تلقى الرابط من شخص آخر، لذا تأكد من مشاركته مع أشخاص موثوق بهم.";
-
 /* No comment provided by engineer. */
 "Use this site" = "استخدام هذا الموقع";
 
@@ -9497,6 +9494,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Sentence to justify why the app asks permission from the user to access their Media Library. */
 "infoplist.NSPhotoLibraryUsageDescription" = "لإضافة صور أو مقاطع فيديو إلى مقالاتك.";
 
+/* Footer text for Invite Links section of the Invite People screen. */
+"invite_people_invite_link_footer" = "استخدم هذا الرابط لضم أعضاء فريقك من دون دعوتهم واحدًا تلو الآخر. سيتمكن أي شخص يزور عنوان URL هذا من التسجيل في مؤسستك، حتى إذا تلقى الرابط من شخص آخر، لذا تأكَّد من مشاركته مع أشخاص موثوق بهم.";
+
 /* Name of the "Save as Draft" action as it should appear in the iOS Share Sheet when sharing content from other apps to WordPress */
 "ios-sharesheet.CFBundleDisplayName" = "حفظ كمسودة";
 

WordPress/Resources/cs.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2022-04-04 20:35:21+0000 */
+/* Translation-Revision-Date: 2022-04-25 13:45:55+0000 */
 /* Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2); */
 /* Generator: GlotPress/3.0.0 */
 /* Language: cs_CZ */
@@ -8323,9 +8323,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* No comment provided by engineer. */
 "Use icon button" = "Použijte ikonu tlačítka";
 
-/* Footer text for Invite Links section of the Invite People screen. */
-"Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted peo" = "Pomocí tohoto odkazu můžete připojit členy svého týmu, aniž byste je museli pozvat jeden po druhém. Kdokoli, kdo navštíví tuto adresu URL, se bude moci zaregistrovat do vaší organizace, i když obdržel odkaz od někoho jiného, takže se ujistěte, že jej sdílíte s důvěryhodnými lidmi.";
-
 /* No comment provided by engineer. */
 "Use this site" = "Vybrat tuto stránku";
 
@@ -9430,6 +9427,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Sentence to justify why the app asks permission from the user to access their Media Library. */
 "infoplist.NSPhotoLibraryUsageDescription" = "Chcete přidat fotky a videa do vašeho příspěvku.";
 
+/* Footer text for Invite Links section of the Invite People screen. */
+"invite_people_invite_link_footer" = "Pomocí tohoto odkazu můžete připojit členy svého týmu, aniž byste je museli pozvat jeden po druhém. Kdokoli, kdo navštíví tuto adresu URL, se bude moci zaregistrovat do vaší organizace, i když obdržel odkaz od někoho jiného, takže se ujistěte, že jej sdílíte s důvěryhodnými lidmi.";
+
 /* Name of the "Save as Draft" action as it should appear in the iOS Share Sheet when sharing content from other apps to WordPress */
 "ios-sharesheet.CFBundleDisplayName" = "Uložit jako koncept";
 

WordPress/Resources/de.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2022-04-08 09:54:11+0000 */
+/* Translation-Revision-Date: 2022-04-25 13:11:55+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/3.0.0 */
 /* Language: de */
@@ -56,6 +56,12 @@
    Plural format string for view title displaying the number of post likes. %1$d is the number of likes. */
 "%1$d Likes" = "%1$d Gefällt mir";
 
+/* Singular format string for displaying the number of users that answered the blogging prompt. */
+"%1$d answer" = "%1$d Antwort";
+
+/* Plural format string for displaying the number of users that answered the blogging prompt. */
+"%1$d answers" = "%1$d Antworten";
+
 /* Format string for displaying number of completed quickstart tutorials. %1$d is number completed, %2$d is total number of tutorials available. */
 "%1$d of %2$d completed" = "%1$d von %2$d komplett";
 
@@ -345,6 +351,9 @@ translators: Block name. %s: The localized block name */
 /* Title for a threat */
 "A file contains a malicious code pattern" = "Eine Datei enthält ein bösartiges Codemuster";
 
+/* Subtitle of the Site Name screen. */
+"A good name is short and memorable.\nYou can change it later." = "Ein guter Name ist kurz und einprägsam.\nDu kannst es später jederzeit ändern.";
+
 /* Story Intro welcome title */
 "A new way to create and publish engaging content on your site." = "Eine neue Möglichkeit zum Erstellen und Veröffentlichen ansprechender Inhalte auf deiner Website.";
 
@@ -481,6 +490,9 @@ translators: Block name. %s: The localized block name */
 /* No comment provided by engineer. */
 "Add Block Before" = "Block davor hinzufügen";
 
+/* No comment provided by engineer. */
+"Add Blocks" = "Blöcke hinzufügen";
+
 /* Alert option to add document contents into a blog post. */
 "Add Contents to Post" = "Inhalte in Beitrag einfügen";
 
@@ -621,6 +633,9 @@ translators: Block name. %s: The localized block name */
 /* Title for the advanced section in site settings screen */
 "Advanced" = "Erweitert";
 
+/* Screen reader text expressing the menu item is after another menu item. Argument is a name for another menu item. */
+"After %@" = "Nach %@";
+
 /* Option to select the Airmail app when logging in with magic links */
 "Airmail" = "Airmail";
 
@@ -778,6 +793,9 @@ translators: Block name. %s: The localized block name */
 /* the comment has an anonymous author. */
 "Anonymous" = "Anonym";
 
+/* Title for a call-to-action button on the prompts card. */
+"Answer Prompt" = "Auf Themenvorschlag antworten";
+
 /* Navigates to picker screen to change the app's icon
    Title of screen to change the app's icon */
 "App Icon" = "App-Icon";
@@ -1036,6 +1054,9 @@ translators: Block name. %s: The localized block name */
 /* Message shown encouraging the user to leave a comment on a post in the reader. */
 "Be the first to leave a comment." = "Schreibe den ersten Kommentar.";
 
+/* Screen reader text expressing the menu item is before another menu item. Argument is a name for another menu item. */
+"Before %@" = "Vor %@";
+
 /* 'Best Day' label for Most Popular stat. */
 "Best Day" = "Bester Tag";
 
@@ -1291,6 +1312,9 @@ translators: Block name. %s: The localized block name */
    Title for the warning shown to the user when he refuses to re-login when the authToken is missing. */
 "Careful!" = "Vorsicht!";
 
+/* Example prompt for the Prompts card in Feature Introduction. */
+"Cast the movie of your life." = "Dreh einen Film über dein Leben.";
+
 /* Label for Categories
    Label for the categories field. Should be the same as WP core. */
 "Categories" = "Kategorien";
@@ -1398,6 +1422,9 @@ translators: Block name. %s: The localized block name */
 /* Overlay message displayed while checking if site has premium purchases */
 "Checking purchases…" = "Überprüfe Käufe …";
 
+/* Screen reader text expressing the menu item is a child of another menu item. Argument is a name for another menu item. */
+"Child of %@" = "Untergeordneter Menüeintrag von %@";
+
 /* Title for the button to progress with the selected site homepage design */
 "Choose" = "Auswählen";
 
@@ -1437,6 +1464,9 @@ translators: Block name. %s: The localized block name */
 /* Label for Publish time picker */
 "Choose a time" = "Uhrzeit auswählen";
 
+/* Select the site's intent. Subtitle */
+"Choose a topic from the list below or type your own." = "Wähle ein Thema aus der unten stehenden Liste aus oder gib ein eigenes ein.";
+
 /* Title of a Quick Start Tour */
 "Choose a unique site icon" = "Ein einzigartiges Website-Icon auswählen";
 
@@ -2447,6 +2477,9 @@ translators: Block name. %s: The localized block name */
 /* No comment provided by engineer. */
 "Double tap and hold to edit" = "Zum Bearbeiten zweimal tippen und halten";
 
+/* Screen reader hint for button that will move the menu item */
+"Double tap and hold to move this menu item up or down. Move horizontally to change hierarchy." = "Um diesen Menüeintrag nach oben oder unten zu verschieben, zweimal tippen und gedrückt halten. Horizontal verschieben, um die Hierarchie zu ändern.";
+
 /* No comment provided by engineer. */
 "Double tap to add a block" = "Zum Hinzufügen eines Blocks zweimal tippen";
 
@@ -2579,6 +2612,9 @@ translators: Block name. %s: The localized block name */
 /* No comment provided by engineer. */
 "Duplicate block" = "Block duplizieren";
 
+/* Placeholder text for the search field int the Site Intent screen. */
+"E.g. Fashion, Poetry, Politics" = "z. B. Mode, Poesie, Politik";
+
 /* No comment provided by engineer. */
 "Each block has its own settings. To find them, tap on a block. Its settings will appear on the toolbar at the bottom of the screen." = "Jeder Block hat eigene Einstellungen. Tippe auf den jeweiligen Block, um sie zu finden. Die Einstellungen werden in der Werkzeugleiste unten auf dem Bildschirm angezeigt.";
 
@@ -3366,6 +3402,13 @@ translators: Block name. %s: The localized block name */
 /* Description of a Quick Start Tour */
 "Give your site a name that reflects its personality and topic. First impressions count!" = "Wähle einen Namen für deine Website, der am besten zu ihrer Persönlichkeit und Ausrichtung passt. Erste Eindrücke zählen!";
 
+/* Default title of the Site Name screen.
+   Title for Site Name screen in iPhone landscape. */
+"Give your website a name" = "Gib deiner Website einen Namen";
+
+/* Title of the Site Name screen. Takes the vertical name as a parameter. */
+"Give your%@website a name" = "Gib deiner %@-Website einen Namen";
+
 /* Option to select the Gmail app when logging in with magic links */
 "Gmail" = "Gmail";
 
@@ -3763,6 +3806,9 @@ translators: Block name. %s: The localized block name */
 /* Message displayed in an alert when user tries to install a first plugin on their site. */
 "Installing the first plugin on your site can take up to 1 minute. During this time you won’t be able to make changes to your site." = "Die Installation des ersten Plugins auf deiner Website kann bis zu einer Minute dauern. Während dieser Zeit kannst du keine Änderungen an deiner Website vornehmen.";
 
+/* Title for a button that opens up the 'Getting More Views and Traffic' support page when tapped. */
+"Interested in building your audience? Check out our top tips" = "Möchtest du eine Zielgruppe aufbauen? Top-Tipps ansehen";
+
 /* Interior Design site intent topic */
 "Interior Design" = "Innenarchitektur";
 
@@ -4447,6 +4493,9 @@ translators: Block name. %s: The localized block name */
 /* Insights 'Most Popular Time' header */
 "Most Popular Time" = "Beliebteste Zeit";
 
+/* Screen reader text for button that will move the menu item. Argument is menu item's name. */
+"Move %@" = "%@ verschieben";
+
 /* No comment provided by engineer. */
 "Move Image Backward" = "Bild nach hinten verschieben";
 
@@ -5705,6 +5754,9 @@ translators: %s: Select control button label e.g. \"Button width\" */
 /* Menu item label for linking a project page. */
 "Projects" = "Projekte";
 
+/* Title label for the Prompts card in My Sites tab. */
+"Prompts" = "Themenvorschläge";
+
 /* Privacy setting for posts set to 'Public' (default). Should be the same as in core WP.
    Text for privacy settings: Public */
 "Public" = "Öffentlich";
@@ -5948,6 +6000,9 @@ translators: %s: Select control button label e.g. \"Button width\" */
 /* No comment provided by engineer. */
 "Remove block" = "Block entfernen";
 
+/* Destructive menu title to remove the prompt card from the dashboard. */
+"Remove from dashboard" = "Aus Dashboard entfernen";
+
 /* Option to remove Insight from view. */
 "Remove from insights" = "Aus Einsichten entfernen";
 
@@ -6841,6 +6896,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Title shown in alert to confirm skipping all quick start items */
 "Skip Quick Start" = "Schnellstart überspringen";
 
+/* Menu title to skip today's prompt. */
+"Skip this prompt" = "Diesen Themenvorschlag überspringen";
+
 /* translators: Slash inserter autocomplete results */
 "Slash inserter results" = "Ergebnisse der Schrägstrich-Eingabe";
 
@@ -8320,9 +8378,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* No comment provided by engineer. */
 "Use icon button" = "Icon-Button verwenden";
 
-/* Footer text for Invite Links section of the Invite People screen. */
-"Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted peo" = "Verwende diesen Link, um deine Teammitglieder einzuladen. Jeder, der diese URL besucht, kann sich bei deiner Organisation registrieren, auch wenn er oder sie den Link von jemand anderem erhalten hat. Teile ihn also nur mit vertrauenswürdigen Personen.";
-
 /* No comment provided by engineer. */
 "Use this site" = "Diese Website verwenden";
 
@@ -8434,6 +8489,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
    Label for viewing more stats. */
 "View more" = "Mehr anzeigen";
 
+/* Menu title to show more prompts. */
+"View more prompts" = "Mehr Themenvorschläge anzeigen";
+
 /* Description for view count. Singular. */
 "View to your site so far" = "Bisheriger Aufruf deiner Website";
 
@@ -9427,6 +9485,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Sentence to justify why the app asks permission from the user to access their Media Library. */
 "infoplist.NSPhotoLibraryUsageDescription" = "Um deinen Beiträgen Fotos oder Videos hinzuzufügen.";
 
+/* Footer text for Invite Links section of the Invite People screen. */
+"invite_people_invite_link_footer" = "Verwende diesen Link, um deine Teammitglieder einzuladen. Jeder, der diese URL besucht, kann sich bei deiner Organisation registrieren, auch wenn er oder sie den Link von jemand anderem erhalten hat. Teile ihn also nur mit vertrauenswürdigen Personen.";
+
 /* Name of the "Save as Draft" action as it should appear in the iOS Share Sheet when sharing content from other apps to WordPress */
 "ios-sharesheet.CFBundleDisplayName" = "Als Entwurf speichern";
 
@@ -9598,3 +9659,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Item 2 of delete screen section listing things that will be deleted. */
 "• Users & Authors" = "• Benutzer und Autoren";
 
+/* Title label that indicates the prompt has been answered. */
+"✓ Answered" = "✓ Geantwortet";
+

WordPress/Resources/en-CA.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2022-03-14 23:56:27+0000 */
+/* Translation-Revision-Date: 2022-04-25 13:47:07+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/3.0.0 */
 /* Language: en_CA */
@@ -8204,9 +8204,6 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* No comment provided by engineer. */
 "Use icon button" = "Use icon button";
 
-/* Footer text for Invite Links section of the Invite People screen. */
-"Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted peo" = "Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted people.";
-
 /* No comment provided by engineer. */
 "Use this site" = "Use this site";
 
@@ -9281,6 +9278,9 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */
 /* Text for related post cell preview */
 "in \"Upgrade\"" = "in \"Upgrade\"";
 
+/* Footer text for Invite Links section of the Invite People screen. */
+"invite_people_invite_link_footer" = "Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted people.";
+
 /* Later today */
 "later today" = "later today";