Merge 17.8 beta 2 into develop

WordPress/Classes/Models/Comment.m

@@ -159,10 +159,11 @@ - (BOOL)isApproved
 - (BOOL)isReadOnly
 {
     // If the current user cannot moderate the comment, they can only Like and Reply if the comment is Approved.
-    if (self.blog.isHostedAtWPcom && !self.canModerate && !self.isApproved) {
+    if ((self.blog.isHostedAtWPcom || self.blog.isAtomic)
+        && !self.canModerate && !self.isApproved) {
         return YES;
     }
-    
+
     return NO;
 }
 

WordPress/Classes/Services/PostService.m

@@ -54,8 +54,8 @@ - (Post *)createPostForBlog:(Blog *)blog {
     post.postType = Post.typeDefaultIdentifier;
 
     BlogAuthor *author = [blog getAuthorWithId:blog.userID];
-    post.authorID = author.userID ?: blog.account.userID;
-    post.author = author.displayName ?: blog.account.displayName;
+    post.authorID = author.userID;
+    post.author = author.displayName;
 
     [blog.managedObjectContext obtainPermanentIDsForObjects:@[post] error:nil];
     NSAssert(![post.objectID isTemporaryID], @"The new post for this blog must have a permanent ObjectID");
@@ -77,8 +77,8 @@ - (Page *)createPageForBlog:(Blog *)blog {
     page.remoteStatus = AbstractPostRemoteStatusSync;
 
     BlogAuthor *author = [blog getAuthorWithId:blog.userID];
-    page.authorID = author.userID ?: blog.account.userID;
-    page.author = author.displayName ?: blog.account.displayName;
+    page.authorID = author.userID;
+    page.author = author.displayName;
 
     [blog.managedObjectContext obtainPermanentIDsForObjects:@[page] error:nil];
     NSAssert(![page.objectID isTemporaryID], @"The new page for this blog must have a permanent ObjectID");

WordPress/Classes/ViewRelated/Comments/CommentViewController.m

@@ -376,7 +376,7 @@ - (void)setupCommentCell:(NoteBlockCommentTableViewCell *)cell
 - (void)setupActionsCell:(NoteBlockActionsTableViewCell *)cell
 {
     // Setup the Cell
-    if (self.comment.blog.isHostedAtWPcom) {
+    if (self.comment.blog.isHostedAtWPcom || self.comment.blog.isAtomic) {
         cell.isReplyEnabled = [UIDevice isPad] && self.userCanLikeAndReply;
         cell.isLikeEnabled = [self.comment.blog supports:BlogFeatureCommentLikes] && self.userCanLikeAndReply;
         cell.isApproveEnabled = self.comment.canModerate;
@@ -702,7 +702,7 @@ - (void)sendReplyWithNewContent:(NSString *)content
     };
 
     void (^failureBlock)(NSError *error) = ^void(NSError *error) {
-        NSString *message = NSLocalizedString(@"There has been an unexpected error while sending your reply", @"Reply Failure Message");
+        NSString *message = error.localizedDescription ?: NSLocalizedString(@"There has been an unexpected error while sending your reply", @"Reply Failure Message");
         [weakSelf displayNoticeWithTitle:message message:nil];
     };
 

WordPress/Classes/ViewRelated/Stats/StatsViewController.m

@@ -99,22 +99,25 @@ - (void) installWidgetsButton
 
 - (void)initStats
 {
-    if (!self.isActivatingStatsModule && ![self.blog isStatsActive]) {
-        [self showStatsModuleDisabled];
-        return;
-    }
-
     SiteStatsInformation.sharedInstance.siteTimeZone = [self.blog timeZone];
 
     // WordPress.com + Jetpack REST
     if (self.blog.account) {
+
+        // Prompt user to enable site stats if stats module is disabled
+        if (!self.isActivatingStatsModule && ![self.blog isStatsActive]) {
+            [self showStatsModuleDisabled];
+            return;
+        }
+
         SiteStatsInformation.sharedInstance.oauth2Token = self.blog.account.authToken;
         SiteStatsInformation.sharedInstance.siteID = self.blog.dotComID;
 
         [self addStatsViewControllerToView];
         [self initializeStatsWidgetsIfNeeded];
         return;
     }
+
     [self refreshStatus];
 }
 

WordPress/Resources/ro.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2021-07-13 08:47:56+0000 */
+/* Translation-Revision-Date: 2021-07-15 15:08:08+0000 */
 /* Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n == 0 || n % 100 >= 2 && n % 100 <= 19) ? 1 : 2); */
 /* Generator: GlotPress/3.0.0-alpha.2 */
 /* Language: ro */
@@ -929,7 +929,7 @@
    Title for Jetpack Backup Update Status Failed screen
    Title for the Jetpack's backup list
    Title of section showing backup status */
-"Backup" = "Copii de siguranță";
+"Backup" = "Copie de siguranță";
 
 /* Title for error displayed when preparing a backup fails. */
 "Backup failed" = "Copia de siguranță a eșuat";

config/Version.internal.xcconfig

@@ -1,4 +1,4 @@
 VERSION_SHORT=17.8
 
 // Internal long version example: VERSION_LONG=9.9.0.20180423
-VERSION_LONG=17.8.0.20210714
+VERSION_LONG=17.8.0.20210716

config/Version.public.xcconfig

@@ -1,4 +1,4 @@
 VERSION_SHORT=17.8
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=17.8.0.1
+VERSION_LONG=17.8.0.2

fastlane/metadata/default/release_notes.txt

@@ -0,0 +1,7 @@
+Text blocks get some love. Color and background customization is added to the block editor’s text blocks.
+
+Other block editor updates include fixing an issue with the block selector on iPad and update loading and failed screens for the editor’s web version.
+
+If you’ve experienced some refresh issues with the follow buttons in the Reader, you can rest easy now, as those issues have been solved.
+
+Authors and Contributors are no longer in the dark! They can now view a site’s Comments via My Site > Comments.

fastlane/metadata/en-CA/release_notes.txt

@@ -0,0 +1,7 @@
+Text blocks get some love. Colour and background customisation is added to the block editor’s text blocks.
+
+Other block editor updates include fixing an issue with the block selector on iPad and update loading and failed screens for the editor’s web version.
+
+If you’ve experienced some refresh issues with the follow buttons in the Reader, you can rest easy now, as those issues have been solved.
+
+Authors and Contributors are no longer in the dark! They can now view a site’s Comments via My Site > Comments.

fastlane/metadata/en-GB/release_notes.txt

@@ -0,0 +1,7 @@
+Text blocks get some love. Colour and background customisation is added to the block editor’s text blocks.
+
+Other block editor updates include fixing an issue with the block selector on iPad and update loading and failed screens for the editor’s web version.
+
+If you’ve experienced some refresh issues with the follow buttons in the Reader, you can rest easy now, as those issues have been solved.
+
+Authors and Contributors are no longer in the dark! They can now view a site’s Comments via My Site > Comments.

fastlane/metadata/en-US/release_notes.txt

@@ -0,0 +1,7 @@
+Text blocks get some love. Color and background customization is added to the block editor’s text blocks.
+
+Other block editor updates include fixing an issue with the block selector on iPad and update loading and failed screens for the editor’s web version.
+
+If you’ve experienced some refresh issues with the follow buttons in the Reader, you can rest easy now, as those issues have been solved.
+
+Authors and Contributors are no longer in the dark! They can now view a site’s Comments via My Site > Comments.

fastlane/metadata/es-ES/release_notes.txt

@@ -0,0 +1,7 @@
+Los bloques de texto reciben algo de cariño. Se ha añadido la personalización del color y del fondo a los bloques de texto del editor de bloques.
+
+Otras actualizaciones del editor de bloques incluyen la corrección de un problema con el selector de bloques en iPad y la actualización de las pantallas de carga y de fallo para la versión web del editor.
+
+Si has experimentado algunos problemas de refresco en el lector con los botones de seguimiento, ahora puedes estar tranquilo, ya que esos problemas han sido solucionados.
+
+¡Los autores y colaboradores ya no están a oscuras! Ahora pueden ver los comentarios de un sitio a través de «Mi sitio > Comentarios».

fastlane/metadata/es-MX/release_notes.txt

@@ -0,0 +1,7 @@
+Los bloques de texto reciben algo de cariño. Se ha añadido la personalización del color y del fondo a los bloques de texto del editor de bloques.
+
+Otras actualizaciones del editor de bloques incluyen la corrección de un problema con el selector de bloques en iPad y la actualización de las pantallas de carga y de fallo para la versión web del editor.
+
+Si has experimentado algunos problemas de refresco en el lector con los botones de seguimiento, ahora puedes estar tranquilo, ya que esos problemas han sido solucionados.
+
+¡Los autores y colaboradores ya no están a oscuras! Ahora pueden ver los comentarios de un sitio a través de "Mi sitio > Comentarios".

fastlane/metadata/ru/release_notes.txt

@@ -0,0 +1,7 @@
+Текстовые блоки получают особое внимание. В текстовые блоки редактора блоков добавлена ​​настройка цвета и фона.
+
+Другие обновления редактора блоков включают исправление проблемы с выбором блоков на iPad, а также загрузку обновлений и экраны ошибок для веб-версии редактора.
+
+Если у вас были проблемы с обновлением с помощью кнопок подписки в Чтиве, вы можете расслабиться, поскольку эти проблемы были решены.
+
+Авторы и участники больше не в неведении, теперь они могут просматривать комментарии сайта через Мой сайт > Комментарии.

fastlane/metadata/sv/release_notes.txt

@@ -0,0 +1,7 @@
+Vi har verkligen brytt oss om textblocken denna gång. Nu går det att anpassa färg och bakgrund för textblock i blockredigeraren.
+
+Bland andra uppdateringar i blockredigeraren har vi rättat ett problem vid val av block på iPad och uppdaterad skärmarna för laddning och misslyckande i webbversionen av redigeraren.
+
+Om du tidigare upplevt vissa problem med uppdatering av prenumerationsknapparna i läsaren kan du nu sova bättre om natten eftersom vi nu löst de problemen.
+
+Författare och bidragsgivare står inte längre utanför informationsflödet! Nu kan de följa kommentarerna på en webbplats via Min webbplats > kommentarer.