Merge pull request #112 from vtex/chore/usingCommons3x

[3.x] Using the subscriptions-commons for frequency translations
vtex · Aug 4, 2020 · 934a0cd · 934a0cd
2 parents 0c60edb + 0569398
commit 934a0cd
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 287 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- Using **subscriptions-commons** for frequency translations.
+
 ## [3.2.0] - 2020-07-20
 
 ### Added

diff --git a/manifest.json b/manifest.json
@@ -11,9 +11,7 @@
     "store": "0.x"
   },
   "mustUpdateAt": "2019-04-02",
-  "registries": [
-    "smartcheckout"
-  ],
+  "registries": ["smartcheckout"],
   "scripts": {
     "postreleasy": "vtex publish --verbose"
   },
@@ -25,7 +23,8 @@
     "vtex.payment-flags": "2.x",
     "vtex.subscriptions-graphql": "3.x",
     "vtex.store-graphql": "2.x",
-    "vtex.totalizer-translator": "2.x"
+    "vtex.totalizer-translator": "2.x",
+    "vtex.subscriptions-commons": "1.x"
   },
   "$schema": "https://raw.githubusercontent.com/vtex/node-vtex-api/master/gen/manifest.schema"
 }
diff --git a/messages/de.json b/messages/de.json
@@ -8,16 +8,6 @@
   "store/subscription.restore.title": "Dieses Abonnement wiederherstellen?",
   "store/subscription.restore.text": "Bei der Wiederherstellung dieses Abonnements, werden die Artikel automatisch wieder bestellt. Sie können es jederzeit ohne zusätzliche Gebühren wieder kündigen.",
   "store/subscription.actions.edit": "Bearbeiten",
-  "store/subscription.periodicity.monday": "Montag",
-  "store/subscription.periodicity.tuesday": "Dienstag",
-  "store/subscription.periodicity.wednesday": "Mittwoch",
-  "store/subscription.periodicity.thursday": "Donnerstag",
-  "store/subscription.periodicity.friday": "Freitag",
-  "store/subscription.periodicity.saturday": "Samstag",
-  "store/subscription.periodicity.sunday": "Sonntag",
-  "store/subscription.periodicity.weekly": "wöchentlich",
-  "store/subscription.periodicity.daily": "täglich",
-  "store/subscription.periodicity.monthly": "monatlich",
   "store/subscription.manage.skip": "Nächsten Einkauf überspringen",
   "store/subscription.manage.unskip": "Den nächsten Einkauf nicht überspringen",
   "store/subscription.manage.cancel": "Abonnement kündigen",
@@ -53,15 +43,6 @@
   "store/subscription.view.title": "Abonnement mit {value} Produkten",
   "store/subscription.notFound.title": "Sie haben noch keine Abonnements",
   "store/subscription.notFound.text": "Abonnieren Sie Ihre Lieblingsprodukte und finden Sie sie immer hier",
-  "store/subscription.periodicity.day": "Jeden {count, plural, one {# Tag} other {# Tage}}",
-  "store/subscription.periodicity.week": "Jede {count, plural, one {# Woche} other {# Wochen}}",
-  "store/subscription.periodicity.month": "Jeden {count, plural, one {# Monat} other {# Monate}}",
-  "store/subscription.periodicity.year": "Jedes {count, plural, one {# Jahr} other {# Jahre}}",
-  "store/subscription.periodicity.biweekly": "alle 15 Tage",
-  "store/subscription.periodicity.bimonthly": "alle zwei Monate",
-  "store/subscription.periodicity.semiannual": "halbjährlich",
-  "store/subscription.periodicity.yearly": "jährlich",
-  "store/subscription.periodicity.every": "Jeden {moment}",
   "store/subscription.alert.error.message": "Beim Versuch, Ihre aktuelle Bestellung aufzugeben, ist ein Zahlungsproblem aufgetreten. Konfigurieren Sie Ihre Zahlungsmethode, um zukünftige Probleme zu vermeiden.",
   "store/subscription.alert.error.button.message": "Zahlungsmethode einstellen",
   "store/subscription.payment.alert.info.message": "Mit dieser Zahlungsmethode konnte kein Kauf getätigt werden. Versuchen Sie es erneut oder wählen Sie eine andere Methode.",

