Merge lp:~canonical-isd-hackers/canonical-identity-provider/preferred-language into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

Implemented language chooser

=== modified file 'identityprovider/branding.py'
--- identityprovider/branding.py	2010-05-13 10:17:21 +0000
+++ identityprovider/branding.py	2010-05-13 15:51:29 +0000
@@ -15,6 +15,7 @@
     server_info = _('This is the Launchpad login service, built on OpenID. '
                     'The service enables you to use your Launchpad account '
                     'to log into OpenID-enabled sites around the Internet.')
+<<<<<<< TREE
     unknown_rp = _('You have used your Single Sign On ID to access a site '
                    'which is <em>not</em> recognised by Launchpad Login '
                    'Service:')
@@ -25,6 +26,14 @@
                         'correctly and try again.')
     oops_error = _('Sorry, something just went wrong in Launchpad Login '
                    'Service.')
+=======
+    log_in_to = _('Log in to Launchpad Login Service')
+    not_found_error = _('There\'s no page with this address in the Launchpad '
+                        'Login Service. Check that you entered the address '
+                        'correctly and try again.')
+    oops_error = _('Sorry, something just went wrong in Launchpad Login '
+                   'Service.')
+>>>>>>> MERGE-SOURCE
 
 
 class Ubuntu(object):
@@ -37,6 +46,7 @@
     server_info = _('This is the Ubuntu SSO service, built on OpenID. The '
                     'service enables you to use your Ubuntu SSO account to '
                     'log into various sites run by Canonical and Ubuntu.')
+<<<<<<< TREE
     unknown_rp = _('You have used your Single Sign On ID to access a site '
                    'which is <em>not</em> recognised by Ubuntu Single Sign '
                    'On:')
@@ -47,5 +57,13 @@
                         'address correctly and try again.')
     oops_error = _('Sorry, something just went wrong in Ubuntu Single Sign '
                    'On.')
+=======
+    log_in_to = _('Log in to Ubuntu Single Sign On')
+    not_found_error = _('There\'s no page with this address in the Ubuntu '
+                        'Single Sign On service. Check that you entered the '
+                        'address correctly and try again.')
+    oops_error = _('Sorry, something just went wrong in Ubuntu Single Sign '
+                   'On.')
+>>>>>>> MERGE-SOURCE
 
 current_brand = globals()[settings.BRAND]()

=== modified file 'identityprovider/context_processors.py'
--- identityprovider/context_processors.py	2010-05-13 14:53:17 +0000
+++ identityprovider/context_processors.py	2010-05-13 15:51:29 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -13,6 +14,7 @@
 from django.conf import settings
 
 from identityprovider.branding import current_brand
+from django.utils.translation import ugettext as _
 
 
 def readonly(request):
@@ -24,3 +26,17 @@
             'template_dir': current_brand.template_dir,
             'brand': current_brand,
             }
+
+language_names = {'es': u'Español',
+                  'es-ar': u'Español de Argentina',
+                  'en': u'English',
+                  'hu': u'Magyar',
+                  'zh-cn': u'简体中文',
+                  'pl': u'Polski',
+                  'de': u'Deutsch',
+                 }
+
+supported = [(x, language_names[x]) for x in settings.SUPPORTED_LANGUAGES]
+
+def i18n(request):
+    return {'supported_languages': supported}

