From ffeefe014c9425e278589f932909ea960f3688bf Mon Sep 17 00:00:00 2001 From: Mathieu Comandon Date: Wed, 3 Apr 2013 14:47:09 +0200 Subject: [PATCH 1/2] Accept languages as 'fr_FR.utf8' in lang_sel url --- rosetta/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosetta/urls.py b/rosetta/urls.py index 4c493fc..4bafab4 100644 --- a/rosetta/urls.py +++ b/rosetta/urls.py @@ -8,5 +8,5 @@ urlpatterns = patterns('rosetta.views', url(r'^$', 'home', name='rosetta-home'), url(r'^pick/$', 'list_languages', name='rosetta-pick-file'), url(r'^download/$', 'download_file', name='rosetta-download-file'), - url(r'^select/(?P[\w\-]+)/(?P\d+)/$', 'lang_sel', name='rosetta-language-selection'), + url(r'^select/(?P[\w\-_\.]+)/(?P\d+)/$', 'lang_sel', name='rosetta-language-selection'), ) From 5ca9eb82340154d492cfdce726fb1cea163c2227 Mon Sep 17 00:00:00 2001 From: Mathieu Comandon Date: Tue, 16 Apr 2013 13:57:17 +0200 Subject: [PATCH 2/2] Add test for pull request #71 --- rosetta/tests/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rosetta/tests/__init__.py b/rosetta/tests/__init__.py index 2a96c6b..c5e9511 100644 --- a/rosetta/tests/__init__.py +++ b/rosetta/tests/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from django.conf import settings from django.contrib.auth.models import User -from django.core.urlresolvers import reverse +from django.core.urlresolvers import reverse, resolve from django.template.defaultfilters import floatformat from django.test import TestCase from django.test.client import Client @@ -537,3 +537,8 @@ class RosettaTestCase(TestCase): r = self.client.post(reverse('rosetta-home'), dict(m_e48f149a8b2e8baa81b816c0edf93890='Hello, world', _next='_next')) r = self.client.get(reverse('rosetta-home')) self.assertTrue('Progress: 25.00%' in str(r.content)) + + def test_24_urlconf_accept_dots_and_underscores(self): + resolver_match = resolve("/rosetta/select/fr_FR.utf8/0/") + self.assertEqual(resolver_match.url_name, "rosetta-language-selection") + self.assertEqual(resolver_match.kwargs['langid'], 'fr_FR.utf8')