Merge pull request #20117 from wordpress-mobile/release/24.1

Merge 24.1 final to trunk

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -29,11 +29,9 @@
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.tasks.Task;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.play.core.review.ReviewException;
 import com.google.android.play.core.review.ReviewInfo;
 import com.google.android.play.core.review.ReviewManager;
 import com.google.android.play.core.review.ReviewManagerFactory;
-import com.google.android.play.core.review.model.ReviewErrorCode;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -184,6 +182,7 @@
 import static org.wordpress.android.login.LoginAnalyticsListener.CreatedAccountSource.EMAIL;
 import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE;
 import static org.wordpress.android.ui.JetpackConnectionSource.NOTIFICATIONS;
+import static org.wordpress.android.util.extensions.InAppReviewExtensionsKt.logException;
 
 import dagger.hilt.android.AndroidEntryPoint;
 
@@ -854,12 +853,7 @@ private void launchInAppReviews() {
  Task<Void> flow = manager.launchReviewFlow(this, reviewInfo);
  flow.addOnFailureListener(e -> AppLog.e(T.MAIN, "Error launching google review API flow.", e));
  } else {
- @ReviewErrorCode int reviewErrorCode = ((ReviewException) task.getException()).getErrorCode();
- AppLog.e(
- T.MAIN,
- "Error fetching ReviewInfo object from Review API to start in-app review process",
- reviewErrorCode
- );
+ logException(task);
  }
  });
  }

WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt

@@ -21,9 +21,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.lifecycle.ViewModelProvider
 import androidx.viewpager.widget.ViewPager.OnPageChangeListener
 import com.google.android.material.snackbar.Snackbar
-import com.google.android.play.core.review.ReviewException
 import com.google.android.play.core.review.ReviewManagerFactory
-import com.google.android.play.core.review.model.ReviewErrorCode
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.databinding.PostListActivityBinding
@@ -66,6 +64,7 @@ import org.wordpress.android.util.SnackbarItem
 import org.wordpress.android.util.SnackbarSequencer
 import org.wordpress.android.util.extensions.getSerializableCompat
 import org.wordpress.android.util.extensions.getSerializableExtraCompat
+import org.wordpress.android.util.extensions.logException
 import org.wordpress.android.util.extensions.redirectContextClickToLongPressListener
 import org.wordpress.android.util.extensions.setLiftOnScrollTargetViewIdAndRequestLayout
 import org.wordpress.android.viewmodel.observeEvent
@@ -360,12 +359,7 @@ class PostsListActivity : LocaleAwareActivity(),
  AppLog.e(AppLog.T.POSTS, "Error launching google review API flow.", e)
  }
  } else {
- @ReviewErrorCode val reviewErrorCode = (task.exception as ReviewException).errorCode
- AppLog.e(
- AppLog.T.POSTS,
- "Error fetching ReviewInfo object from Review API to start in-app review process",
- reviewErrorCode
- )
+ task.logException()
  }
  }
  }

WordPress/src/main/java/org/wordpress/android/util/extensions/InAppReviewExtensions.kt

@@ -0,0 +1,15 @@
+package org.wordpress.android.util.extensions
+
+import com.google.android.gms.tasks.Task
+import com.google.android.play.core.review.ReviewException
+import com.google.android.play.core.review.ReviewInfo
+import com.google.android.play.core.review.model.ReviewErrorCode
+import org.wordpress.android.util.AppLog
+
+fun Task<ReviewInfo>.logException() {
+ val errorMessage = "Error fetching ReviewInfo object from Review API to start in-app review process"
+ (exception as? ReviewException)?.let {
+ @ReviewErrorCode val reviewErrorCode = it.errorCode
+ AppLog.e(AppLog.T.UTILS, errorMessage, reviewErrorCode)
+ } ?: AppLog.e(AppLog.T.UTILS, "$errorMessage: ${exception?.message}")
+}

WordPress/src/main/res/values-ar/strings.xml

@@ -29,8 +29,6 @@ Language: ar
  <string name="bloganuary_dashboard_nudge_overlay_text_two">انشر ردك.</string>
  <string name="bloganuary_dashboard_nudge_overlay_text_one">استقبل موجّهًا جديدًا لإلهامك في كل يوم.</string>
  <string name="bloganuary_dashboard_nudge_text">في شهر يناير، ستأتي موجّهات التدوين من Bloganuary - تحدٍّ مجتمعي لدينا لإنشاء عادة التدوين الخاصة بالعام الجديد.</string>
