From 901bdde699add8c87cc4f100bbc6c46ed9695f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 7 Dec 2018 15:40:38 +0100
Subject: [PATCH 01/20] Add object variables in global scope with snowdog
 naming

---
 view/frontend/templates/onepage.phtml | 6 ++++--
 view/frontend/web/js/filters/index.js | 4 +++-
 view/frontend/web/js/store/index.js   | 7 +++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/view/frontend/templates/onepage.phtml b/view/frontend/templates/onepage.phtml
index ee08fd2..01e0499 100644
--- a/view/frontend/templates/onepage.phtml
+++ b/view/frontend/templates/onepage.phtml
@@ -1,8 +1,10 @@
 <div id="checkout" class="checkout-container"></div>
 
 <script>
-  var config = <?= \Zend_Json::encode($block->getCheckoutConfig()) ?>;
-  var baseUrl = '<?= $block->getBaseUrl() ?>';
+  var snowdog = snowdog ? snowdog : {};
+
+  snowdog.config = <?= \Zend_Json::encode($block->getCheckoutConfig()) ?>;
+  snowdog.baseUrl = '<?= $block->getBaseUrl() ?>';
 </script>
 
 <script type="text/x-magento-init">
diff --git a/view/frontend/web/js/filters/index.js b/view/frontend/web/js/filters/index.js
index c74c58c..77cd420 100644
--- a/view/frontend/web/js/filters/index.js
+++ b/view/frontend/web/js/filters/index.js
@@ -1,6 +1,8 @@
+const config = window.snowdog.config ? window.snowdog.config : {}
+
 export function currency (price) {
   price = parseFloat(price).toFixed(2)
-  return window.config.basePriceFormat.pattern.replace('%s', price)
+  return config.basePriceFormat.pattern.replace('%s', price)
 }
 
 export function quantity (value) {
diff --git a/view/frontend/web/js/store/index.js b/view/frontend/web/js/store/index.js
index adf9671..75036d6 100644
--- a/view/frontend/web/js/store/index.js
+++ b/view/frontend/web/js/store/index.js
@@ -5,10 +5,13 @@ import axios from 'axios'
 
 Vue.use(Vuex)
 
+const config = window.snowdog.config ? window.snowdog.config : {}
+const baseUrl = window.snowdog.baseUrl ? window.snowdog.baseUrl : {}
+
 const store = new Vuex.Store({
   state: {
-    config: window.config,
-    baseUrl: window.baseUrl,
+    config: config,
+    baseUrl: baseUrl,
     regions,
     customer: {
       email: null

From abee95fc1a7c6097dbea43e861bc65488bce72ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 7 Dec 2018 16:45:52 +0100
Subject: [PATCH 02/20] Simplify access to variables in store

---
 view/frontend/web/js/store/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/frontend/web/js/store/index.js b/view/frontend/web/js/store/index.js
index 75036d6..542f81b 100644
--- a/view/frontend/web/js/store/index.js
+++ b/view/frontend/web/js/store/index.js
@@ -10,8 +10,8 @@ const baseUrl = window.snowdog.baseUrl ? window.snowdog.baseUrl : {}
 
 const store = new Vuex.Store({
   state: {
-    config: config,
-    baseUrl: baseUrl,
+    config,
+    baseUrl,
     regions,
     customer: {
       email: null

From 610e757b66fd3110d8d63bb83548f4304a2abb6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 7 Dec 2018 16:46:51 +0100
Subject: [PATCH 03/20] WIP - Add i18n module with testing translations and
 start with adding it

---
 package.json                                |  1 +
 view/frontend/web/js/data/translations.json | 12 ++++++++++++
 view/frontend/web/js/i18n/index.js          | 13 +++++++++++++
 view/frontend/web/js/script.js              |  3 +++
 yarn.lock                                   |  4 ++++
 5 files changed, 33 insertions(+)
 create mode 100644 view/frontend/web/js/data/translations.json
 create mode 100644 view/frontend/web/js/i18n/index.js

diff --git a/package.json b/package.json
index 598e011..b8988d2 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
   "dependencies": {
     "axios": "^0.18.0",
     "vue": "^2.4.4",
+    "vue-i18n": "^8.4.0",
     "vue-multiselect": "^2.1.0",
     "vuelidate": "^0.7.4",
     "vuex": "^3.0.0"
diff --git a/view/frontend/web/js/data/translations.json b/view/frontend/web/js/data/translations.json
new file mode 100644
index 0000000..16226db
--- /dev/null
+++ b/view/frontend/web/js/data/translations.json
@@ -0,0 +1,12 @@
+{
+  "en": {
+    "message": {
+      "hello": "hello in eng"
+    }
+  },
+  "pl": {
+    "message": {
+      "hello": "siema elo"
+    }
+  }
+}
diff --git a/view/frontend/web/js/i18n/index.js b/view/frontend/web/js/i18n/index.js
new file mode 100644
index 0000000..9efead0
--- /dev/null
+++ b/view/frontend/web/js/i18n/index.js
@@ -0,0 +1,13 @@
+import messages from '../data/translations.json'
+
+import Vue from 'vue'
+import Vuei18n from 'vue-i18n'
+
+Vue.use(Vuei18n)
+
+const i18n = new Vuei18n({
+  locale: 'pl', // add variable from magento with lang code
+  messages
+})
+
+export default i18n
diff --git a/view/frontend/web/js/script.js b/view/frontend/web/js/script.js
index 4876800..9f36f72 100644
--- a/view/frontend/web/js/script.js
+++ b/view/frontend/web/js/script.js
@@ -1,9 +1,11 @@
 import Vue from 'vue'
 import store from './store'
+import i18n from './i18n'
 import App from './App.vue'
 import * as filters from './filters'
 
 import Vuelidate from 'vuelidate'
+
 Vue.use(Vuelidate)
 
 // register global filters
@@ -14,5 +16,6 @@ Object.keys(filters).forEach((key) => {
 new Vue({
   el: '#checkout',
   store,
+  i18n,
   render: h => h(App)
 })
diff --git a/yarn.lock b/yarn.lock
index 32e4a75..0a0cf04 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6000,6 +6000,10 @@ vue-hot-reload-api@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926"
 
+vue-i18n@^8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.4.0.tgz#bc3437ff8f5f389c57235ced602e9d7bfd87995c"
+
 vue-loader@^13.3.0:
   version "13.7.2"
   resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.7.2.tgz#f633f6393e905ffd730400f03c99353618c08fe8"

From 62a422dfc99d8956f798f4832476f2bd3d6be7e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Mon, 10 Dec 2018 16:54:48 +0100
Subject: [PATCH 04/20] Add locale variable to tell our module which lang to
 use and translate

---
 view/frontend/templates/onepage.phtml | 6 ++++++
 view/frontend/web/js/i18n/index.js    | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/view/frontend/templates/onepage.phtml b/view/frontend/templates/onepage.phtml
index 01e0499..6e33309 100644
--- a/view/frontend/templates/onepage.phtml
+++ b/view/frontend/templates/onepage.phtml
@@ -1,3 +1,8 @@
+<?php
+$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+$store = $objectManager->get('Magento\Framework\Locale\Resolver');
+?>
+
 <div id="checkout" class="checkout-container"></div>
 
 <script>
@@ -5,6 +10,7 @@
 
   snowdog.config = <?= \Zend_Json::encode($block->getCheckoutConfig()) ?>;
   snowdog.baseUrl = '<?= $block->getBaseUrl() ?>';
+  snowdog.storeLocale = '<?= $store->getLocale() ?>';
 </script>
 
 <script type="text/x-magento-init">
diff --git a/view/frontend/web/js/i18n/index.js b/view/frontend/web/js/i18n/index.js
index 9efead0..d50c7f6 100644
--- a/view/frontend/web/js/i18n/index.js
+++ b/view/frontend/web/js/i18n/index.js
@@ -5,8 +5,11 @@ import Vuei18n from 'vue-i18n'
 
 Vue.use(Vuei18n)
 
+const storeLocale = window.snowdog.storeLocale
+
 const i18n = new Vuei18n({
-  locale: 'pl', // add variable from magento with lang code
+  locale: storeLocale,
+  fallbackLocale: 'en_US', // Set as deafult lang to avoid missing translations
   messages
 })
 

From 6ddde135473d0d54efb06ebf2d00473c38ed2138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Mon, 10 Dec 2018 16:59:06 +0100
Subject: [PATCH 05/20] Add translation function in all possibly places + add
 translation JSON file with data

---
 .../web/js/components/BillingAddressForm.vue  |  32 ++--
 .../web/js/components/DiscountCodeForm.vue    |  16 +-
 .../web/js/components/PaymentMethods.vue      |   6 +-
 .../web/js/components/ProductsList.vue        |   2 +-
 .../web/js/components/ProductsListItem.vue    |  11 +-
 .../web/js/components/ProgressBar.vue         |   4 +-
 .../web/js/components/ShippingMethods.vue     |   6 +-
 .../frontend/web/js/components/TotalsData.vue |  12 +-
 .../js/components/steps/ThePaymentStep.vue    |  12 +-
 .../js/components/steps/TheShippingStep.vue   |  43 +++--
 .../js/components/steps/TheSuccessStep.vue    |   8 +-
 view/frontend/web/js/data/translations.json   | 160 +++++++++++++++++-
 12 files changed, 229 insertions(+), 83 deletions(-)

diff --git a/view/frontend/web/js/components/BillingAddressForm.vue b/view/frontend/web/js/components/BillingAddressForm.vue
index d81dd1c..4907b1d 100644
--- a/view/frontend/web/js/components/BillingAddressForm.vue
+++ b/view/frontend/web/js/components/BillingAddressForm.vue
@@ -3,36 +3,36 @@
     <BaseInput
       v-model="$v.address.firstname.$model"
       :validation="$v.address.firstname"
-      label="First name"
+      :label="$t('formElements.firstName')"
       name="firstname"
     />
     <BaseInput
       v-model="$v.address.lastname.$model"
       :validation="$v.address.lastname"
-      label="Last name"
+      :label="$t('formElements.lastName')"
       name="lastname"
     />
     <BaseInput
       v-model="$v.address.telephone.$model"
       :validation="$v.address.telephone"
-      label="Phone Number"
+      :label="$t('formElements.phoneNumber')"
       name="telephone"
       type="tel"
     />
     <BaseInput
       v-model="$v.address.street0.$model"
       :validation="$v.address.street0"
-      label="Street Address"
+      :label="$t('formElements.streetAddress')"
       name="street0"
     />
     <BaseInput
       v-model="address.street1"
-      label="Street Address"
+      :label="$t('formElements.streetAddress')"
       name="street1"
     />
     <div>
       <label for="country">
-        Select Country
+        {{ $t('formElements.country') }}
       </label>
       <multiselect
         id="country"
@@ -40,9 +40,9 @@
         :options="countries"
         :allow-empty="false"
         :show-labels="false"
+        :placeholder="$t('formElements.country')"
         name="country"
         label="label"
-        placeholder="Select country"
       />
       <span
         v-if="
@@ -50,31 +50,31 @@
             && !$v.address.country_id.required
         "
       >
-        This field is required!
+        {{ $t('errorCode.required') }}
       </span>
     </div>
     <BaseInput
       v-model="$v.address.city.$model"
       :validation="$v.address.city"
-      label="City"
+      :label="$t('formElements.city')"
       name="city"
     />
     <BaseInput
       v-model="$v.address.postcode.$model"
       :validation="$v.address.postcode"
-      label="Zip/Postal Code"
+      :label="$t('formElements.zipCode')"
       name="postcode"
     />
     <BaseInput
       v-if="!regions.length"
       v-model="$v.address.region.$model"
       :validation="$v.address.region"
-      label="State/Province"
+      :label="$t('formElements.state')"
       name="region"
     />
     <div v-if="regions.length">
       <label for="region_id">
-        Select State/Province
+        {{ $t('formElements.selectState') }}
       </label>
       <multiselect
         id="region_id"
@@ -83,9 +83,9 @@
         :options="regions"
         :allow-empty="false"
         :show-labels="false"
+        :placeholder="$t('formElements.state')"
         name="region_id"
         label="label"
-        placeholder="Select State/Province"
       />
       <span
         v-if="
@@ -93,16 +93,16 @@
             && !$v.address.region_id.required
         "
       >
-        This field is required!
+        {{ $t('errorCode.required') }}
       </span>
     </div>
     <BaseInput
       v-model="address.company"
-      label="Company"
+      :label="$t('formElements.company')"
       name="company"
     />
     <BaseButton
-      text="Save Address"
+      :text="$t('general.saveAddress')"
       @click.native="saveAddress"
     />
   </form>
diff --git a/view/frontend/web/js/components/DiscountCodeForm.vue b/view/frontend/web/js/components/DiscountCodeForm.vue
index 893cde5..3054c3a 100644
--- a/view/frontend/web/js/components/DiscountCodeForm.vue
+++ b/view/frontend/web/js/components/DiscountCodeForm.vue
@@ -1,29 +1,29 @@
 <template>
   <div>
     <h2>
-      Discount
+      {{ $t('discount.title') }}
     </h2>
     <div class="discount-code">
       <form class="discount__form">
         <BaseInput
           v-model="discount.code"
           :read-only="couponCode !== ''"
-          label="Apply Discount Code"
+          :label="$t('discount.apply')"
           name="discount-code"
         />
         <BaseButton
           v-if="couponCode === ''"
           :loader="loader"
+          :text="$t('discount.addDiscount')"
           class="button"
-          text="Apply Discount"
           with-loader
           @click.native="applyDiscount"
         />
         <BaseButton
           v-else
           :loader="loader"
+          :text="$t('discount.removeDiscount')"
           class="button"
-          text="Remove Discount"
           @click.native="removeDiscount"
         />
         <p
@@ -82,9 +82,9 @@ export default {
           this.loader = false
 
           if (error.status === 404) {
-            this.error = `Coupon code not found! Failed when trying to activate: '${this.discount.code}' coupon code. Please use another one.`
+            this.error = this.$t('errorCode.discountNotFound', { code: this.discount.code })
           } else {
-            this.error = 'Something goes wrong when trying to send coupon code. Please try again later.'
+            this.error = this.$t('errorCode.discountAddGeneralError')
           }
         })
     },
@@ -103,9 +103,9 @@ export default {
           this.loader = false
 
           if (error.status === 404) {
-            this.error = `Failed when trying to delete: '${this.discount.code}' coupon code. Coupon code not found!`
+            this.error = this.$t('errorCode.discountDeleteError', { code: this.discount.code })
           } else {
-            this.error = 'Something goes wrong when trying to delete coupon code. Please try again later.'
+            this.error = this.$t('errorCode.discountDeleteGeneralError')
           }
         })
     }
diff --git a/view/frontend/web/js/components/PaymentMethods.vue b/view/frontend/web/js/components/PaymentMethods.vue
index 6961707..6f679a6 100644
--- a/view/frontend/web/js/components/PaymentMethods.vue
+++ b/view/frontend/web/js/components/PaymentMethods.vue
@@ -1,7 +1,7 @@
 <template>
   <form>
     <h2>
-      Payment methods
+      {{ $t('paymentMethods.title') }}
     </h2>
     <div v-if="paymentMethods.length">
       <div
@@ -26,12 +26,12 @@
             && !$v.selectedPaymentMethod.required
         "
       >
-        This field is required!
+        {{ $t('errorCode.required') }}
       </span>
     </div>
     <div v-else>
       <p>
-        In this country we don't handle any payment methods.
+        {{ $t('errorCode.unsupportedPaymentsForCountry') }}
       </p>
     </div>
   </form>
diff --git a/view/frontend/web/js/components/ProductsList.vue b/view/frontend/web/js/components/ProductsList.vue
index 6f8d578..6c1793e 100644
--- a/view/frontend/web/js/components/ProductsList.vue
+++ b/view/frontend/web/js/components/ProductsList.vue
@@ -4,7 +4,7 @@
     class="products-list"
   >
     <h2>
-      Product List
+      {{ $t('productList.title') }}
     </h2>
     <ul class="products">
       <ProductsListItem
diff --git a/view/frontend/web/js/components/ProductsListItem.vue b/view/frontend/web/js/components/ProductsListItem.vue
index f41056f..6c4e8e8 100644
--- a/view/frontend/web/js/components/ProductsListItem.vue
+++ b/view/frontend/web/js/components/ProductsListItem.vue
@@ -1,14 +1,15 @@
 <template>
   <li class="product">
     <p class="products__title">
-      Product name:
+      {{ $t('productList.name') }}
       <strong>
         {{ product.name }}
       </strong>
     </p>
 
     <span class="product__price">
-      Price:
+      {{ $t('productList.price') }}
+
       <strong>
         {{ product.price | currency }}
       </strong>
@@ -16,7 +17,7 @@
 
     <div class="products__handler">
       <p class="products__information">
-        Product details:
+        {{ $t('productList.details') }}
       </p>
 
       <template v-for="detail in JSON.parse(product.options)">
@@ -32,7 +33,7 @@
       </template>
 
       <span class="products__detail">
-        Qty:
+        {{ $t('productList.qty') }}
         <strong>
           {{ product.qty }}
         </strong>
@@ -40,7 +41,7 @@
 
       <template v-if="product.discount_percent > 0">
         <span class="product__detail">
-          Discount: {{ product.discount_percent }}%
+          {{ $t('productList.dicsount') }} {{ product.discount_percent }}%
         </span>
       </template>
     </div>
diff --git a/view/frontend/web/js/components/ProgressBar.vue b/view/frontend/web/js/components/ProgressBar.vue
index 63dbcfa..5506840 100644
--- a/view/frontend/web/js/components/ProgressBar.vue
+++ b/view/frontend/web/js/components/ProgressBar.vue
@@ -10,7 +10,7 @@
           { 'progress-bar__item--active': step === 'shipping' }
         ]"
       >
-        Shipping Step
+        {{ $t('steps.shipping') }}
       </span>/
       <span
         :class="[
@@ -18,7 +18,7 @@
           { 'progress-bar__item--active': step === 'payment' }
         ]"
       >
-        Review & Payments Step
+        {{ $t('steps.payment') }}
       </span>
     </h1>
   </div>
diff --git a/view/frontend/web/js/components/ShippingMethods.vue b/view/frontend/web/js/components/ShippingMethods.vue
index 10a80cb..28dffdc 100644
--- a/view/frontend/web/js/components/ShippingMethods.vue
+++ b/view/frontend/web/js/components/ShippingMethods.vue
@@ -1,7 +1,7 @@
 <template>
   <form>
     <h2>
-      Shipping methods
+      {{ $t('shippingMethods.title') }}
     </h2>
     <div
       v-if="shippingMethods.length"
@@ -38,12 +38,12 @@
             && !$v.selectedShippingMethod.required
         "
       >
-        This field is required!
+        {{ $t('errorCode.required') }}
       </span>
     </div>
     <div v-else>
       <p>
-        In this country we don't handle any shipping methods.
+        {{ $t('errorCode.unsupportedShippingForCountry') }}
       </p>
     </div>
   </form>
diff --git a/view/frontend/web/js/components/TotalsData.vue b/view/frontend/web/js/components/TotalsData.vue
index b0369aa..9550f10 100644
--- a/view/frontend/web/js/components/TotalsData.vue
+++ b/view/frontend/web/js/components/TotalsData.vue
@@ -4,11 +4,11 @@
     class="totals"
   >
     <h2>
-      Order Summary
+      {{ $t('totals.summary') }}
     </h2>
 
     <p class="totals__item">
-      Cart subtotal:
+      {{ $t('totals.subtotal') }}
 
       <strong>
         {{ totals.subtotal | currency }}
@@ -16,7 +16,7 @@
     </p>
 
     <p class="totals__item">
-      Shipping:
+      {{ $t('totals.shipping') }}
 
       <strong>
         {{ totals.shipping_amount | currency }}
@@ -27,7 +27,7 @@
       v-if="parseInt(totals.tax_amount) !== 0"
       class="totals__item"
     >
-      Tax:
+      {{ $t('totals.tax') }}
 
       <strong>
         {{ totals.tax_amount | currency }}
@@ -38,7 +38,7 @@
       v-if="parseInt(totals.discount_amount) !== 0"
       class="totals__item-dicsount"
     >
-      Discount:
+      {{ $t('totals.discount') }}
 
       <strong>
         {{ totals.discount_amount | currency }}
@@ -49,7 +49,7 @@
       v-if="totals.subtotal !== totals.base_grand_total"
       class="totals__item-total"
     >
-      Order Total:
+      {{ $t('totals.orderTotals') }}
 
       <strong>
         {{ totals.base_grand_total | currency }}
diff --git a/view/frontend/web/js/components/steps/ThePaymentStep.vue b/view/frontend/web/js/components/steps/ThePaymentStep.vue
index 9a39889..6139fbd 100644
--- a/view/frontend/web/js/components/steps/ThePaymentStep.vue
+++ b/view/frontend/web/js/components/steps/ThePaymentStep.vue
@@ -4,16 +4,16 @@
     class="billing-address"
   >
     <h2>
-      Billing Address
+      {{ $t('payment.title') }}
     </h2>
     <BaseCheckbox
       id="billing-address-same-as-shipping-address"
+      :text="$t('payment.billingCheckbox')"
       v-model="billingAndShippingAddressTheSame"
       label-class="label"
       field-class="checkbox shipping-address__field"
       input-class="shipping-address__checkbox"
       name="billing-address-same-as-shipping-address"
-      text="My billing and shipping address are the same"
     />
     <AddressData
       v-if="billingAndShippingAddressTheSame && billingAddress !== null"
@@ -23,7 +23,7 @@
       <template v-if="editBillingAddress">
         <BillingAddressForm @hideAddressForm="editBillingAddress = false"/>
         <BaseButton
-          text="Cancel"
+          :text="$t('general.cancel')"
           @click.native="toggleBillingAddress()"
         />
       </template>
@@ -33,7 +33,7 @@
           :address="newBillingAddress"
         />
         <BaseButton
-          text="Edit Address"
+          :text="$t('payment.editAddress')"
           @click.native="editAddress"
         />
       </div>
@@ -46,11 +46,11 @@
     <BaseButton
       :loader="loader"
       :disabled="disabledPlaceOrder"
-      text="Place order"
+      :text="$t('general.order')"
       @click.native="placeOrder"
     />
     <BaseButton
-      text="Back"
+      :text="$t('general.back')"
       @click.native="changeStep('shipping')"
     />
   </section>
diff --git a/view/frontend/web/js/components/steps/TheShippingStep.vue b/view/frontend/web/js/components/steps/TheShippingStep.vue
index e27f914..c7bb270 100644
--- a/view/frontend/web/js/components/steps/TheShippingStep.vue
+++ b/view/frontend/web/js/components/steps/TheShippingStep.vue
@@ -3,7 +3,7 @@
     v-if="step === 'shipping'"
     class="shipping-address"
   >
-    <h2>Shipping address</h2>
+    <h2>{{ $t('shipping.title') }}</h2>
     <form class="shipping-address__form">
       <BaseInput
         v-model.trim="$v.customer.email.$model"
@@ -22,36 +22,36 @@
         <BaseInput
           v-model="$v.address.firstname.$model"
           :validation="$v.address.firstname"
-          label="First name"
+          :label="$t('formElements.firstName')"
           name="firstname"
         />
         <BaseInput
           v-model="$v.address.lastname.$model"
           :validation="$v.address.lastname"
-          label="Last name"
+          :label="$t('formElements.lastName')"
           name="lastname"
         />
         <BaseInput
           v-model="$v.address.telephone.$model"
           :validation="$v.address.telephone"
-          label="Phone Number"
+          :label="$t('formElements.phoneNumber')"
           name="telephone"
           type="tel"
         />
         <BaseInput
           v-model="$v.address.street0.$model"
           :validation="$v.address.street0"
-          label="Street Address"
+          :label="$t('formElements.streetAddress')"
           name="street0"
         />
         <BaseInput
           v-model="address.street1"
-          label="Street Address"
+          :label="$t('formElements.streetAddress')"
           name="street1"
         />
         <div>
           <label for="country">
-            Select Country
+            {{ $t('formElements.country') }}
           </label>
           <multiselect
             id="country"
@@ -59,9 +59,9 @@
             :options="countries"
             :allow-empty="false"
             :show-labels="false"
+            :placeholder="$t('formElements.country')"
             name="country"
             label="label"
-            placeholder="Select country"
             @input="onCountryChange"
           />
           <span
@@ -70,31 +70,31 @@
                 && !$v.address.country_id.required
             "
           >
-            This field is required!
+            {{ $t('errorCode.required') }}
           </span>
         </div>
         <BaseInput
           v-model="$v.address.city.$model"
           :validation="$v.address.city"
-          label="City"
+          :label="$t('formElements.city')"
           name="city"
         />
         <BaseInput
           v-model="$v.address.postcode.$model"
           :validation="$v.address.postcode"
-          label="Zip/Postal Code"
+          :label="$t('formElements.zipCode')"
           name="postcode"
         />
         <BaseInput
           v-if="!regions.length"
           v-model="$v.address.region.$model"
           :validation="$v.address.region"
-          label="State/Province"
+          :label="$t('formElements.state')"
           name="region"
         />
         <div v-if="regions.length">
           <label for="region_id">
-            Select State/Province
+            {{ $t("formElements.selectState") }}
           </label>
           <multiselect
             id="region_id"
@@ -103,9 +103,9 @@
             :options="regions"
             :allow-empty="false"
             :show-labels="false"
+            :placeholder="$t('formElements.selectState')"
             name="region_id"
             label="label"
-            placeholder="Select State/Province"
           />
           <span
             v-if="
@@ -113,12 +113,12 @@
                 && !$v.address.region_id.required
             "
           >
-            This field is required!
+            {{ $t('errorCode.required') }}
           </span>
         </div>
         <BaseInput
           v-model="address.company"
-          label="Company"
+          :label="$t('formElements.company')"
           name="company"
         />
       </div>
@@ -129,7 +129,7 @@
     />
     <BaseButton
       :loader="loader"
-      text="Next Step"
+      :text="$t('general.nextStep')"
       @click.native="goToNextStep()"
     />
   </section>
@@ -226,12 +226,9 @@ export default {
     emailAvailabilityMessage () {
       if (this.customer.email !== '' && !this.$v.customer.email.$error) {
         if (this.customer.emailAvailable) {
-          return `You can create an account after checkout.`
+          return this.$t('shipping.createAccount')
         } else {
-          return `
-            You already have an account with us.
-            Sign in <a href="${this.loginUrl}">here</a> or continue as guest.
-          `
+          return this.$t('shipping.logIn', { link: this.loginUrl })
         }
       } else {
         return false
@@ -259,7 +256,7 @@ export default {
           this.customer.emailAvailable = data
         })
         .catch(error => {
-          console.error('Looks like there was a problem: \n', error)
+          console.error(`${this.$t('error.generalError')} \n`, error)
         })
     },
     onCountryChange () {
diff --git a/view/frontend/web/js/components/steps/TheSuccessStep.vue b/view/frontend/web/js/components/steps/TheSuccessStep.vue
index 786d9bc..4a2d604 100644
--- a/view/frontend/web/js/components/steps/TheSuccessStep.vue
+++ b/view/frontend/web/js/components/steps/TheSuccessStep.vue
@@ -1,12 +1,12 @@
 <template>
   <section v-if="step === 'success'">
-    <h1>Thank you for your purchase!</h1>
+    <h1> {{ $t('success.finished') }}</h1>
     <template v-if="orderId !== null">
-      Your order number is: {{ orderId }}.
+      {{ $t('success.orderNumber', { orderId: orderId }) }}
     </template>
-    <p>We'll email you an order confirmation with details and tracking info.</p>
+    <p>{{ $t('success.emailDetails') }}</p>
     <a href="/">
-      Continue shopping
+      {{ $t('success.continueShopping') }}
     </a>
   </section>
 </template>
diff --git a/view/frontend/web/js/data/translations.json b/view/frontend/web/js/data/translations.json
index 16226db..36481e1 100644
--- a/view/frontend/web/js/data/translations.json
+++ b/view/frontend/web/js/data/translations.json
@@ -1,12 +1,160 @@
 {
-  "en": {
-    "message": {
-      "hello": "hello in eng"
+  "en_US": {
+    "general": {
+      "nextStep": "Next Step",
+      "back": "Back",
+      "order": "Place order",
+      "cancel": "Cancel",
+      "saveAddress": "Save Address"
+    },
+    "steps": {
+      "shipping": "Shipping Step",
+      "payment": "Review & Payments Step"
+    },
+    "shipping": {
+      "title": "Shipping address",
+      "createAccount": "You can create an account after checkout",
+      "logIn": "You already have an account with us. Sign in <a href='%{link}'>here</a> or continue as guest."
+    },
+    "formElements": {
+      "firstName": "First name",
+      "lastName": "Last name",
+      "phoneNumber": "Phone Number",
+      "streetAddress": "Street Address",
+      "country": "Select Country",
+      "city": "City",
+      "zipCode": "Zip/Postal Code",
+      "state": "State/Province",
+      "selectState": "Select State/Province",
+      "company": "Company"
+    },
+    "payment": {
+      "title": "Billing Address",
+      "billingCheckbox": "My billing and shipping address are the same",
+      "editAddress": "Edit Address"
+    },
+    "success": {
+      "finished": "Thank you for your purchase!",
+      "orderNumber": "Your order number is: %{orderId}.",
+      "emailDetails": "We'll email you an order confirmation with details and tracking info.",
+      "continueShopping": "Continue shopping"
+    },
+    "discount": {
+      "title": "Discount",
+      "apply": "Apply Discount Code",
+      "addDiscount": "Apply Discount",
+      "removeDiscount": "Remove Discount"
+    },
+    "totals": {
+      "summary": "Order summary",
+      "subtotal": "Cart subtotal:",
+      "shipping": "Shipping:",
+      "tax": "Tax:",
+      "discount": "Discount:",
+      "orderTotals": "Order Total:"
+    },
+    "paymentMethods": {
+      "title": "Payment methods"
+    },
+    "shippingMethods": {
+      "title": "Shipping Methods"
+    },
+    "productList": {
+      "title": "Product List",
+      "name": "Product name:",
+      "price": "Price:",
+      "details": "Product details:",
+      "qty": "Qty:",
+      "discount": "Discount:"
+    },
+    "errorCode": {
+      "required": "This field is required!",
+      "generalError": "Looks like there was a problem:",
+      "unsupportedPaymentsForCountry": "In this country we don't handle any payment methods.",
+      "unsupportedShippingForCountry": "In this country we don't handle any shipping methods.",
+      "discountNotFound": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
+      "discountAddGeneralError": "Something goes wrong when trying to send coupon code. Please try again later.",
+      "discountDeleteError": "Failed when trying to delete: '%{code}' coupon code. Coupon code not found!",
+      "discountDeleteGeneralError": "Something goes wrong when trying to delete coupon code. Please try again later."
     }
   },
-  "pl": {
-    "message": {
-      "hello": "siema elo"
+  "pl_PL": {
+    "general": {
+      "nextStep": "Przejdź dalej",
+      "back": "Wróć",
+      "order": "Złóż zamówienie",
+      "cancel": "Anuluj",
+      "saveAddress": "Zapisz adres"
+    },
+    "steps": {
+      "shipping": "Sposób wysyłki",
+      "payment": "Podsumowanie i płatność"
+    },
+    "shipping": {
+      "title": "Adres dostawy",
+      "createAccount": "Możesz stworzyć konto po zakupie",
+      "logIn": "Posiadasz konto w naszym sklpie. Zalgouj się <a href='%{link}'>tutaj</a> lub kontynuuj jako gość"
+    },
+    "formElements": {
+      "firstName": "Imię",
+      "lastName": "Nazwisko",
+      "phoneNumber": "Numer telefonu",
+      "streetAddress": "Adres",
+      "country": "Wybierz kraj",
+      "city": "Miasto",
+      "zipCode": "Kod pocztowy",
+      "state": "Województwo",
+      "selectState": "Wpisz województwo",
+      "company": "Firma"
+    },
+    "payment": {
+      "title": "Adres rozliczeniowy",
+      "billingCheckbox": "Mój adres dostawy jest taki sam jak adres płatności",
+      "editAddress": "Edytuj adres"
+    },
+    "success": {
+      "finished": "Dziękujemy za złożenie zamówienia!",
+      "orderNumber": "Numer Twojego zamówienia to: %{orderId}.",
+      "emailDetails": "Szczegóły dotyczące zamówienia zostaną przesłane na email.",
+      "continueShopping": "Kontynuuj zakupy"
+    },
+    "discount": {
+      "title": "Zniżka",
+      "apply": "Dodaj kod zniżkowy",
+      "addDiscount": "Przyznaj rabat",
+      "removeDiscount": "Usuń rabat"
+    },
+    "totals": {
+      "summary": "Podsumowanie",
+      "subtotal": "Podsumowanie koszyka:",
+      "shipping": "Wysyłka:",
+      "tax": "Podatek:",
+      "discount": "Zniżka:",
+      "orderTotals": "Suma zamówienia:"
+    },
+    "paymentMethods": {
+      "title": "Metody płatności"
+    },
+    "shippingMethods": {
+      "title": "Metody wysyłki"
+    },
+    "productList": {
+      "title": "Lista produktów",
+      "name": "Nazwa produktu:",
+      "price": "Cena:",
+      "details": "Szczegóły produktu:",
+      "qty": "Ilość:",
+      "discount": "Zniżka:"
+    },
+    "errorCode": {
+      "required": "To pole jest obowiązkowe!",
+      "generalError": "Wygląda na to, że napotkano błąd:",
+      "unsupportedPaymentsForCountry": "Nie wspieramy żadnych metod płatności dla tego kraju.",
+      "unsupportedShippingForCountry": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
+      "discountNotFound": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",
+      "discountAddGeneralError": "Coś poszło nie tak podczas wysyłania kuponu rabatowego. Sróbuj ponownie później.",
+      "discountDeleteError": "Błąd poczas próby usunięcia kodu rabatowego: '%{code}'. Nie znaleziono takiego kuponu!",
+      "discountDeleteGeneralError": "Coś poszło nie tak podczas usuwania kuponu rabatowego. Sróbuj ponownie później."
     }
   }
 }

From 8d0b234df91ead4ac2d3011388fb770d7538a091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Mon, 10 Dec 2018 18:43:47 +0100
Subject: [PATCH 06/20] Add i18n module in tests and update snapshot

---
 test/ProductsList.test.js                    | 16 +++++++++++++---
 test/__snapshots__/ProductsList.test.js.snap |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/test/ProductsList.test.js b/test/ProductsList.test.js
index 502a4de..7771612 100644
--- a/test/ProductsList.test.js
+++ b/test/ProductsList.test.js
@@ -1,7 +1,16 @@
 import Vue from 'vue'
-import { mount } from '@vue/test-utils'
+import Vuei18n from 'vue-i18n'
+import { mount, createLocalVue } from '@vue/test-utils'
+import messages from '../view/frontend/web/js/data/translations.json'
 import ProductsList from '../view/frontend/web/js/components/ProductsList.vue'
 
+const localVue = createLocalVue()
+localVue.use(Vuei18n)
+const i18n = new Vuei18n({
+  locale: 'en_US',
+  messages
+})
+
 Vue.filter('currency', function (price) {
   const pattern = '$%s'
   price = parseFloat(price).toFixed(2)
@@ -9,7 +18,6 @@ Vue.filter('currency', function (price) {
 })
 
 describe('ProductsList.test.js', () => {
-
   let wrapper
 
   beforeEach(() => {
@@ -41,7 +49,9 @@ describe('ProductsList.test.js', () => {
           }
         ],
         step: () => 'shipping'
-      }
+      },
+      localVue,
+      i18n
     })
   })
 
diff --git a/test/__snapshots__/ProductsList.test.js.snap b/test/__snapshots__/ProductsList.test.js.snap
index fe257e2..b694b2d 100644
--- a/test/__snapshots__/ProductsList.test.js.snap
+++ b/test/__snapshots__/ProductsList.test.js.snap
@@ -34,6 +34,7 @@ exports[`ProductsList.test.js has the expected html structure 1`] = `
       >
         
     Price:
+
     
         <strong>
           

From 854d498a5825e8272cef01adc4dcabe67c78b605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 21 Dec 2018 11:55:38 +0100
Subject: [PATCH 07/20] Update config variables in index store

---
 view/frontend/web/js/store/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/frontend/web/js/store/index.js b/view/frontend/web/js/store/index.js
index 06b659b..ea50105 100644
--- a/view/frontend/web/js/store/index.js
+++ b/view/frontend/web/js/store/index.js
@@ -10,8 +10,8 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
   state: {
-    config: window.config,
-    baseUrl: window.baseUrl,
+    config: (window.snowdog.config) ? window.snowdog.config : {},
+    baseUrl: (window.snowdog.baseUrl) ? window.snowdog.baseUrl : {},
     customer: null,
     regions,
     step: 'shipping',

From 3fa338de6c75853d6e7a2a4e1475ab8847c79bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 21 Dec 2018 12:04:16 +0100
Subject: [PATCH 08/20] Update storeLocale to set default lang

---
 view/frontend/web/js/i18n/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/view/frontend/web/js/i18n/index.js b/view/frontend/web/js/i18n/index.js
index d50c7f6..51ae4b3 100644
--- a/view/frontend/web/js/i18n/index.js
+++ b/view/frontend/web/js/i18n/index.js
@@ -5,10 +5,8 @@ import Vuei18n from 'vue-i18n'
 
 Vue.use(Vuei18n)
 
-const storeLocale = window.snowdog.storeLocale
-
 const i18n = new Vuei18n({
-  locale: storeLocale,
+  locale: (window.snowdog.storeLocale) ? window.snowdog.storeLocale : 'en_US',
   fallbackLocale: 'en_US', // Set as deafult lang to avoid missing translations
   messages
 })

From 42d452540b9bb40261884d2f5be9fa21b0281b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 21 Dec 2018 17:46:59 +0100
Subject: [PATCH 09/20] WIP adding HMR to use dynamic imports and load only
 necessary languages

---
 .babelrc                                      |   1 +
 .eslintrc.js                                  |   4 +-
 package.json                                  |   5 +-
 test/ProductsList.test.js                     |   2 +-
 .../web/js/data/translations-en_US.json       |  79 +++++++++
 .../web/js/data/translations-pl_PL.json       |  79 +++++++++
 view/frontend/web/js/data/translations.json   | 160 ------------------
 view/frontend/web/js/i18n/index.js            |  29 +++-
 webpack.config.js                             |   8 +
 yarn.lock                                     | 135 ++++++++++++++-
 10 files changed, 329 insertions(+), 173 deletions(-)
 create mode 100644 view/frontend/web/js/data/translations-en_US.json
 create mode 100644 view/frontend/web/js/data/translations-pl_PL.json
 delete mode 100644 view/frontend/web/js/data/translations.json

diff --git a/.babelrc b/.babelrc
index 73d7cf3..bb726eb 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,5 @@
 {
+  "plugins": ["syntax-dynamic-import"],
   "presets": [
     ["env", { "modules": false }],
     "stage-3"
diff --git a/.eslintrc.js b/.eslintrc.js
index 3a77b16..62f883c 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,7 +1,9 @@
 module.exports = {
   root: true,
   parserOptions: {
-    sourceType: 'module'
+    parser: "babel-eslint",
+    ecmaVersion: 8,
+    sourceType: "module"
   },
   env: {
     browser: true,
diff --git a/package.json b/package.json
index b8988d2..9030036 100644
--- a/package.json
+++ b/package.json
@@ -34,15 +34,18 @@
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.20",
     "babel-core": "^6.26.3",
+    "babel-eslint": "^8.2.6",
     "babel-jest": "^23.0.1",
     "babel-loader": "^7.1.4",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-stage-3": "^6.24.1",
     "css-loader": "^0.28.7",
     "eslint": "^4.19.1",
     "eslint-config-standard": "^11.0.0",
     "eslint-loader": "^2.0.0",
-    "eslint-plugin-import": "^2.10.0",
+    "eslint-plugin-import": "^2.13.0",
     "eslint-plugin-node": "^6.0.1",
     "eslint-plugin-promise": "^3.7.0",
     "eslint-plugin-standard": "^3.0.1",
diff --git a/test/ProductsList.test.js b/test/ProductsList.test.js
index 7771612..1777c68 100644
--- a/test/ProductsList.test.js
+++ b/test/ProductsList.test.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import Vuei18n from 'vue-i18n'
 import { mount, createLocalVue } from '@vue/test-utils'
-import messages from '../view/frontend/web/js/data/translations.json'
+import messages from '../view/frontend/web/js/data/translations-en_US.json'
 import ProductsList from '../view/frontend/web/js/components/ProductsList.vue'
 
 const localVue = createLocalVue()
diff --git a/view/frontend/web/js/data/translations-en_US.json b/view/frontend/web/js/data/translations-en_US.json
new file mode 100644
index 0000000..838fddc
--- /dev/null
+++ b/view/frontend/web/js/data/translations-en_US.json
@@ -0,0 +1,79 @@
+{
+  "general": {
+    "nextStep": "Next Step",
+    "back": "Back",
+    "order": "Place order",
+    "cancel": "Cancel",
+    "saveAddress": "Save Address"
+  },
+  "steps": {
+    "shipping": "Shipping Step",
+    "payment": "Review & Payments Step"
+  },
+  "shipping": {
+    "title": "Shipping address",
+    "createAccount": "You can create an account after checkout",
+    "logIn": "You already have an account with us. Sign in <a href='%{link}'>here</a> or continue as guest."
+  },
+  "formElements": {
+    "firstName": "First name",
+    "lastName": "Last name",
+    "phoneNumber": "Phone Number",
+    "streetAddress": "Street Address",
+    "country": "Select Country",
+    "city": "City",
+    "zipCode": "Zip/Postal Code",
+    "state": "State/Province",
+    "selectState": "Select State/Province",
+    "company": "Company"
+  },
+  "payment": {
+    "title": "Billing Address",
+    "billingCheckbox": "My billing and shipping address are the same",
+    "editAddress": "Edit Address"
+  },
+  "success": {
+    "finished": "Thank you for your purchase!",
+    "orderNumber": "Your order number is: %{orderId}.",
+    "emailDetails": "We'll email you an order confirmation with details and tracking info.",
+    "continueShopping": "Continue shopping"
+  },
+  "discount": {
+    "title": "Discount",
+    "apply": "Apply Discount Code",
+    "addDiscount": "Apply Discount",
+    "removeDiscount": "Remove Discount"
+  },
+  "totals": {
+    "summary": "Order summary",
+    "subtotal": "Cart subtotal:",
+    "shipping": "Shipping:",
+    "tax": "Tax:",
+    "discount": "Discount:",
+    "orderTotals": "Order Total:"
+  },
+  "paymentMethods": {
+    "title": "Payment methods"
+  },
+  "shippingMethods": {
+    "title": "Shipping Methods"
+  },
+  "productList": {
+    "title": "Product List",
+    "name": "Product name:",
+    "price": "Price:",
+    "details": "Product details:",
+    "qty": "Qty:",
+    "discount": "Discount:"
+  },
+  "errorCode": {
+    "required": "This field is required!",
+    "generalError": "Looks like there was a problem:",
+    "unsupportedPaymentsForCountry": "In this country we don't handle any payment methods.",
+    "unsupportedShippingForCountry": "In this country we don't handle any shipping methods.",
+    "discountNotFound": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
+    "discountAddGeneralError": "Something goes wrong when trying to send coupon code. Please try again later.",
+    "discountDeleteError": "Failed when trying to delete: '%{code}' coupon code. Coupon code not found!",
+    "discountDeleteGeneralError": "Something goes wrong when trying to delete coupon code. Please try again later."
+  }
+}
diff --git a/view/frontend/web/js/data/translations-pl_PL.json b/view/frontend/web/js/data/translations-pl_PL.json
new file mode 100644
index 0000000..dc3a803
--- /dev/null
+++ b/view/frontend/web/js/data/translations-pl_PL.json
@@ -0,0 +1,79 @@
+{
+  "general": {
+    "nextStep": "Przejdź dalej",
+    "back": "Wróć",
+    "order": "Złóż zamówienie",
+    "cancel": "Anuluj",
+    "saveAddress": "Zapisz adres"
+  },
+  "steps": {
+    "shipping": "Sposób wysyłki",
+    "payment": "Podsumowanie i płatność"
+  },
+  "shipping": {
+    "title": "Adres dostawy",
+    "createAccount": "Możesz stworzyć konto po zakupie",
+    "logIn": "Posiadasz konto w naszym sklpie. Zalgouj się <a href='%{link}'>tutaj</a> lub kontynuuj jako gość"
+  },
+  "formElements": {
+    "firstName": "Imię",
+    "lastName": "Nazwisko",
+    "phoneNumber": "Numer telefonu",
+    "streetAddress": "Adres",
+    "country": "Wybierz kraj",
+    "city": "Miasto",
+    "zipCode": "Kod pocztowy",
+    "state": "Województwo",
+    "selectState": "Wpisz województwo",
+    "company": "Firma"
+  },
+  "payment": {
+    "title": "Adres rozliczeniowy",
+    "billingCheckbox": "Mój adres dostawy jest taki sam jak adres płatności",
+    "editAddress": "Edytuj adres"
+  },
+  "success": {
+    "finished": "Dziękujemy za złożenie zamówienia!",
+    "orderNumber": "Numer Twojego zamówienia to: %{orderId}.",
+    "emailDetails": "Szczegóły dotyczące zamówienia zostaną przesłane na email.",
+    "continueShopping": "Kontynuuj zakupy"
+  },
+  "discount": {
+    "title": "Zniżka",
+    "apply": "Dodaj kod zniżkowy",
+    "addDiscount": "Przyznaj rabat",
+    "removeDiscount": "Usuń rabat"
+  },
+  "totals": {
+    "summary": "Podsumowanie",
+    "subtotal": "Podsumowanie koszyka:",
+    "shipping": "Wysyłka:",
+    "tax": "Podatek:",
+    "discount": "Zniżka:",
+    "orderTotals": "Suma zamówienia:"
+  },
+  "paymentMethods": {
+    "title": "Metody płatności"
+  },
+  "shippingMethods": {
+    "title": "Metody wysyłki"
+  },
+  "productList": {
+    "title": "Lista produktów",
+    "name": "Nazwa produktu:",
+    "price": "Cena:",
+    "details": "Szczegóły produktu:",
+    "qty": "Ilość:",
+    "discount": "Zniżka:"
+  },
+  "errorCode": {
+    "required": "To pole jest obowiązkowe!",
+    "generalError": "Wygląda na to, że napotkano błąd:",
+    "unsupportedPaymentsForCountry": "Nie wspieramy żadnych metod płatności dla tego kraju.",
+    "unsupportedShippingForCountry": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
+    "discountNotFound": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",
+    "discountAddGeneralError": "Coś poszło nie tak podczas wysyłania kuponu rabatowego. Sróbuj ponownie później.",
+    "discountDeleteError": "Błąd poczas próby usunięcia kodu rabatowego: '%{code}'. Nie znaleziono takiego kuponu!",
+    "discountDeleteGeneralError": "Coś poszło nie tak podczas usuwania kuponu rabatowego. Sróbuj ponownie później."
+  }
+}
diff --git a/view/frontend/web/js/data/translations.json b/view/frontend/web/js/data/translations.json
deleted file mode 100644
index 36481e1..0000000
--- a/view/frontend/web/js/data/translations.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "en_US": {
-    "general": {
-      "nextStep": "Next Step",
-      "back": "Back",
-      "order": "Place order",
-      "cancel": "Cancel",
-      "saveAddress": "Save Address"
-    },
-    "steps": {
-      "shipping": "Shipping Step",
-      "payment": "Review & Payments Step"
-    },
-    "shipping": {
-      "title": "Shipping address",
-      "createAccount": "You can create an account after checkout",
-      "logIn": "You already have an account with us. Sign in <a href='%{link}'>here</a> or continue as guest."
-    },
-    "formElements": {
-      "firstName": "First name",
-      "lastName": "Last name",
-      "phoneNumber": "Phone Number",
-      "streetAddress": "Street Address",
-      "country": "Select Country",
-      "city": "City",
-      "zipCode": "Zip/Postal Code",
-      "state": "State/Province",
-      "selectState": "Select State/Province",
-      "company": "Company"
-    },
-    "payment": {
-      "title": "Billing Address",
-      "billingCheckbox": "My billing and shipping address are the same",
-      "editAddress": "Edit Address"
-    },
-    "success": {
-      "finished": "Thank you for your purchase!",
-      "orderNumber": "Your order number is: %{orderId}.",
-      "emailDetails": "We'll email you an order confirmation with details and tracking info.",
-      "continueShopping": "Continue shopping"
-    },
-    "discount": {
-      "title": "Discount",
-      "apply": "Apply Discount Code",
-      "addDiscount": "Apply Discount",
-      "removeDiscount": "Remove Discount"
-    },
-    "totals": {
-      "summary": "Order summary",
-      "subtotal": "Cart subtotal:",
-      "shipping": "Shipping:",
-      "tax": "Tax:",
-      "discount": "Discount:",
-      "orderTotals": "Order Total:"
-    },
-    "paymentMethods": {
-      "title": "Payment methods"
-    },
-    "shippingMethods": {
-      "title": "Shipping Methods"
-    },
-    "productList": {
-      "title": "Product List",
-      "name": "Product name:",
-      "price": "Price:",
-      "details": "Product details:",
-      "qty": "Qty:",
-      "discount": "Discount:"
-    },
-    "errorCode": {
-      "required": "This field is required!",
-      "generalError": "Looks like there was a problem:",
-      "unsupportedPaymentsForCountry": "In this country we don't handle any payment methods.",
-      "unsupportedShippingForCountry": "In this country we don't handle any shipping methods.",
-      "discountNotFound": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
-      "discountAddGeneralError": "Something goes wrong when trying to send coupon code. Please try again later.",
-      "discountDeleteError": "Failed when trying to delete: '%{code}' coupon code. Coupon code not found!",
-      "discountDeleteGeneralError": "Something goes wrong when trying to delete coupon code. Please try again later."
-    }
-  },
-  "pl_PL": {
-    "general": {
-      "nextStep": "Przejdź dalej",
-      "back": "Wróć",
-      "order": "Złóż zamówienie",
-      "cancel": "Anuluj",
-      "saveAddress": "Zapisz adres"
-    },
-    "steps": {
-      "shipping": "Sposób wysyłki",
-      "payment": "Podsumowanie i płatność"
-    },
-    "shipping": {
-      "title": "Adres dostawy",
-      "createAccount": "Możesz stworzyć konto po zakupie",
-      "logIn": "Posiadasz konto w naszym sklpie. Zalgouj się <a href='%{link}'>tutaj</a> lub kontynuuj jako gość"
-    },
-    "formElements": {
-      "firstName": "Imię",
-      "lastName": "Nazwisko",
-      "phoneNumber": "Numer telefonu",
-      "streetAddress": "Adres",
-      "country": "Wybierz kraj",
-      "city": "Miasto",
-      "zipCode": "Kod pocztowy",
-      "state": "Województwo",
-      "selectState": "Wpisz województwo",
-      "company": "Firma"
-    },
-    "payment": {
-      "title": "Adres rozliczeniowy",
-      "billingCheckbox": "Mój adres dostawy jest taki sam jak adres płatności",
-      "editAddress": "Edytuj adres"
-    },
-    "success": {
-      "finished": "Dziękujemy za złożenie zamówienia!",
-      "orderNumber": "Numer Twojego zamówienia to: %{orderId}.",
-      "emailDetails": "Szczegóły dotyczące zamówienia zostaną przesłane na email.",
-      "continueShopping": "Kontynuuj zakupy"
-    },
-    "discount": {
-      "title": "Zniżka",
-      "apply": "Dodaj kod zniżkowy",
-      "addDiscount": "Przyznaj rabat",
-      "removeDiscount": "Usuń rabat"
-    },
-    "totals": {
-      "summary": "Podsumowanie",
-      "subtotal": "Podsumowanie koszyka:",
-      "shipping": "Wysyłka:",
-      "tax": "Podatek:",
-      "discount": "Zniżka:",
-      "orderTotals": "Suma zamówienia:"
-    },
-    "paymentMethods": {
-      "title": "Metody płatności"
-    },
-    "shippingMethods": {
-      "title": "Metody wysyłki"
-    },
-    "productList": {
-      "title": "Lista produktów",
-      "name": "Nazwa produktu:",
-      "price": "Cena:",
-      "details": "Szczegóły produktu:",
-      "qty": "Ilość:",
-      "discount": "Zniżka:"
-    },
-    "errorCode": {
-      "required": "To pole jest obowiązkowe!",
-      "generalError": "Wygląda na to, że napotkano błąd:",
-      "unsupportedPaymentsForCountry": "Nie wspieramy żadnych metod płatności dla tego kraju.",
-      "unsupportedShippingForCountry": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
-      "discountNotFound": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",
-      "discountAddGeneralError": "Coś poszło nie tak podczas wysyłania kuponu rabatowego. Sróbuj ponownie później.",
-      "discountDeleteError": "Błąd poczas próby usunięcia kodu rabatowego: '%{code}'. Nie znaleziono takiego kuponu!",
-      "discountDeleteGeneralError": "Coś poszło nie tak podczas usuwania kuponu rabatowego. Sróbuj ponownie później."
-    }
-  }
-}
diff --git a/view/frontend/web/js/i18n/index.js b/view/frontend/web/js/i18n/index.js
index 51ae4b3..e197afa 100644
--- a/view/frontend/web/js/i18n/index.js
+++ b/view/frontend/web/js/i18n/index.js
@@ -1,14 +1,35 @@
-import messages from '../data/translations.json'
-
 import Vue from 'vue'
 import Vuei18n from 'vue-i18n'
 
+// Load en-US as default lang
+import defaultMessages from '../data/translations-en_US.json'
+
+const storeLocale = (window.snowdog.storeLocale) ? window.snowdog.storeLocale : 'en_US'
+
 Vue.use(Vuei18n)
 
 const i18n = new Vuei18n({
-  locale: (window.snowdog.storeLocale) ? window.snowdog.storeLocale : 'en_US',
+  locale: 'en_US',
   fallbackLocale: 'en_US', // Set as deafult lang to avoid missing translations
-  messages
+  messages: defaultMessages
 })
 
+function loadLanguageJson (storeLocale) {
+  if (module.hot && storeLocale !== 'en_US') {
+    return import(/* webpackMode: "eager" */ `../data/translations-${storeLocale}.json`)
+      .then(messages => {
+        const languages = { 'en_US': defaultMessages }
+        languages[storeLocale] = messages
+
+        return languages
+      })
+      .catch(() => {
+        console.debug('Unable to load translations for this lang - default en_US loaded')
+        return { 'en_US': defaultMessages }
+      })
+  } else {
+    return { 'en_US': defaultMessages }
+  }
+}
+
 export default i18n
diff --git a/webpack.config.js b/webpack.config.js
index dd966d3..325db67 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,4 +1,5 @@
 const path = require('path')
+const webpack = require('webpack')
 
 module.exports = {
   entry: './view/frontend/web/js/script.js',
@@ -6,6 +7,13 @@ module.exports = {
     path: path.resolve(__dirname, './view/frontend/web/js/dist'),
     filename: 'index.js'
   },
+  devServer: {
+    contentBase: path.resolve(__dirname, './view/frontend/web/js/dist'),
+    hot: true
+  },
+  plugins: [
+    new webpack.HotModuleReplacementPlugin()
+  ],
   module: {
     rules: [
       {
diff --git a/yarn.lock b/yarn.lock
index 0a0cf04..cac30d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,12 +2,56 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.44"
+
 "@babel/code-frame@^7.0.0-beta.35":
   version "7.0.0-beta.51"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.51.tgz#bd71d9b192af978df915829d39d4094456439a0c"
   dependencies:
     "@babel/highlight" "7.0.0-beta.51"
 
+"@babel/generator@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-function-name@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.44"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-get-function-arity@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-split-export-declaration@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/highlight@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
 "@babel/highlight@7.0.0-beta.51":
   version "7.0.0-beta.51"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.51.tgz#e8844ae25a1595ccfd42b89623b4376ca06d225d"
@@ -16,6 +60,38 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@babel/template@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    lodash "^4.2.0"
+
+"@babel/traverse@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/generator" "7.0.0-beta.44"
+    "@babel/helper-function-name" "7.0.0-beta.44"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+"@babel/types@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
 "@vue/test-utils@^1.0.0-beta.20":
   version "1.0.0-beta.20"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.20.tgz#ef4505341b802f3de1c06b3cb8651378c87371fa"
@@ -335,6 +411,17 @@ babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.26.3:
     slash "^1.0.0"
     source-map "^0.5.7"
 
+babel-eslint@^8.2.6:
+  version "8.2.6"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.6.tgz#6270d0c73205628067c0f7ae1693a9e797acefd9"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/traverse" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    eslint-scope "3.7.1"
+    eslint-visitor-keys "^1.0.0"
+
 babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
@@ -497,6 +584,10 @@ babel-plugin-syntax-async-generators@^6.5.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
 
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "http://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+
 babel-plugin-syntax-exponentiation-operator@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
@@ -727,6 +818,14 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
+babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  dependencies:
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
+
 babel-preset-env@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
@@ -831,6 +930,10 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
+babylon@7.0.0-beta.44:
+  version "7.0.0-beta.44"
+  resolved "http://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
+
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
@@ -1966,9 +2069,9 @@ eslint-module-utils@^2.2.0:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
 
-eslint-plugin-import@^2.10.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.12.0.tgz#dad31781292d6664b25317fd049d2e2b2f02205d"
+eslint-plugin-import@^2.13.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8"
   dependencies:
     contains-path "^0.1.0"
     debug "^2.6.8"
@@ -2004,7 +2107,7 @@ eslint-plugin-vue@^4.5.0:
   dependencies:
     vue-eslint-parser "^2.0.3"
 
-eslint-scope@^3.7.1:
+eslint-scope@3.7.1, eslint-scope@^3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
   dependencies:
@@ -2528,6 +2631,10 @@ globals@^11.0.1:
   version "11.5.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.5.0.tgz#6bc840de6771173b191f13d3a9c94d441ee92642"
 
+globals@^11.1.0:
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
+
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -2844,7 +2951,7 @@ interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
-invariant@^2.2.2:
+invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
@@ -3561,6 +3668,10 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -3742,6 +3853,10 @@ lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.3.0, l
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
+lodash@^4.2.0:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -4978,6 +5093,10 @@ regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
+regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -5455,7 +5574,7 @@ source-map@^0.4.2, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -5762,6 +5881,10 @@ to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"

From 2488a912ee854931dee050a32fa73807eb663420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Sun, 30 Dec 2018 22:19:29 +0100
Subject: [PATCH 10/20] Revert HMR at this point

---
 webpack.config.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index 325db67..dd966d3 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,5 +1,4 @@
 const path = require('path')
-const webpack = require('webpack')
 
 module.exports = {
   entry: './view/frontend/web/js/script.js',
@@ -7,13 +6,6 @@ module.exports = {
     path: path.resolve(__dirname, './view/frontend/web/js/dist'),
     filename: 'index.js'
   },
-  devServer: {
-    contentBase: path.resolve(__dirname, './view/frontend/web/js/dist'),
-    hot: true
-  },
-  plugins: [
-    new webpack.HotModuleReplacementPlugin()
-  ],
   module: {
     rules: [
       {

From 0555292203b61d9ff1fd2727dc9f97345d8e9c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Sun, 30 Dec 2018 22:20:10 +0100
Subject: [PATCH 11/20] Split languages to separate files as langs and adjust
 script to select good message

---
 .../web/js/data/translations-en_US.json       | 154 +++++++++---------
 .../web/js/data/translations-pl_PL.json       | 154 +++++++++---------
 view/frontend/web/js/i18n/index.js            |  34 ++--
 view/frontend/web/js/script.js                |   2 +-
 4 files changed, 171 insertions(+), 173 deletions(-)

diff --git a/view/frontend/web/js/data/translations-en_US.json b/view/frontend/web/js/data/translations-en_US.json
index 838fddc..1477ead 100644
--- a/view/frontend/web/js/data/translations-en_US.json
+++ b/view/frontend/web/js/data/translations-en_US.json
@@ -1,79 +1,81 @@
 {
-  "general": {
-    "nextStep": "Next Step",
-    "back": "Back",
-    "order": "Place order",
-    "cancel": "Cancel",
-    "saveAddress": "Save Address"
-  },
-  "steps": {
-    "shipping": "Shipping Step",
-    "payment": "Review & Payments Step"
-  },
-  "shipping": {
-    "title": "Shipping address",
-    "createAccount": "You can create an account after checkout",
-    "logIn": "You already have an account with us. Sign in <a href='%{link}'>here</a> or continue as guest."
-  },
-  "formElements": {
-    "firstName": "First name",
-    "lastName": "Last name",
-    "phoneNumber": "Phone Number",
-    "streetAddress": "Street Address",
-    "country": "Select Country",
-    "city": "City",
-    "zipCode": "Zip/Postal Code",
-    "state": "State/Province",
-    "selectState": "Select State/Province",
-    "company": "Company"
-  },
-  "payment": {
-    "title": "Billing Address",
-    "billingCheckbox": "My billing and shipping address are the same",
-    "editAddress": "Edit Address"
-  },
-  "success": {
-    "finished": "Thank you for your purchase!",
-    "orderNumber": "Your order number is: %{orderId}.",
-    "emailDetails": "We'll email you an order confirmation with details and tracking info.",
-    "continueShopping": "Continue shopping"
-  },
-  "discount": {
-    "title": "Discount",
-    "apply": "Apply Discount Code",
-    "addDiscount": "Apply Discount",
-    "removeDiscount": "Remove Discount"
-  },
-  "totals": {
-    "summary": "Order summary",
-    "subtotal": "Cart subtotal:",
-    "shipping": "Shipping:",
-    "tax": "Tax:",
-    "discount": "Discount:",
-    "orderTotals": "Order Total:"
-  },
-  "paymentMethods": {
-    "title": "Payment methods"
-  },
-  "shippingMethods": {
-    "title": "Shipping Methods"
-  },
-  "productList": {
-    "title": "Product List",
-    "name": "Product name:",
-    "price": "Price:",
-    "details": "Product details:",
-    "qty": "Qty:",
-    "discount": "Discount:"
-  },
-  "errorCode": {
-    "required": "This field is required!",
-    "generalError": "Looks like there was a problem:",
-    "unsupportedPaymentsForCountry": "In this country we don't handle any payment methods.",
-    "unsupportedShippingForCountry": "In this country we don't handle any shipping methods.",
-    "discountNotFound": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
-    "discountAddGeneralError": "Something goes wrong when trying to send coupon code. Please try again later.",
-    "discountDeleteError": "Failed when trying to delete: '%{code}' coupon code. Coupon code not found!",
-    "discountDeleteGeneralError": "Something goes wrong when trying to delete coupon code. Please try again later."
+  "en_US": {
+    "general": {
+      "nextStep": "Next Step",
+      "back": "Back",
+      "order": "Place order",
+      "cancel": "Cancel",
+      "saveAddress": "Save Address"
+    },
+    "steps": {
+      "shipping": "Shipping Step",
+      "payment": "Review & Payments Step"
+    },
+    "shipping": {
+      "title": "Shipping address",
+      "createAccount": "You can create an account after checkout",
+      "logIn": "You already have an account with us. Sign in <a href='%{link}'>here</a> or continue as guest."
+    },
+    "formElements": {
+      "firstName": "First name",
+      "lastName": "Last name",
+      "phoneNumber": "Phone Number",
+      "streetAddress": "Street Address",
+      "country": "Select Country",
+      "city": "City",
+      "zipCode": "Zip/Postal Code",
+      "state": "State/Province",
+      "selectState": "Select State/Province",
+      "company": "Company"
+    },
+    "payment": {
+      "title": "Billing Address",
+      "billingCheckbox": "My billing and shipping address are the same",
+      "editAddress": "Edit Address"
+    },
+    "success": {
+      "finished": "Thank you for your purchase!",
+      "orderNumber": "Your order number is: %{orderId}.",
+      "emailDetails": "We'll email you an order confirmation with details and tracking info.",
+      "continueShopping": "Continue shopping"
+    },
+    "discount": {
+      "title": "Discount",
+      "apply": "Apply Discount Code",
+      "addDiscount": "Apply Discount",
+      "removeDiscount": "Remove Discount"
+    },
+    "totals": {
+      "summary": "Order summary",
+      "subtotal": "Cart subtotal:",
+      "shipping": "Shipping:",
+      "tax": "Tax:",
+      "discount": "Discount:",
+      "orderTotals": "Order Total:"
+    },
+    "paymentMethods": {
+      "title": "Payment methods"
+    },
+    "shippingMethods": {
+      "title": "Shipping Methods"
+    },
+    "productList": {
+      "title": "Product List",
+      "name": "Product name:",
+      "price": "Price:",
+      "details": "Product details:",
+      "qty": "Qty:",
+      "discount": "Discount:"
+    },
+    "errorCode": {
+      "required": "This field is required!",
+      "generalError": "Looks like there was a problem:",
+      "unsupportedPaymentsForCountry": "In this country we don't handle any payment methods.",
+      "unsupportedShippingForCountry": "In this country we don't handle any shipping methods.",
+      "discountNotFound": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
+      "discountAddGeneralError": "Something goes wrong when trying to send coupon code. Please try again later.",
+      "discountDeleteError": "Failed when trying to delete: '%{code}' coupon code. Coupon code not found!",
+      "discountDeleteGeneralError": "Something goes wrong when trying to delete coupon code. Please try again later."
+    }
   }
 }
diff --git a/view/frontend/web/js/data/translations-pl_PL.json b/view/frontend/web/js/data/translations-pl_PL.json
index dc3a803..d9874d1 100644
--- a/view/frontend/web/js/data/translations-pl_PL.json
+++ b/view/frontend/web/js/data/translations-pl_PL.json
@@ -1,79 +1,81 @@
 {
-  "general": {
-    "nextStep": "Przejdź dalej",
-    "back": "Wróć",
-    "order": "Złóż zamówienie",
-    "cancel": "Anuluj",
-    "saveAddress": "Zapisz adres"
-  },
-  "steps": {
-    "shipping": "Sposób wysyłki",
-    "payment": "Podsumowanie i płatność"
-  },
-  "shipping": {
-    "title": "Adres dostawy",
-    "createAccount": "Możesz stworzyć konto po zakupie",
-    "logIn": "Posiadasz konto w naszym sklpie. Zalgouj się <a href='%{link}'>tutaj</a> lub kontynuuj jako gość"
-  },
-  "formElements": {
-    "firstName": "Imię",
-    "lastName": "Nazwisko",
-    "phoneNumber": "Numer telefonu",
-    "streetAddress": "Adres",
-    "country": "Wybierz kraj",
-    "city": "Miasto",
-    "zipCode": "Kod pocztowy",
-    "state": "Województwo",
-    "selectState": "Wpisz województwo",
-    "company": "Firma"
-  },
-  "payment": {
-    "title": "Adres rozliczeniowy",
-    "billingCheckbox": "Mój adres dostawy jest taki sam jak adres płatności",
-    "editAddress": "Edytuj adres"
-  },
-  "success": {
-    "finished": "Dziękujemy za złożenie zamówienia!",
-    "orderNumber": "Numer Twojego zamówienia to: %{orderId}.",
-    "emailDetails": "Szczegóły dotyczące zamówienia zostaną przesłane na email.",
-    "continueShopping": "Kontynuuj zakupy"
-  },
-  "discount": {
-    "title": "Zniżka",
-    "apply": "Dodaj kod zniżkowy",
-    "addDiscount": "Przyznaj rabat",
-    "removeDiscount": "Usuń rabat"
-  },
-  "totals": {
-    "summary": "Podsumowanie",
-    "subtotal": "Podsumowanie koszyka:",
-    "shipping": "Wysyłka:",
-    "tax": "Podatek:",
-    "discount": "Zniżka:",
-    "orderTotals": "Suma zamówienia:"
-  },
-  "paymentMethods": {
-    "title": "Metody płatności"
-  },
-  "shippingMethods": {
-    "title": "Metody wysyłki"
-  },
-  "productList": {
-    "title": "Lista produktów",
-    "name": "Nazwa produktu:",
-    "price": "Cena:",
-    "details": "Szczegóły produktu:",
-    "qty": "Ilość:",
-    "discount": "Zniżka:"
-  },
-  "errorCode": {
-    "required": "To pole jest obowiązkowe!",
-    "generalError": "Wygląda na to, że napotkano błąd:",
-    "unsupportedPaymentsForCountry": "Nie wspieramy żadnych metod płatności dla tego kraju.",
-    "unsupportedShippingForCountry": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
-    "discountNotFound": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",
-    "discountAddGeneralError": "Coś poszło nie tak podczas wysyłania kuponu rabatowego. Sróbuj ponownie później.",
-    "discountDeleteError": "Błąd poczas próby usunięcia kodu rabatowego: '%{code}'. Nie znaleziono takiego kuponu!",
-    "discountDeleteGeneralError": "Coś poszło nie tak podczas usuwania kuponu rabatowego. Sróbuj ponownie później."
+  "pl_PL": {
+    "general": {
+      "nextStep": "Przejdź dalej",
+      "back": "Wróć",
+      "order": "Złóż zamówienie",
+      "cancel": "Anuluj",
+      "saveAddress": "Zapisz adres"
+    },
+    "steps": {
+      "shipping": "Sposób wysyłki",
+      "payment": "Podsumowanie i płatność"
+    },
+    "shipping": {
+      "title": "Adres dostawy",
+      "createAccount": "Możesz stworzyć konto po zakupie",
+      "logIn": "Posiadasz konto w naszym sklpie. Zalgouj się <a href='%{link}'>tutaj</a> lub kontynuuj jako gość"
+    },
+    "formElements": {
+      "firstName": "Imię",
+      "lastName": "Nazwisko",
+      "phoneNumber": "Numer telefonu",
+      "streetAddress": "Adres",
+      "country": "Wybierz kraj",
+      "city": "Miasto",
+      "zipCode": "Kod pocztowy",
+      "state": "Województwo",
+      "selectState": "Wpisz województwo",
+      "company": "Firma"
+    },
+    "payment": {
+      "title": "Adres rozliczeniowy",
+      "billingCheckbox": "Mój adres dostawy jest taki sam jak adres płatności",
+      "editAddress": "Edytuj adres"
+    },
+    "success": {
+      "finished": "Dziękujemy za złożenie zamówienia!",
+      "orderNumber": "Numer Twojego zamówienia to: %{orderId}.",
+      "emailDetails": "Szczegóły dotyczące zamówienia zostaną przesłane na email.",
+      "continueShopping": "Kontynuuj zakupy"
+    },
+    "discount": {
+      "title": "Zniżka",
+      "apply": "Dodaj kod zniżkowy",
+      "addDiscount": "Przyznaj rabat",
+      "removeDiscount": "Usuń rabat"
+    },
+    "totals": {
+      "summary": "Podsumowanie",
+      "subtotal": "Podsumowanie koszyka:",
+      "shipping": "Wysyłka:",
+      "tax": "Podatek:",
+      "discount": "Zniżka:",
+      "orderTotals": "Suma zamówienia:"
+    },
+    "paymentMethods": {
+      "title": "Metody płatności"
+    },
+    "shippingMethods": {
+      "title": "Metody wysyłki"
+    },
+    "productList": {
+      "title": "Lista produktów",
+      "name": "Nazwa produktu:",
+      "price": "Cena:",
+      "details": "Szczegóły produktu:",
+      "qty": "Ilość:",
+      "discount": "Zniżka:"
+    },
+    "errorCode": {
+      "required": "To pole jest obowiązkowe!",
+      "generalError": "Wygląda na to, że napotkano błąd:",
+      "unsupportedPaymentsForCountry": "Nie wspieramy żadnych metod płatności dla tego kraju.",
+      "unsupportedShippingForCountry": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
+      "discountNotFound": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",
+      "discountAddGeneralError": "Coś poszło nie tak podczas wysyłania kuponu rabatowego. Sróbuj ponownie później.",
+      "discountDeleteError": "Błąd poczas próby usunięcia kodu rabatowego: '%{code}'. Nie znaleziono takiego kuponu!",
+      "discountDeleteGeneralError": "Coś poszło nie tak podczas usuwania kuponu rabatowego. Sróbuj ponownie później."
+    }
   }
 }
diff --git a/view/frontend/web/js/i18n/index.js b/view/frontend/web/js/i18n/index.js
index e197afa..2983467 100644
--- a/view/frontend/web/js/i18n/index.js
+++ b/view/frontend/web/js/i18n/index.js
@@ -1,35 +1,29 @@
 import Vue from 'vue'
 import Vuei18n from 'vue-i18n'
 
-// Load en-US as default lang
 import defaultMessages from '../data/translations-en_US.json'
+import plMessages from '../data/translations-pl_PL.json'
 
-const storeLocale = (window.snowdog.storeLocale) ? window.snowdog.storeLocale : 'en_US'
+const storeLocale = window.snowdog.storeLocale
 
 Vue.use(Vuei18n)
 
-const i18n = new Vuei18n({
+export const i18n = new Vuei18n({
   locale: 'en_US',
   fallbackLocale: 'en_US', // Set as deafult lang to avoid missing translations
-  messages: defaultMessages
+  messages: {
+    en_US: defaultMessages.en_US,
+    pl_PL: plMessages.pl_PL
+  }
 })
 
-function loadLanguageJson (storeLocale) {
-  if (module.hot && storeLocale !== 'en_US') {
-    return import(/* webpackMode: "eager" */ `../data/translations-${storeLocale}.json`)
-      .then(messages => {
-        const languages = { 'en_US': defaultMessages }
-        languages[storeLocale] = messages
-
-        return languages
-      })
-      .catch(() => {
-        console.debug('Unable to load translations for this lang - default en_US loaded')
-        return { 'en_US': defaultMessages }
-      })
-  } else {
-    return { 'en_US': defaultMessages }
+function settingLocalCode (localCode) {
+  if (localCode === 'en_US') {
+    return false
   }
+
+  i18n.locale = localCode
+  return localCode
 }
 
-export default i18n
+settingLocalCode(storeLocale)
diff --git a/view/frontend/web/js/script.js b/view/frontend/web/js/script.js
index 9f36f72..2033678 100644
--- a/view/frontend/web/js/script.js
+++ b/view/frontend/web/js/script.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import store from './store'
-import i18n from './i18n'
+import { i18n } from './i18n'
 import App from './App.vue'
 import * as filters from './filters'
 

From 3164d9b603ab27e0f473b6a76a9a61a6cb3bdf6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Sun, 30 Dec 2018 23:32:04 +0100
Subject: [PATCH 12/20] Use global variable in utils

---
 view/frontend/web/js/utils/checkout-axios.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/web/js/utils/checkout-axios.js b/view/frontend/web/js/utils/checkout-axios.js
index cfb4ba0..4ba5d6b 100644
--- a/view/frontend/web/js/utils/checkout-axios.js
+++ b/view/frontend/web/js/utils/checkout-axios.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 export default axios.create({
-  baseURL: window.baseUrl + 'rest/V1/',
+  baseURL: window.snowdog.baseUrl + 'rest/V1/',
   headers: {
     'Content-Type': 'application/json',
     'X-Requested-With': 'XMLHttpRequest'

From a639c2cb9eac333d4b5e31dcab1bc2c2c2560f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Sun, 30 Dec 2018 23:32:48 +0100
Subject: [PATCH 13/20] Create flat translations object to use slugs in
 templates

---
 .../web/js/components/BillingAddressForm.vue  |  32 ++---
 .../web/js/components/CustomerEmailField.vue  |   7 +-
 .../web/js/components/DiscountCodeForm.vue    |  16 +--
 .../web/js/components/PaymentMethods.vue      |   6 +-
 .../web/js/components/ProductsList.vue        |   2 +-
 .../web/js/components/ProductsListItem.vue    |  10 +-
 .../web/js/components/ProgressBar.vue         |   4 +-
 .../web/js/components/ShippingMethods.vue     |   6 +-
 .../frontend/web/js/components/TotalsData.vue |  12 +-
 .../js/components/steps/ThePaymentStep.vue    |  10 +-
 .../js/components/steps/TheShippingStep.vue   |  34 ++---
 .../js/components/steps/TheSuccessStep.vue    |   8 +-
 .../web/js/data/translations-en_US.json       | 128 +++++++-----------
 .../web/js/data/translations-pl_PL.json       | 128 +++++++-----------
 14 files changed, 174 insertions(+), 229 deletions(-)

diff --git a/view/frontend/web/js/components/BillingAddressForm.vue b/view/frontend/web/js/components/BillingAddressForm.vue
index 4907b1d..a069d04 100644
--- a/view/frontend/web/js/components/BillingAddressForm.vue
+++ b/view/frontend/web/js/components/BillingAddressForm.vue
@@ -3,36 +3,36 @@
     <BaseInput
       v-model="$v.address.firstname.$model"
       :validation="$v.address.firstname"
-      :label="$t('formElements.firstName')"
+      :label="$t('First Name')"
       name="firstname"
     />
     <BaseInput
       v-model="$v.address.lastname.$model"
       :validation="$v.address.lastname"
-      :label="$t('formElements.lastName')"
+      :label="$t('Last Name')"
       name="lastname"
     />
     <BaseInput
       v-model="$v.address.telephone.$model"
       :validation="$v.address.telephone"
-      :label="$t('formElements.phoneNumber')"
+      :label="$t('Phone Number')"
       name="telephone"
       type="tel"
     />
     <BaseInput
       v-model="$v.address.street0.$model"
       :validation="$v.address.street0"
-      :label="$t('formElements.streetAddress')"
+      :label="$t('Street Address')"
       name="street0"
     />
     <BaseInput
       v-model="address.street1"
-      :label="$t('formElements.streetAddress')"
+      :label="$t('Street Address')"
       name="street1"
     />
     <div>
       <label for="country">
-        {{ $t('formElements.country') }}
+        {{ $t('Select Country') }}
       </label>
       <multiselect
         id="country"
@@ -40,7 +40,7 @@
         :options="countries"
         :allow-empty="false"
         :show-labels="false"
-        :placeholder="$t('formElements.country')"
+        :placeholder="$t('Select Country')"
         name="country"
         label="label"
       />
@@ -50,31 +50,31 @@
             && !$v.address.country_id.required
         "
       >
-        {{ $t('errorCode.required') }}
+        {{ $t('This field is required!') }}
       </span>
     </div>
     <BaseInput
       v-model="$v.address.city.$model"
       :validation="$v.address.city"
-      :label="$t('formElements.city')"
+      :label="$t('City')"
       name="city"
     />
     <BaseInput
       v-model="$v.address.postcode.$model"
       :validation="$v.address.postcode"
-      :label="$t('formElements.zipCode')"
+      :label="$t('Zip Code')"
       name="postcode"
     />
     <BaseInput
       v-if="!regions.length"
       v-model="$v.address.region.$model"
       :validation="$v.address.region"
-      :label="$t('formElements.state')"
+      :label="$t('State')"
       name="region"
     />
     <div v-if="regions.length">
       <label for="region_id">
-        {{ $t('formElements.selectState') }}
+        {{ $t('Select State') }}
       </label>
       <multiselect
         id="region_id"
@@ -83,7 +83,7 @@
         :options="regions"
         :allow-empty="false"
         :show-labels="false"
-        :placeholder="$t('formElements.state')"
+        :placeholder="$t('State')"
         name="region_id"
         label="label"
       />
@@ -93,16 +93,16 @@
             && !$v.address.region_id.required
         "
       >
-        {{ $t('errorCode.required') }}
+        {{ $t('This field is required!') }}
       </span>
     </div>
     <BaseInput
       v-model="address.company"
-      :label="$t('formElements.company')"
+      :label="$t('Company')"
       name="company"
     />
     <BaseButton
-      :text="$t('general.saveAddress')"
+      :text="$t('Save Address')"
       @click.native="saveAddress"
     />
   </form>
diff --git a/view/frontend/web/js/components/CustomerEmailField.vue b/view/frontend/web/js/components/CustomerEmailField.vue
index ced6ed2..9be6373 100644
--- a/view/frontend/web/js/components/CustomerEmailField.vue
+++ b/view/frontend/web/js/components/CustomerEmailField.vue
@@ -47,12 +47,9 @@ export default {
     emailAvailabilityMessage () {
       if (this.email !== '' && !this.$v.email.$error) {
         if (this.emailAvailable) {
-          return `You can create an account after checkout.`
+          return this.$t('You can create an account after checkout')
         } else {
-          return `
-            You already have an account with us.
-            Sign in <a href="/customer/account/login/">here</a> or continue as guest.
-          `
+          return this.$t('You already have an account with us', { link: '/customer/account/login/' })
         }
       } else {
         return false
diff --git a/view/frontend/web/js/components/DiscountCodeForm.vue b/view/frontend/web/js/components/DiscountCodeForm.vue
index 3054c3a..1a68905 100644
--- a/view/frontend/web/js/components/DiscountCodeForm.vue
+++ b/view/frontend/web/js/components/DiscountCodeForm.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
     <h2>
-      {{ $t('discount.title') }}
+      {{ $t('Discount') }}
     </h2>
     <div class="discount-code">
       <form class="discount__form">
         <BaseInput
           v-model="discount.code"
           :read-only="couponCode !== ''"
-          :label="$t('discount.apply')"
+          :label="$t('Apply Discount Code')"
           name="discount-code"
         />
         <BaseButton
           v-if="couponCode === ''"
           :loader="loader"
-          :text="$t('discount.addDiscount')"
+          :text="$t('Apply Discount')"
           class="button"
           with-loader
           @click.native="applyDiscount"
@@ -22,7 +22,7 @@
         <BaseButton
           v-else
           :loader="loader"
-          :text="$t('discount.removeDiscount')"
+          :text="$t('Remove Discount')"
           class="button"
           @click.native="removeDiscount"
         />
@@ -82,9 +82,9 @@ export default {
           this.loader = false
 
           if (error.status === 404) {
-            this.error = this.$t('errorCode.discountNotFound', { code: this.discount.code })
+            this.error = this.$t('Coupon code not found!', { code: this.discount.code })
           } else {
-            this.error = this.$t('errorCode.discountAddGeneralError')
+            this.error = this.$t('Something goes wrong when trying to send coupon code. Please try again later.')
           }
         })
     },
@@ -103,9 +103,9 @@ export default {
           this.loader = false
 
           if (error.status === 404) {
-            this.error = this.$t('errorCode.discountDeleteError', { code: this.discount.code })
+            this.error = this.$t('Failed when trying to delete coupon code', { code: this.discount.code })
           } else {
-            this.error = this.$t('errorCode.discountDeleteGeneralError')
+            this.error = this.$t('Something goes wrong when trying to delete coupon code')
           }
         })
     }
diff --git a/view/frontend/web/js/components/PaymentMethods.vue b/view/frontend/web/js/components/PaymentMethods.vue
index 6f679a6..5270dd9 100644
--- a/view/frontend/web/js/components/PaymentMethods.vue
+++ b/view/frontend/web/js/components/PaymentMethods.vue
@@ -1,7 +1,7 @@
 <template>
   <form>
     <h2>
-      {{ $t('paymentMethods.title') }}
+      {{ $t('Payment methods') }}
     </h2>
     <div v-if="paymentMethods.length">
       <div
@@ -26,12 +26,12 @@
             && !$v.selectedPaymentMethod.required
         "
       >
-        {{ $t('errorCode.required') }}
+        {{ $t('This field is required!') }}
       </span>
     </div>
     <div v-else>
       <p>
-        {{ $t('errorCode.unsupportedPaymentsForCountry') }}
+        {{ $t('In this country we don\'t handle any payment methods') }}
       </p>
     </div>
   </form>
diff --git a/view/frontend/web/js/components/ProductsList.vue b/view/frontend/web/js/components/ProductsList.vue
index 6c1793e..024da83 100644
--- a/view/frontend/web/js/components/ProductsList.vue
+++ b/view/frontend/web/js/components/ProductsList.vue
@@ -4,7 +4,7 @@
     class="products-list"
   >
     <h2>
-      {{ $t('productList.title') }}
+      {{ $t('Product List') }}
     </h2>
     <ul class="products">
       <ProductsListItem
diff --git a/view/frontend/web/js/components/ProductsListItem.vue b/view/frontend/web/js/components/ProductsListItem.vue
index 6c4e8e8..c15539e 100644
--- a/view/frontend/web/js/components/ProductsListItem.vue
+++ b/view/frontend/web/js/components/ProductsListItem.vue
@@ -1,14 +1,14 @@
 <template>
   <li class="product">
     <p class="products__title">
-      {{ $t('productList.name') }}
+      {{ $t('Product Name') }}
       <strong>
         {{ product.name }}
       </strong>
     </p>
 
     <span class="product__price">
-      {{ $t('productList.price') }}
+      {{ $t('Price') }}
 
       <strong>
         {{ product.price | currency }}
@@ -17,7 +17,7 @@
 
     <div class="products__handler">
       <p class="products__information">
-        {{ $t('productList.details') }}
+        {{ $t('Price details') }}
       </p>
 
       <template v-for="detail in JSON.parse(product.options)">
@@ -33,7 +33,7 @@
       </template>
 
       <span class="products__detail">
-        {{ $t('productList.qty') }}
+        {{ $t('Qty') }}
         <strong>
           {{ product.qty }}
         </strong>
@@ -41,7 +41,7 @@
 
       <template v-if="product.discount_percent > 0">
         <span class="product__detail">
-          {{ $t('productList.dicsount') }} {{ product.discount_percent }}%
+          {{ $t('Discount') }}: {{ product.discount_percent }}%
         </span>
       </template>
     </div>
diff --git a/view/frontend/web/js/components/ProgressBar.vue b/view/frontend/web/js/components/ProgressBar.vue
index 5506840..f67c07b 100644
--- a/view/frontend/web/js/components/ProgressBar.vue
+++ b/view/frontend/web/js/components/ProgressBar.vue
@@ -10,7 +10,7 @@
           { 'progress-bar__item--active': step === 'shipping' }
         ]"
       >
-        {{ $t('steps.shipping') }}
+        {{ $t('Shipping Step') }}
       </span>/
       <span
         :class="[
@@ -18,7 +18,7 @@
           { 'progress-bar__item--active': step === 'payment' }
         ]"
       >
-        {{ $t('steps.payment') }}
+        {{ $t('Review & Payment Step') }}
       </span>
     </h1>
   </div>
diff --git a/view/frontend/web/js/components/ShippingMethods.vue b/view/frontend/web/js/components/ShippingMethods.vue
index 28dffdc..3c2110a 100644
--- a/view/frontend/web/js/components/ShippingMethods.vue
+++ b/view/frontend/web/js/components/ShippingMethods.vue
@@ -1,7 +1,7 @@
 <template>
   <form>
     <h2>
-      {{ $t('shippingMethods.title') }}
+      {{ $t('Shipping Methods') }}
     </h2>
     <div
       v-if="shippingMethods.length"
@@ -38,12 +38,12 @@
             && !$v.selectedShippingMethod.required
         "
       >
-        {{ $t('errorCode.required') }}
+        {{ $t('This field is required!') }}
       </span>
     </div>
     <div v-else>
       <p>
-        {{ $t('errorCode.unsupportedShippingForCountry') }}
+        {{ $t('In this country we don\'t handle any shipping methods') }}
       </p>
     </div>
   </form>
diff --git a/view/frontend/web/js/components/TotalsData.vue b/view/frontend/web/js/components/TotalsData.vue
index 9550f10..faabf39 100644
--- a/view/frontend/web/js/components/TotalsData.vue
+++ b/view/frontend/web/js/components/TotalsData.vue
@@ -4,11 +4,11 @@
     class="totals"
   >
     <h2>
-      {{ $t('totals.summary') }}
+      {{ $t('Order Summary') }}
     </h2>
 
     <p class="totals__item">
-      {{ $t('totals.subtotal') }}
+      {{ $t('Cart Subtotal') }}
 
       <strong>
         {{ totals.subtotal | currency }}
@@ -16,7 +16,7 @@
     </p>
 
     <p class="totals__item">
-      {{ $t('totals.shipping') }}
+      {{ $t('Shipping') }}
 
       <strong>
         {{ totals.shipping_amount | currency }}
@@ -27,7 +27,7 @@
       v-if="parseInt(totals.tax_amount) !== 0"
       class="totals__item"
     >
-      {{ $t('totals.tax') }}
+      {{ $t('Tax') }}
 
       <strong>
         {{ totals.tax_amount | currency }}
@@ -38,7 +38,7 @@
       v-if="parseInt(totals.discount_amount) !== 0"
       class="totals__item-dicsount"
     >
-      {{ $t('totals.discount') }}
+      {{ $t('Discount') }}
 
       <strong>
         {{ totals.discount_amount | currency }}
@@ -49,7 +49,7 @@
       v-if="totals.subtotal !== totals.base_grand_total"
       class="totals__item-total"
     >
-      {{ $t('totals.orderTotals') }}
+      {{ $t('Order Totals') }}
 
       <strong>
         {{ totals.base_grand_total | currency }}
diff --git a/view/frontend/web/js/components/steps/ThePaymentStep.vue b/view/frontend/web/js/components/steps/ThePaymentStep.vue
index 6139fbd..194f2d6 100644
--- a/view/frontend/web/js/components/steps/ThePaymentStep.vue
+++ b/view/frontend/web/js/components/steps/ThePaymentStep.vue
@@ -4,11 +4,11 @@
     class="billing-address"
   >
     <h2>
-      {{ $t('payment.title') }}
+      {{ $t('Billing Address') }}
     </h2>
     <BaseCheckbox
       id="billing-address-same-as-shipping-address"
-      :text="$t('payment.billingCheckbox')"
+      :text="$t('My billing and shipping address are the same')"
       v-model="billingAndShippingAddressTheSame"
       label-class="label"
       field-class="checkbox shipping-address__field"
@@ -23,7 +23,7 @@
       <template v-if="editBillingAddress">
         <BillingAddressForm @hideAddressForm="editBillingAddress = false"/>
         <BaseButton
-          :text="$t('general.cancel')"
+          :text="$t('Cancel')"
           @click.native="toggleBillingAddress()"
         />
       </template>
@@ -46,11 +46,11 @@
     <BaseButton
       :loader="loader"
       :disabled="disabledPlaceOrder"
-      :text="$t('general.order')"
+      :text="$t('Place Order')"
       @click.native="placeOrder"
     />
     <BaseButton
-      :text="$t('general.back')"
+      :text="$t('Back')"
       @click.native="changeStep('shipping')"
     />
   </section>
diff --git a/view/frontend/web/js/components/steps/TheShippingStep.vue b/view/frontend/web/js/components/steps/TheShippingStep.vue
index f9554ba..eec808f 100644
--- a/view/frontend/web/js/components/steps/TheShippingStep.vue
+++ b/view/frontend/web/js/components/steps/TheShippingStep.vue
@@ -3,7 +3,7 @@
     v-if="step === 'shipping'"
     class="shipping-address"
   >
-    <h2>{{ $t('shipping.title') }}</h2>
+    <h2>{{ $t('Shipping Address') }}</h2>
     <form class="shipping-address__form">
       <CustomerEmailField
         v-if="!isCustomerLoggedIn"
@@ -14,36 +14,36 @@
         <BaseInput
           v-model="$v.address.firstname.$model"
           :validation="$v.address.firstname"
-          :label="$t('formElements.firstName')"
+          :label="$t('First Name')"
           name="firstname"
         />
         <BaseInput
           v-model="$v.address.lastname.$model"
           :validation="$v.address.lastname"
-          :label="$t('formElements.lastName')"
+          :label="$t('Last Name')"
           name="lastname"
         />
         <BaseInput
           v-model="$v.address.telephone.$model"
           :validation="$v.address.telephone"
-          :label="$t('formElements.phoneNumber')"
+          :label="$t('Phone Number')"
           name="telephone"
           type="tel"
         />
         <BaseInput
           v-model="$v.address.street0.$model"
           :validation="$v.address.street0"
-          :label="$t('formElements.streetAddress')"
+          :label="$t('Street Address')"
           name="street0"
         />
         <BaseInput
           v-model="address.street1"
-          :label="$t('formElements.streetAddress')"
+          :label="$t('Street Address')"
           name="street1"
         />
         <div>
           <label for="country">
-            {{ $t('formElements.country') }}
+            {{ $t('Select Country') }}
           </label>
           <multiselect
             id="country"
@@ -51,7 +51,7 @@
             :options="countries"
             :allow-empty="false"
             :show-labels="false"
-            :placeholder="$t('formElements.country')"
+            :placeholder="$t('Select Country')"
             name="country"
             label="label"
             @input="onCountryChange"
@@ -62,31 +62,31 @@
                 && !$v.address.country_id.required
             "
           >
-            {{ $t('errorCode.required') }}
+            {{ $t('This field is required!') }}
           </span>
         </div>
         <BaseInput
           v-model="$v.address.city.$model"
           :validation="$v.address.city"
-          :label="$t('formElements.city')"
+          :label="$t('City')"
           name="city"
         />
         <BaseInput
           v-model="$v.address.postcode.$model"
           :validation="$v.address.postcode"
-          :label="$t('formElements.zipCode')"
+          :label="$t('Zip Code')"
           name="postcode"
         />
         <BaseInput
           v-if="!regions.length"
           v-model="$v.address.region.$model"
           :validation="$v.address.region"
-          :label="$t('formElements.state')"
+          :label="$t('State')"
           name="region"
         />
         <div v-if="regions.length">
           <label for="region_id">
-            {{ $t("formElements.selectState") }}
+            {{ $t("Select State") }}
           </label>
           <multiselect
             id="region_id"
@@ -95,7 +95,7 @@
             :options="regions"
             :allow-empty="false"
             :show-labels="false"
-            :placeholder="$t('formElements.selectState')"
+            :placeholder="$t('Select State')"
             name="region_id"
             label="label"
           />
@@ -105,12 +105,12 @@
                 && !$v.address.region_id.required
             "
           >
-            {{ $t('errorCode.required') }}
+            {{ $t('This field is required!') }}
           </span>
         </div>
         <BaseInput
           v-model="address.company"
-          :label="$t('formElements.company')"
+          :label="$t('Company')"
           name="company"
         />
       </div>
@@ -121,7 +121,7 @@
     />
     <BaseButton
       :loader="loader"
-      :text="$t('general.nextStep')"
+      :text="$t('Next Step')"
       @click.native="goToNextStep()"
     />
   </section>
diff --git a/view/frontend/web/js/components/steps/TheSuccessStep.vue b/view/frontend/web/js/components/steps/TheSuccessStep.vue
index 4a2d604..9e5befa 100644
--- a/view/frontend/web/js/components/steps/TheSuccessStep.vue
+++ b/view/frontend/web/js/components/steps/TheSuccessStep.vue
@@ -1,12 +1,12 @@
 <template>
   <section v-if="step === 'success'">
-    <h1> {{ $t('success.finished') }}</h1>
+    <h1> {{ $t('Thank you for your purchase!') }}</h1>
     <template v-if="orderId !== null">
-      {{ $t('success.orderNumber', { orderId: orderId }) }}
+      {{ $t('Your order number is', { orderId: orderId }) }}
     </template>
-    <p>{{ $t('success.emailDetails') }}</p>
+    <p>{{ $t('We\'ll email you an order confirmation with details and tracking info.') }}</p>
     <a href="/">
-      {{ $t('success.continueShopping') }}
+      {{ $t('Continue shopping') }}
     </a>
   </section>
 </template>
diff --git a/view/frontend/web/js/data/translations-en_US.json b/view/frontend/web/js/data/translations-en_US.json
index 1477ead..4453343 100644
--- a/view/frontend/web/js/data/translations-en_US.json
+++ b/view/frontend/web/js/data/translations-en_US.json
@@ -1,81 +1,55 @@
 {
   "en_US": {
-    "general": {
-      "nextStep": "Next Step",
-      "back": "Back",
-      "order": "Place order",
-      "cancel": "Cancel",
-      "saveAddress": "Save Address"
-    },
-    "steps": {
-      "shipping": "Shipping Step",
-      "payment": "Review & Payments Step"
-    },
-    "shipping": {
-      "title": "Shipping address",
-      "createAccount": "You can create an account after checkout",
-      "logIn": "You already have an account with us. Sign in <a href='%{link}'>here</a> or continue as guest."
-    },
-    "formElements": {
-      "firstName": "First name",
-      "lastName": "Last name",
-      "phoneNumber": "Phone Number",
-      "streetAddress": "Street Address",
-      "country": "Select Country",
-      "city": "City",
-      "zipCode": "Zip/Postal Code",
-      "state": "State/Province",
-      "selectState": "Select State/Province",
-      "company": "Company"
-    },
-    "payment": {
-      "title": "Billing Address",
-      "billingCheckbox": "My billing and shipping address are the same",
-      "editAddress": "Edit Address"
-    },
-    "success": {
-      "finished": "Thank you for your purchase!",
-      "orderNumber": "Your order number is: %{orderId}.",
-      "emailDetails": "We'll email you an order confirmation with details and tracking info.",
-      "continueShopping": "Continue shopping"
-    },
-    "discount": {
-      "title": "Discount",
-      "apply": "Apply Discount Code",
-      "addDiscount": "Apply Discount",
-      "removeDiscount": "Remove Discount"
-    },
-    "totals": {
-      "summary": "Order summary",
-      "subtotal": "Cart subtotal:",
-      "shipping": "Shipping:",
-      "tax": "Tax:",
-      "discount": "Discount:",
-      "orderTotals": "Order Total:"
-    },
-    "paymentMethods": {
-      "title": "Payment methods"
-    },
-    "shippingMethods": {
-      "title": "Shipping Methods"
-    },
-    "productList": {
-      "title": "Product List",
-      "name": "Product name:",
-      "price": "Price:",
-      "details": "Product details:",
-      "qty": "Qty:",
-      "discount": "Discount:"
-    },
-    "errorCode": {
-      "required": "This field is required!",
-      "generalError": "Looks like there was a problem:",
-      "unsupportedPaymentsForCountry": "In this country we don't handle any payment methods.",
-      "unsupportedShippingForCountry": "In this country we don't handle any shipping methods.",
-      "discountNotFound": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
-      "discountAddGeneralError": "Something goes wrong when trying to send coupon code. Please try again later.",
-      "discountDeleteError": "Failed when trying to delete: '%{code}' coupon code. Coupon code not found!",
-      "discountDeleteGeneralError": "Something goes wrong when trying to delete coupon code. Please try again later."
-    }
+    "Next Step": "Next Step",
+    "Back": "Back",
+    "Place order": "Place order",
+    "Cancel": "Cancel",
+    "Save Address": "Save Address",
+    "Shipping Step": "Shipping Step",
+    "Review & Payment Step": "Review & Payments Step",
+    "Shipping Address": "Shipping address",
+    "You can create an account after checkout": "You can create an account after checkout",
+    "You already have an account with us": "You already have an account with us. Sign in <a href='%{link}'>here</a> or continue as guest.",
+    "First Name": "First name",
+    "Last Name": "Last name",
+    "Phone Number": "Phone Number",
+    "Street Address": "Street Address",
+    "Select Country": "Select Country",
+    "City": "City",
+    "Zip Code": "Zip/Postal Code",
+    "State": "State/Province",
+    "Select State": "Select State/Province",
+    "Company": "Company",
+    "Billing Address": "Billing Address",
+    "My billing and shipping address are the same": "My billing and shipping address are the same",
+    "Edit Address": "Edit Address",
+    "Thank you for your purchase!": "Thank you for your purchase!",
+    "Your order number is": "Your order number is: %{orderId}.",
+    "We'll email you an order confirmation with details and tracking info.": "We'll email you an order confirmation with details and tracking info.",
+    "Continue shopping": "Continue shopping",
+    "Discount": "Discount",
+    "Apply Discount Code": "Apply Discount Code",
+    "Apply Discount": "Apply Discount",
+    "Remove Discount": "Remove Discount",
+    "Order Summary": "Order summary",
+    "Cart Subtotal": "Cart subtotal:",
+    "Shipping": "Shipping:",
+    "Tax": "Tax:",
+    "Order Totals": "Order Total:",
+    "Payment methods": "Payment methods",
+    "Shipping Methods": "Shipping Methods",
+    "Product List": "Product List",
+    "Product name": "Product name:",
+    "Price": "Price:",
+    "Price details": "Product details:",
+    "Qty": "Qty:",
+    "This field is required!": "This field is required!",
+    "Looks like there was a problem": "Looks like there was a problem:",
+    "In this country we don't handle any payment methods": "In this country we don't handle any payment methods.",
+    "In this country we don't handle any shipping methods": "In this country we don't handle any shipping methods.",
+    "Coupon code not found!": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
+    "Something goes wrong when trying to send coupon code. Please try again later.": "Something goes wrong when trying to send coupon code. Please try again later.",
+    "Failed when trying to delete coupon code": "Failed when trying to delete: '%{code}' coupon code. Coupon code not found!",
+    "Something goes wrong when trying to delete coupon code": "Something goes wrong when trying to delete coupon code. Please try again later."
   }
 }
diff --git a/view/frontend/web/js/data/translations-pl_PL.json b/view/frontend/web/js/data/translations-pl_PL.json
index d9874d1..ce88459 100644
--- a/view/frontend/web/js/data/translations-pl_PL.json
+++ b/view/frontend/web/js/data/translations-pl_PL.json
@@ -1,81 +1,55 @@
 {
   "pl_PL": {
-    "general": {
-      "nextStep": "Przejdź dalej",
-      "back": "Wróć",
-      "order": "Złóż zamówienie",
-      "cancel": "Anuluj",
-      "saveAddress": "Zapisz adres"
-    },
-    "steps": {
-      "shipping": "Sposób wysyłki",
-      "payment": "Podsumowanie i płatność"
-    },
-    "shipping": {
-      "title": "Adres dostawy",
-      "createAccount": "Możesz stworzyć konto po zakupie",
-      "logIn": "Posiadasz konto w naszym sklpie. Zalgouj się <a href='%{link}'>tutaj</a> lub kontynuuj jako gość"
-    },
-    "formElements": {
-      "firstName": "Imię",
-      "lastName": "Nazwisko",
-      "phoneNumber": "Numer telefonu",
-      "streetAddress": "Adres",
-      "country": "Wybierz kraj",
-      "city": "Miasto",
-      "zipCode": "Kod pocztowy",
-      "state": "Województwo",
-      "selectState": "Wpisz województwo",
-      "company": "Firma"
-    },
-    "payment": {
-      "title": "Adres rozliczeniowy",
-      "billingCheckbox": "Mój adres dostawy jest taki sam jak adres płatności",
-      "editAddress": "Edytuj adres"
-    },
-    "success": {
-      "finished": "Dziękujemy za złożenie zamówienia!",
-      "orderNumber": "Numer Twojego zamówienia to: %{orderId}.",
-      "emailDetails": "Szczegóły dotyczące zamówienia zostaną przesłane na email.",
-      "continueShopping": "Kontynuuj zakupy"
-    },
-    "discount": {
-      "title": "Zniżka",
-      "apply": "Dodaj kod zniżkowy",
-      "addDiscount": "Przyznaj rabat",
-      "removeDiscount": "Usuń rabat"
-    },
-    "totals": {
-      "summary": "Podsumowanie",
-      "subtotal": "Podsumowanie koszyka:",
-      "shipping": "Wysyłka:",
-      "tax": "Podatek:",
-      "discount": "Zniżka:",
-      "orderTotals": "Suma zamówienia:"
-    },
-    "paymentMethods": {
-      "title": "Metody płatności"
-    },
-    "shippingMethods": {
-      "title": "Metody wysyłki"
-    },
-    "productList": {
-      "title": "Lista produktów",
-      "name": "Nazwa produktu:",
-      "price": "Cena:",
-      "details": "Szczegóły produktu:",
-      "qty": "Ilość:",
-      "discount": "Zniżka:"
-    },
-    "errorCode": {
-      "required": "To pole jest obowiązkowe!",
-      "generalError": "Wygląda na to, że napotkano błąd:",
-      "unsupportedPaymentsForCountry": "Nie wspieramy żadnych metod płatności dla tego kraju.",
-      "unsupportedShippingForCountry": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
-      "discountNotFound": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",
-      "discountAddGeneralError": "Coś poszło nie tak podczas wysyłania kuponu rabatowego. Sróbuj ponownie później.",
-      "discountDeleteError": "Błąd poczas próby usunięcia kodu rabatowego: '%{code}'. Nie znaleziono takiego kuponu!",
-      "discountDeleteGeneralError": "Coś poszło nie tak podczas usuwania kuponu rabatowego. Sróbuj ponownie później."
-    }
+    "Next Step": "Przejdź dalej",
+    "Back": "Wróć",
+    "Place Order": "Złóż zamówienie",
+    "Cancel": "Anuluj",
+    "Save Address": "Zapisz adres",
+    "Shipping Step": "Sposób wysyłki",
+    "Review & Payment Step": "Podsumowanie i płatność",
+    "Shipping Address": "Adres dostawy",
+    "You can create an account after checkout": "Możesz stworzyć konto po zakupie",
+    "You already have an account with us": "Posiadasz konto w naszym sklpie. Zalgouj się <a href='%{link}'>tutaj</a> lub kontynuuj jako gość",
+    "First Name": "Imię",
+    "Last Name": "Nazwisko",
+    "Phone Number": "Numer telefonu",
+    "Street Address": "Adres",
+    "Select Country": "Wybierz kraj",
+    "City": "Miasto",
+    "Zip Code": "Kod pocztowy",
+    "State": "Województwo",
+    "Select State": "Wpisz województwo",
+    "Company": "Firma",
+    "Billing Address": "Adres rozliczeniowy",
+    "My billing and shipping address are the same": "Mój adres dostawy jest taki sam jak adres płatności",
+    "Edit Address": "Edytuj adres",
+    "Thank you for your purchase!": "Dziękujemy za złożenie zamówienia!",
+    "Your order number is": "Numer Twojego zamówienia to: %{orderId}.",
+    "We'll email you an order confirmation with details and tracking info.": "Szczegóły dotyczące zamówienia zostaną przesłane na email.",
+    "Continue shopping": "Kontynuuj zakupy",
+    "Discount": "Zniżka",
+    "Apply Discount Code": "Dodaj kod zniżkowy",
+    "Apply Discount": "Przyznaj rabat",
+    "Remove Discount": "Usuń rabat",
+    "Order Summary": "Podsumowanie",
+    "Cart Subtotal": "Podsumowanie koszyka:",
+    "Shipping": "Wysyłka:",
+    "Tax": "Podatek:",
+    "Order Totals": "Suma zamówienia:",
+    "Payment Methods": "Metody płatności",
+    "Shipping Methods": "Metody wysyłki",
+    "Product List": "Lista produktów",
+    "Product Name": "Nazwa produktu:",
+    "Price": "Cena:",
+    "Price details": "Szczegóły produktu:",
+    "Qty": "Ilość:",
+    "This field is required!": "To pole jest obowiązkowe!",
+    "Looks like there was a problem": "Wygląda na to, że napotkano błąd:",
+    "In this country we don't handle any payment methods": "Nie wspieramy żadnych metod płatności dla tego kraju.",
+    "In this country we don't handle any shipping methods": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
+    "Coupon code not found!": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",
+    "Something goes wrong when trying to send coupon code. Please try again later.": "Coś poszło nie tak podczas wysyłania kuponu rabatowego. Sróbuj ponownie później.",
+    "Failed when trying to delete coupon code": "Błąd poczas próby usunięcia kodu rabatowego: '%{code}'. Nie znaleziono takiego kuponu!",
+    "Something goes wrong when trying to delete coupon code": "Coś poszło nie tak podczas usuwania kuponu rabatowego. Sróbuj ponownie później."
   }
 }

From aca0803b0188b5dae36ac8215fcdb7fe00e0354f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Mon, 31 Dec 2018 00:10:34 +0100
Subject: [PATCH 14/20] Fix one translation in product list item

---
 view/frontend/web/js/components/ProductsListItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/web/js/components/ProductsListItem.vue b/view/frontend/web/js/components/ProductsListItem.vue
index c15539e..ad03304 100644
--- a/view/frontend/web/js/components/ProductsListItem.vue
+++ b/view/frontend/web/js/components/ProductsListItem.vue
@@ -1,7 +1,7 @@
 <template>
   <li class="product">
     <p class="products__title">
-      {{ $t('Product Name') }}
+      {{ $t('Product name') }}
       <strong>
         {{ product.name }}
       </strong>

From 4856c5403c34b610d7bfd5086d17b4755f7a195a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Mon, 31 Dec 2018 00:10:53 +0100
Subject: [PATCH 15/20] Add global variable in jest configuration in
 package.json

---
 package.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package.json b/package.json
index 9030036..21b94cc 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,11 @@
     "transform": {
       "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
       ".*\\.(vue)$": "<rootDir>/node_modules/jest-vue-preprocessor"
+    },
+    "globals": {
+      "snowdog": {
+        "baseUrl": "global-base-url"
+      }
     }
   },
   "dependencies": {

From 796e567e41a52553b8300cc73d203b936471062a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 4 Jan 2019 12:22:29 +0100
Subject: [PATCH 16/20] Revert unecessary changes from HMR b/c we don't use it

---
 .babelrc     |   1 -
 .eslintrc.js |   4 +-
 package.json |   3 --
 yarn.lock    | 141 +++++----------------------------------------------
 4 files changed, 15 insertions(+), 134 deletions(-)

diff --git a/.babelrc b/.babelrc
index bb726eb..73d7cf3 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,5 +1,4 @@
 {
-  "plugins": ["syntax-dynamic-import"],
   "presets": [
     ["env", { "modules": false }],
     "stage-3"
diff --git a/.eslintrc.js b/.eslintrc.js
index 62f883c..3a77b16 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,9 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    parser: "babel-eslint",
-    ecmaVersion: 8,
-    sourceType: "module"
+    sourceType: 'module'
   },
   env: {
     browser: true,
diff --git a/package.json b/package.json
index 21b94cc..7577eda 100644
--- a/package.json
+++ b/package.json
@@ -39,11 +39,8 @@
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.20",
     "babel-core": "^6.26.3",
-    "babel-eslint": "^8.2.6",
     "babel-jest": "^23.0.1",
     "babel-loader": "^7.1.4",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-stage-3": "^6.24.1",
     "css-loader": "^0.28.7",
diff --git a/yarn.lock b/yarn.lock
index cac30d5..6b9a3e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,56 +2,12 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
-  dependencies:
-    "@babel/highlight" "7.0.0-beta.44"
-
 "@babel/code-frame@^7.0.0-beta.35":
   version "7.0.0-beta.51"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.51.tgz#bd71d9b192af978df915829d39d4094456439a0c"
   dependencies:
     "@babel/highlight" "7.0.0-beta.51"
 
-"@babel/generator@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
-  dependencies:
-    "@babel/types" "7.0.0-beta.44"
-    jsesc "^2.5.1"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/helper-function-name@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
-  dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.44"
-    "@babel/template" "7.0.0-beta.44"
-    "@babel/types" "7.0.0-beta.44"
-
-"@babel/helper-get-function-arity@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
-  dependencies:
-    "@babel/types" "7.0.0-beta.44"
-
-"@babel/helper-split-export-declaration@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
-  dependencies:
-    "@babel/types" "7.0.0-beta.44"
-
-"@babel/highlight@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
 "@babel/highlight@7.0.0-beta.51":
   version "7.0.0-beta.51"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.51.tgz#e8844ae25a1595ccfd42b89623b4376ca06d225d"
@@ -60,38 +16,6 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/template@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.44"
-    "@babel/types" "7.0.0-beta.44"
-    babylon "7.0.0-beta.44"
-    lodash "^4.2.0"
-
-"@babel/traverse@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.44"
-    "@babel/generator" "7.0.0-beta.44"
-    "@babel/helper-function-name" "7.0.0-beta.44"
-    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
-    "@babel/types" "7.0.0-beta.44"
-    babylon "7.0.0-beta.44"
-    debug "^3.1.0"
-    globals "^11.1.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-"@babel/types@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^2.0.0"
-
 "@vue/test-utils@^1.0.0-beta.20":
   version "1.0.0-beta.20"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.20.tgz#ef4505341b802f3de1c06b3cb8651378c87371fa"
@@ -411,17 +335,6 @@ babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.26.3:
     slash "^1.0.0"
     source-map "^0.5.7"
 
-babel-eslint@^8.2.6:
-  version "8.2.6"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.6.tgz#6270d0c73205628067c0f7ae1693a9e797acefd9"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.44"
-    "@babel/traverse" "7.0.0-beta.44"
-    "@babel/types" "7.0.0-beta.44"
-    babylon "7.0.0-beta.44"
-    eslint-scope "3.7.1"
-    eslint-visitor-keys "^1.0.0"
-
 babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
@@ -584,10 +497,6 @@ babel-plugin-syntax-async-generators@^6.5.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
 
-babel-plugin-syntax-dynamic-import@^6.18.0:
-  version "6.18.0"
-  resolved "http://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
-
 babel-plugin-syntax-exponentiation-operator@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
@@ -818,14 +727,6 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-polyfill@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
-  dependencies:
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    regenerator-runtime "^0.10.5"
-
 babel-preset-env@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
@@ -930,10 +831,6 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@7.0.0-beta.44:
-  version "7.0.0-beta.44"
-  resolved "http://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
-
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
@@ -2107,7 +2004,7 @@ eslint-plugin-vue@^4.5.0:
   dependencies:
     vue-eslint-parser "^2.0.3"
 
-eslint-scope@3.7.1, eslint-scope@^3.7.1:
+eslint-scope@^3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
   dependencies:
@@ -2631,10 +2528,6 @@ globals@^11.0.1:
   version "11.5.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.5.0.tgz#6bc840de6771173b191f13d3a9c94d441ee92642"
 
-globals@^11.1.0:
-  version "11.9.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
-
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -2951,7 +2844,7 @@ interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
-invariant@^2.2.0, invariant@^2.2.2:
+invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
@@ -3668,10 +3561,6 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -3853,10 +3742,6 @@ lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.3.0, l
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-lodash@^4.2.0:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -4531,6 +4416,10 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -5093,10 +4982,6 @@ regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
-regenerator-runtime@^0.10.5:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
-
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -5302,12 +5187,18 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0:
+resolve@^1.3.3, resolve@^1.4.0:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.5.0, resolve@^1.6.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
+  dependencies:
+    path-parse "^1.0.6"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -5574,7 +5465,7 @@ source-map@^0.4.2, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -5881,10 +5772,6 @@ to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"

From 708739f320e61426f5fde35fa915522ddacc8450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 4 Jan 2019 12:22:53 +0100
Subject: [PATCH 17/20] Simplify array of translations and name of function to
 update lang

---
 .../web/js/data/translations-en_US.json       | 104 +++++++++---------
 .../web/js/data/translations-pl_PL.json       | 104 +++++++++---------
 view/frontend/web/js/i18n/index.js            |   8 +-
 3 files changed, 106 insertions(+), 110 deletions(-)

diff --git a/view/frontend/web/js/data/translations-en_US.json b/view/frontend/web/js/data/translations-en_US.json
index 4453343..9f87f4c 100644
--- a/view/frontend/web/js/data/translations-en_US.json
+++ b/view/frontend/web/js/data/translations-en_US.json
@@ -1,55 +1,53 @@
 {
-  "en_US": {
-    "Next Step": "Next Step",
-    "Back": "Back",
-    "Place order": "Place order",
-    "Cancel": "Cancel",
-    "Save Address": "Save Address",
-    "Shipping Step": "Shipping Step",
-    "Review & Payment Step": "Review & Payments Step",
-    "Shipping Address": "Shipping address",
-    "You can create an account after checkout": "You can create an account after checkout",
-    "You already have an account with us": "You already have an account with us. Sign in <a href='%{link}'>here</a> or continue as guest.",
-    "First Name": "First name",
-    "Last Name": "Last name",
-    "Phone Number": "Phone Number",
-    "Street Address": "Street Address",
-    "Select Country": "Select Country",
-    "City": "City",
-    "Zip Code": "Zip/Postal Code",
-    "State": "State/Province",
-    "Select State": "Select State/Province",
-    "Company": "Company",
-    "Billing Address": "Billing Address",
-    "My billing and shipping address are the same": "My billing and shipping address are the same",
-    "Edit Address": "Edit Address",
-    "Thank you for your purchase!": "Thank you for your purchase!",
-    "Your order number is": "Your order number is: %{orderId}.",
-    "We'll email you an order confirmation with details and tracking info.": "We'll email you an order confirmation with details and tracking info.",
-    "Continue shopping": "Continue shopping",
-    "Discount": "Discount",
-    "Apply Discount Code": "Apply Discount Code",
-    "Apply Discount": "Apply Discount",
-    "Remove Discount": "Remove Discount",
-    "Order Summary": "Order summary",
-    "Cart Subtotal": "Cart subtotal:",
-    "Shipping": "Shipping:",
-    "Tax": "Tax:",
-    "Order Totals": "Order Total:",
-    "Payment methods": "Payment methods",
-    "Shipping Methods": "Shipping Methods",
-    "Product List": "Product List",
-    "Product name": "Product name:",
-    "Price": "Price:",
-    "Price details": "Product details:",
-    "Qty": "Qty:",
-    "This field is required!": "This field is required!",
-    "Looks like there was a problem": "Looks like there was a problem:",
-    "In this country we don't handle any payment methods": "In this country we don't handle any payment methods.",
-    "In this country we don't handle any shipping methods": "In this country we don't handle any shipping methods.",
-    "Coupon code not found!": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
-    "Something goes wrong when trying to send coupon code. Please try again later.": "Something goes wrong when trying to send coupon code. Please try again later.",
-    "Failed when trying to delete coupon code": "Failed when trying to delete: '%{code}' coupon code. Coupon code not found!",
-    "Something goes wrong when trying to delete coupon code": "Something goes wrong when trying to delete coupon code. Please try again later."
-  }
+  "Next Step": "Next Step",
+  "Back": "Back",
+  "Place order": "Place order",
+  "Cancel": "Cancel",
+  "Save Address": "Save Address",
+  "Shipping Step": "Shipping Step",
+  "Review & Payment Step": "Review & Payments Step",
+  "Shipping Address": "Shipping address",
+  "You can create an account after checkout": "You can create an account after checkout",
+  "You already have an account with us": "You already have an account with us. Sign in <a href='%{link}'>here</a> or continue as guest.",
+  "First Name": "First name",
+  "Last Name": "Last name",
+  "Phone Number": "Phone Number",
+  "Street Address": "Street Address",
+  "Select Country": "Select Country",
+  "City": "City",
+  "Zip Code": "Zip/Postal Code",
+  "State": "State/Province",
+  "Select State": "Select State/Province",
+  "Company": "Company",
+  "Billing Address": "Billing Address",
+  "My billing and shipping address are the same": "My billing and shipping address are the same",
+  "Edit Address": "Edit Address",
+  "Thank you for your purchase!": "Thank you for your purchase!",
+  "Your order number is": "Your order number is: %{orderId}.",
+  "We'll email you an order confirmation with details and tracking info.": "We'll email you an order confirmation with details and tracking info.",
+  "Continue shopping": "Continue shopping",
+  "Discount": "Discount",
+  "Apply Discount Code": "Apply Discount Code",
+  "Apply Discount": "Apply Discount",
+  "Remove Discount": "Remove Discount",
+  "Order Summary": "Order summary",
+  "Cart Subtotal": "Cart subtotal:",
+  "Shipping": "Shipping:",
+  "Tax": "Tax:",
+  "Order Totals": "Order Total:",
+  "Payment methods": "Payment methods",
+  "Shipping Methods": "Shipping Methods",
+  "Product List": "Product List",
+  "Product name": "Product name:",
+  "Price": "Price:",
+  "Price details": "Product details:",
+  "Qty": "Qty:",
+  "This field is required!": "This field is required!",
+  "Looks like there was a problem": "Looks like there was a problem:",
+  "In this country we don't handle any payment methods": "In this country we don't handle any payment methods.",
+  "In this country we don't handle any shipping methods": "In this country we don't handle any shipping methods.",
+  "Coupon code not found!": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
+  "Something goes wrong when trying to send coupon code. Please try again later.": "Something goes wrong when trying to send coupon code. Please try again later.",
+  "Failed when trying to delete coupon code": "Failed when trying to delete: '%{code}' coupon code. Coupon code not found!",
+  "Something goes wrong when trying to delete coupon code": "Something goes wrong when trying to delete coupon code. Please try again later."
 }
diff --git a/view/frontend/web/js/data/translations-pl_PL.json b/view/frontend/web/js/data/translations-pl_PL.json
index ce88459..f283d59 100644
--- a/view/frontend/web/js/data/translations-pl_PL.json
+++ b/view/frontend/web/js/data/translations-pl_PL.json
@@ -1,55 +1,53 @@
 {
-  "pl_PL": {
-    "Next Step": "Przejdź dalej",
-    "Back": "Wróć",
-    "Place Order": "Złóż zamówienie",
-    "Cancel": "Anuluj",
-    "Save Address": "Zapisz adres",
-    "Shipping Step": "Sposób wysyłki",
-    "Review & Payment Step": "Podsumowanie i płatność",
-    "Shipping Address": "Adres dostawy",
-    "You can create an account after checkout": "Możesz stworzyć konto po zakupie",
-    "You already have an account with us": "Posiadasz konto w naszym sklpie. Zalgouj się <a href='%{link}'>tutaj</a> lub kontynuuj jako gość",
-    "First Name": "Imię",
-    "Last Name": "Nazwisko",
-    "Phone Number": "Numer telefonu",
-    "Street Address": "Adres",
-    "Select Country": "Wybierz kraj",
-    "City": "Miasto",
-    "Zip Code": "Kod pocztowy",
-    "State": "Województwo",
-    "Select State": "Wpisz województwo",
-    "Company": "Firma",
-    "Billing Address": "Adres rozliczeniowy",
-    "My billing and shipping address are the same": "Mój adres dostawy jest taki sam jak adres płatności",
-    "Edit Address": "Edytuj adres",
-    "Thank you for your purchase!": "Dziękujemy za złożenie zamówienia!",
-    "Your order number is": "Numer Twojego zamówienia to: %{orderId}.",
-    "We'll email you an order confirmation with details and tracking info.": "Szczegóły dotyczące zamówienia zostaną przesłane na email.",
-    "Continue shopping": "Kontynuuj zakupy",
-    "Discount": "Zniżka",
-    "Apply Discount Code": "Dodaj kod zniżkowy",
-    "Apply Discount": "Przyznaj rabat",
-    "Remove Discount": "Usuń rabat",
-    "Order Summary": "Podsumowanie",
-    "Cart Subtotal": "Podsumowanie koszyka:",
-    "Shipping": "Wysyłka:",
-    "Tax": "Podatek:",
-    "Order Totals": "Suma zamówienia:",
-    "Payment Methods": "Metody płatności",
-    "Shipping Methods": "Metody wysyłki",
-    "Product List": "Lista produktów",
-    "Product Name": "Nazwa produktu:",
-    "Price": "Cena:",
-    "Price details": "Szczegóły produktu:",
-    "Qty": "Ilość:",
-    "This field is required!": "To pole jest obowiązkowe!",
-    "Looks like there was a problem": "Wygląda na to, że napotkano błąd:",
-    "In this country we don't handle any payment methods": "Nie wspieramy żadnych metod płatności dla tego kraju.",
-    "In this country we don't handle any shipping methods": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
-    "Coupon code not found!": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",
-    "Something goes wrong when trying to send coupon code. Please try again later.": "Coś poszło nie tak podczas wysyłania kuponu rabatowego. Sróbuj ponownie później.",
-    "Failed when trying to delete coupon code": "Błąd poczas próby usunięcia kodu rabatowego: '%{code}'. Nie znaleziono takiego kuponu!",
-    "Something goes wrong when trying to delete coupon code": "Coś poszło nie tak podczas usuwania kuponu rabatowego. Sróbuj ponownie później."
-  }
+  "Next Step": "Przejdź dalej",
+  "Back": "Wróć",
+  "Place Order": "Złóż zamówienie",
+  "Cancel": "Anuluj",
+  "Save Address": "Zapisz adres",
+  "Shipping Step": "Sposób wysyłki",
+  "Review & Payment Step": "Podsumowanie i płatność",
+  "Shipping Address": "Adres dostawy",
+  "You can create an account after checkout": "Możesz stworzyć konto po zakupie",
+  "You already have an account with us": "Posiadasz konto w naszym sklpie. Zalgouj się <a href='%{link}'>tutaj</a> lub kontynuuj jako gość",
+  "First Name": "Imię",
+  "Last Name": "Nazwisko",
+  "Phone Number": "Numer telefonu",
+  "Street Address": "Adres",
+  "Select Country": "Wybierz kraj",
+  "City": "Miasto",
+  "Zip Code": "Kod pocztowy",
+  "State": "Województwo",
+  "Select State": "Wpisz województwo",
+  "Company": "Firma",
+  "Billing Address": "Adres rozliczeniowy",
+  "My billing and shipping address are the same": "Mój adres dostawy jest taki sam jak adres płatności",
+  "Edit Address": "Edytuj adres",
+  "Thank you for your purchase!": "Dziękujemy za złożenie zamówienia!",
+  "Your order number is": "Numer Twojego zamówienia to: %{orderId}.",
+  "We'll email you an order confirmation with details and tracking info.": "Szczegóły dotyczące zamówienia zostaną przesłane na email.",
+  "Continue shopping": "Kontynuuj zakupy",
+  "Discount": "Zniżka",
+  "Apply Discount Code": "Dodaj kod zniżkowy",
+  "Apply Discount": "Przyznaj rabat",
+  "Remove Discount": "Usuń rabat",
+  "Order Summary": "Podsumowanie",
+  "Cart Subtotal": "Podsumowanie koszyka:",
+  "Shipping": "Wysyłka:",
+  "Tax": "Podatek:",
+  "Order Totals": "Suma zamówienia:",
+  "Payment Methods": "Metody płatności",
+  "Shipping Methods": "Metody wysyłki",
+  "Product List": "Lista produktów",
+  "Product Name": "Nazwa produktu:",
+  "Price": "Cena:",
+  "Price details": "Szczegóły produktu:",
+  "Qty": "Ilość:",
+  "This field is required!": "To pole jest obowiązkowe!",
+  "Looks like there was a problem": "Wygląda na to, że napotkano błąd:",
+  "In this country we don't handle any payment methods": "Nie wspieramy żadnych metod płatności dla tego kraju.",
+  "In this country we don't handle any shipping methods": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
+  "Coupon code not found!": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",
+  "Something goes wrong when trying to send coupon code. Please try again later.": "Coś poszło nie tak podczas wysyłania kuponu rabatowego. Sróbuj ponownie później.",
+  "Failed when trying to delete coupon code": "Błąd poczas próby usunięcia kodu rabatowego: '%{code}'. Nie znaleziono takiego kuponu!",
+  "Something goes wrong when trying to delete coupon code": "Coś poszło nie tak podczas usuwania kuponu rabatowego. Sróbuj ponownie później."
 }
diff --git a/view/frontend/web/js/i18n/index.js b/view/frontend/web/js/i18n/index.js
index 2983467..e930c22 100644
--- a/view/frontend/web/js/i18n/index.js
+++ b/view/frontend/web/js/i18n/index.js
@@ -12,12 +12,12 @@ export const i18n = new Vuei18n({
   locale: 'en_US',
   fallbackLocale: 'en_US', // Set as deafult lang to avoid missing translations
   messages: {
-    en_US: defaultMessages.en_US,
-    pl_PL: plMessages.pl_PL
+    en_US: defaultMessages,
+    pl_PL: plMessages
   }
 })
 
-function settingLocalCode (localCode) {
+function setLocalCode (localCode) {
   if (localCode === 'en_US') {
     return false
   }
@@ -26,4 +26,4 @@ function settingLocalCode (localCode) {
   return localCode
 }
 
-settingLocalCode(storeLocale)
+setLocalCode(storeLocale)

From 829f29114f29aed09eb367c0f1481c2ad9d9b3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 4 Jan 2019 13:16:05 +0100
Subject: [PATCH 18/20] Remove repetaed non translated text

---
 view/frontend/web/js/components/steps/TheShippingStep.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/view/frontend/web/js/components/steps/TheShippingStep.vue b/view/frontend/web/js/components/steps/TheShippingStep.vue
index 897725b..39de7af 100644
--- a/view/frontend/web/js/components/steps/TheShippingStep.vue
+++ b/view/frontend/web/js/components/steps/TheShippingStep.vue
@@ -4,7 +4,6 @@
     class="shipping-address"
   >
     <h2>{{ $t('Shipping Address') }}</h2>
-    <h2>Shipping address</h2>
     <form>
       <CustomerEmailField
         v-if="!isCustomerLoggedIn"

From 230a1fbdd87b911e77c68658c5e74724251da63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 4 Jan 2019 14:42:41 +0100
Subject: [PATCH 19/20] Repair formatting in vue file

---
 view/frontend/web/js/components/ShippingAddressForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/web/js/components/ShippingAddressForm.vue b/view/frontend/web/js/components/ShippingAddressForm.vue
index 535cc41..3cf1f74 100644
--- a/view/frontend/web/js/components/ShippingAddressForm.vue
+++ b/view/frontend/web/js/components/ShippingAddressForm.vue
@@ -75,7 +75,7 @@
     />
     <div v-if="regions.length">
       <label for="region_id">
-         {{ $t("Select State") }}
+        {{ $t("Select State") }}
       </label>
       <multiselect
         id="region_id"

From 6bdf62cb368c57f7665668b67204eb32820dab08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Kud=C5=82a?= <filip.kudla@snow.dog>
Date: Fri, 4 Jan 2019 14:46:05 +0100
Subject: [PATCH 20/20] Update translations and remove ':' sign with adding it
 in templates

---
 .../web/js/components/CustomerEmailField.vue   |  2 +-
 .../web/js/components/ProductsListItem.vue     |  8 ++++----
 view/frontend/web/js/components/TotalsData.vue |  8 ++++----
 .../web/js/data/translations-en_US.json        | 18 +++++++++---------
 .../web/js/data/translations-pl_PL.json        | 16 ++++++++--------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/view/frontend/web/js/components/CustomerEmailField.vue b/view/frontend/web/js/components/CustomerEmailField.vue
index 9be6373..cee378c 100644
--- a/view/frontend/web/js/components/CustomerEmailField.vue
+++ b/view/frontend/web/js/components/CustomerEmailField.vue
@@ -86,7 +86,7 @@ export default {
           this.emailAvailable = data
         })
         .catch(error => {
-          console.error('Looks like there was a problem: \n', error)
+          console.error(`${this.$t('Looks like there was a problem')}: \n`, error)
         })
 
       this.$store.commit('setItem', {
diff --git a/view/frontend/web/js/components/ProductsListItem.vue b/view/frontend/web/js/components/ProductsListItem.vue
index ad03304..76030ab 100644
--- a/view/frontend/web/js/components/ProductsListItem.vue
+++ b/view/frontend/web/js/components/ProductsListItem.vue
@@ -1,14 +1,14 @@
 <template>
   <li class="product">
     <p class="products__title">
-      {{ $t('Product name') }}
+      {{ $t('Product name') }}:
       <strong>
         {{ product.name }}
       </strong>
     </p>
 
     <span class="product__price">
-      {{ $t('Price') }}
+      {{ $t('Price') }}:
 
       <strong>
         {{ product.price | currency }}
@@ -17,7 +17,7 @@
 
     <div class="products__handler">
       <p class="products__information">
-        {{ $t('Price details') }}
+        {{ $t('Product details') }}:
       </p>
 
       <template v-for="detail in JSON.parse(product.options)">
@@ -33,7 +33,7 @@
       </template>
 
       <span class="products__detail">
-        {{ $t('Qty') }}
+        {{ $t('Qty') }}:
         <strong>
           {{ product.qty }}
         </strong>
diff --git a/view/frontend/web/js/components/TotalsData.vue b/view/frontend/web/js/components/TotalsData.vue
index faabf39..f471a21 100644
--- a/view/frontend/web/js/components/TotalsData.vue
+++ b/view/frontend/web/js/components/TotalsData.vue
@@ -8,7 +8,7 @@
     </h2>
 
     <p class="totals__item">
-      {{ $t('Cart Subtotal') }}
+      {{ $t('Cart Subtotal') }}:
 
       <strong>
         {{ totals.subtotal | currency }}
@@ -16,7 +16,7 @@
     </p>
 
     <p class="totals__item">
-      {{ $t('Shipping') }}
+      {{ $t('Shipping') }}:
 
       <strong>
         {{ totals.shipping_amount | currency }}
@@ -27,7 +27,7 @@
       v-if="parseInt(totals.tax_amount) !== 0"
       class="totals__item"
     >
-      {{ $t('Tax') }}
+      {{ $t('Tax') }}:
 
       <strong>
         {{ totals.tax_amount | currency }}
@@ -49,7 +49,7 @@
       v-if="totals.subtotal !== totals.base_grand_total"
       class="totals__item-total"
     >
-      {{ $t('Order Totals') }}
+      {{ $t('Order Totals') }}:
 
       <strong>
         {{ totals.base_grand_total | currency }}
diff --git a/view/frontend/web/js/data/translations-en_US.json b/view/frontend/web/js/data/translations-en_US.json
index 9f87f4c..71592a5 100644
--- a/view/frontend/web/js/data/translations-en_US.json
+++ b/view/frontend/web/js/data/translations-en_US.json
@@ -31,19 +31,19 @@
   "Apply Discount": "Apply Discount",
   "Remove Discount": "Remove Discount",
   "Order Summary": "Order summary",
-  "Cart Subtotal": "Cart subtotal:",
-  "Shipping": "Shipping:",
-  "Tax": "Tax:",
-  "Order Totals": "Order Total:",
+  "Cart Subtotal": "Cart subtotal",
+  "Shipping": "Shipping",
+  "Tax": "Tax",
+  "Order Totals": "Order Total",
   "Payment methods": "Payment methods",
   "Shipping Methods": "Shipping Methods",
   "Product List": "Product List",
-  "Product name": "Product name:",
-  "Price": "Price:",
-  "Price details": "Product details:",
-  "Qty": "Qty:",
+  "Product name": "Product name",
+  "Price": "Price",
+  "Product details": "Product details",
+  "Qty": "Qty",
   "This field is required!": "This field is required!",
-  "Looks like there was a problem": "Looks like there was a problem:",
+  "Looks like there was a problem": "Looks like there was a problem",
   "In this country we don't handle any payment methods": "In this country we don't handle any payment methods.",
   "In this country we don't handle any shipping methods": "In this country we don't handle any shipping methods.",
   "Coupon code not found!": "Coupon code not found! Failed when trying to activate: '%{code}' coupon code. Please use another one.",
diff --git a/view/frontend/web/js/data/translations-pl_PL.json b/view/frontend/web/js/data/translations-pl_PL.json
index f283d59..ce7da57 100644
--- a/view/frontend/web/js/data/translations-pl_PL.json
+++ b/view/frontend/web/js/data/translations-pl_PL.json
@@ -31,19 +31,19 @@
   "Apply Discount": "Przyznaj rabat",
   "Remove Discount": "Usuń rabat",
   "Order Summary": "Podsumowanie",
-  "Cart Subtotal": "Podsumowanie koszyka:",
-  "Shipping": "Wysyłka:",
-  "Tax": "Podatek:",
-  "Order Totals": "Suma zamówienia:",
+  "Cart Subtotal": "Podsumowanie koszyka",
+  "Shipping": "Wysyłka",
+  "Tax": "Podatek",
+  "Order Totals": "Suma zamówienia",
   "Payment Methods": "Metody płatności",
   "Shipping Methods": "Metody wysyłki",
   "Product List": "Lista produktów",
   "Product Name": "Nazwa produktu:",
-  "Price": "Cena:",
-  "Price details": "Szczegóły produktu:",
-  "Qty": "Ilość:",
+  "Price": "Cena",
+  "Product details": "Szczegóły produktu",
+  "Qty": "Ilość",
   "This field is required!": "To pole jest obowiązkowe!",
-  "Looks like there was a problem": "Wygląda na to, że napotkano błąd:",
+  "Looks like there was a problem": "Wygląda na to, że napotkano błąd",
   "In this country we don't handle any payment methods": "Nie wspieramy żadnych metod płatności dla tego kraju.",
   "In this country we don't handle any shipping methods": "Nie wspieramy żadnych metod dostawy dla tego kraju.",
   "Coupon code not found!": "Kod rabatowy nie został znaleziony! Błąd poczas próby aktywacji kodu: '%{code}'. Skorzystaj z innego.",