Merge pull request #1532 from rmisio/seperate-currencies

Seperate currencies

Author: jjeffryes

js/languages/en-US.json

@@ -129,13 +129,13 @@ <h4><%= polyglot.t('CanBeShippedTo') %></h4>
           <% var matchedItemShippableCountries = _.uniq(_.intersection(_.pluck(ob.userAddresses, 'country'), ob.vendor_offer.listing.shipping.shipping_regions));
           if(matchedItemShippableCountries.length > 0){
             _.each(matchedItemShippableCountries, function(data){
-              print("<p>" + polyglot.t(`countries.${data}.name`) + "</p>");
+              print("<p>" + polyglot.t(`countries.${data}`) + "</p>");
             });
           } else if(!ob.worldwide){
             print(polyglot.t('NoShippableAddress'));
           } else {
             _.each(_.uniq(_.pluck(ob.userAddresses, 'country')), function(data){
-              print("<p>" + polyglot.t(`countries.${data}.name`) + "</p>");
+              print("<p>" + polyglot.t(`countries.${data}`) + "</p>");
             });
           }
           %>

js/templates/item.html

@@ -727,7 +727,7 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
               <%- ob.buyer_order.order.shipping.ship_to %>, <br />
               <%- ob.buyer_order.order.shipping.address %><br />
               <%- ob.buyer_order.order.shipping.city %>, <%- ob.buyer_order.order.shipping.state %> <%- ob.buyer_order.order.shipping.postal_code %><br />
-              <%= polyglot.t('countries.' + ob.buyer_order.order.shipping.country + '.name') %>
+              <%= polyglot.t('countries.' + ob.buyer_order.order.shipping.country) %>
             </div>
           </div>
         </div>

js/templates/transactionModal.html

@@ -11,7 +11,7 @@ function localizeShippingRegions(regions) {
     if (region === 'ALL') {
       localized.push(polyglot.t('WorldwideShipping'));
     } else {
-      localized.push(polyglot.t(`countries.${region}.name`));
+      localized.push(polyglot.t(`countries.${region}`));
     }
   });
 

js/utils/localize.js

@@ -84,7 +84,7 @@ module.exports = baseVw.extend({
     this.countryList = countries.get('countries');
     this.countriesSelect = $('<select class="chosen custCol-text" id="buyWizardCountryInput" required></select>');
     __.each(this.countryList, function(countryFromList, i){
-      var countryOption = $('<option value="'+countryFromList.dataName+'" data-name="'+countryFromList.name +'">'+polyglot.t(`countries.${countryFromList.dataName}.name`)+'</option>');
+      var countryOption = $('<option value="'+countryFromList.dataName+'" data-name="'+countryFromList.name +'">'+polyglot.t(`countries.${countryFromList.dataName}`)+'</option>');
       countryOption.attr("selected",self.options.userModel.get('country') == countryFromList.dataName);
       self.countriesSelect.append(countryOption);
     });

js/views/buyWizardVw.js

@@ -90,7 +90,7 @@ module.exports = baseVw.extend({
         this.listContents.push('checked="checked"');
       }
       this.listContents.push('>');
-      this.listContents.push('<label class="homeModal-currency radioLabel" for="currency-'+ itemJSON.dataName +'">'+ polyglot.t(`countries.${itemJSON.dataName}.currency`) +'</label>');
+      this.listContents.push('<label class="homeModal-currency radioLabel" for="currency-'+ itemJSON.dataName +'">'+ polyglot.t(`currencies.${itemJSON.code}`) +'</label>');
       this.listContents.push('</div></li>');
     }
   }

js/views/currencyListVw.js

@@ -182,7 +182,7 @@ module.exports = baseVw.extend({
     });
     var shipsTo = this.$el.find('#shipsTo');
     __.each(countryList, function(countryFromList, i){
-      var content = !i ? countryFromList.name : polyglot.t(`countries.${countryFromList.dataName}.name`);
+      var content = !i ? countryFromList.name : polyglot.t(`countries.${countryFromList.dataName}`);
 
       shipsTo.append(
         `<option value="${countryFromList.dataName}">${content}</option>`

js/views/itemEditVw.js

@@ -104,10 +104,10 @@ module.exports = baseVw.extend({
               starsTemplate: starsTemplate,
               activeTab: self.activeTab,
               fetchingRatings: self.fetchingRatings,
-              userCountry: polyglot.t(`countries.${self.userModel.get('country')}.name`),
+              userCountry: polyglot.t(`countries.${self.userModel.get('country')}`),
               shippingRegionsDisplay: localize.localizeShippingRegions(self.shippingRegions),
               worldwide: self.worldwide,
-              displayShippingOrigin: self.shippingOrigin && polyglot.t(`countries.${self.shippingOrigin}.name`)
+              displayShippingOrigin: self.shippingOrigin && polyglot.t(`countries.${self.shippingOrigin}`)
             })
           )
         );

js/views/itemVw.js

@@ -422,8 +422,8 @@ module.exports = Backbone.View.extend({
     currencyList.unshift({code: "BTC", currency:"Bitcoin", currencyUnits: "4"});
 
     __.each(countryList, function(c, i){
-      var country_option = $('<option value="'+c.dataName+'" data-name="'+c.name+'">'+polyglot.t(`countries.${c.dataName}.name`)+'</option>');
-      var ship_country_option = $('<option value="'+c.dataName+'" data-name="'+c.name+'">'+polyglot.t(`countries.${c.dataName}.name`)+'</option>');
+      var country_option = $('<option value="'+c.dataName+'" data-name="'+c.name+'">'+polyglot.t(`countries.${c.dataName}`)+'</option>');
+      var ship_country_option = $('<option value="'+c.dataName+'" data-name="'+c.name+'">'+polyglot.t(`countries.${c.dataName}`)+'</option>');
       country_option.attr("selected",user.country == c.dataName);
       //if user has a country in their profile, preselect it in the new address section
       ship_country_option.attr("selected",user.country== c.dataName);
@@ -434,8 +434,7 @@ module.exports = Backbone.View.extend({
     __.each(currencyList, function(c, i){
       //only show currently available currencies
       if(self.availableCurrenciesList.indexOf(c.code) > -1 || c.code === "BTC"){
-        var currency = c.code === 'BTC' ? c.currency : polyglot.t(`countries.${c.dataName}.currency`),
-            currency_option = $('<option value="'+c.code+'">'+currency+'</option>');
+        var currency_option = $('<option value="'+c.code+'">'+ polyglot.t(`currencies.${c.code}`) +'</option>');
         currency_option.attr("selected",user.currency_code == c.code);
         currency_str += currency_option[0].outerHTML;
       }