diff --git a/messages/en.json b/messages/en.json
@@ -8,16 +8,6 @@
   "store/subscription.restore.title": "Restore this subscription?",
   "store/subscription.restore.text": "By resuming, this subscription's items will be ordered automatically again. You can cancel it again anytime, with no extra fees.",
   "store/subscription.actions.edit": "Edit",
-  "store/subscription.periodicity.monday": "Monday",
-  "store/subscription.periodicity.tuesday": "Tuesday",
-  "store/subscription.periodicity.wednesday": "Wednesday",
-  "store/subscription.periodicity.thursday": "Thursday",
-  "store/subscription.periodicity.friday": "Friday",
-  "store/subscription.periodicity.saturday": "Saturday",
-  "store/subscription.periodicity.sunday": "Sunday",
-  "store/subscription.periodicity.weekly": "Weekly",
-  "store/subscription.periodicity.daily": "Daily",
-  "store/subscription.periodicity.monthly": "Monthly",
   "store/subscription.manage.skip": "Skip next purchase",
   "store/subscription.manage.unskip": "Do not skip next purchase",
   "store/subscription.manage.cancel": "Cancel subscription",
@@ -53,15 +43,6 @@
   "store/subscription.view.title": "Subscription with {value} products",
   "store/subscription.notFound.title": "You don't have subscriptions yet",
   "store/subscription.notFound.text": "Subscribe your favorite products and always find them here",
-  "store/subscription.periodicity.day": "every {count, plural, one {# day} other {# days}}",
-  "store/subscription.periodicity.week": "every {count, plural, one {# week} other {# weeks}}",
-  "store/subscription.periodicity.month": "every {count, plural, one {# month} other {# months}}",
-  "store/subscription.periodicity.year": "every {count, plural, one {# year} other {# years}}",
-  "store/subscription.periodicity.biweekly": "every 15 days",
-  "store/subscription.periodicity.bimonthly": "bimonthly",
-  "store/subscription.periodicity.semiannual": "semiannually",
-  "store/subscription.periodicity.yearly": "yearly",
-  "store/subscription.periodicity.every": "every {moment}",
   "store/subscription.alert.error.message": "There was a payment problem on trying to place your current order. Configure your payment method to avoid future problems.",
   "store/subscription.alert.error.button.message": "Setup payment method",
   "store/subscription.payment.alert.info.message": "It wasn't possible to make a purchase with this payment method. Try again or choose another method.",

diff --git a/messages/es.json b/messages/es.json
@@ -8,16 +8,6 @@
   "store/subscription.restore.title": "¿Restaurar esta suscripción?",
   "store/subscription.restore.text": "Al restaurar, esta suscripción se ordenará automáticamente nuevamente. Puede cancelarla en cualquier momento, sin cargos adicionales",
   "store/subscription.actions.edit": "Editar",
-  "store/subscription.periodicity.monday": "Monday",
-  "store/subscription.periodicity.tuesday": "Tuesday",
-  "store/subscription.periodicity.wednesday": "Miércoles",
-  "store/subscription.periodicity.thursday": "Jueves",
-  "store/subscription.periodicity.friday": "Viernes",
-  "store/subscription.periodicity.saturday": "Sábado",
-  "store/subscription.periodicity.sunday": "Domingo",
-  "store/subscription.periodicity.weekly": "Semanal",
-  "store/subscription.periodicity.daily": "Diario",
-  "store/subscription.periodicity.monthly": "Mensal",
   "store/subscription.manage.skip": "Saltar la próxima compra",
   "store/subscription.manage.unskip": "No saltar la próxima compra",
   "store/subscription.manage.cancel": "Cancelar suscripción",
@@ -53,15 +43,6 @@
   "store/subscription.view.title": "Suscripción con {productos} de valor",
   "store/subscription.notFound.title": "Aún no tiene suscripciones",
   "store/subscription.notFound.text": "Suscribe tus productos favoritos y siempre los encuentras aquí",
-  "store/subscription.periodicity.day": "{count, plural, one {cada 1 día} other {cada # días}}",
-  "store/subscription.periodicity.week": "{count, plural, one {cada 1 semana} other {cada # semanas}}",
-  "store/subscription.periodicity.month": "{count, plural, one {cada 1 mes} other {cada # meses}}",
-  "store/subscription.periodicity.year": "{count, plural, one {cada 1 año} other {cada # años}}",
-  "store/subscription.periodicity.biweekly": "cada 15 días",
-  "store/subscription.periodicity.bimonthly": "bimensual",
-  "store/subscription.periodicity.semiannual": "semi anualmente",
-  "store/subscription.periodicity.yearly": "anual",
-  "store/subscription.periodicity.every": "todos los días {moment}",
   "store/subscription.alert.error.message": "Hubo un problema de pago al intentar realizar su pedido actual. Configure su método de pago para evitar futuros problemas.",
   "store/subscription.alert.error.button.message": "Configuración del método de pago",
   "store/subscription.payment.alert.info.message": "No fue posible realizar una compra con este método de pago. Inténtelo de nuevo o elija otro método.",