- <string name="turn_off">لا، توقف عن الاستخدام</string>
- <string name="leave_on">نعم، واصل الاستخدام</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_your_web_bro">لهذا السبب، نوصي بتحرير المكوّن باستخدام متصفح الويب لديك.</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_the_web_edit">لهذا السبب، نوصي بتحرير المكوّن باستخدام محرر الويب.</string>
  <string name="gutenberg_native_alternatively_you_can_flatten_the_content_by_ungrouping_the_block">بدلاً من ذلك، يمكنك تمهيد المحتوى عن طريق فك تجميع المكوّن.</string>

WordPress/src/main/res/values-de/strings.xml

@@ -34,8 +34,6 @@ Language: de
  <string name="bloganuary_dashboard_nudge_overlay_icon_content_description">Bloganuary</string>
  <string name="bloganuary_dashboard_nudge_text">Im Januar erhältst du Blog-Schreibanregungen vom Bloganuary, unserer Community-Challenge. Diese soll dir helfen, Bloggen im neuen Jahr zur Gewohnheit zu machen.</string>
  <string name="bloganuary_dashboard_nudge_title_december">Der Bloganuary kommt!</string>
- <string name="turn_off">Nein, deaktivieren</string>
- <string name="leave_on">Ja, aktiviert lassen</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_your_web_bro">Aus diesem Grund empfehlen wir, den Block in deinem Webbrowser zu bearbeiten.</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_the_web_edit">Aus diesem Grund empfehlen wir, den Block im Webeditor zu bearbeiten.</string>
  <string name="gutenberg_native_alternatively_you_can_flatten_the_content_by_ungrouping_the_block">Alternativ kannst du die Tiefe des Inhalts reduzieren, indem du die Gruppierung des Blocks aufhebst.</string>
@@ -50,8 +48,6 @@ Language: de
  <string name="gutenberg_native_blocks_nested_deeper_than_d_levels_may_not_render_properly_in_the">Blöcke, die tiefer als %d Ebenen verschachtelt sind, werden im mobilen Editor möglicherweise nicht richtig dargestellt.</string>
  <string name="jp_migration_lets_go_button">Los geht\'s</string>
  <string name="jp_migration_done_no_sites_message">Es ist an der Zeit, deine WordPress-Reise in der Jetpack-App fortzusetzen.</string>
- <string name="image_optimization_popup_desc">Die Bildoptimierung schrumpft Bilder für schnelleres Hochladen.\n\nDiese Option ist standardmäßig aktiviert, aber du kannst jederzeit Änderungen in den App-Einstellungen vornehmen.</string>
- <string name="image_optimization_popup_title">Sollen Bilder weiterhin optimiert werden?</string>
  <string name="domain_management_clear_search">Suche löschen</string>
  <string name="media_encoder_quality_very_high">Sehr hoch</string>
  <string name="notification_security_key_needed">Bitte gib deinen Sicherheitsschlüssel an, um fortzufahren.</string>

WordPress/src/main/res/values-en-rGB/strings.xml

@@ -34,8 +34,6 @@ Language: en_GB
  <string name="bloganuary_dashboard_nudge_overlay_icon_content_description">Bloganuary</string>
  <string name="bloganuary_dashboard_nudge_text">For the month of January, blogging prompts will come from Bloganuary – our community challenge to build a blogging habit for the new year.</string>
  <string name="bloganuary_dashboard_nudge_title_december">Bloganuary is coming!</string>
- <string name="turn_off">No, turn off</string>
- <string name="leave_on">Yes, leave on</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_your_web_bro">For this reason, we recommend editing the block using your web browser.</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_the_web_edit">For this reason, we recommend editing the block using the web editor.</string>
  <string name="gutenberg_native_alternatively_you_can_flatten_the_content_by_ungrouping_the_block">Alternatively, you can flatten the content by ungrouping the block.</string>
@@ -50,8 +48,6 @@ Language: en_GB
  <string name="gutenberg_native_blocks_nested_deeper_than_d_levels_may_not_render_properly_in_the">Blocks nested deeper than %d levels may not render properly in the mobile editor.</string>
  <string name="jp_migration_lets_go_button">Let\'s go</string>
  <string name="jp_migration_done_no_sites_message">It\'s time to continue your WordPress journey on the Jetpack app.</string>