=== renamed directory 'identityprovider/locale/es_AR' => 'identityprovider/locale/es'
=== added directory 'identityprovider/media/flags'
=== added file 'identityprovider/media/flags/de.png'
Binary files identityprovider/media/flags/de.png	1970-01-01 00:00:00 +0000 and identityprovider/media/flags/de.png	2010-05-13 15:51:29 +0000 differ
=== added file 'identityprovider/media/flags/en.png'
Binary files identityprovider/media/flags/en.png	1970-01-01 00:00:00 +0000 and identityprovider/media/flags/en.png	2010-05-13 15:51:29 +0000 differ
=== added file 'identityprovider/media/flags/es-ar.png'
Binary files identityprovider/media/flags/es-ar.png	1970-01-01 00:00:00 +0000 and identityprovider/media/flags/es-ar.png	2010-05-13 15:51:29 +0000 differ
=== added file 'identityprovider/media/flags/es.png'
Binary files identityprovider/media/flags/es.png	1970-01-01 00:00:00 +0000 and identityprovider/media/flags/es.png	2010-05-13 15:51:29 +0000 differ
=== added file 'identityprovider/media/flags/hu.png'
Binary files identityprovider/media/flags/hu.png	1970-01-01 00:00:00 +0000 and identityprovider/media/flags/hu.png	2010-05-13 15:51:29 +0000 differ
=== added file 'identityprovider/media/flags/pl.png'
Binary files identityprovider/media/flags/pl.png	1970-01-01 00:00:00 +0000 and identityprovider/media/flags/pl.png	2010-05-13 15:51:29 +0000 differ
=== added file 'identityprovider/media/flags/zh-cn.png'
Binary files identityprovider/media/flags/zh-cn.png	1970-01-01 00:00:00 +0000 and identityprovider/media/flags/zh-cn.png	2010-05-13 15:51:29 +0000 differ
=== modified file 'identityprovider/media/ubuntu/styles.css'
--- identityprovider/media/ubuntu/styles.css	2010-04-21 15:29:24 +0000
+++ identityprovider/media/ubuntu/styles.css	2010-05-13 15:51:29 +0000
@@ -408,3 +408,40 @@
 .findoutmore {
     font-size: 120%;
 }
+
+/* Internationalization stuff */
+#language_footer {
+    float: right;
+    padding: 10px 0 0;
+    height: 20px;
+    vertical-align: center;
+}
+
+#language_footer img,
+#language_footer a {
+    float: left;
+}
+
+#language_footer a {
+    margin-left: 4px;
+}
+
+#language_select div {
+    margin: 4px;
+}
+
+#language_select input {
+    border: 0;
+    border-bottom: 1px solid transparent;
+    padding: 0 0 0 20px;
+    color: #eb6f31;
+}
+
+#language_select input:hover {
+    cursor: pointer;
+    text-decoration: underline;
+    border-bottom: 1px solid #eb6f31;
+}
+
+    text-decoration: none;
+}

=== modified file 'identityprovider/middleware/useraccount.py'
--- identityprovider/middleware/useraccount.py	2010-04-21 15:29:24 +0000
+++ identityprovider/middleware/useraccount.py	2010-05-13 15:51:29 +0000
@@ -35,3 +35,7 @@
                     request.user = user
                 except User.DoesNotExist:
                     logout(request)
+            if isinstance(request.user, Account):
+                lang = request.user.preferredlanguage
+                if lang is not None:
+                    request.session['django_language'] = lang

=== modified file 'identityprovider/models/account.py'
--- identityprovider/models/account.py	2010-05-12 16:37:14 +0000
+++ identityprovider/models/account.py	2010-05-13 15:51:29 +0000
@@ -70,6 +70,7 @@
     displayname = models.TextField()
     openid_identifier = models.TextField(default=generate_openid_identifier)
     status_comment = models.TextField(blank=True, null=True)
+    preferredlanguage = models.TextField(blank=True, null=True)
     old_openid_identifier = models.TextField(blank=True, null=True)
 
     objects = AccountManager()

=== modified file 'identityprovider/templates/account/confirm_new_email.html'
--- identityprovider/templates/account/confirm_new_email.html	2010-05-13 09:46:28 +0000
+++ identityprovider/templates/account/confirm_new_email.html	2010-05-13 15:51:29 +0000
@@ -11,7 +11,12 @@
 	<h2 class="main">{% blocktrans %}Validate {{ email }}?{% endblocktrans %}</h2>
 
 	<div class="info">
+<<<<<<< TREE
 		<p>{% blocktrans %}Are you sure you want to confirm and validate this email address?{% endblocktrans %}</p>
+=======
+		<p>{% blocktrans %}Are you sure you want to confirm and validate this
+        email address? {% endblocktrans %}</p>
+>>>>>>> MERGE-SOURCE
 	</div>
 
     <div class="actions">

=== modified file 'identityprovider/templates/launchpad/registration/login.html'
--- identityprovider/templates/launchpad/registration/login.html	2010-05-13 14:45:39 +0000
+++ identityprovider/templates/launchpad/registration/login.html	2010-05-13 15:51:29 +0000
@@ -21,7 +21,12 @@
     <div id="auth-text">
         {% if token and rpconfig %}
         <p>