diff --git a/messages/fr.json b/messages/fr.json
@@ -8,16 +8,6 @@
   "store/subscription.restore.title": "Restaurer cet abonnement?",
   "store/subscription.restore.text": "En restaurant, cet abonnement sera automatiquement commandé à nouveau. Vous pouvez l’annuler à tout moment, sans frais supplémentaires.",
   "store/subscription.actions.edit": "Éditer",
-  "store/subscription.periodicity.monday": "Lundi",
-  "store/subscription.periodicity.tuesday": "Mardi",
-  "store/subscription.periodicity.wednesday": "Mercredi",
-  "store/subscription.periodicity.thursday": "Jeudi",
-  "store/subscription.periodicity.friday": "Vendredi",
-  "store/subscription.periodicity.saturday": "Samedi",
-  "store/subscription.periodicity.sunday": "Dimanche",
-  "store/subscription.periodicity.weekly": "Hebdomadaire",
-  "store/subscription.periodicity.daily": "Quotidien",
-  "store/subscription.periodicity.monthly": "Monthly",
   "store/subscription.manage.skip": "Passer le prochain achat",
   "store/subscription.manage.unskip": "Ne pas ignorer le prochain achat",
   "store/subscription.manage.cancel": "Annuler l'abonnement",
@@ -53,15 +43,6 @@
   "store/subscription.view.title": "Abonnement à des produits {value}",
   "store/subscription.notFound.title": "Vous n'avez encore aucun abonnement.",
   "store/subscription.notFound.text": "Abonnez-vous à vos produits préférés et trouvez-les toujours ici",
-  "store/subscription.periodicity.day": "tous les {count} jours",
-  "store/subscription.periodicity.week": "{count, plural, one {chaque 1 semaine} other {chaque # semaines}}",
-  "store/subscription.periodicity.month": "{count, plural, one {tous les 1 mois} other {chaque # mois}}",
-  "store/subscription.periodicity.year": "{count, plural, one {tous les 1 ans} other {chaque # années} }",
-  "store/subscription.periodicity.biweekly": "tous les 15 jours",
-  "store/subscription.periodicity.bimonthly": "bimensuel",
-  "store/subscription.periodicity.semiannual": "semestriellement",
-  "store/subscription.periodicity.yearly": "annuel",
-  "store/subscription.periodicity.every": "chaque {moment}",
   "store/subscription.alert.error.message": "Un problème de paiement est survenu lors de la tentative de passer votre commande en cours. Configurez votre méthode de paiement pour éviter des problèmes futurs.",
   "store/subscription.alert.error.button.message": "Configuration du mode de paiement",
   "store/subscription.payment.alert.info.message": "Il n’était pas possible de faire un achat avec ce mode de paiement. Veuillez réessayer ou choisir un autre mode.",

diff --git a/messages/it.json b/messages/it.json
@@ -8,16 +8,6 @@
   "store/subscription.restore.title": "Ripristinare questa sottoscrizione?",
   "store/subscription.restore.text": "Riattivando il servizio, questi oggetti verranno ordinati automaticamente di nuovo. Puoi annullare il servizio in qualsiasi momento senza costi aggiuntivi.",
   "store/subscription.actions.edit": "Modifica",
-  "store/subscription.periodicity.monday": "Lunedì",
-  "store/subscription.periodicity.tuesday": "Martedì",
-  "store/subscription.periodicity.wednesday": "Mercoledì",
-  "store/subscription.periodicity.thursday": "Giovedì",
-  "store/subscription.periodicity.friday": "Venerdì",
-  "store/subscription.periodicity.saturday": "Sabato",
-  "store/subscription.periodicity.sunday": "Domenica",
-  "store/subscription.periodicity.weekly": "Settimanale",
-  "store/subscription.periodicity.daily": "Giornaliero",
-  "store/subscription.periodicity.monthly": "Mensile",
   "store/subscription.manage.skip": "Salta il prossimo acquisto",
   "store/subscription.manage.unskip": "Non saltare il prossimo acquisto",
   "store/subscription.manage.cancel": "Annulla sottoscrizione",
