Author: batiste.bieler
Date: Wed Jul 15 01:56:17 2009
New Revision: 606
Modified:
trunk/pages/models.py
trunk/pages/settings.py
trunk/pages/tests/pages_tests.py
trunk/pages/urls.py
Log:
Add a PAGE_USE_LANGUAGE_PREFIX setting to enable langauge prefix
Modified: trunk/pages/models.py
==============================================================================
--- trunk/pages/models.py (original)
+++ trunk/pages/models.py Wed Jul 15 01:56:17 2009
@@ -157,8 +157,10 @@
return languages
def get_absolute_url(self, language=None):
- return reverse('pages-root') + str(language) + '/' \
- + self.get_url(language)
+ url = reverse('pages-root')
+ if settings.PAGE_USE_LANGUAGE_PREFIX:
+ url += str(language) + '/'
+ return url + self.get_url(language)
def get_url(self, language=None):
"""
Modified: trunk/pages/settings.py
==============================================================================
--- trunk/pages/settings.py (original)
+++ trunk/pages/settings.py Wed Jul 15 01:56:17 2009
@@ -101,6 +101,11 @@
# framework
PAGE_USE_SITE_ID = getattr(settings, 'PAGE_USE_SITE_ID', False)
+# Set PAGE_USE_LANGUAGE_PREFIX to ``True`` to make the ``get_absolute_url``
+# method to prefix the URLs with the language code
+PAGE_USE_LANGUAGE_PREFIX = getattr(settings, 'PAGE_USE_LANGUAGE_PREFIX',
+
False)
+
# Assign a list of placeholders to PAGE_CONTENT_REVISION_EXCLUDE_LIST
# to exclude them from the revision process.
PAGE_CONTENT_REVISION_EXCLUDE_LIST = getattr(settings,
Modified: trunk/pages/tests/pages_tests.py
==============================================================================
--- trunk/pages/tests/pages_tests.py (original)
+++ trunk/pages/tests/pages_tests.py Wed Jul 15 01:56:17 2009
@@ -95,7 +95,7 @@
response = c.post('/admin/pages/page/add/', page_data)
self.assertRedirects(response, '/admin/pages/page/')
- response = c.get('/pages/en-us/test-page-2/')
+ response = c.get('/pages/test-page-2/')
self.assertEqual(response.status_code, 200)
def test_05_edit_page(self):
@@ -305,7 +305,7 @@
# this assert test that the creation fails as wanted
self.assertEqual(response.status_code, 200)
- response = c.get('/pages/en-us/same-slug/')
+ response = c.get('/pages/same-slug/')
self.assertEqual(response.status_code, 200)
page1 =
Content.objects.get_content_slug_by_slug(page_data['slug']).page
@@ -318,10 +318,10 @@
self.assertRedirects(response, '/admin/pages/page/')
# finaly test that we can get every page according the path
- response = c.get('/pages/en-us/same-slug/')
+ response = c.get('/pages/same-slug/')
self.assertContains(response, "parent title", 2)
- response = c.get('/pages/en-us/same-slug/same-slug/')
+ response = c.get('/pages/same-slug/same-slug/')
self.assertContains(response, "children title", 2)
def test_11_show_content_tag(self):
@@ -570,11 +570,11 @@
# create a page for the example otherwise you will get a Http404
error
response = c.post('/admin/pages/page/add/', page_data)
- response = c.get('/pages/en-us/page1/')
+ response = c.get('/pages/page1/')
self.assertEqual(response.status_code, 200)
try:
- response = c.get('/pages/en-us/toto/page1/')
+ response = c.get('/pages/toto/page1/')
except TemplateDoesNotExist, e:
if e.args != ('404.html',):
raise
Modified: trunk/pages/urls.py
==============================================================================
--- trunk/pages/urls.py (original)
+++ trunk/pages/urls.py Wed Jul 15 01:56:17 2009
@@ -8,7 +8,13 @@
url(r'^$', details, name='pages-root'),
)
-urlpatterns += patterns('',
- url(r'^(?P<lang>[-\w]+)/(?P<path>.*)$', details,
- name='pages-details-by-slug'),
-)
\ No newline at end of file
+if settings.PAGE_USE_LANGUAGE_PREFIX:
+ urlpatterns += patterns('',
+ url(r'^(?P<lang>[-\w]+)/(?P<path>.*)$', details,
+ name='pages-details-by-slug'),
+ )
+else:
+ urlpatterns += patterns('',
+ url(r'^(?P<path>.*)$', details,
+ name='pages-details-by-slug'),
+ )
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
