Author: batiste.bieler
Date: Sun Mar 1 06:39:39 2009
New Revision: 373
Modified:
trunk/pages/admin/__init__.py
trunk/pages/tests.py
Log:
Fix issue 58, add a regression test.
Modified: trunk/pages/admin/__init__.py
==============================================================================
--- trunk/pages/admin/__init__.py (original)
+++ trunk/pages/admin/__init__.py Sun Mar 1 06:39:39 2009
@@ -212,7 +212,7 @@
form = super(PageAdmin, self).get_form(request, obj, **kwargs)
language = get_language_from_request(request, obj)
- form.base_fields['language'].initial = force_unicode(language)
+ form.base_fields['language'].initial =
settings.PAGE_DEFAULT_LANGUAGE
if obj:
initial_slug = obj.slug(language=language, fallback=False)
initial_title = obj.title(language=language, fallback=False)
Modified: trunk/pages/tests.py
==============================================================================
--- trunk/pages/tests.py (original)
+++ trunk/pages/tests.py Sun Mar 1 06:39:39 2009
@@ -176,6 +176,16 @@
"""
c = Client()
user = c.login(username= 'batiste', password='b')
+
+ # test that the default language setting is used add page admin
+ # and not accept-language in HTTP requests.
+ setattr(settings, "PAGE_DEFAULT_LANGUAGE", 'de')
+ response = c.get('/admin/pages/page/add/')
+ self.assertContains(response, 'value="de" selected="selected"')
+ setattr(settings, "PAGE_DEFAULT_LANGUAGE", 'fr')
+ response = c.get('/admin/pages/page/add/')
+ self.assertContains(response, 'value="fr" selected="selected"')
+
page_data = self.get_new_page_data()
page_data["title"] = 'english title'
response = c.post('/admin/pages/page/add/', page_data)
@@ -184,6 +194,9 @@
response = c.post('/admin/pages/page/1/', page_data)
self.assertRedirects(response, '/admin/pages/page/')
+ # test that the frontend view use the good parameters
+ # I cannot find a way of setting the accept-language HTTP
+ # header so I used django_language cookie instead
c = Client()
c.cookies["django_language"] = 'en'
response = c.get('/pages/')
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