+<<<<<<< TREE
           {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses the Launchpad Login Service.{% endblocktrans %}
+=======
+          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses
+the Launchpad Login Service.{% endblocktrans %}
+>>>>>>> MERGE-SOURCE
         </p>
         {% endif %}
     </div>

=== modified file 'identityprovider/templates/registration/confirm_new_account.html'
=== modified file 'identityprovider/templates/registration/new_account.html'
--- identityprovider/templates/registration/new_account.html	2010-05-13 09:55:17 +0000
+++ identityprovider/templates/registration/new_account.html	2010-05-13 15:51:29 +0000
@@ -9,7 +9,7 @@
 {% block "content" %}
 <div id="auth">
     <h2 class="main">
-	    {{ brand.create_account }}
+        {{ brand.create_account }}
    </h2>
 
     <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to create your account.{% endblocktrans %}</p>

=== modified file 'identityprovider/templates/registration/reset_password.html'
=== added file 'identityprovider/templates/select_language.html'
--- identityprovider/templates/select_language.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/select_language.html	2010-05-13 15:51:29 +0000
@@ -0,0 +1,32 @@
+<!-- Copyright 2010 Canonical Ltd.  This software is licensed under the
+GNU Affero General Public License version 3 (see the file  LICENSE). -->
+
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block "title" %}
+    {% trans "Choose your language" %}
+{% endblock %}
+
+{% block "content" %}
+<div id="box">
+    <h1 class="main">{% trans "Choose your language" %}</h1>
+    <div id="language_select">
+    {% for lang in supported_languages %}
+    <form action="" method="POST">
+        <input type="hidden" name="next" value="{{next}}">
+        <input type="hidden" name="language" value="{{lang.0}}" />
+        <div><input type="submit" name="submit" value="{{lang.1|capfirst}}"
+            style="background: transparent url('/assets/identityprovider/flags/{{lang.0}}.png') center left no-repeat"/>
+        </div>
+    </form>
+    {% endfor %}
+    </div>
+    <h2 class="main">{% trans "Can't find your language?" %}</h2>
+    <p>{% blocktrans %}We welcome volunteers to help us translate this site to new languages. If you are able to help, please visit our <a href="https://translations.launchpad.net/canonical-identity-provider">translations site</a> to get started.{% endblocktrans %}
+    </p>
+</div>
+{% endblock %}
+
+{% comment %} Removing language link from footer on this page {% endcomment %}
+{% block "language_footer" %}{% endblock %}

=== modified file 'identityprovider/templates/ubuntu/base.html'
--- identityprovider/templates/ubuntu/base.html	2010-05-13 14:45:39 +0000
+++ identityprovider/templates/ubuntu/base.html	2010-05-13 15:51:29 +0000
@@ -45,6 +45,14 @@
                 </div>
             </div>
             <div id="footer">
+              {% block "language_footer" %}
+                <div id="language_footer">
+                    <img src="/assets/identityprovider/flags/{{ LANGUAGE_CODE }}.png">
+                    <a href="/set_language?next={{request.path_info|urlencode}}">
+                        {% trans "Choose your language" %}
+                    </a>
+                </div>
+               {% endblock %}
                 <p>{% blocktrans %}&copy; 2009-2010 Canonical Ltd.<br />
 Ubuntu and Canonical are registered trademarks of Canonical Group Ltd.<br />
 Please review our <a href="http://ubuntu.com/legal">Terms of Service</a> as well as our <a href="http://ubuntu.com/legal#privacy">Privacy Policy</a>.{% endblocktrans %}</p>

=== modified file 'identityprovider/templates/ubuntu/registration/login.html'
--- identityprovider/templates/ubuntu/registration/login.html	2010-05-13 14:45:39 +0000
+++ identityprovider/templates/ubuntu/registration/login.html	2010-05-13 15:51:29 +0000
@@ -15,13 +15,22 @@
     {% if rpconfig %}
         {% include "widgets/trusted_rp.html" %}
     {% else %}
+<<<<<<< TREE
         <h2 class="main">{% blocktrans %}Log in to Ubuntu Single Sign On{% endblocktrans %}</h2>
+=======
+        <h2 class="main">{{ brand.log_in_to }}</h2>
+>>>>>>> MERGE-SOURCE
     {% endif %}
 
     <div id="auth-text">
         {% if token and rpconfig %}
         <p>