- <string name="image_optimization_popup_desc">Image optimisation shrinks images for faster uploading.\n\nThis option is enabled by default, but you can change it in the app settings at any time.</string>
- <string name="image_optimization_popup_title">Keep optimising images?</string>
  <string name="domain_management_clear_search">Clear search</string>
  <string name="media_encoder_quality_very_high">Very High</string>
  <string name="notification_security_key_needed">Please provide your security key to continue.</string>

WordPress/src/main/res/values-es-rCO/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2022-07-22 14:44:13+0000
+Translation-Revision-Date: 2024-02-01 06:33:18+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/4.0.0-beta.2
 Language: es_CO
@@ -170,6 +170,7 @@ Language: es_CO
  <string name="blogging_prompts_onboarding_content_bottom">¡Te mostraremos un nuevo estímulo cada día en tu escritorio para ayudarte a que fluyan esos fluidos creativos!</string>
  <string name="blogging_prompts_onboarding_content_top">El mejor modo de convertirte en un mejor escritor es crear un hábito de escritura y compartir con otros - ¡aquí es donde entran los estímulos! </string>
  <string name="blogging_prompt_set_reminders">Configurar recordatorios</string>
+ <string name="blogging_reminders_prompt_title">Incluir el estímulo diario</string>
  <string name="post_publishing_set_up_blogging_prompts_message">Publicar con regularidad atrae nuevos lectores. ¡Cuéntanos cuándo quieres escribir y te enviaremos un recordatorio!</string>
  <string name="set_your_blogging_prompts_title">Conviértete en un mejor escritor creando un hábito</string>
  <string name="site_creation_intent_writing_poetry">Escritura y poesía</string>
@@ -205,6 +206,7 @@ Language: es_CO
  <string name="new_site_creation_intents_input_hint">Ej.: Moda, poesía, política</string>
  <string name="new_site_creation_intents_title">Temática del sitio</string>
  <string name="quick_start_site_menu_tab_message_short">Toca &lt;b&gt;%1$s&lt;/b&gt; para continuar.</string>
+ <string name="my_site_blogging_prompt_card_menu_skip">Omitir por hoy</string>
  <string name="my_site_blogging_prompt_card_menu_view_more">Ver más estímulos</string>
  <string name="my_site_blogging_prompt_card_share_chooser_title">Comparte el estímulo de bloguear</string>
  <string name="my_site_blogging_prompt_card_answered_prompt">✓ Respondido</string>
@@ -449,6 +451,7 @@ Language: es_CO
  <string name="blogging_reminders_notification_title">Es hora de bloguear en %s</string>
  <string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_wordpress_for_ios">WordPress para iOS aún no es compatible con editar bloques reutilizables</string>
  <string name="gutenberg_native_editing_reusable_blocks_is_not_yet_supported_on_wordpress_for_and">WordPress para Android aún no es compatible con editar bloques reutilizables</string>
+ <string name="gutenberg_native_alternatively_you_can_detach_and_edit_these_blocks_separately_by">Alternativamente, puedes separar y editar estos bloques por separado tocando en \"Convertir en bloques normales\".</string>
  <string name="blogging_reminders_done">Hecho</string>
  <string name="blogging_reminders_notify_me">Avísame</string>
  <string name="restore_details_enter_server_creds_msg">&lt;a href=\"%1$s\"&gt;Introduce las credenciales de tu servidor&lt;/a&gt; para activar las restauraciones del sitio con un clic de las copias de seguridad.</string>
@@ -458,6 +461,7 @@ Language: es_CO
  <string name="support_ticket_subject">Soporte de WordPress para Android</string>
  <string name="site_settings_categories_hint">Gestiona las categorías de tu sitio</string>
  <string name="site_settings_categories_title">Categorías</string>
+ <string name="site_settings_blogging_reminders_title">Recordatorios</string>
  <string name="page_is_posts_page_warning">El contenido de la página de tus últimas entradas se genera automáticamente y no se puede editar.</string>
  <string name="gutenberg_native_border_settings">Ajustes del borde</string>
  <string name="storage_utils_dialog_dont_show_button">No mostrar de nuevo</string>
@@ -524,6 +528,7 @@ Language: es_CO
  <string name="gutenberg_native_custom_url">URL personalizada</string>
  <string name="gutenberg_native_create_embed">Crear una incrustación</string>
  <string name="gutenberg_native_column_d">Columna %d</string>
+ <string name="gutenberg_native_more">Más</string>
  <string name="gutenberg_native_briefly_describe_the_link_to_help_screen_reader_user">Describe brevemente el enlace para ayudar a los usuarios de lectores de pantalla</string>
  <string name="gutenberg_native_add_blocks">Añadir bloques</string>
  <string name="login_no_jetpack_sites">No se han encontrado sitios de Jetpack</string>