@@ -53,15 +43,6 @@
   "store/subscription.view.title": "Sottoscrizione contenente {value} prodotti",
   "store/subscription.notFound.title": "Non possiedi ancora alcuna sottoscrizione",
   "store/subscription.notFound.text": "Inserisci i tuoi prodotti preferiti e potrai trovarli sempre qui",
-  "store/subscription.periodicity.day": "ogni {count, plural, one {# giorno} other {# giorni}}",
-  "store/subscription.periodicity.week": "ogni {count, plural, one {# settimana} other {# settimane}}",
-  "store/subscription.periodicity.month": "ogni {count, plural, one {# mese} other {# mesi}}",
-  "store/subscription.periodicity.year": "ogni {count, plural, one {# anno} other {# anni}}",
-  "store/subscription.periodicity.biweekly": "ogni 15 giorni",
-  "store/subscription.periodicity.bimonthly": "bimestrale",
-  "store/subscription.periodicity.semiannual": "semestrale",
-  "store/subscription.periodicity.yearly": "annuale",
-  "store/subscription.periodicity.every": "ogni {moment}",
   "store/subscription.alert.error.message": "Al momento di effettuare l'ordine si è verificato un problema con il pagamento. Configura il tuo metodo di pagamento per evitare problemi in futuro.",
   "store/subscription.alert.error.button.message": "Imposta il metodo di pagamento",
   "store/subscription.payment.alert.info.message": "Non è stato possibile effettuare l'acquisto usando questo metodo di pagamento. Prova nuovamente o scegli un altro metodo.",
@@ -114,4 +95,4 @@
   "store/subscription.products.card.remove.desc": "Se rimuovi il prodotto, questo non verrà più ordinato con la tua sottoscrizione.",
   "store/subscription.batch.modal.all": "Tutti",
   "store/subscription.batch.modal.desc": "Desideri applicare questa modifica anche per questi altri abbonamenti?"
-}
+}
diff --git a/messages/pt.json b/messages/pt.json
@@ -8,16 +8,6 @@
   "store/subscription.restore.title": "Retomar esta assinatura?",
   "store/subscription.restore.text": "Ao retomar, esta assinatura voltará a ser pedida automaticamente. Você poderá cancelar a qualquer momento, sem taxas extras.",
   "store/subscription.actions.edit": "Editar",
-  "store/subscription.periodicity.monday": "Segunda-feira",
-  "store/subscription.periodicity.tuesday": "Terça-feira",
-  "store/subscription.periodicity.wednesday": "Quarta-feira",
-  "store/subscription.periodicity.thursday": "Quinta-feira",
-  "store/subscription.periodicity.friday": "Sexta-feira",
-  "store/subscription.periodicity.saturday": "Sábado",
-  "store/subscription.periodicity.sunday": "Domingo",
-  "store/subscription.periodicity.weekly": "{count, plural, one {Semanalmente} other {A cada # semanas}}",
-  "store/subscription.periodicity.daily": "{count, plural, one {Diariamente} other {A cada # dias}}",
-  "store/subscription.periodicity.monthly": "{count, plural, one {Mensalmente} other {A cada # meses}}",
   "store/subscription.manage.skip": "Pular próxima compra",
   "store/subscription.manage.unskip": "Não pular próxima compra",
   "store/subscription.manage.cancel": "Cancelar assinatura",
@@ -53,15 +43,6 @@
   "store/subscription.view.title": "Assinatura com {value} produtos",
   "store/subscription.notFound.title": "Você ainda não possui assinaturas",
   "store/subscription.notFound.text": "Assine seus produtos preferidos e os encontre sempre aqui",
