reactioncommerce · brent-hoover · Apr 12, 2016 · Apr 7, 2016 · Apr 9, 2016 · Apr 9, 2016
diff --git a/packages/reaction-accounts/client/templates/addressBook/add/add.js b/packages/reaction-accounts/client/templates/addressBook/add/add.js
@@ -69,7 +69,7 @@ AutoForm.hooks({
 
       Meteor.call("accounts/addressBookAdd", insertDoc, (error, result) => {
         if (error) {
-          Alerts.toast(`Failed to add address: ${error.message}`, "error");
+          Alerts.toast(i18next.t("addressBookAdd.failedToAddAddress", { err: error.message }), "error");
           this.done(new Error("Failed to add address: ", error));
           return false;
         }

diff --git a/packages/reaction-accounts/client/templates/addressBook/addressBook.html b/packages/reaction-accounts/client/templates/addressBook/addressBook.html
@@ -1,7 +1,7 @@
 <template name="addressBookPanel">
   <div class="panel panel-default panel-address-book">
     <div class="panel-heading">
-      <h2 class="panel-title">Address Book</h2>
+      <h2 class="panel-title" data-i18n="accountsUI.addressBook">Address Book</h2>
     </div>
     {{> addressBook address=address}}
   </div>

diff --git a/packages/reaction-accounts/client/templates/addressBook/addressBook.js b/packages/reaction-accounts/client/templates/addressBook/addressBook.js
@@ -88,7 +88,7 @@ Template.addressBook.events({
 
     Meteor.call("accounts/addressBookRemove", this._id, (error, result) => {
       if (error) {
-        Alerts.toast(`Can't remove this address: ${error.message}`, "error");
+        Alerts.toast(i18next.t("addressBookGrid.cantRemoveThisAddress", { err: error.message }), "error");
       }
       if (result) {
         let account = ReactionCore.Collections.Accounts.findOne({

diff --git a/packages/reaction-accounts/client/templates/addressBook/edit/edit.js b/packages/reaction-accounts/client/templates/addressBook/edit/edit.js
@@ -12,7 +12,7 @@ AutoForm.hooks({
       const addressBook = $(this.template.firstNode).closest(".address-book");
       Meteor.call("accounts/addressBookUpdate", insertDoc, (error, result) => {
         if (error) {
-          Alerts.toast(`Something went wrong: ${error.message}`, "error");
+          Alerts.toast(i18next.t("addressBookEdit.somethingWentWrong", { err: error.message }), "error");
           this.done(new Error(error));
           return false;
         }

diff --git a/packages/reaction-accounts/client/templates/addressBook/grid/grid.html b/packages/reaction-accounts/client/templates/addressBook/grid/grid.html
@@ -42,10 +42,10 @@ <h4 id="billing-address-label" data-i18n="addressBookGrid.selectBillingAddress">
             </address>
           </div>
           <div class="controls">
-            <button type="button" class="btn btn-default" data-id="{{_id}}" data-event-action="editAddress">
+            <button type="button" class="btn btn-default" data-id="{{_id}}" data-event-action="editAddress" title="{{i18n 'addressBookGrid.edit' 'Edit'}}">
               <i class="fa fa-pencil"></i>
             </button>
-            <button type="button" class="btn btn-default danger-action" data-id="{{_id}}" data-event-action="removeAddress">
+            <button type="button" class="btn btn-default danger-action" data-id="{{_id}}" data-event-action="removeAddress" title="{{i18n 'addressBookGrid.removeAddress' 'Remove Address'}}">
               <i class="fa fa-trash-o"></i>
             </button>
           </div>

diff --git a/packages/reaction-accounts/client/templates/profile/profile.html b/packages/reaction-accounts/client/templates/profile/profile.html
@@ -27,7 +27,7 @@
     <div class="flex-item">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3 class="panel-title">Orders</h3>
+          <h3 class="panel-title" data-i18n="accountsUI.yourOrders">Your Orders</h3>
         </div>
 
         <div class="panel-content">

diff --git a/packages/reaction-accounts/client/templates/updatePassword/updatePassword.html b/packages/reaction-accounts/client/templates/updatePassword/updatePassword.html
@@ -48,7 +48,7 @@ <h4 class="modal-title" data-i18n="accountsUI.updateYourPassword">Update Your Pa
     {{> loginFormMessages messages=messages}}
 
     <div class="form-group {{hasError messages.errors.oldPassword}}">
-      <label for="currentPassword_{{uniqueId}}" class="control-label" data-i18n="accountsUI.oldPassword">Current Password</label>
+      <label for="currentPassword_{{uniqueId}}" class="control-label" data-i18n="accountsUI.currentPassword">Current Password</label>
       <input id="currentPassword_{{uniqueId}}" class="form-control login-input--oldPassword" type="password" value="{{oldPassword}}">
       {{#if hasError messages.errors.oldPassword}}
         <span class="help-block">

diff --git a/packages/reaction-i18n/private/data/i18n/en.json b/packages/reaction-i18n/private/data/i18n/en.json
@@ -94,6 +94,9 @@
           "analyticsSettingsLabel": "Analytics Settings",
           "paypalSettingsLabel": "PayPal Settings",
           "genericPaymentSettingsLabel": "Generic Payment Settings"
+        },
+        "userAccountDropdown": {
+          "profileLabel": "Profile"
         }
       },
       "accounts": {
@@ -359,15 +362,20 @@
         "addAddress": "Add Address",
         "chooseAddress": "Choose shipping & billing address",
         "createDefault": "Create your default address",
+        "edit": "Edit",
+        "removeAddress": "Remove Address",
         "selectShippingAddress": "Select a shipping address",
-        "selectBillingAddress": "Select a billing address"
+        "selectBillingAddress": "Select a billing address",
+        "cantRemoveThisAddress": "Can't remove this address: {{err}}"
       },
       "addressBookAdd": {
         "addAddress": "Add a new address entry",
-        "createAddress": "Create your default address"
+        "createAddress": "Create your default address",
+        "failedToAddAddress": "Failed to add address: {{err}}"
       },
       "addressBookEdit": {
-        "editAddress": "Editing this address entry"
+        "editAddress": "Editing this address entry",
+        "somethingWentWrong": "Something went wrong: {{err}}"
       },
       "corePackageConfig": {
         "settings": {
@@ -544,6 +552,8 @@
         "with": "with",
         "checkoutAsGuest": "Checkout without user account",
         "role": "Role",
+        "yourOrders": "Your Orders",
+        "addressBook": "Address Book",
         "info": {
           "emailSent": "Email Sent",
           "emailVerified": "Email verified",

diff --git a/packages/reaction-i18n/private/data/i18n/ru.json b/packages/reaction-i18n/private/data/i18n/ru.json
@@ -22,11 +22,13 @@
           "analyticsTitle": "Аналитика",
           "analyticsDescription": "Внедрение аналитики и отслеживания событий",
           "authorizeNetLabel": "Authorize.net",
+          "authorizenetTitle": "Authorize.net",
           "authorizeNetDescription": "Платежи через Authorize.net",
           "shippingLabel": "Доставка",
           "shippingTitle": "Доставка",
           "shippingDescription": "Настройки тарифов по доставке",
           "braintreeLabel": "Braintree",
+          "braintreeTitle": "Braintree",
           "braintreeDescription": "Платежи через Braintree",
           "catalogLabel": "Каталог",
           "catalogTitle": "Каталог",
@@ -46,24 +48,27 @@
           "layoutTitle": "план",
           "layoutDescription": "план",
           "connectLabel": "Connect",
+          "connectTitle": "Connect",
           "connectDescription": "Подключение Reaction как развёрнутого сервиса",
           "ordersLabel": "Заказы",
           "ordersTitle": "Заказы",
           "ordersDescription": "Управление заказами",
           "paypalLabel": "PayPal",
           "paypalTitle": "PayPal",
           "paypalDescription": "Платежи через PayPal",
-          "routingLabel": "маршрутизация",
-          "routingTitle": "маршрутизация",
-          "routingDescription": "Маршрутизация утилиты",
-          "themesLabel": "основа",
-          "themesTitle": "основа",
-          "themesDescription": "основа UI и компонент",
+          "routingLabel": "Маршрутизация",
+          "routingTitle": "Маршрутизация",
+          "routingDescription": "Утилиты маршрутизации",
           "socialLabel": "Социальные сети",
           "socialTitle": "Социальные сети",
           "socialDescription": "Интеграция с соц. сетями",
+          "themesLabel": "Темы",
+          "themesTitle": "Темы",
+          "themesDescription": "Темы и UI компоненты",
           "stripeLabel": "Stripe",
-          "stripeDescription": "Платежи через Stripe"
+          "stripeDescription": "Платежи через Stripe",
+          "filtrationLabel": "Filtration",
+          "filtrationDescription": "Products filtration for Reaction"
         },
         "groups": {
           "appearance": "Внешний вид",
@@ -89,6 +94,9 @@
           "analyticsSettingsLabel": "Настройки аналитики",
           "paypalSettingsLabel": "Настройки PayPal",
           "genericPaymentSettingsLabel": "Настройки Generic Payment"
+        },
+        "userAccountDropdown": {
+          "profileLabel": "Профиль"
         }
       },
       "accounts": {
@@ -99,6 +107,7 @@
       "app": {
         "add": "Создать",
         "editMode": "Режим редактирования",
+        "createContent": "Создать содержимое",
         "auto": "Автоматически",
         "save": "Сохранить",
         "saveAndContinue": "Сохранить и продолжить",
@@ -112,6 +121,7 @@
         "settings": "Настройки",
         "loading": "Загрузка",
         "toggle": "Переключить",
+        "toggleEditMode": "Переключить режим редактирования",
         "warning": "Ой!",
         "unauthorizedMessage": "У вас недостаточно прав для просмотра содержимого.",
         "updateSettings": "Обновить настройки",
@@ -352,15 +362,20 @@
         "addAddress": "Добавить адрес",
         "chooseAddress": "Выбор адреса доставки и платёжного адреса",
         "createDefault": "Добавить адрес по умолчанию",
+        "edit": "Редактировать",
+        "removeAddress": "Удалить адрес",
         "selectShippingAddress": "Выберите адрес доставки",
-        "selectBillingAddress": "Выберите платёжный адрес"
+        "selectBillingAddress": "Выберите платёжный адрес",
+        "cantRemoveThisAddress": "Невозможно удалить этот адрес: {{err}}"
       },
       "addressBookAdd": {
         "addAddress": "Добавить ещё адрес",
-        "createAddress": "Добавить адрес по умолчанию"
+        "createAddress": "Добавить адрес по умолчанию",
+        "failedToAddAddress": "Добавить адрес не удалось: {{err}}"
       },
       "addressBookEdit": {
-        "editAddress": "Редактирование адреса"
+        "editAddress": "Редактирование адреса",
+        "somethingWentWrong": "Что-то пошло не так: {{err}}"
       },
       "corePackageConfig": {
         "settings": {
@@ -537,6 +552,8 @@
         "with": "с",
         "checkoutAsGuest": "Оформить заказ без создания учётной записи",
         "role": "Роль",
+        "yourOrders": "Ваши заказы",
+        "addressBook": "Адресная книга",
         "info": {
           "emailSent": "Email отправлен",
           "emailVerified": "Email прошел проверку",