Merge pull request #1236 from diox/add-all-countries

Add all countries (bug 1058257)

bower.json

@@ -14,7 +14,7 @@
     "yulelog"
   ],
   "dependencies": {
-    "marketplace-constants": "0.11.0",
+    "marketplace-constants": "0.12.0",
     "marketplace-core-modules": "2.8.3",
     "marketplace-elements": "0.7.0",
     "marketplace-jquery": "2.0.2",

src/media/css/account.styl

@@ -67,12 +67,18 @@
 
         span {
             color: $greyscale-black;
+            margin: 0 0 0 8px;
 
             +rtl() {
-                background-position: 100% 1px;
-                padding-right: 25px;
+                margin: 0 8px 0 0;
             }
         }
+
+        img {
+            height: 20px;
+            vertical-align: middle;
+            width: 20px;
+        }
     }
     .newsletter-info {
         padding-left: 10px;

src/media/css/lib/index.styl

@@ -9,7 +9,6 @@
 @import 'spinner';
 
 @import 'collection_colors';
-@import 'regions';
 
 desktop-h2() {
     font-size: 40px;

src/media/css/site.styl

@@ -210,23 +210,6 @@ noscript {
     animation: 0.9s spin 1 steps(30);
 }
 
-.region {
-    background-repeat: no-repeat;
-    background-size: 20px auto;
-    color: $medium-gray;
-    display: inline-block;
-    margin-top: 6px;
-    min-height: 20px;
-    overflow: visible;
-    padding: 2px 0 2px 28px;
-    text-overflow: normal;
-}
-
-for region in $regions
-    .region-{region} {
-        background-image: url(unquote('../img/icons/regions/' + region + '.png'));
-    }
-
 @media $retina {
     .spinner {
         spinner-base-image('retina');

src/media/js/views/debug.js

@@ -127,8 +127,11 @@ define('views/debug',
             filter: log.filter,
             persistent_logs: log.persistent.all,
             profile: compatFilter.featureProfile,
-            regions: (regions.REGION_SLUGS ||
-                      Object.keys(regions.REGION_CHOICES_SLUG)).sort(),
+            regions: _.sortBy(utilsLocal.items(regions.REGION_CHOICES_SLUG),
+                function(r) {
+                    return r[1];
+                }
+            ),
             recent_logs: log.get_recent(100),
             request_cache: storage.getItem('request_cache') || {}
         });

src/templates/debug.html

@@ -27,8 +27,8 @@ <h1>Debug</h1>
     <select name="region" id="debug-region">
       {% set user_region = user.get_setting('region_override') %}
       <option value="" {{ 'selected' if not user_region }}>---</option>
-      {% for region in regions %}
-        <option value="{{ region }}" {{ 'selected' if region == user_region }}>
+      {% for code, region in regions %}
+        <option value="{{ code }}" {{ 'selected' if code == user_region }}>
           {{ region }}</option>
       {% endfor %}
     </select>

src/templates/settings.html

@@ -35,7 +35,7 @@ <h3>{{ _('General settings') }}</h3>
       {% defer (url=anonApi('region', [user_helpers.region()])) %}
         <div class="region account-field">
           <label>{{ _('Region') }}</label>
-          <span class="region region-{{ this.slug }}">{{ this.name }}</span>
+          <img src="{{ media('/fireplace/img/icons/regions/' + this.slug + '.png') }}" alt=""><span>{{ this.name }}</span>
         </div>
       {% end %}