From e6f2f6a08e55f1980a006f5a4d29e038170e7d68 Mon Sep 17 00:00:00 2001 From: newsiberian Date: Tue, 26 Apr 2016 18:37:43 +0600 Subject: [PATCH 1/2] - added `failedToPlaceOrder` translation; - fix some Russian `cartCompleted` phrases; --- .../templates/cart/checkout/completed/completed.html | 2 +- packages/reaction-checkout/common/methods/cart.js | 2 +- packages/reaction-i18n/private/data/i18n/en.json | 3 ++- packages/reaction-i18n/private/data/i18n/ru.json | 9 +++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/reaction-checkout/client/templates/cart/checkout/completed/completed.html b/packages/reaction-checkout/client/templates/cart/checkout/completed/completed.html index 838903d7636..e1542ff0438 100644 --- a/packages/reaction-checkout/client/templates/cart/checkout/completed/completed.html +++ b/packages/reaction-checkout/client/templates/cart/checkout/completed/completed.html @@ -6,7 +6,7 @@

Thank you!

-

Your order is now {{orderStatus}}.

+

Your order is now {{orderStatus}}.

{{#unless email}} diff --git a/packages/reaction-checkout/common/methods/cart.js b/packages/reaction-checkout/common/methods/cart.js index d7691a746b2..af78ea84a6d 100644 --- a/packages/reaction-checkout/common/methods/cart.js +++ b/packages/reaction-checkout/common/methods/cart.js @@ -66,7 +66,7 @@ if (Meteor.isClient) { _id: cartId }); } else { - Alerts.inline("Failed to place order.", "danger", { + Alerts.inline(i18next.t("checkoutPayment.failedToPlaceOrder"), "danger", { autoHide: true, placement: "paymentMethod" }); diff --git a/packages/reaction-i18n/private/data/i18n/en.json b/packages/reaction-i18n/private/data/i18n/en.json index acc8541f3c4..c58a6da61dc 100644 --- a/packages/reaction-i18n/private/data/i18n/en.json +++ b/packages/reaction-i18n/private/data/i18n/en.json @@ -466,7 +466,8 @@ "processingError": "There was a problem with your payment.", "completeYourOrder": "Complete your order", "noPaymentMethods": "No payment methods are configured.", - "configureNow": "Configure now." + "configureNow": "Configure now.", + "failedToPlaceOrder": "Failed to place order." }, "checkoutReview": { "review": "Review" diff --git a/packages/reaction-i18n/private/data/i18n/ru.json b/packages/reaction-i18n/private/data/i18n/ru.json index 3a18c5681a0..195e7f8f82e 100644 --- a/packages/reaction-i18n/private/data/i18n/ru.json +++ b/packages/reaction-i18n/private/data/i18n/ru.json @@ -342,10 +342,10 @@ "cartCompleted": { "thankYou": "Благодарим!", "itemsFrom": "товар(ы) из", - "yourOrderIsNow": "Ваш заказ сейчас", + "yourOrderIsNow": "Ваш заказ ", "summaryMessage": "Благодарим за заказ.", - "submitted": "submitted", - "registerGuest": "Привет! Добавьте email для получения обновлений заказа.", + "submitted": "размещён", + "registerGuest": "Здравствуйте! Добавьте email для получения обновлений заказа.", "trackYourDelivery": "Обновления заказа будут высланы на", "noOrdersFound": "Заказов не найдено.", "adminMessage": "Вы просматриваете заказы как администратор" @@ -465,7 +465,8 @@ "processingError": "С вашим платежом возникли сложности.", "completeYourOrder": "Завершить ваш заказ", "noPaymentMethods": "Не указан ни один вариант платежа.", - "configureNow": "Укажите сейчас." + "configureNow": "Укажите сейчас.", + "failedToPlaceOrder": "Разместить заказ не удалось." }, "checkoutReview": { "review": "Итого" From d62aab987be758a0df4a9d3be3cbb59df57822f9 Mon Sep 17 00:00:00 2001 From: newsiberian Date: Wed, 27 Apr 2016 22:11:02 +0600 Subject: [PATCH 2/2] - updated `cartSubTotals` ru translations; - updated some of checkout ru translations; --- packages/reaction-i18n/private/data/i18n/ru.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/reaction-i18n/private/data/i18n/ru.json b/packages/reaction-i18n/private/data/i18n/ru.json index 195e7f8f82e..9fd358ffd36 100644 --- a/packages/reaction-i18n/private/data/i18n/ru.json +++ b/packages/reaction-i18n/private/data/i18n/ru.json @@ -291,10 +291,10 @@ "cartSubTotals": { "head": "Ваша корзина", "items": "Товаров", - "subtotal": "Цена", + "subtotal": "Сумма", "shipping": "Доставка", "tax": "Налог", - "total": "Сумма" + "total": "Итого" }, "cartDrawerItems": { "left": "слева" @@ -457,11 +457,11 @@ "login": "Вход в учётную запись", "shippingBilling": "Адреса", "shippingOptions": "Варианты доставки", - "reviewPayment": "Подтверждение и оплата", + "reviewPayment": "Обзор", "complete": "Готово" }, "checkoutPayment": { - "addPaymentToCompleteOrder": "Добавить способ оплаты для завершения заказа", + "addPaymentToCompleteOrder": "Добавить платёж для завершения заказа", "processingError": "С вашим платежом возникли сложности.", "completeYourOrder": "Завершить ваш заказ", "noPaymentMethods": "Не указан ни один вариант платежа.", @@ -469,7 +469,7 @@ "failedToPlaceOrder": "Разместить заказ не удалось." }, "checkoutReview": { - "review": "Итого" + "review": "Обзор" }, "checkoutShipping": { "selectShippingOption": "Выбор способа доставки",