Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html

@@ -58,20 +58,21 @@
             <div class="method-msg">
 
                 <span class="col col-msg"
-                      attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
+                      attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg" data-bind="i18n:'10-15 Working Days -'">
 
-                    10-15 Working Days - <span class="free-over ff">Free Over <span text="$parent.full_free_ship()"></span></span>
 
                 </span>
+                <span class="free-over ff" data-bind="i18n:'Free Over'"> </span>
+                <span text="$parent.full_free_ship()"></span>
 
             </div>
             <!-- /ko -->
             <!-- ko ifnot: (method.amount) -->
             <div class="method-msg">
                 <span class="col col-msg"
-                      attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
+                      attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg" data-bind="i18n:'10-15 Working Days -'">
 
-                        10-15 Working Days</span>
+                </span>
 
                 </span>
             </div>
@@ -135,19 +136,21 @@
             <!-- ko if: (method.amount) -->
             <div class="method-msg">
                 <span class="col col-msg"
-                      attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
+                      attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg" data-bind="i18n:'10-15 Working Days -'">
+
 
-                        10-15 Working Days - <span class="free-over">Free Over <span text="$parent.full_free_ship()"></span></span>
 
                     </span>
+                <span class="free-over" data-bind="i18n:'Free Over'"></span>
+                <span text="$parent.full_free_ship()"></span>
             </div>
             <!-- /ko -->
             <!-- ko ifnot: (method.amount) -->
             <div class="method-msg">
                 <span class="col col-msg"
-                      attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg">
+                      attr="'id': 'label_carrier_' + method.method_code + '_' + method.carrier_code_msg" data-bind="i18n:'10-15 Working Days'">
 
-                        10-15 Working Days</span>
+                </span>
 
                 </span>
             </div>

app/design/frontend/Joshine/breeze/i18n/es_ES.csv

@@ -15636,6 +15636,7 @@ invalid email address,Dirección de correo electrónico no válida
 Free Over,Gratis sobre
 "10-15 Working Days -","10-15 días laborables-"
 SECURE CHECKOUT,PAGO SEGURO
+"10-15 Working Days","10-15 días laborables"