Ticket #14164: 14164_l10n_sitemaps.diff

django/contrib/sitemaps/__init__.py

@@ -69 +69 @@
                 'location':   loc,
                 'lastmod':    self.__get('lastmod', item, None),
                 'changefreq': self.__get('changefreq', item, None),
-                'priority':   self.__get('priority', item, None)
+                'priority':   str(self.__get('priority', item, ''))
             }
             urls.append(url_info)
         return urls

tests/regressiontests/sitemaps/tests.py

@@ +1 @@
+from xml.dom.minidom import parseString
+
+from django.conf import settings
+from django.test import TestCase
+from django.utils.formats import localize
+from django.utils.translation import activate
+
+
+class LocalizationTests(TestCase):
+
+    def setUp(self):
+        self.orig_use_l10n = settings.USE_L10N
+
+    def tearDown(self):
+        settings.USE_L10N = self.orig_use_l10n
+
+    def test_localized_priority(self):
+        """The priority value should not be localized (#14164)"""
+        settings.USE_L10N = True
+        activate('fr')
+        # Localization should be active now:
+        self.assertEqual(u'0,3', localize(0.3))
+        # Retrieve an item with a known priority and check it:
+        response = self.client.get('/sitemaps/sitemap.xml')
+        doc = parseString(response.content)
+        priority = None
+        for elt in doc.getElementsByTagName('url'):
+            loc = elt.childNodes[0].childNodes[0].nodeValue
+            if loc.endswith('/ticket14164'):
+                priority = elt.childNodes[3].childNodes[0].nodeValue
+                break
+        self.assertEqual(u'0.5', priority)

tests/regressiontests/sitemaps/urls.py

@@ +1 @@
+from django.conf.urls.defaults import *
+
+from sitemaps import SimpleSitemap
+
+
+sitemaps = {
+    'simple': SimpleSitemap,
+}
+
+
+urlpatterns = patterns('django.contrib.sitemaps.views',
+    (r'^sitemap\.xml$', 'sitemap', {'sitemaps': sitemaps}),
+)

tests/regressiontests/sitemaps/sitemaps.py

@@ +1 @@
+from datetime import datetime
+from django.contrib.sitemaps import Sitemap
+
+
+class SimpleSitemap(Sitemap):
+    changefreq = "never"
+    priority = 0.5
+    location = '/ticket14164'
+    lastmod = datetime.now()
+
+    def items(self):
+        return [object()]

tests/urls.py

@@ -41 +41 @@
 
     # special headers views
     (r'special_headers/', include('regressiontests.special_headers.urls')),
+
+    # sitemaps
+    (r'^sitemaps/', include('regressiontests.sitemaps.urls')),
 )

tests/runtests.py

@@ -28 +28 @@
     'django.contrib.comments',
     'django.contrib.admin',
     'django.contrib.admindocs',
+    'django.contrib.sitemaps',
 ]
 
 def get_test_models():