Merge 2096767 into fcf50b9

django-oscar · Apr 17, 2013 · d912e86 · d912e86
2 parents fcf50b9 + 2096767
commit d912e86
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/sandbox/sandbox/urls.py b/sandbox/sandbox/urls.py
@@ -10,11 +10,16 @@
 
 admin.autodiscover()
 
+js_info_dict = {
+    'packages': ('stores',),
+}
+
 urlpatterns = patterns('',
     url(r'^dashboard/stores/', include(dashboard_app.urls)),
     url(r'^stores/', include(stores_app.urls)),
     url(r'^', include(shop.urls)),
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
 )
 
 

diff --git a/stores/static/stores/js/dashboard.js b/stores/static/stores/js/dashboard.js
@@ -147,7 +147,7 @@ stores.dashboard = {
             latLng: pos
         }, function (responses) {
             if (!responses || responses.length < 0) {
-                alert("did not receive valid geo position");
+                alert(gettext("did not receive valid geo position"));
             }
         });
     },

diff --git a/stores/static/stores/js/stores.js b/stores/static/stores/js/stores.js
@@ -45,7 +45,7 @@ var stores = (function(s, gmaps, o) {
                         };
                         navigator.geolocation.getCurrentPosition(success, error);
                     } else {
-                        o.messages.error('Your location could not be determined');
+                        o.messages.error(gettext('Your location could not be determined'));
                     }
                 });
             },

diff --git a/stores/templates/stores/partials/extrascripts.html b/stores/templates/stores/partials/extrascripts.html
@@ -1,3 +1,8 @@
 {% load staticfiles %}
+<script type="text/javascript">
+if(typeof gettext === 'undefined') {
+  jQuery.getScript('{% url django.views.i18n.javascript_catalog %}');
+}
+</script>
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&libraries=places"></script>
 <script type="text/javascript" src="{% static "stores/js/stores.js" %}"></script>