+<<<<<<< TREE
           {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses the Ubuntu Single Sign On service.{% endblocktrans %}
+=======
+          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses
+the Ubuntu Single Sign On service.{% endblocktrans %}
+>>>>>>> MERGE-SOURCE
         </p>
         {% endif %}
         <p>

=== added file 'identityprovider/tests/test_language_selection.py'
--- identityprovider/tests/test_language_selection.py	1970-01-01 00:00:00 +0000
+++ identityprovider/tests/test_language_selection.py	2010-05-13 15:51:29 +0000
@@ -0,0 +1,15 @@
+from identityprovider.tests.utils import BasicAccountTestCase
+
+
+class SelectLanguagePageTestCase(BasicAccountTestCase):
+
+    def setUp(self):
+        self.client.login(username='[e-mail]', password='test')
+
+    def test_link_for_language_choosing_is_displayed_on_main_page(self):
+        r = self.client.get('/')
+        self.assertContains(r, 'id="language_footer"')
+
+    def test_link_for_language_choosing_is_not_diplayed_on_language_page(self):
+        r = self.client.get('/set_language')
+        self.assertNotContains(r, 'id="language_footer"')

=== added file 'identityprovider/tests/test_views_i18n.py'
--- identityprovider/tests/test_views_i18n.py	1970-01-01 00:00:00 +0000
+++ identityprovider/tests/test_views_i18n.py	2010-05-13 15:51:29 +0000
@@ -0,0 +1,25 @@
+from identityprovider.tests.utils import BasicAccountTestCase
+
+
+class SetLanguageTestCase(BasicAccountTestCase):
+
+    def setUp(self):
+        self.disable_csrf()
+
+    def tearDown(self):
+        self.reset_csrf()
+
+    def test_when_supplying_non_local_next_url_redirects_to_main(self):
+        r = self.client.post('/set_language',
+                             {'language': 'es', 'next': 'http://example.com'})
+        self.assertRedirects(r, '/')
+
+    def test_next_must_be_resolved_to_existing_view(self):
+        r = self.client.post('/set_language',
+                             {'language': 'es', 'next': '/not-existing'})
+        self.assertRedirects(r, '/')
+
+    def test_next_works_for_to_be_resolved_for_existing_view(self):
+        r = self.client.post('/set_language',
+                             {'language': 'es', 'next': '/+login'})
+        self.assertRedirects(r, '/+login')

=== modified file 'identityprovider/tests/test_views_ui.py'
--- identityprovider/tests/test_views_ui.py	2010-05-12 16:24:02 +0000
+++ identityprovider/tests/test_views_ui.py	2010-05-13 15:51:29 +0000
@@ -38,13 +38,6 @@
     def tearDown(self):
         self.reset_csrf()
 
-    def reset_csrf(self):
-        settings.MIDDLEWARE_CLASSES = self._MIDDLEWARE_CLASSES
-
-    def disable_csrf(self):
-        self._MIDDLEWARE_CLASSES = settings.MIDDLEWARE_CLASSES
-        settings.MIDDLEWARE_CLASSES = (x for x in self._MIDDLEWARE_CLASSES
-                                         if not 'csrf' in x.lower())
 
     def authenticate(self):
         self.client.login(username='[e-mail]', password='test')
@@ -592,3 +585,26 @@
         self.assertTemplateUsed(r, 'registration/new_account.html')
         msg = 'It appears that our captcha service was unable to load'
         self.assertContains(r, msg)
+
+
+class LanguagesTestCase(BasicAccountTestCase):
+
+    def test_preffered_lang_is_preserved_after_logout(self):
+        account = Account.objects.get_by_email("[e-mail]")
+        account.preferredlanguage = 'es'
+        account.save()
+
+        self.client.login(username='[e-mail]', password='test')
+        r = self.client.get('/')
+        self.assertContains(r, 'es.png')
+
+        self.client.get('/+logout')
+        r = self.client.get('/')
+        self.assertContains(r, 'es.png')
+
+    def test_language_selected_before_login_is_preserved(self):
+        self.assertNotContains(self.client.get('/'), 'es.png')
+        self.client.post('/set_language', {'language': 'es'})
+        self.assertContains(self.client.get('/'), 'es.png')
+        self.client.login(username='[e-mail]', password='test')
+        self.assertContains(self.client.get('/'), 'es.png')

=== modified file 'identityprovider/tests/utils.py'
--- identityprovider/tests/utils.py	2010-05-07 21:21:33 +0000
+++ identityprovider/tests/utils.py	2010-05-13 15:51:29 +0000
@@ -56,6 +56,14 @@
     fixtures = ['lp_account', 'lp_accountpassword', 'lp_emailaddress_noperson']
     pgsql_functions = ['generate_openid_identifier']
 
+    def reset_csrf(self):
+        settings.MIDDLEWARE_CLASSES = self._MIDDLEWARE_CLASSES
+
+    def disable_csrf(self):
+        self._MIDDLEWARE_CLASSES = settings.MIDDLEWARE_CLASSES
+        settings.MIDDLEWARE_CLASSES = (x for x in self._MIDDLEWARE_CLASSES
+                                         if not 'csrf' in x.lower())
+
 
 class LPAccountTestCase(BasicAccountTestCase):
     def setUp(self):

=== modified file 'identityprovider/urls.py'
--- identityprovider/urls.py	2010-05-11 00:38:22 +0000
+++ identityprovider/urls.py	2010-05-13 15:51:29 +0000
@@ -51,6 +51,10 @@
     (r'^%(optional_token)s\+remove-email$' % repls, 'delete_email'),
 )
 
