mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
3f96a7a358
commit
46fab8983e
@ -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
django/contrib/sitemaps/tests/__init__.py
Normal file
1
django/contrib/sitemaps/tests/__init__.py
Normal file
@ -0,0 +1 @@
|
||||
from django.contrib.sitemaps.tests.basic import *
|
39
django/contrib/sitemaps/tests/basic.py
Normal file
39
django/contrib/sitemaps/tests/basic.py
Normal file
@ -0,0 +1,39 @@
|
||||
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
django/contrib/sitemaps/tests/urls.py
Normal file
20
django/contrib/sitemaps/tests/urls.py
Normal file
@ -0,0 +1,20 @@
|
||||
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}),
|
||||
)
|
Loading…
Reference in New Issue
Block a user