Ticket #13896: django_13896_2.diff

docs/ref/contrib/syndication.txt

@@ -268 +268 @@
 --------
 
 Feeds created by the syndication framework automatically include the
-appropriate ``<language>`` tag (RSS 2.0) or ``xml:lang`` attribute (Atom). This
-comes directly from your :setting:`LANGUAGE_CODE` setting.
+appropriate ``<language>`` tag (RSS 2.0) or ``xml:lang`` attribute (Atom). You
+can set the language for a feed by specifying an attribute :attr:`language`,
+using the same format as the project-wide setting :setting:`LANGUAGE_CODE`. If 
+you don't specify a language, it comes directly from your 
+:setting:`LANGUAGE_CODE` setting.
 
 URLs
 ----

django/contrib/syndication/views.py

@@ -104 +104 @@
             subtitle = self.__get_dynamic_attr('subtitle', obj),
             link = link,
             description = self.__get_dynamic_attr('description', obj),
-            language = settings.LANGUAGE_CODE.decode(),
+            language = self.__get_dynamic_attr('language', obj, settings.LANGUAGE_CODE.decode()),
             feed_url = add_domain(
                 current_site.domain,
                 self.__get_dynamic_attr('feed_url', obj) or request.path,

tests/regressiontests/syndication/tests.py

@@ -7 +7 @@
 from django.test import TestCase
 from django.utils import tzinfo
 from django.utils.feedgenerator import rfc2822_date, rfc3339_date
+from django.conf import settings
 
 from models import Entry
 
@@ -224 +225 @@
         doc = minidom.parseString(response.content)
         updated = doc.getElementsByTagName('updated')[0].firstChild.wholeText
         self.assertEqual(updated[-6:], '+00:42')
+    
+    def test_language_code(self):
+        """
+        Test that language code is set via dynamic parameter.
+        """
+        response = self.client.get('/syndication/language/')
+        feed = minidom.parseString(response.content).firstChild
+        self.assertEqual(feed.getElementsByTagName('language')[0].firstChild.wholeText, 'tl')
+        #Make sure that it's not because Tagalog is set in settings already
+        self.assertNotEqual(settings.LANGUAGE_CODE.decode(), 'tl')
 
     def test_feed_url(self):
         """

tests/regressiontests/syndication/urls.py

@@ -18 +18 @@
     (r'^feedurl/$', feeds.TestFeedUrlFeed()),
     (r'^articles/$', feeds.ArticlesFeed()),
     (r'^template/$', feeds.TemplateFeed()),
+    (r'^language/$', feeds.LanguageFeed()),
 
     (r'^depr-feeds/(?P<url>.*)/$', 'feed', {'feed_dict': feed_dict}),
     (r'^depr-feeds-empty/(?P<url>.*)/$', 'feed', {'feed_dict': None}),

tests/regressiontests/syndication/feeds.py

@@ -91 +91 @@
         # settings.TIME_ZONE.
         return item.date.replace(tzinfo=tzinfo.FixedOffset(42))
 
+class LanguageFeed(TestRss2Feed):
+    language = 'tl'
 
 class TestFeedUrlFeed(TestAtomFeed):
     feed_url = 'http://example.com/customfeedurl/'