Merge pull request #10639 from woocommerce/merge/17.0-final-into-trunk

Merge 17.0 final into trunk
woocommerce · Jan 26, 2024 · 0682f64 · 0682f64
2 parents c044fa7 + 665de99
commit 0682f64
Show file tree

Hide file tree

Showing 40 changed files with 1,709 additions and 1,223 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,7 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 17.1
 -----
+- [*] [Internal] Fixed crash when going to background from the order creation screen [https://github.com/woocommerce/woocommerce-android/pull/10600]
 
 17.0
 -----

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/WooPlugin.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/WooPlugin.kt
@@ -1,9 +1,15 @@
 package com.woocommerce.android.model
 
+import android.os.Parcelable
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class WooPlugin(
     val isInstalled: Boolean,
     val isActive: Boolean,
     val version: String?
-) {
+) : Parcelable {
+    @IgnoredOnParcel
     val isOperational = isInstalled && isActive
 }
diff --git a/...ce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt b/...ce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt
@@ -216,7 +216,8 @@ class OrderCreateEditViewModel @Inject constructor(
     private val pluginsInformation: MutableStateFlow<Map<String, WooPlugin>> =
         savedState.getStateFlow(
             scope = viewModelScope,
-            initialValue = HashMap()
+            initialValue = HashMap(),
+            key = "plugins_information"
         )
     val isGiftCardExtensionEnabled
         get() = pluginsInformation.value[WOO_GIFT_CARDS.pluginName]

diff --git a/WooCommerce/src/main/res/values-ar/strings.xml b/WooCommerce/src/main/res/values-ar/strings.xml
@@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-01-17 02:10:07+0000
+Translation-Revision-Date: 2024-01-23 13:54:03+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/2.4.0-alpha
 Language: ar
 -->
 <resources>
+    <string name="blaze_campaign_preview_details_confirm_details_button">تأكيد التفاصيل</string>
+    <string name="blaze_campaign_preview_details_destination_url">وجهة الإعلان</string>
+    <string name="blaze_campaign_preview_details_interests">مجالات الاهتمام</string>
+    <string name="blaze_campaign_preview_details_location">الموقع</string>
+    <string name="blaze_campaign_preview_details_devices">الأجهزة</string>
+    <string name="blaze_campaign_preview_details_language">اللغة</string>
+    <string name="blaze_campaign_preview_details_budget">الميزانية</string>
+    <string name="blaze_campaign_preview_details_section_title">تفاصيل</string>
+    <string name="blaze_campaign_preview_shop_now_button">التسوق الآن</string>
+    <string name="blaze_campaign_preview_edit_ad_button">تحرير الإعلان</string>
+    <string name="blaze_campaign_screen_fragment_title">معاينة</string>
     <string name="disabled">تعطيل المزامنة</string>
+    <string name="order_configuration_product_selection_control"> تحديد المنتج</string>
+    <string name="order_configuration_product_selection">تحديد المنتج %s</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_5">&lt;b&gt;الانتقال إلى الوضع المباشر:&lt;/b&gt; راقب كيف يبدأ عرضك الترويجي وتتبَّع نجاحه.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_4">&lt;b&gt;مراجعة سريعة:&lt;/b&gt; أرسل إعلانك لإجراء فحص سريع من المشرف.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_3">&lt;b&gt;تعيين ميزانيتك:&lt;/b&gt; حدد إنفاقك ومدة الحملة.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_2">&lt;b&gt;تخصيص العناصر المستهدفة:&lt;/b&gt; حدد الجمهور حسب الموقع أو مجالات الاهتمامات، وشاهد مدى الوصول المحتمل.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_1">&lt;b&gt;اختيار منتج:&lt;/b&gt; اختر ما تريد الترويج له باستخدام Blaze.</string>
+    <string name="scan_to_update_inventory_manage_stock">إدارة المخزون</string>
+    <string name="scan_to_update_inventory_stock_not_managed">لم تتم إدارة المخزون</string>
+    <string name="blaze_campaign_creation_new_intro_learn_more">التعرُّف على كيفية عمل Blaze</string>
     <string name="blaze_campaign_creation_new_intro_start_button">بدء الحملة الخاصة بك</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_subtitle">إعلاناتك على ملايين المواقع داخل شبكات ووردبريس.كوم وTumblr.</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_title">الوصول إلى عدد ضخم من الجمهور</string>
@@ -125,6 +146,7 @@ Language: ar
     <string name="configuration_quantity_between"> يتراوح بين ⁦%1$s⁩ و⁦%2$s⁩ من العناصر </string>
     <string name="configuration_quantity_item_plural">%d من العناصر</string>
     <string name="configuration_quantity_item">%d من العناصر</string>
+    <string name="order_configuration_change_product_quantity">تغيير كمية المنتج من %1$.2f إلى %2$.2f</string>
     <string name="save_configuration">حفظ التكوين</string>
     <string name="product_configuration_title">التكوين</string>
     <string name="default_product_title">المنتج %s</string>

diff --git a/WooCommerce/src/main/res/values-de/strings.xml b/WooCommerce/src/main/res/values-de/strings.xml
@@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-01-17 02:10:07+0000
+Translation-Revision-Date: 2024-01-23 13:54:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: de
 -->
 <resources>
+    <string name="blaze_campaign_preview_details_confirm_details_button">Details bestätigen</string>
+    <string name="blaze_campaign_preview_details_destination_url">Ziel der Werbung</string>
+    <string name="blaze_campaign_preview_details_interests">Interessen</string>
+    <string name="blaze_campaign_preview_details_location">Ort</string>
+    <string name="blaze_campaign_preview_details_devices">Geräte</string>
+    <string name="blaze_campaign_preview_details_language">Sprache</string>
+    <string name="blaze_campaign_preview_details_budget">Budget</string>
+    <string name="blaze_campaign_preview_details_section_title">Details</string>
+    <string name="blaze_campaign_preview_shop_now_button">Jetzt einkaufen</string>
+    <string name="blaze_campaign_preview_edit_ad_button">Werbung bearbeiten</string>
+    <string name="blaze_campaign_screen_fragment_title">Vorschau</string>
     <string name="disabled">Deaktiviert</string>
+    <string name="order_configuration_product_selection_control">Produktauswahl</string>
+    <string name="order_configuration_product_selection">Produkt %s auswählen</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_5">&lt;b&gt;Go-live:&lt;/b&gt; Beobachte, wie deine Werbeaktion startet, und verfolge, wie erfolgreich sie ist.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_4">&lt;b&gt;Schnelle Überprüfung:&lt;/b&gt; Reiche deine Werbung zur schnellen Überprüfung durch den Moderator ein.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_3">&lt;b&gt;Festlegen des Budgets:&lt;/b&gt; Lege deine Ausgaben und die Länge deiner Kampagne fest.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_2">&lt;b&gt;Anpassen der Zielgruppe:&lt;/b&gt; Wähle die Zielgruppe nach Ort oder Interessen aus und sieh dir die potenzielle Reichweite an.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_1">&lt;b&gt;Auswahl des Produkts:&lt;/b&gt; Wähle, was du mit Blaze bewerben möchtest.</string>
+    <string name="scan_to_update_inventory_manage_stock">Bestand verwalten</string>
+    <string name="scan_to_update_inventory_stock_not_managed">Bestand nicht verwaltet</string>
+    <string name="blaze_campaign_creation_new_intro_learn_more">So funktioniert Blaze</string>
     <string name="blaze_campaign_creation_new_intro_start_button">Deine Kampagne starten</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_subtitle">Deine Werbung auf Millionen Websites in den WordPress.com- und Tumblr-Netzwerken.</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_title">Erziele eine große Reichweite</string>
@@ -125,6 +146,7 @@ Language: de
     <string name="configuration_quantity_between"> zwischen %1$s und %2$s Artikeln </string>
     <string name="configuration_quantity_item_plural">%d Artikel</string>
     <string name="configuration_quantity_item">%d Artikel</string>
+    <string name="order_configuration_change_product_quantity">Ändere die Produktmenge von %1$.2f zu %2$.2f</string>
     <string name="save_configuration">Konfiguration speichern</string>
     <string name="product_configuration_title">Konfiguration</string>
     <string name="default_product_title">Produkt %s</string>

diff --git a/WooCommerce/src/main/res/values-es/strings.xml b/WooCommerce/src/main/res/values-es/strings.xml
@@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-01-17 02:10:07+0000
+Translation-Revision-Date: 2024-01-24 08:54:04+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: es
 -->
 <resources>
+    <string name="blaze_campaign_preview_details_confirm_details_button">Confirmar detalles</string>
+    <string name="blaze_campaign_preview_details_destination_url">Destino del anuncio</string>
+    <string name="blaze_campaign_preview_details_interests">Intereses</string>
+    <string name="blaze_campaign_preview_details_location">Ubicación</string>
+    <string name="blaze_campaign_preview_details_devices">Dispositivos</string>
+    <string name="blaze_campaign_preview_details_language">Idioma</string>
+    <string name="blaze_campaign_preview_details_budget">Presupuesto</string>
+    <string name="blaze_campaign_preview_details_section_title">Detalles</string>
+    <string name="blaze_campaign_preview_shop_now_button">Comprar ahora</string>
+    <string name="blaze_campaign_preview_edit_ad_button">Editar anuncio</string>
+    <string name="blaze_campaign_screen_fragment_title">Vista previa</string>
     <string name="disabled">Desactivado</string>
+    <string name="order_configuration_product_selection_control">Elección de producto</string>
+    <string name="order_configuration_product_selection">Elegir el producto %s</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_5">&lt;b&gt;Publica contenido:&lt;/b&gt; observa cómo comienza tu promoción y haz un seguimiento de su progreso.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_4">&lt;b&gt;Reseña rápida:&lt;/b&gt; envía tu anuncio para que lo compruebe rápidamente un moderador.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_3">&lt;b&gt;Define tu presupuesto:&lt;/b&gt; decide el gasto y la duración de la campaña.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_2">&lt;b&gt;Segmentación personalizada:&lt;/b&gt; elige la audiencia por ubicación o intereses, y observa el alcance potencial.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_1">&lt;b&gt;Elige un producto:&lt;/b&gt; elige qué quieres promocionar con Blaze.</string>
+    <string name="scan_to_update_inventory_manage_stock">Gestionar inventario</string>
+    <string name="scan_to_update_inventory_stock_not_managed">Inventario no gestionado</string>
+    <string name="blaze_campaign_creation_new_intro_learn_more">Echa un vistazo a cómo funciona Blaze</string>
     <string name="blaze_campaign_creation_new_intro_start_button">Empieza tu campaña</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_subtitle">Tus anuncios en millones de sitios de la red de WordPress.com y Tumblr.</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_title">Accede a una gran audiencia</string>
@@ -125,6 +146,7 @@ Language: es
     <string name="configuration_quantity_between"> entre %1$s y %2$s elementos </string>
     <string name="configuration_quantity_item_plural">%d elementos</string>
     <string name="configuration_quantity_item">%d elemento</string>
+    <string name="order_configuration_change_product_quantity">Cambiar la cantidad de producto de %1$.2f a %2$.2f</string>
     <string name="save_configuration">Guardar configuración</string>
     <string name="product_configuration_title">Configuración</string>
     <string name="default_product_title">Producto %s</string>

diff --git a/WooCommerce/src/main/res/values-fr/strings.xml b/WooCommerce/src/main/res/values-fr/strings.xml
@@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-01-17 02:10:07+0000
+Translation-Revision-Date: 2024-01-23 13:54:03+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/2.4.0-alpha
 Language: fr
 -->
 <resources>
+    <string name="blaze_campaign_preview_details_confirm_details_button">Confirmer les détails</string>
+    <string name="blaze_campaign_preview_details_destination_url">Destination de la publicité</string>
+    <string name="blaze_campaign_preview_details_interests">Intérêts</string>
+    <string name="blaze_campaign_preview_details_location">Emplacement</string>
+    <string name="blaze_campaign_preview_details_devices">Appareils</string>
+    <string name="blaze_campaign_preview_details_language">Langue</string>
+    <string name="blaze_campaign_preview_details_budget">Budget</string>
+    <string name="blaze_campaign_preview_details_section_title">Détails</string>
+    <string name="blaze_campaign_preview_shop_now_button">Acheter maintenant</string>
+    <string name="blaze_campaign_preview_edit_ad_button">Modifier la publicité</string>
+    <string name="blaze_campaign_screen_fragment_title">Aperçu</string>
     <string name="disabled">Désactivé</string>
+    <string name="order_configuration_product_selection_control">Sélection de produits</string>
+    <string name="order_configuration_product_selection">Sélectionner le produit %s</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_5">&lt;b&gt;Mise en ligne :&lt;/b&gt; observez les débuts de votre campagne promotionnelle et suivez son succès.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_4">&lt;b&gt;Examen rapide :&lt;/b&gt; envoyez votre publicité pour une vérification rapide par un modérateur.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_3">&lt;b&gt;Fixer votre budget :&lt;/b&gt; établissez vos dépenses et la durée de votre campagne.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_2">&lt;b&gt;Personnaliser la cible :&lt;/b&gt; sélectionnez le public par emplacement ou intérêts et découvrez la portée potentielle.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_1">&lt;b&gt;Choisir un produit :&lt;/b&gt; choisissez ce que vous voulez promouvoir avec Blaze.</string>
+    <string name="scan_to_update_inventory_manage_stock">Gérer le stock</string>
+    <string name="scan_to_update_inventory_stock_not_managed">Stock non géré</string>
+    <string name="blaze_campaign_creation_new_intro_learn_more">Voir comment fonctionne Blaze</string>
     <string name="blaze_campaign_creation_new_intro_start_button">Lancer votre campagne</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_subtitle">Vos publicités sur des millions de sites des réseaux WordPress.com et Tumblr.</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_title">Accéder à un large public</string>
@@ -125,6 +146,7 @@ Language: fr
     <string name="configuration_quantity_between"> entre %1$s et %2$s éléments </string>
     <string name="configuration_quantity_item_plural">%d éléments</string>
     <string name="configuration_quantity_item">%d élément</string>
+    <string name="order_configuration_change_product_quantity">Modifier la quantité de produit de %1$.2f à %2$.2f</string>
     <string name="save_configuration">Enregistrer la configuration</string>
     <string name="product_configuration_title">Configuration</string>
     <string name="default_product_title">Produit %s</string>

diff --git a/WooCommerce/src/main/res/values-he/strings.xml b/WooCommerce/src/main/res/values-he/strings.xml
@@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-01-17 02:10:07+0000
+Translation-Revision-Date: 2024-01-23 13:54:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: he_IL
 -->
 <resources>
+    <string name="blaze_campaign_preview_details_confirm_details_button">לאשר את הפרטים</string>
+    <string name="blaze_campaign_preview_details_destination_url">היעד של הפרסומת</string>
+    <string name="blaze_campaign_preview_details_interests">תחומי עניין</string>
+    <string name="blaze_campaign_preview_details_location">מיקום</string>
+    <string name="blaze_campaign_preview_details_devices">מכשירים</string>
+    <string name="blaze_campaign_preview_details_language">שפה</string>
+    <string name="blaze_campaign_preview_details_budget">תקציב</string>
+    <string name="blaze_campaign_preview_details_section_title">פרטים</string>
+    <string name="blaze_campaign_preview_shop_now_button">לרכישה כעת</string>
+    <string name="blaze_campaign_preview_edit_ad_button">לערוך את הפרסומת</string>
+    <string name="blaze_campaign_screen_fragment_title">תצוגה מקדימה</string>
     <string name="disabled">נָכֶה</string>
+    <string name="order_configuration_product_selection_control">בחירת מוצרים</string>
+    <string name="order_configuration_product_selection">יש לבחור מוצר %s</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_5">&lt;b&gt;לפרסם באינטרנט:&lt;/b&gt; לראות את הביצועים כאשר מבצע הקידום מתחיל ולעקוב אחר הצלחתו.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_4">&lt;b&gt;סקירה מהירה:&lt;/b&gt; לשלוח את הפרסומת לבדיקה מהירה של המנהלים.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_3">&lt;b&gt;להגדיר את התקציב שלך:&lt;/b&gt; להחליט לגבי ההוצאה ומשך הקמפיין.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_2">&lt;b&gt;להתאים אישית את מיקוד הקהל:&lt;/b&gt; לבחור קהל לפי מיקום או תחום עניין ולראות את הפוטנציאל לחשיפה.</string>
+    <string name="blaze_campaign_creation_new_intro_learn_item_1">&lt;b&gt;לבחור מוצר:&lt;/b&gt; לבחור מה לקדם עם Blaze.</string>
+    <string name="scan_to_update_inventory_manage_stock">ניהול מלאי</string>
+    <string name="scan_to_update_inventory_stock_not_managed">המלאי לא מנוהל</string>
+    <string name="blaze_campaign_creation_new_intro_learn_more">ללמוד איך Blaze פועל</string>
     <string name="blaze_campaign_creation_new_intro_start_button">להתחיל קמפיין</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_subtitle">המודעות שלך יוצגו במיליוני אתרים ברשת WordPress.com וברשת Tumblr.</string>
     <string name="blaze_campaign_creation_new_intro_benefit_3_title">לגשת לקהל עצום</string>
@@ -125,6 +146,7 @@ Language: he_IL
     <string name="configuration_quantity_between"> ⁦%1$s⁩ עד ⁦%2$s⁩ פריטים </string>
     <string name="configuration_quantity_item_plural">%d פריטים</string>
     <string name="configuration_quantity_item">פריט %d</string>
+    <string name="order_configuration_change_product_quantity">לשנות את כמות המוצר מ-%1$.2f ל-%2$.2f</string>
     <string name="save_configuration">לשמור הגדרות תצורה</string>
     <string name="product_configuration_title">הגדרות תצורה</string>
     <string name="default_product_title">מוצר %s</string>