-  "store/subscription.periodicity.day": "a cada {count, plural, one {1 dia} other {# dias}}",
-  "store/subscription.periodicity.week": "a cada {count, plural, one {1 semana} other {# semanas}}",
-  "store/subscription.periodicity.month": "a cada {count, plural, one {1 mês} other {# meses}}",
-  "store/subscription.periodicity.year": "a cada {count, plural, one {1 ano} other {# anos}}",
-  "store/subscription.periodicity.biweekly": "A cada 15 dias",
-  "store/subscription.periodicity.bimonthly": "Bimestralmente",
-  "store/subscription.periodicity.semiannual": "Semestralmente",
-  "store/subscription.periodicity.yearly": "Anualmente",
-  "store/subscription.periodicity.every": "todo dia {moment}",
   "store/subscription.alert.error.message": "Houve um problema de pagamento ao efetuar o seu pedido atual. Configure sua forma de pagamento para evitar problemas futuros.",
   "store/subscription.alert.error.button.message": "Configurar Pagamento",
   "store/subscription.payment.alert.info.message": "Não foi possível efetuar a compra com essa forma de pagamento. Tente novamente ou escolha outra maneira de pagamento.",

diff --git a/messages/ro.json b/messages/ro.json
@@ -8,16 +8,6 @@
   "store/subscription.restore.title": "Restabiliți acest abonament?",
   "store/subscription.restore.text": "Prin restabilire, acest abonament va fi comandat din nou automat. Puteți să îl anulați oricând, fără taxe suplimentare",
   "store/subscription.actions.edit": "Editează",
-  "store/subscription.periodicity.monday": "luni",
-  "store/subscription.periodicity.tuesday": "Marți",
-  "store/subscription.periodicity.wednesday": "miercuri",
-  "store/subscription.periodicity.thursday": "joi",
-  "store/subscription.periodicity.friday": "Vineri",
-  "store/subscription.periodicity.saturday": "Sâmbătă",
-  "store/subscription.periodicity.sunday": "Duminică",
-  "store/subscription.periodicity.weekly": "săptămânal",
-  "store/subscription.periodicity.daily": "zilnic",
-  "store/subscription.periodicity.monthly": "lunar",
   "store/subscription.manage.skip": "Urmărirea achiziției următoare",
   "store/subscription.manage.unskip": "Nu treceți peste achiziția următoare",
   "store/subscription.manage.cancel": "Anularea abonamentului",
@@ -53,15 +43,6 @@
   "store/subscription.view.title": "Abonament la {value} products",
   "store/subscription.notFound.title": "Nu aveți încă abonamente",
   "store/subscription.notFound.text": "Abonați-vă produsele preferate și găsiți-le întotdeauna aici",
-  "store/subscription.periodicity.day": "{count, plural, =0 {fiecare # zile} one {la fiecare 1 zi} other {fiecare # zile}}",
-  "store/subscription.periodicity.week": "{count, plural, =0 {fiecare # saptamani} one {la fiecare 1 săptămână} other {fiecare # saptamani}}",
-  "store/subscription.periodicity.month": "{count, plural, =0 {fiecare # luni} one {la fiecare 1 lună} other {fiecare # luni}}",
-  "store/subscription.periodicity.year": "{count, plural, =0 {fiecare an # de ani} one {la fiecare 1 an} other {fiecare an # de ani}}",
-  "store/subscription.periodicity.biweekly": "la fiecare 15 zile",
-  "store/subscription.periodicity.bimonthly": "bilunar",
-  "store/subscription.periodicity.semiannual": "semi anual",
-  "store/subscription.periodicity.yearly": "anual",
-  "store/subscription.periodicity.every": "în fiecare {moment}",
   "store/subscription.alert.error.message": "A apărut o problemă de plată în încercarea de a plasa comanda dvs. curentă. Configurați-vă metoda de plată pentru a evita problemele viitoare",
   "store/subscription.alert.error.button.message": "Metoda de plată setată",
   "store/subscription.payment.alert.info.message": "Nu a fost posibilă efectuarea unei achiziții cu această metodă de plată. Încercați din nou sau alegeți altă metodă.",

diff --git a/react/__mocks__/vtex.subscriptions-commons.tsx b/react/__mocks__/vtex.subscriptions-commons.tsx
@@ -0,0 +1,5 @@
+export const translations = {
+  translateWeekDay: () => '',
+  translatePeriodicity: () => '',
+  translatePurchaseDay: () => '',
+}
diff --git a/react/components/Details/DataCard/EditData.tsx b/react/components/Details/DataCard/EditData.tsx
@@ -200,7 +200,7 @@ class EditData extends Component<Props, State> {
                 label={intl.formatMessage(messages.chargeEvery)}
                 placeholder={intl.formatMessage(messages.select)}
                 options={this.getIntervalOptions()}
-                value={purchaseDay.toLowerCase()}
+                value={purchaseDay ?? ''}
                 onChange={this.handlePurchaseDayChange}
               />
             </div>