Commit 38e9ca1e authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Fixed #14164 -- Ensure that sitemap priorities aren't rendered with...

[1.2.X] Fixed #14164 -- Ensure that sitemap priorities aren't rendered with localized numerical formats. Thanks to dokterbob for the report, and vung for the draft patch.

Backport of r13644 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 2370a103
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class Sitemap(object):
                '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
+1 −0
Original line number Diff line number Diff line
from django.contrib.sitemaps.tests.basic import *
+39 −0
Original line number Diff line number Diff line
from datetime import date
from django.conf import settings
from django.test import TestCase
from django.utils.formats import localize
from django.utils.translation import activate


class SitemapTests(TestCase):
    urls = 'django.contrib.sitemaps.tests.urls'

    def setUp(self):
        self.old_USE_L10N = settings.USE_L10N

    def tearDown(self):
        settings.USE_L10N = self.old_USE_L10N

    def test_simple_sitemap(self):
        "A simple sitemap can be rendered"
        # Retrieve the sitemap.
        response = self.client.get('/sitemaps/sitemap.xml')
        # Check for all the important bits:
        self.assertEquals(response.content, """<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url><loc>http://example.com/ticket14164</loc><lastmod>%s</lastmod><changefreq>never</changefreq><priority>0.5</priority></url>
</urlset>
""" % date.today().strftime('%Y-%m-%d'))

    def test_localized_priority(self):
        "The priority value should not be localized (Refs #14164)"
        # Localization should be active
        settings.USE_L10N = True
        activate('fr')
        self.assertEqual(u'0,3', localize(0.3))

        # Retrieve the sitemap. Check that priorities
        # haven't been rendered in localized format
        response = self.client.get('/sitemaps/sitemap.xml')
        self.assertContains(response, '<priority>0.5</priority>')
        self.assertContains(response, '<lastmod>%s</lastmod>' % date.today().strftime('%Y-%m-%d'))
+20 −0
Original line number Diff line number Diff line
from datetime import datetime
from django.conf.urls.defaults import *
from django.contrib.sitemaps import Sitemap

class SimpleSitemap(Sitemap):
    changefreq = "never"
    priority = 0.5
    location = '/ticket14164'
    lastmod = datetime.now()

    def items(self):
        return [object()]

sitemaps = {
    'simple': SimpleSitemap,
}

urlpatterns = patterns('django.contrib.sitemaps.views',
    (r'^sitemaps/sitemap\.xml$', 'sitemap', {'sitemaps': sitemaps}),
)