+urlpatterns += patterns('identityprovider.views.i18n',
+        (r'^set_language$', 'set_language'),
+)
+
 urlpatterns += patterns('identityprovider.views.readonly',
     (r'^readonly$', 'readonly_admin'),
     (r'^readonly/((?P<appserver>[A-Za-z0-9\-_.:]+)/)?(?P<action>enable|disable|set|clear)(/(?P<conn>[A-Za-z0-9\-_.]+))?',
@@ -77,9 +81,6 @@
             {'document_root': settings.SSO_MEDIA_ROOT +
              current_brand.template_dir}),
         (r'^i18n/', include('django.conf.urls.i18n')),
-        (r'^set_language/$',
-            'django.views.generic.simple.direct_to_template',
-            {'template': 'set_language.html'}),
     )
 
 if getattr(settings, 'TESTING', False):

=== added file 'identityprovider/views/i18n.py'
--- identityprovider/views/i18n.py	1970-01-01 00:00:00 +0000
+++ identityprovider/views/i18n.py	2010-05-13 15:51:29 +0000
@@ -0,0 +1,34 @@
+from urllib import quote
+
+from django.conf import settings
+from django.http import Http404
+from django.shortcuts import render_to_response
+from django.template import RequestContext
+from django.views.i18n import set_language as django_set_language
+from django.core.urlresolvers import resolve, Resolver404
+
+
+def set_language(request):
+    if request.method == 'GET':
+        next = request.GET.get('next', '/')
+        context = RequestContext(request, {'next': quote(next)})
+        return render_to_response('select_language.html', context)
+    elif request.method != 'POST':
+        raise Http404()
+    lang = request.POST.get('language')
+    if lang not in settings.SUPPORTED_LANGUAGES:
+        raise Http404('Unsupported language')
+    if request.user.is_authenticated():
+        account = request.user
+        account.preferredlanguage = lang
+        account.save()
+    response = django_set_language(request)
+    redirection = response['Location']
+    if not redirection.startswith('/'):
+        response['Location'] = '/'
+    else:
+        try:
+            resolve(redirection)
+        except Resolver404:
+            response['Location'] = '/'
+    return response

=== modified file 'identityprovider/views/ui.py'
--- identityprovider/views/ui.py	2010-05-13 14:53:17 +0000
+++ identityprovider/views/ui.py	2010-05-13 15:51:29 +0000
@@ -91,13 +91,21 @@
 
 
 def logout(request, token=None):
+    try:
+        lang = request.user.preferredlanguage
+    except AttributeError:
+        lang = None
+
     # We don't want to lose session[token] when we log the user out
     raw_orequest = request.session.get(token, None)
     auth.logout(request)
     if token is not None and raw_orequest is not None:
         request.session[token] = raw_orequest
     request.session['message'] = _("You have successfully logged out")
-    return HttpResponseRedirect('+login')
+    response = HttpResponseRedirect('+login')
+    if lang:
+        response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang)
+    return response
 
 
 def claim_token(request, authtoken):