WordPress/src/main/res/values-es/strings.xml

@@ -34,8 +34,6 @@ Language: es
  <string name="bloganuary_dashboard_nudge_overlay_icon_content_description">Bloganuary</string>
  <string name="bloganuary_dashboard_nudge_text">Durante el mes de enero, las sugerencias para escribir en el blog provendrán de Bloganuary, nuestro reto comunitario para crear un hábito de blogueo para el nuevo año.</string>
  <string name="bloganuary_dashboard_nudge_title_december">¡Bloganuary está a la vuelta de la esquina!</string>
- <string name="turn_off">No, apágala</string>
- <string name="leave_on">Sí, déjala encendida</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_your_web_bro">Por esta razón, te recomendamos que edites el bloque utilizando tu navegador web.</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_the_web_edit">Por este motivo, te recomendamos que edites el bloque utilizando el editor web.</string>
  <string name="gutenberg_native_alternatively_you_can_flatten_the_content_by_ungrouping_the_block">También puedes aplanar el contenido desagrupando el bloque.</string>
@@ -50,8 +48,6 @@ Language: es
  <string name="gutenberg_native_blocks_nested_deeper_than_d_levels_may_not_render_properly_in_the">Es posible que los bloques anidados a más de %d niveles no se muestren correctamente en el editor móvil.</string>
  <string name="jp_migration_lets_go_button">Vamos</string>
  <string name="jp_migration_done_no_sites_message">Es hora de continuar tu viaje por WordPress en la aplicación Jetpack.</string>
- <string name="image_optimization_popup_desc">La optimización de imágenes las reduce para subirlas más rápido.\n\nEsta opción está activada por defecto, pero puedes cambiarla en los ajustes de la aplicación en cualquier momento.</string>
- <string name="image_optimization_popup_title">¿Seguir optimizando las imágenes?</string>
  <string name="domain_management_clear_search">Vaciar la búsqueda</string>
  <string name="media_encoder_quality_very_high">Muy alta</string>
  <string name="notification_security_key_needed">Introduce tu clave de seguridad para continuar.</string>

WordPress/src/main/res/values-fr-rCA/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-01-25 19:56:22+0000
+Translation-Revision-Date: 2024-02-02 09:34:10+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/4.0.0-beta.2
 Language: fr
@@ -31,8 +31,6 @@ Language: fr
  <string name="bloganuary_dashboard_nudge_overlay_text_one">Recevez chaque jour une invite pour vous inspirer.</string>
  <string name="bloganuary_dashboard_nudge_overlay_title">Participer à notre défi d’écriture d’un mois</string>
  <string name="bloganuary_dashboard_nudge_overlay_icon_content_description">De Bloganuary</string>
- <string name="turn_off">Non, désactiver</string>
- <string name="leave_on">Oui, laisser activé</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_your_web_bro">Pour cette raison, nous vous recommandons de modifier le bloc à l’aide de votre navigateur web.</string>
  <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_the_web_edit">Pour cette raison, nous vous recommandons de modifier le bloc à l’aide de l’éditeur web.</string>
  <string name="gutenberg_native_alternatively_you_can_flatten_the_content_by_ungrouping_the_block">Sinon, vous pouvez aplatir le contenu en dégroupant le bloc.</string>
@@ -2363,7 +2361,7 @@ Language: fr
  <string name="pages_move_to_draft">Passer en brouillon</string>
  <string name="pages_set_parent">Configurer le parent</string>
  <string name="pages_view">Afficher</string>
- <string name="pages_trashed">Mises à la Corbeille</string>
+ <string name="pages_trashed">Mis à la corbeille</string>
  <string name="pages_scheduled">Planifiées</string>
  <string name="pages_drafts">Brouillons</string>
  <string name="pages_published">Publiées</string>
@@ -3617,7 +3615,7 @@ Language: fr
  <string name="mnu_comment_unapprove">Désapprouver</string>
  <string name="mnu_comment_approve">Approuver</string>
  <string name="edit_comment">Modifier le commentaire</string>
- <string name="comment_status_trash">À la Corbeille</string>
+ <string name="comment_status_trash">Mis à la corbeille</string>
  <string name="comment_status_spam">Indésirable</string>
  <string name="comment_status_unapproved">En attente</string>
  <string name="comment_status_approved">Approuvé</string>