Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 19532ef

Browse files
jjeffryesjjeffryes
committed
Merge with master
2 parents a3ae38e + 4e7318f commit 19532ef

File tree

8 files changed

+27
-287
lines changed

8 files changed

+27
-287
lines changed

‎js/languages/en-US.json‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,7 @@
668668
"MustAddAddress": "You must add an address to ship to",
669669
"VendorShipsTo": "Ships to:",
670670
"DoesNotShipHere": "Does not ship here",
671+
"NoShippableAddresses": "This item does not ship to any of your saved addresses.",
671672
"Send": "Send",
672673
"SendBTCtoAddress": "Send %{amount} BTC to %{recipient}",
673674
"OpenAddress": "Open in Local Wallet",
@@ -716,39 +717,6 @@
716717
},
717718
"langChangeRestartTitle": "Restart needed for language change",
718719
"langChangeRestartMessage": "In order for your language change to fully take effect, you must restart the app.",
719-
"timezones": {
720-
"-12": "(GMT -12:00) Eniwetok, Kwajalein",
721-
"-11": "(GMT -11:00) Midway Island, Samoa",
722-
"-10": "(GMT -10:00) Hawaii",
723-
"-9": "(GMT -9:00) Alaska",
724-
"-8": "(GMT -8:00) Pacific Time (US & Canada)",
725-
"-7": "(GMT -7:00) Mountain Time (US & Canada)",
726-
"-6": "(GMT -6:00) Central Time (US & Canada), Mexico City",
727-
"-5": "(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima",
728-
"-4": "(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz",
729-
"-3.5": "(GMT -3:30) Newfoundland",
730-
"-3": "(GMT -3:00) Brazil, Buenos Aires, Georgetown",
731-
"-2": "(GMT -2:00) Mid-Atlantic",
732-
"-1": "(GMT -1:00) Azores, Cape Verde Islands",
733-
"0": "(GMT) Western Europe Time, London, Lisbon, Casablanca",
734-
"1": "(GMT +1:00) Brussels, Copenhagen, Madrid, Paris",
735-
"2": "(GMT +2:00) Kaliningrad, South Africa",
736-
"3": "(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg",
737-
"3.5": "(GMT +3:30) Tehran",
738-
"4": "(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi",
739-
"4.5": "(GMT +4:30) Kabul",
740-
"5": "(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent",
741-
"5.5": "(GMT +5:30) Bombay, Calcutta, Madras, New Delhi",
742-
"5.75": "(GMT +5:45) Kathmandu",
743-
"6": "(GMT +6:00) Almaty, Dhaka, Colombo",
744-
"7": "(GMT +7:00) Bangkok, Hanoi, Jakarta",
745-
"8": "(GMT +8:00) Beijing, Perth, Singapore, Hong Kong",
746-
"9": "(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk",
747-
"9.5": "(GMT +9:30) Adelaide, Darwin",
748-
"10": "(GMT +10:00) Eastern Australia, Guam, Vladivostok",
749-
"11": "(GMT +11:00) Magadan, Solomon Islands, New Caledonia",
750-
"12": "(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka"
751-
},
752720
"countries": {
753721
"AFGHANISTAN": "Afghanistan",
754722
"ALAND_ISLANDS": "Aland Islands",

‎js/models/timezonesMd.js‎

Lines changed: 0 additions & 134 deletions
This file was deleted.

‎js/templates/buyAddresses.html‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1+
<% if(_.intersection(_.pluck(ob.user.shipping_addresses, 'country'), ob.vendor_offer.listing.shipping.shipping_regions).length < 1 && !ob.worldwide) { %>
12
<div class="flexRow custCol-primary custCol-border">
2-
<div class="rowItem padding10">
3-
<div class="textSize14px txt-fade padding10">
4-
<strong><%= polyglot.t('buyFlow.VendorShipsTo') %> </strong>
5-
<span>
6-
<%= ob.shipsToList %>
7-
</span>
8-
</div>
3+
<div class="rowItem padding10 txt-center">
4+
<strong><%= polyglot.t('buyFlow.NoShippableAddresses') %></strong>
95
</div>
106
</div>
7+
<% } %>
118
<% _.each(ob.user.shipping_addresses, function(address, i){ %>
129
<% if(address.country && address.displayCountry && address.name) { %>
1310
<% if(ob.worldwide || ob.vendor_offer.listing.shipping.shipping_regions.indexOf(address.country) > -1){ %>

‎js/templates/onboardingModal.html‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -97,39 +97,6 @@
9797
</div>
9898
</div>
9999
</div>
100-
<div class="accordion-child accordion-inactive custCol-primary">
101-
<div class="bar barTxt h6 custCol-secondary custCol-text">
102-
<%= polyglot.t('onboarding.timeZone') %>
103-
<span class="textOpacity75 fontSize14 floatRight">5 <%= polyglot.t('of') %> 10</span>
104-
</div>
105-
<div class="flexContainer flex-border" id="homeModal-timeList">
106-
<div class="flexRow">
107-
<div class="txtFieldWrapper txtFieldWrapper-bar searchWrapper custCol-border">
108-
<input type="text" class="search txtField txtField-bar custCol-primary custCol-border custCol-text" placeholder="<%= polyglot.t('onboarding.TimezonePlaceholder') %>" />
109-
</div>
110-
</div>
111-
<ul class="flexRow list js-homeModal-listParent js-homeModal-timeZoneList homeModal-settings scrollOverflowY custCol-primary custCol-text customThemeScrollbar">
112-
<% ob.timezones.forEach((tz) => { %>
113-
<li class="flexRow custCol-border">
114-
<div class="rowItem js-homeModal-timeSelect paddingLeft6">
115-
<input type="radio" class="fieldItem" id="<%= tz.name %>" name="time_zone" value="<%= tz.offset %>">
116-
<label class="homeModal-time radioLabel" for="<%= tz.name %>"><%= polyglot.t('timezones.' + tz.offset) %></label>
117-
</div>
118-
</li>
119-
<% }) %>
120-
</ul>
121-
</div>
122-
<div class="bar barFlush borderBottomLeftRaidus3 borderBottomRightRaidus3">
123-
<a class="btn btn-bar btn-half js-accordionPrev custCol-secondary custCol-border-primary borderBottomLeftRaidus3 custCol-text borderRight" tabIndex="0">
124-
<span class="ion-chevron-left fontSize10 marginRight2 textOpacity75"></span>
125-
<%= polyglot.t('Back') %>
126-
</a>
127-
<a class="btn btn-bar btn-half js-accordionNext custCol-secondary custCol-border-primary borderBottomRightRaidus3 custCol-text" tabIndex="0">
128-
<%= polyglot.t('Next') %>
129-
<span class="ion-chevron-right fontSize10 marginLeft2 textOpacity75"></span>
130-
</a>
131-
</div>
132-
</div>
133100
<div class="accordion-child accordion-inactive custCol-primary">
134101
<div class="bar barTxt h6 custCol-secondary custCol-text">
135102
<%= polyglot.t('onboarding.yourDetails') %> (<%= polyglot.t('Optional') %>)

‎js/templates/settings.html‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -123,26 +123,6 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('General') %></h3>
123123

124124
</div>
125125

126-
<div class="flexRow overflowVisible">
127-
128-
<div class="flexCol-3 borderRight custCol-border">
129-
<div class="fieldItem">
130-
<label for="time_zone">
131-
<%= polyglot.t('TimeZone') %>
132-
</label>
133-
</div>
134-
</div>
135-
136-
<div class="flexCol-9 borderRight0 custCol-border">
137-
<div class="fieldItem padding0">
138-
<div class="fieldItem-selectWrapper chosen-relative noIcon">
139-
<select name="time_zone" class="chosen" id="time_zone">
140-
</select>
141-
</div>
142-
</div>
143-
</div>
144-
</div>
145-
146126
<div class="flexRow">
147127
<div class="flexCol-3 borderRight custCol-border">
148128
<div class="fieldItem">

‎js/views/buyAddressesVw.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
var __ = require('underscore'),
44
$ = require('jquery'),
55
loadTemplate = require('../utils/loadTemplate'),
6-
baseVw = require('./baseVw'),
7-
localize = require('../utils/localize');
6+
baseVw = require('./baseVw');
87

98
module.exports = baseVw.extend({
109

@@ -30,8 +29,7 @@ module.exports = baseVw.extend({
3029
loadedTemplate(
3130
__.extend({}, self.model.toJSON(), {
3231
worldwide: self.worldwide,
33-
selected: selected,
34-
shipsToList: localize.localizeShippingRegions(self.shippingRegions)
32+
selected: selected
3533
})
3634
)
3735
);

0 commit comments

Comments
 (0)