diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt index ccef08f1995..bf18b493d0d 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt @@ -211,7 +211,7 @@ private fun ProductInfo(item: WooPosItem) { Spacer(modifier = Modifier.height(8.dp)) when (item) { is SimpleProduct -> SimpleProductDetails(item = item) - is VariableProduct -> VariableProductDetails(item = item) + is VariableProduct -> VariableProductDetails() is Variation -> VariationProductDetails(item = item) } } @@ -249,9 +249,9 @@ private fun SimpleProductDetails(item: SimpleProduct) { } @Composable -private fun VariableProductDetails(item: VariableProduct) { +private fun VariableProductDetails() { Text( - text = "${item.numOfVariations} Variations", + text = stringResource(id = R.string.woopos_variations_options_available_text), style = MaterialTheme.typography.h6, fontWeight = FontWeight.Normal ) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/variations/WooPosVariationsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/variations/WooPosVariationsScreen.kt index caf554da89e..09385c52012 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/variations/WooPosVariationsScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/variations/WooPosVariationsScreen.kt @@ -235,19 +235,6 @@ private fun VariationsToolbar( top.linkTo(parent.top, margin = 8.dp) } ) - - Text( - text = stringResource( - id = R.string.woopos_items_list_variable_product_variations, - variableProductData.numOfVariations - ), - style = MaterialTheme.typography.h6, - color = MaterialTheme.colors.onSurface.copy(alpha = 0.6f), - modifier = Modifier.constrainAs(variationsCount) { - start.linkTo(productName.start) - top.linkTo(productName.bottom, margin = 4.dp) - } - ) } } diff --git a/WooCommerce/src/main/res/values-ar/strings.xml b/WooCommerce/src/main/res/values-ar/strings.xml index 1419263fde6..b64a707edd2 100644 --- a/WooCommerce/src/main/res/values-ar/strings.xml +++ b/WooCommerce/src/main/res/values-ar/strings.xml @@ -9,7 +9,6 @@ Language: ar خطأ في تحميل الأشكال \"فشل تحميل مزيد من العناصر. يرجى المحاولة مرة أخرى\". رجوع - ⁦%1$d⁩ من الأشكال الشكل %s، الشعر %s المنتج المتغير %s، السعر %s يتعذر أن يكون الوصف فارغًا diff --git a/WooCommerce/src/main/res/values-de/strings.xml b/WooCommerce/src/main/res/values-de/strings.xml index fd4778c1bb0..934941ae7ad 100644 --- a/WooCommerce/src/main/res/values-de/strings.xml +++ b/WooCommerce/src/main/res/values-de/strings.xml @@ -9,7 +9,6 @@ Language: de Beim Laden der Varianten ist ein Fehler aufgetreten „Es ist ein Fehler beim Laden weiterer Artikel aufgetreten. Bitte versuche es erneut.“ Zurück - %1$d Varianten Variante: %s, Preis: %s Variables Produkt: %s, Preis: %s Beschreibung darf nicht leer sein diff --git a/WooCommerce/src/main/res/values-es/strings.xml b/WooCommerce/src/main/res/values-es/strings.xml index 36352a864ab..d223676b406 100644 --- a/WooCommerce/src/main/res/values-es/strings.xml +++ b/WooCommerce/src/main/res/values-es/strings.xml @@ -9,7 +9,6 @@ Language: es Error al cargar variaciones \"No se han podido cargar más elementos. Inténtalo de nuevo\". Volver - %1$d variaciones Variación: %s; Precio: %s Producto variable: %s; Precio: %s La descripción no puede estar vacía. diff --git a/WooCommerce/src/main/res/values-fr/strings.xml b/WooCommerce/src/main/res/values-fr/strings.xml index 94207044339..29007c158e1 100644 --- a/WooCommerce/src/main/res/values-fr/strings.xml +++ b/WooCommerce/src/main/res/values-fr/strings.xml @@ -9,7 +9,6 @@ Language: fr Erreur lors du chargement des variantes « Échec du chargement d’éléments supplémentaires. Veuillez réessayer. » Retour - %1$d variantes Variante %s, prix %s Produit variable %s, prix %s La description ne peut pas être vide diff --git a/WooCommerce/src/main/res/values-he/strings.xml b/WooCommerce/src/main/res/values-he/strings.xml index 16952313ea9..8310593c2cd 100644 --- a/WooCommerce/src/main/res/values-he/strings.xml +++ b/WooCommerce/src/main/res/values-he/strings.xml @@ -9,7 +9,6 @@ Language: he_IL שגיאה בטעינת הסוגים \"הטעינה של פריטים נוספים נכשלה. יש לנסות שוב.\" חזרה - ⁦%1$d⁩ סוגים סוג %s, מחיר %s מוצר עם סוגים %s, מחיר %s התיאור לא יכול להיות ריק diff --git a/WooCommerce/src/main/res/values-id/strings.xml b/WooCommerce/src/main/res/values-id/strings.xml index dab5376fb65..4d39d9546e7 100644 --- a/WooCommerce/src/main/res/values-id/strings.xml +++ b/WooCommerce/src/main/res/values-id/strings.xml @@ -9,7 +9,6 @@ Language: id Error saat memuat variasi \"Gagal memuat item lain. Harap coba lagi.\" Kembali - %1$d variasi Variasi %s, Harga %s Produk Variabel %s, Harga %s Deskripsi tidak boleh kosong diff --git a/WooCommerce/src/main/res/values-it/strings.xml b/WooCommerce/src/main/res/values-it/strings.xml index e44d3516fd9..8e990f29efc 100644 --- a/WooCommerce/src/main/res/values-it/strings.xml +++ b/WooCommerce/src/main/res/values-it/strings.xml @@ -9,7 +9,6 @@ Language: it Errore nel caricamento delle varianti \"Impossibile caricare altri articoli. Riprova\". Indietro - %1$d varianti Variante %s, prezzo %s Prodotto variabile %s, prezzo %s La descrizione non può essere vuota diff --git a/WooCommerce/src/main/res/values-ja/strings.xml b/WooCommerce/src/main/res/values-ja/strings.xml index 3e348cc1f2c..12965875f67 100644 --- a/WooCommerce/src/main/res/values-ja/strings.xml +++ b/WooCommerce/src/main/res/values-ja/strings.xml @@ -9,7 +9,6 @@ Language: ja_JP バリエーションの読み込み中にエラーが発生しました 「その他のアイテムの読み込みに失敗しました。 もう一度実行してください」 戻る - %1$d個のバリエーション バリエーション %s、価格 %s バリエーションのある商品 %s、価格 %s 説明を空にすることはできません diff --git a/WooCommerce/src/main/res/values-ko/strings.xml b/WooCommerce/src/main/res/values-ko/strings.xml index 42af79cabf3..f28a2e9a35f 100644 --- a/WooCommerce/src/main/res/values-ko/strings.xml +++ b/WooCommerce/src/main/res/values-ko/strings.xml @@ -9,7 +9,6 @@ Language: ko_KR 상품 옵션 로드 오류 \"아이템을 더 로드하지 못했습니다. 다시 시도하세요” 뒤로 - %1$d개 변형 상품 옵션 %s, 가격 %s 변형 상품 %s, 가격 %s 설명은 비워 둘 수 없음 diff --git a/WooCommerce/src/main/res/values-nl/strings.xml b/WooCommerce/src/main/res/values-nl/strings.xml index 30cdfca69b0..9e1d1b0b2ef 100644 --- a/WooCommerce/src/main/res/values-nl/strings.xml +++ b/WooCommerce/src/main/res/values-nl/strings.xml @@ -9,7 +9,6 @@ Language: nl Fout bij laden van variaties \'Meer items laden mislukt. Probeer het opnieuw.\' Terug - %1$d variaties Variatie %s, prijs %s Variabel product %s, prijs %s De omschrijving mag niet leeg zijn diff --git a/WooCommerce/src/main/res/values-pt-rBR/strings.xml b/WooCommerce/src/main/res/values-pt-rBR/strings.xml index 6bad3589209..7a7e332081b 100644 --- a/WooCommerce/src/main/res/values-pt-rBR/strings.xml +++ b/WooCommerce/src/main/res/values-pt-rBR/strings.xml @@ -9,7 +9,6 @@ Language: pt_BR Erro ao carregar variações \"Falha ao carregar mais itens. Tente novamente.\" Voltar - %1$d variações Variação: %s; preço: %s Produto variável: %s; preço: %s A descrição não pode ficar em branco diff --git a/WooCommerce/src/main/res/values-ru/strings.xml b/WooCommerce/src/main/res/values-ru/strings.xml index 07c974d84b1..6cd9378bae8 100644 --- a/WooCommerce/src/main/res/values-ru/strings.xml +++ b/WooCommerce/src/main/res/values-ru/strings.xml @@ -9,7 +9,6 @@ Language: ru Ошибка при загрузке вариантов «Не удалось загрузить другие товары. Повторите попытку». Назад - Вариантов: %1$d Вариант %s, цена %s Товар с вариантами %s, цена %s Описание не может быть пустым diff --git a/WooCommerce/src/main/res/values-sv/strings.xml b/WooCommerce/src/main/res/values-sv/strings.xml index fd9041563d4..82b4bfa1cef 100644 --- a/WooCommerce/src/main/res/values-sv/strings.xml +++ b/WooCommerce/src/main/res/values-sv/strings.xml @@ -9,7 +9,6 @@ Language: sv_SE Ett fel uppstod när variationer hämtades \"Det gick inte att ladda fler objekt. Försök igen.\" Tillbaka - %1$d variationer Variation %s, Pris %s Variabel produkt%s, Pris %s Beskrivning kan inte vara tom diff --git a/WooCommerce/src/main/res/values-tr/strings.xml b/WooCommerce/src/main/res/values-tr/strings.xml index b2474465118..5071c43a2de 100644 --- a/WooCommerce/src/main/res/values-tr/strings.xml +++ b/WooCommerce/src/main/res/values-tr/strings.xml @@ -9,7 +9,6 @@ Language: tr Varyasyonlar yüklenirken hata oluştu \"Daha fazla öğe yüklenemedi. Lütfen yeniden deneyin.\" Geri - %1$d varyasyon %s Varyasyon, %s Fiyat %s Varyasyonlu Ürün, %s Fiyat Açıklama boş olamaz diff --git a/WooCommerce/src/main/res/values-zh-rCN/strings.xml b/WooCommerce/src/main/res/values-zh-rCN/strings.xml index bbb1258841b..6dff807f72a 100644 --- a/WooCommerce/src/main/res/values-zh-rCN/strings.xml +++ b/WooCommerce/src/main/res/values-zh-rCN/strings.xml @@ -9,7 +9,6 @@ Language: zh_CN 加载变体时出错 “无法加载更多项目。 请重试。” 返回 - %1$d 个变体 变体 %s,价格 %s 可变产品 %s,价格 %s 描述不能为空 diff --git a/WooCommerce/src/main/res/values-zh-rTW/strings.xml b/WooCommerce/src/main/res/values-zh-rTW/strings.xml index bce72fce4aa..71af6f58092 100644 --- a/WooCommerce/src/main/res/values-zh-rTW/strings.xml +++ b/WooCommerce/src/main/res/values-zh-rTW/strings.xml @@ -9,7 +9,6 @@ Language: zh_TW 載入款式時發生錯誤 「無法載入更多項目, 請再試一次。」 返回 - %1$d 種款式 款式 %s,價格 %s 多款式商品 %s,價格 %s 說明不得空白 diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml index 76ca64ea2d4..4b2aae8fc2e 100644 --- a/WooCommerce/src/main/res/values/strings.xml +++ b/WooCommerce/src/main/res/values/strings.xml @@ -4359,13 +4359,13 @@ Popup menu with options. Swipe to navigate through items. It looks like you\'re not connected to the internet. Ensure your Wi-Fi is turned on. If you\'re using mobile data, make sure it\'s enabled in your device settings. - %1$d variations Back Try again "Failed to load more items" "An error occurred while loading products." "Failed to load more items. Double tap to try again." Error loading variations + Options available Cash payment Mark payment as complete diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml index 562efb694e8..dcf992ef667 100644 --- a/fastlane/resources/values/strings.xml +++ b/fastlane/resources/values/strings.xml @@ -4345,7 +4345,6 @@ Popup menu with options. Swipe to navigate through items. It looks like you\'re not connected to the internet. Ensure your Wi-Fi is turned on. If you\'re using mobile data, make sure it\'s enabled in your device settings. - %1$d variations Back Try again "Failed to load more items"