Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-translatable-strings into lp:canonical-identity-provider/release

[Szilveszter Farkas]

This branch hopes to make translators's life easier.

[Łukasz Czyżykowski (lukasz-czyzykowski)]

Looks good.

review: Approve

=== modified file 'identityprovider/branding.py'
--- identityprovider/branding.py	2010-05-12 17:15:50 +0000
+++ identityprovider/branding.py	2010-05-13 15:20:43 +0000
@@ -15,6 +15,16 @@
     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.')
+    unknown_rp = _('You have used your Single Sign On ID to access a site '
+                   'which is <em>not</em> recognised by Launchpad Login '
+                   'Service:')
+    complete_reg = _('Complete your Launchpad Login Service registration')
+    reset_password = _('Reset your Launchpad Login Service password')
+    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.')
 
 
 class Ubuntu(object):
@@ -27,5 +37,15 @@
     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.')
+    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:')
+    complete_reg = _('Complete your Ubuntu Single Sign On registration')
+    reset_password = _('Reset your Ubuntu Single Sign On password')
+    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.')
 
 current_brand = globals()[settings.BRAND]()

=== modified file 'identityprovider/context_processors.py'
--- identityprovider/context_processors.py	2010-04-21 15:29:24 +0000
+++ identityprovider/context_processors.py	2010-05-13 15:20:43 +0000
@@ -22,6 +22,5 @@
 def branding(request):
     return {
             'template_dir': current_brand.template_dir,
-            'sso_brand_name': u'%s' % current_brand.name,
             'brand': current_brand,
             }

=== modified file 'identityprovider/models/authtoken.py'
--- identityprovider/models/authtoken.py	2010-04-21 15:29:24 +0000
+++ identityprovider/models/authtoken.py	2010-05-13 15:20:43 +0000
@@ -78,9 +78,9 @@
             'toaddress': self.email,
             'token_url': self.get_absolute_url(),
             'support_form_url': settings.SUPPORT_FORM_URL,
-            'sso_brand_name': unicode(current_brand.name),
         }
-        message = render_to_string('email/validate-email.txt', replacements)
+        message = render_to_string('%s/email/validate-email.txt' %
+            current_brand.template_dir, replacements)
         subject = u'%s' % current_brand.name + ": Validate your email address"
         self._send_email(u"%s Email Validator" % current_brand.name, subject,
                          message)
@@ -89,10 +89,9 @@
         replacements = {
             'token': self.token,
             'toaddress': self.email,
-            'sso_brand_name': unicode(current_brand.name),
         }
-        message = render_to_string('email/email-validation-token.txt',
-            replacements)
+        message = render_to_string('%s/email/email-validation-token.txt' %
+            current_brand.template_dir, replacements)
         subject = u"%s: Validate your email address" % current_brand.name
         self._send_email(u"%s Email Validator" % current_brand.name, subject,
                          message)
@@ -100,20 +99,20 @@
     def sendPasswordResetEmail(self):
         replacements = {
             'token_url': self.get_absolute_url(),
-            'sso_brand_name': unicode(current_brand.name)
         }
         from_name = unicode(current_brand.name)
-        message = render_to_string('email/forgottenpassword.txt', replacements)
+        message = render_to_string('%s/email/forgottenpassword.txt' %
+            current_brand.template_dir, replacements)
         subject = u"%s: Forgotten Password" % current_brand.name
         self._send_email(from_name, subject, message)
 
     def sendNewUserEmail(self):
         replacements = {
             'token_url': self.get_absolute_url(),
-            'sso_brand_name': unicode(current_brand.name)
         }
         from_name = unicode(current_brand.name)
-        message = render_to_string('email/newuser.txt', replacements)
+        message = render_to_string('%s/email/newuser.txt' %
+            current_brand.template_dir, replacements)
         subject = u"%s: Finish your registration" % current_brand.name
         self._send_email(from_name, subject, message)
 

=== modified file 'identityprovider/templates/404.html'
--- identityprovider/templates/404.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/404.html	2010-05-13 15:20:43 +0000
@@ -12,11 +12,7 @@
     <div id="box">
         <h1 class="main">Lost something?</h1>
         <div>
-          <p>{% blocktrans %}There's no page with this address in the
-{{ sso_brand_name }} service.
-
-Check that you entered the address correctly and try again.{% endblocktrans %}
-          </p>
+          <p>{{ brand.not_found }}</p>
           <p>
             {% blocktrans %}(Error <abbr>ID</abbr>: {{oopsid}}){% endblocktrans %}
           </p>

=== modified file 'identityprovider/templates/500.html'
--- identityprovider/templates/500.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/500.html	2010-05-13 15:20:43 +0000
@@ -13,7 +13,7 @@
         <h1 class="main">Oops!</h1>
         <div>
           <p>
-            {% blocktrans %}Sorry, something just went wrong in {{ sso_brand_name }}.{% endblocktrans %}
+            {{ brand.oops_error }}
           </p>
           <p>
             {% blocktrans %}We&#8217;ve recorded what happened,

=== modified file 'identityprovider/templates/account/confirm_new_email.html'
--- identityprovider/templates/account/confirm_new_email.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/account/confirm_new_email.html	2010-05-13 15:20:43 +0000
@@ -11,8 +11,7 @@
 	<h2 class="main">{% blocktrans %}Validate {{ email }}?{% endblocktrans %}</h2>
 
 	<div class="info">
-		<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>
 	</div>
 
     <div class="actions">

=== modified file 'identityprovider/templates/account/delete_email.html'
--- identityprovider/templates/account/delete_email.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/account/delete_email.html	2010-05-13 15:20:43 +0000
@@ -13,8 +13,7 @@
     <h2 class="main">{% blocktrans %}Remove {{ email }}?{% endblocktrans %}</h2>
     
     <div class="info">
-        <p>{% blocktrans %}Are you sure you want to remove this unverified email
-address?{% endblocktrans %}</p>
+        <p>{% blocktrans %}Are you sure you want to remove this unverified email address?{% endblocktrans %}</p>
     </div>
     
     <div class="actions">

=== modified file 'identityprovider/templates/account/edit.html'
--- identityprovider/templates/account/edit.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/account/edit.html	2010-05-13 15:20:43 +0000
@@ -69,8 +69,7 @@
             <label class="formLabel tooltip"
                 for="id_preferred_email">{% trans "Preferred email" %}
                 <span class="description tooltip">? <span class="tooltip-content">
-                    {% blocktrans %}This email address is passed on to other
-sites when requested as part of the login process.{% endblocktrans %}
+                    {% blocktrans %}This email address is passed on to other sites when requested as part of the login process.{% endblocktrans %}
                 </span>
                 <span class="tooltip-tail">&nbsp;</span></span></label>
             {{ form.preferred_email }}
@@ -122,8 +121,7 @@
             {% endif %}
             {% if not form.newpassword.errors %}
             <div id="pwhint">
-                {% blocktrans %}Password must be at least 8 characters long,
-and must contain at least one number and an upper case letter.{% endblocktrans %}
+                {% blocktrans %}Password must be at least 8 characters long, and must contain at least one number and an upper case letter.{% endblocktrans %}
             </div>
             {% endif %}
             {% if form.non_field_errors %}

=== modified file 'identityprovider/templates/account/new_email.html'
--- identityprovider/templates/account/new_email.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/account/new_email.html	2010-05-13 15:20:43 +0000
@@ -10,8 +10,7 @@
 <div id="auth">
     <h2 class="main">{% trans "Add an email address to your account" %}</h2>
 
-    <p>{% blocktrans %}Enter your email address, and we will send you
-instructions on how to confirm your account.{% endblocktrans %}</p>
+    <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to confirm your account.{% endblocktrans %}</p>
 
     <form action="+new-email" method="post">
         <p class="input-row{% if form.newemail.errors %} haserrors{% endif %}">

=== modified file 'identityprovider/templates/admin/readonly_confirm.html'
--- identityprovider/templates/admin/readonly_confirm.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/admin/readonly_confirm.html	2010-05-13 15:20:43 +0000
@@ -23,16 +23,14 @@
     {% blocktrans %}You're not operating on all appservers{% endblocktrans %}
     </p>
     <p>
-    {% blocktrans %}Changing readonly mode on a single application server can
-lead to inconsistent states and unexpected behaviour.{% endblocktrans %}
+    {% blocktrans %}Changing readonly mode on a single application server can lead to inconsistent states and unexpected behaviour.{% endblocktrans %}
     </p>
     </div>
     {% else %}
     {% ifequal action "clear" %}
     <div class="system-message">
     <p class="system-message-title">
-    {% blocktrans %}Make sure the master database connection is enabled on all
-app servers <b>before</b> leaving readonly mode!{% endblocktrans %}
+    {% blocktrans %}Make sure the master database connection is enabled on all app servers <b>before</b> leaving readonly mode!{% endblocktrans %}
     </p>
     </div>
     {% endifequal %}
@@ -45,29 +43,23 @@
 <b>{{ appserver }}</b>.{% endblocktrans %}
         {% else %}
             {% blocktrans %}You are about to enable readonly mode globally.{% endblocktrans %}</p><p>
-            {% blocktrans %}All appservers will be passed to read-only mode if
-you confirm.{% endblocktrans %}
+            {% blocktrans %}All appservers will be passed to read-only mode if you confirm.{% endblocktrans %}
         {% endif %}
     {% else %}
     {% ifequal action "clear" %}
         {% if appserver %}
-            {% blocktrans %}You are about to clear readonly mode on appserver
-<b>{{ appserver }}</b>.{% endblocktrans %}</p><p>
-            {% blocktrans %}If you confirm, <b>{{ appserver }}</b> will attempt
-to resume normal operation with its master database connection.{% endblocktrans %}</p>
+            {% blocktrans %}You are about to clear readonly mode on appserver <b>{{ appserver }}</b>.{% endblocktrans %}</p><p>
+            {% blocktrans %}If you confirm, <b>{{ appserver }}</b> will attempt to resume normal operation with its master database connection.{% endblocktrans %}</p>
         {% else %}
             {% blocktrans %}You are about to clear readonly mode globally.{% endblocktrans %}</p><p>
-            {% blocktrans %}If you confirm, all appservers will attempt to
-resume normal operation.{% endblocktrans %}
+            {% blocktrans %}If you confirm, all appservers will attempt to resume normal operation.{% endblocktrans %}
         {% endif %}
     {% else %}
     {% ifequal action "enable" %}
-    {% blocktrans %}You are about to enable the <b>{{ conn }}</b> database connection on appserver
-<b>{{ appserver }}</b>.{% endblocktrans %}
+    {% blocktrans %}You are about to enable the <b>{{ conn }}</b> database connection on appserver <b>{{ appserver }}</b>.{% endblocktrans %}
     {% else %}
     {% ifequal action "disable" %}
-    {% blocktrans %}You are about to disable the <b>{{ conn }}</b> database connection on appserver
-<b>{{ appserver }}</b>.{% endblocktrans %}
+    {% blocktrans %}You are about to disable the <b>{{ conn }}</b> database connection on appserver <b>{{ appserver }}</b>.{% endblocktrans %}
     {% endifequal %}
     {% endifequal %}
     {% endifequal %}

=== modified file 'identityprovider/templates/launchpad/base.html'
--- identityprovider/templates/launchpad/base.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/launchpad/base.html	2010-05-13 15:20:43 +0000
@@ -27,9 +27,7 @@
             <div id="maincontent">
                 {% if readonly %}
                 <div class="message">
-                  {% blocktrans %}We are currently in read-only mode. That
-means that at the moment you can't create new accounts, update your personal
-information, or request password reminders.{% endblocktrans %}
+                  {% blocktrans %}We are currently in read-only mode. That means that at the moment you can't create new accounts, update your personal information, or request password reminders.{% endblocktrans %}
                 </ul>
                 </div>
                 {% endif %}

=== added directory 'identityprovider/templates/launchpad/email'
=== added file 'identityprovider/templates/launchpad/email/email-validation-token.txt'
--- identityprovider/templates/launchpad/email/email-validation-token.txt	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/email/email-validation-token.txt	2010-05-13 15:20:43 +0000
@@ -0,0 +1,14 @@
+{% load i18n %}
+{% blocktrans %}Hello
+
+We received a request to validate the email address {{ toaddress }} for use in the Launchpad Login Service.
+
+If you made this request, please copy and paste the token below into the desktop application to complete the process to add {{ toaddress }} to your existing Launchpad Login Service account.
+
+    {{ token }}
+
+If you did not make this request, please ignore this message or report it as a possible attempt at a security attack on your data.
+
+Thank you,
+
+The Launchpad Login Service team{% endblocktrans %}

=== added file 'identityprovider/templates/launchpad/email/forgottenpassword.txt'
--- identityprovider/templates/launchpad/email/forgottenpassword.txt	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/email/forgottenpassword.txt	2010-05-13 15:20:43 +0000
@@ -0,0 +1,14 @@
+{% load i18n %}
+{% blocktrans %}Hello
+
+You have requested a new password for your Launchpad Login Service account.
+
+To change your password:
+
+    {{ token_url }}
+
+If you don't know what this is about, then someone else has entered your email address at the Launchpad Login Service. Sorry about that. You don't need to do anything further, just delete this message.
+
+Regards,
+
+The Launchpad Login Service team{% endblocktrans %}

=== added file 'identityprovider/templates/launchpad/email/impersonate-warning.txt'
--- identityprovider/templates/launchpad/email/impersonate-warning.txt	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/email/impersonate-warning.txt	2010-05-13 15:20:43 +0000
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% blocktrans %}We've received a request to create a new account with your email address.
+
+If this was you, perhaps you've forgotten your password?
+
+    {{ forgotten_password_url }}
+
+If not, someone may be trying to impersonate you. If you get more requests like this, please let us know.
+
+Regards,
+
+The Launchpad Login Service team{% endblocktrans %}

=== added file 'identityprovider/templates/launchpad/email/newuser.txt'
--- identityprovider/templates/launchpad/email/newuser.txt	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/email/newuser.txt	2010-05-13 15:20:43 +0000
@@ -0,0 +1,14 @@
+{% load i18n %}
+{% blocktrans %}Hello
+
+Thank you for registering with the Launchpad Login Service.
+
+To complete your registration:
+
+    {{ token_url }}
+
+If you don't know what this is about, then someone has probably entered your email address by mistake at the Launchpad Login Service web site. Sorry about that. You don't need to do anything further, just delete this message.
+
+Regards,
+
+The Launchpad Login Service team{% endblocktrans %}

=== added file 'identityprovider/templates/launchpad/email/validate-email.txt'
--- identityprovider/templates/launchpad/email/validate-email.txt	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/launchpad/email/validate-email.txt	2010-05-13 15:20:43 +0000
@@ -0,0 +1,18 @@
+{% load i18n %}
+{% blocktrans %}Hello
+
+We received a request from {{ requester }} using email address {{ requester_email }}, trying to validate the email address {{ toaddress }} for use in the Launchpad Login Service.
+
+If you made this request, please click on the link below and complete the process to add {{ toaddress }} to your existing Launchpad Login Service account.
+
+    {{ token_url }}
+
+If you did not make this request, please ignore this message or report it on
+
+    {{ support_form_url }}
+
+as a possible attempt at a security attack on your data.
+
+Thank you,
+
+The Launchpad Login Service team{% endblocktrans %}

=== modified file 'identityprovider/templates/launchpad/registration/login.html'
--- identityprovider/templates/launchpad/registration/login.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/launchpad/registration/login.html	2010-05-13 15:20:43 +0000
@@ -15,14 +15,13 @@
     {% if rpconfig %}
         {% include "widgets/trusted_rp.html" %}
     {% else %}
-        <h2 class="main">{% blocktrans %}Log in to {{ sso_brand_name }}{% endblocktrans %}</h2>
+        <h2 class="main">{% blocktrans %}Log in to Launchpad Login Service{% endblocktrans %}</h2>
     {% endif %}
 
     <div id="auth-text">
         {% if token and rpconfig %}
         <p>
-          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses
-the {{ sso_brand_name }} service.{% endblocktrans %}
+          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses the Launchpad Login Service.{% endblocktrans %}
         </p>
         {% endif %}
     </div>
@@ -61,27 +60,19 @@
 	  <h2>{% trans "What is Launchpad and a Launchpad Account?" %}</h2>
 	
 	  <p>
-            {% blocktrans %}Launchpad is the central point where we gather all
-sorts of interactions around Ubuntu, Canonical and free software generally.
-You can use your Launchpad account to report bugs, to find or contribute
-translations, to find specs, to contribute code.{% endblocktrans %}
+            {% blocktrans %}Launchpad is the central point where we gather all sorts of interactions around Ubuntu, Canonical and free software generally. You can use your Launchpad account to report bugs, to find or contribute translations, to find specs, to contribute code.{% endblocktrans %}
 	  </p>
 	</div>
 {% endblock %}
 
 {% block rightcol %}
    <p>
-     {% blocktrans %}This is the Launchpad login service utilizing
-<a href="http://openid.net/">OpenID</a> technology. This site allows you to use
-<a href="https://launchpad.net/people/+me">your Launchpad account</a> to log
-into OpenID-enabled sites around the Internet.{% endblocktrans %}
-   </p>
-   <p>
-     {% blocktrans %}To learn more about using this service, please review the
-<a href="https://help.launchpad.net/OpenID">instructions</a>.{% endblocktrans %}
-   </p>
-   <p>
-     {% blocktrans %}If you want to change any of your account's details, you
-can do so by logging in using the form beside.{% endblocktrans %}
+     {% blocktrans %}This is the Launchpad login service utilizing <a href="http://openid.net/">OpenID</a> technology. This site allows you to use <a href="https://launchpad.net/people/+me">your Launchpad account</a> to log into OpenID-enabled sites around the Internet.{% endblocktrans %}
+   </p>
+   <p>
+     {% blocktrans %}To learn more about using this service, please review the <a href="https://help.launchpad.net/OpenID">instructions</a>.{% endblocktrans %}
+   </p>
+   <p>
+     {% blocktrans %}If you want to change any of your account's details, you can do so by logging in using the form beside.{% endblocktrans %}
    </p>
 {% endblock %}

=== modified file 'identityprovider/templates/registration/bad_token.html'
--- identityprovider/templates/registration/bad_token.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/registration/bad_token.html	2010-05-13 15:20:43 +0000
@@ -9,8 +9,6 @@
 {% block "content" %}
 <h1 class="main">{% trans "Unauthorized token" %}</h1>
 
-<p>{% blocktrans %}You are not authorized to use this token. If this URL
-was sent to you by email, please make sure you open it in the same browser
-where you requested it.{% endblocktrans %}</p>
+<p>{% blocktrans %}You are not authorized to use this token. If this URL was sent to you by email, please make sure you open it in the same browser where you requested it.{% endblocktrans %}</p>
 {% endblock %}
 

=== modified file 'identityprovider/templates/registration/confirm_new_account.html'
--- identityprovider/templates/registration/confirm_new_account.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/registration/confirm_new_account.html	2010-05-13 15:20:43 +0000
@@ -12,7 +12,7 @@
 
 {% block "content" %}
 <div id="auth">
-    <h1 class="main">{% blocktrans %}Complete your {{ sso_brand_name }} registration{% endblocktrans %}</h1>
+    <h1 class="main">{{ brand.complete_reg }}</h1>
 
     <form id="login-form" class="longfields" action="+newaccount" method="post">
         <p class="input-row{% if form.displayname.errors %} haserrors{% endif %}">
@@ -27,8 +27,7 @@
             <span class="error">{{ form.password.errors|first }}</span>
         {% else %}
             <span id="pwhint">
-              {% blocktrans %}Password must be at least 8 characters long,
-and must contain at least one number and an upper case letter.{% endblocktrans %}
+              {% blocktrans %}Password must be at least 8 characters long, and must contain at least one number and an upper case letter.{% endblocktrans %}
             </span>
         {% endif %}
         </p>

=== modified file 'identityprovider/templates/registration/email_sent.html'
--- identityprovider/templates/registration/email_sent.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/registration/email_sent.html	2010-05-13 15:20:43 +0000
@@ -25,22 +25,14 @@
 </div>
 <div id="col2">
     <h2 class="main">{% trans "Haven&rsquo;t received it?" %}</h2>
-    <p>{% blocktrans %}If you don&rsquo;t receive the message
-within a few minutes, it might be because:{% endblocktrans %}</p>
-    <p>{% blocktrans %}Your mail provider uses &ldquo;greylisting&rdquo; to
-reduce spam. If so, you&rsquo;ll need to wait an hour or two for the
-message to arrive.{% endblocktrans %}</p>
-    <p>{% blocktrans %}Your mail provider mistakenly blocks messages from
-this site. Try signing up using a service like
-<a href="http://gmail.com/">Gmail</a> or
-<a href="http://mail.yahoo.com/">Yahoo Mail</a>.
-If that works, complain to your usual mail provider.{% endblocktrans %}
+    <p>{% blocktrans %}If you don&rsquo;t receive the message within a few minutes, it might be because:{% endblocktrans %}</p>
+    <p>{% blocktrans %}Your mail provider uses &ldquo;greylisting&rdquo; to reduce spam. If so, you&rsquo;ll need to wait an hour or two for the message to arrive.{% endblocktrans %}</p>
+    <p>{% blocktrans %}Your mail provider mistakenly blocks messages from this site. Try signing up using a service like <a href="http://gmail.com/">Gmail</a> or <a href="http://mail.yahoo.com/">Yahoo Mail</a>. If that works, complain to your usual mail provider.{% endblocktrans %}
     </p>
     {% if email_notreceived_extra %}
     <p>{{ email_notreceived_extra|safe }}</p>
     {% endif %}
-    <p>{% blocktrans %}If neither of those work, the Login Service might be
-having a problem.{% endblocktrans %}
+    <p>{% blocktrans %}If neither of those work, our service might be having a problem.{% endblocktrans %}
     </p>
 </div>
 {% if user.is_authenticated %}</div>{% endif %}

=== modified file 'identityprovider/templates/registration/forgot_password.html'
--- identityprovider/templates/registration/forgot_password.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/registration/forgot_password.html	2010-05-13 15:20:43 +0000
@@ -8,10 +8,9 @@
 
 {% block "content" %}
 <div id="auth">
-    <h1 class="main">{% blocktrans %}Reset your {{ sso_brand_name }} password{% endblocktrans %}</h1>
+    <h1 class="main">{{ brand.reset_password }}</h1>
 
-    <p>{% blocktrans %}Enter your email address, and we will send you
-instructions on how to reset your password.{% endblocktrans %}</p>
+    <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to reset your password.{% endblocktrans %}</p>
 
     <form action="+forgot_password" method="post">
         <p class="input-row{% if form.email.errors %} haserrors{% endif %}">

=== modified file 'identityprovider/templates/registration/logout_to_confirm.html'
--- identityprovider/templates/registration/logout_to_confirm.html	2010-05-11 13:09:30 +0000
+++ identityprovider/templates/registration/logout_to_confirm.html	2010-05-13 15:20:43 +0000
@@ -9,7 +9,6 @@
 {% block "content" %}
 	<h1 class="main">{% trans "Can not confirm token while logged in" %}</h1>
 
-	<p>{% blocktrans %}You can not confirm this token because you are logged in as
-	a different user. Please log out and try again.{% endblocktrans %}</p>
+	<p>{% blocktrans %}You can not confirm this token because you are logged in as a different user. Please log out and try again.{% endblocktrans %}</p>
 {% endblock %}
 

=== modified file 'identityprovider/templates/registration/new_account.html'
--- identityprovider/templates/registration/new_account.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/registration/new_account.html	2010-05-13 15:20:43 +0000
@@ -12,8 +12,7 @@
 	    {{ brand.create_account }}
    </h2>
 
-    <p>{% blocktrans %}Enter your email address, and we will send you
-instructions on how to create your account.{% endblocktrans %}</p>
+    <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to create your account.{% endblocktrans %}</p>
 
     <form action="+new_account" method="post">
         <p class="input-row{% if form.email.errors %} haserrors{% endif %}">

=== modified file 'identityprovider/templates/registration/reset_password.html'
--- identityprovider/templates/registration/reset_password.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/registration/reset_password.html	2010-05-13 15:20:43 +0000
@@ -13,7 +13,7 @@
 {% block "content" %}
     <div id="box">
         <div id="auth">
-            <h2 class="main">{% blocktrans %}Reset your {{ sso_brand_name }} password{% endblocktrans %}</h2>
+            <h2 class="main">{{ brand.reset_password }}</h2>
 
             <form id="login-form" class="longfields" action="+resetpassword" method="post">
                 <p class="input-row{% if form.password.errors or form.non_field_errors %} haserrors{% endif %}">
@@ -23,8 +23,7 @@
                     <span class="error">{{ form.password.errors|first }}</span>
                 {% else %}
                     <span id="pwhint">
-                      {% blocktrans %}Password must be at least 8 characters
-long, and must contain at least one number and an upper case letter.{% endblocktrans %}
+                      {% blocktrans %}Password must be at least 8 characters long, and must contain at least one number and an upper case letter.{% endblocktrans %}
                     </span>
                 {% endif %}
                 </p>

=== modified file 'identityprovider/templates/ubuntu/base.html'
--- identityprovider/templates/ubuntu/base.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/ubuntu/base.html	2010-05-13 15:20:43 +0000
@@ -18,9 +18,9 @@
                     <div id="header">
                         <div id="logo">
                             <h1 id="title">
-                            <a href="/">{%if sso_brand_name%}
-                            {% blocktrans %}{{sso_brand_name}}{%endblocktrans%}
-                            {%endif%}</a></h1>
+                            <a href="/">
+                            {% blocktrans %}Ubuntu Single Sign On{% endblocktrans %}
+                            </a></h1>
                         </div>
                     </div>
                     <div id="content">
@@ -29,12 +29,7 @@
                         {% endif %}
                 {% if readonly %}
                 <span class="warning">
-                  {% blocktrans %}
-                    We are currently in read-only mode.  That means that
-                    at the moment you can't create new accounts,
-                    update your personal information, or
-                    request password reminders.                  
-                  {% endblocktrans %}
+{% blocktrans %}We are currently in read-only mode. That means that at the moment you can't create new accounts, update your personal information, or request password reminders.{% endblocktrans %}
                     </ul>
                 </span>
                 {% endif %}
@@ -51,12 +46,8 @@
             </div>
             <div id="footer">
                 <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>
+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>
             </div>
         </div>
     </body>

=== renamed directory 'identityprovider/templates/email' => 'identityprovider/templates/ubuntu/email'
=== modified file 'identityprovider/templates/ubuntu/email/email-validation-token.txt'
--- identityprovider/templates/email/email-validation-token.txt	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/ubuntu/email/email-validation-token.txt	2010-05-13 15:20:43 +0000
@@ -1,19 +1,14 @@
 {% load i18n %}
 {% blocktrans %}Hello
 
-We received a request to validate the email address
-{{ toaddress }} for use in the {{ sso_brand_name }} service.
+We received a request to validate the email address {{ toaddress }} for use in the Ubuntu Single Sign On service.
 
-If you made this request, please copy and paste the token
-below into the desktop application to complete the process
-to add {{ toaddress }} to your existing {{ sso_brand_name }}
-service account.
+If you made this request, please copy and paste the token below into the desktop application to complete the process to add {{ toaddress }} to your existing Ubuntu Single Sign On service account.
 
     {{ token }}
 
-If you did not make this request, please ignore this message or report
-it as a possible attempt at a security attack on your data.
+If you did not make this request, please ignore this message or report it as a possible attempt at a security attack on your data.
 
 Thank you,
 
-The {{ sso_brand_name }} service team{% endblocktrans %}
+The Ubuntu Single Sign On team{% endblocktrans %}

=== modified file 'identityprovider/templates/ubuntu/email/forgottenpassword.txt'
--- identityprovider/templates/email/forgottenpassword.txt	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/ubuntu/email/forgottenpassword.txt	2010-05-13 15:20:43 +0000
@@ -1,16 +1,14 @@
 {% load i18n %}
 {% blocktrans %}Hello
 
-You have requested a new password for your {{ sso_brand_name }} account.
+You have requested a new password for your Ubuntu Single Sign On account.
 
 To change your password:
 
     {{ token_url }}
 
-If you don't know what this is about, then someone else has entered your
-email address at the {{ sso_brand_name }} service. Sorry about that.
-You don't need to do anything further, just delete this message.
+If you don't know what this is about, then someone else has entered your email address at the Ubuntu Single Sign On service. Sorry about that. You don't need to do anything further, just delete this message.
 
 Regards,
 
-The {{ sso_brand_name }} team{% endblocktrans %}
+The Ubuntu Single Sign On team{% endblocktrans %}

=== modified file 'identityprovider/templates/ubuntu/email/impersonate-warning.txt'
--- identityprovider/templates/email/impersonate-warning.txt	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/ubuntu/email/impersonate-warning.txt	2010-05-13 15:20:43 +0000
@@ -1,14 +1,12 @@
 {% load i18n %}
-{% blocktrans %}We've received a request to create a new account with your
-email address.
+{% blocktrans %}We've received a request to create a new account with your email address.
 
 If this was you, perhaps you've forgotten your password?
 
     {{ forgotten_password_url }}
 
-If not, someone may be trying to impersonate you. If you get more requests
-like this, please let us know.
+If not, someone may be trying to impersonate you. If you get more requests like this, please let us know.
 
 Regards,
 
-The {{ sso_brand_name }} team{% endblocktrans %}
+The Ubuntu Single Sign On team{% endblocktrans %}

=== modified file 'identityprovider/templates/ubuntu/email/newuser.txt'
--- identityprovider/templates/email/newuser.txt	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/ubuntu/email/newuser.txt	2010-05-13 15:20:43 +0000
@@ -1,17 +1,14 @@
 {% load i18n %}
 {% blocktrans %}Hello
 
-Thank you for registering with the {{ sso_brand_name }} service.
+Thank you for registering with the Ubuntu Single Sign On service.
 
 To complete your registration:
 
     {{ token_url }}
 
-If you don't know what this is about, then someone has probably entered your
-email address by mistake at the {{ sso_brand_name }} service web site.
-Sorry about that. You don't need to do anything further, just delete this
-message.
+If you don't know what this is about, then someone has probably entered your email address by mistake at the Ubuntu Single Sign On service web site. Sorry about that. You don't need to do anything further, just delete this message.
 
 Regards,
 
-The {{ sso_brand_name }} service team{% endblocktrans %}
+The Ubuntu Single Sign On team{% endblocktrans %}

=== modified file 'identityprovider/templates/ubuntu/email/validate-email.txt'
--- identityprovider/templates/email/validate-email.txt	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/ubuntu/email/validate-email.txt	2010-05-13 15:20:43 +0000
@@ -1,13 +1,9 @@
 {% load i18n %}
 {% blocktrans %}Hello
 
-We received a request from {{ requester }} using email address
-{{ requester_email }}, trying to validate the email address
-{{ toaddress }} for use in the {{ sso_brand_name }} service.
+We received a request from {{ requester }} using email address {{ requester_email }}, trying to validate the email address {{ toaddress }} for use in the Ubuntu Single Sign On service.
 
-If you made this request, please click on the link below
-and complete the process to add {{ toaddress }}
-to your existing {{ sso_brand_name }} service account.
+If you made this request, please click on the link below and complete the process to add {{ toaddress }} to your existing Ubuntu Single Sign On service account.
 
     {{ token_url }}
 
@@ -19,4 +15,4 @@
 
 Thank you,
 
-The {{ sso_brand_name }} service team{% endblocktrans %}
+The Ubuntu Single Sign On team{% endblocktrans %}

=== modified file 'identityprovider/templates/ubuntu/registration/login.html'
--- identityprovider/templates/ubuntu/registration/login.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/ubuntu/registration/login.html	2010-05-13 15:20:43 +0000
@@ -15,19 +15,17 @@
     {% if rpconfig %}
         {% include "widgets/trusted_rp.html" %}
     {% else %}
-        <h2 class="main">{% blocktrans %}Log in to {{ sso_brand_name }}{% endblocktrans %}</h2>
+        <h2 class="main">{% blocktrans %}Log in to Ubuntu Single Sign On{% endblocktrans %}</h2>
     {% endif %}
 
     <div id="auth-text">
         {% if token and rpconfig %}
         <p>
-          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses
-the {{ sso_brand_name }} service.{% endblocktrans %}
+          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses the Ubuntu Single Sign On service.{% endblocktrans %}
         </p>
         {% endif %}
         <p>
-        {% blocktrans %}Please note that if you've registered with Launchpad you
-can use your existing Launchpad credentials to log in.{% endblocktrans %}
+        {% blocktrans %}Please note that if you've registered with Launchpad you can use your existing Launchpad credentials to log in.{% endblocktrans %}
         </p>
     </div>
 
@@ -64,8 +62,7 @@
 {% block rightcol %}
     <h2 class="main">{% trans "Are you new?" %}</h2>
     <p>
-      {% blocktrans %}This is a new service to provide a single, central login
-service for all Ubuntu-related sites.{% endblocktrans %}
+      {% blocktrans %}This is a new service to provide a single, central login service for all Ubuntu-related sites.{% endblocktrans %}
     </p>
     <p class="findoutmore">
       <a href="/+description">{% trans "Find out more" %}</a>

=== modified file 'identityprovider/templates/widgets/recaptcha.html'
--- identityprovider/templates/widgets/recaptcha.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/widgets/recaptcha.html	2010-05-13 15:20:43 +0000
@@ -21,9 +21,7 @@
 <div {% if captcha_error %}class='captchaError'{% endif %}>
 {% ifequal captcha_error "&error=no-challenge" %}
 <p>
-{% blocktrans %}It appears that our captcha service was unable to load on this
-page. This may be caused by a plugin on your browser. Please correct this and
-try again. If the problem persists, please contact
+{% blocktrans %}It appears that our captcha service was unable to load on this page. This may be caused by a plugin on your browser. Please correct this and try again. If the problem persists, please contact
 <a href="https://forms.canonical.com/sso-support/">Ubuntu SSO support</a>{% endblocktrans %}
 </p>
 {% endifequal %}

=== modified file 'identityprovider/templates/widgets/unknown_rp.html'
--- identityprovider/templates/widgets/unknown_rp.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/widgets/unknown_rp.html	2010-05-13 15:20:43 +0000
@@ -9,15 +9,11 @@
     {% if not sane_trust_root %}
     <p class="warning message">
         <strong>{% trans "Warning:" %}</strong>
-        {% blocktrans %}<em>{{ trust_root }}</em> does not look like
-a trustworthy URL.{% endblocktrans %}
+        {% blocktrans %}<em>{{ trust_root }}</em> does not look like a trustworthy URL.{% endblocktrans %}
     </p>
     {% endif %}
 
-    <p class="grey">{% blocktrans %}You have used your Single
-Sign On ID to access a site which is <em>not</em> recognised by
-{{sso_brand_name}}:{% endblocktrans %}
-    </p>
+    <p class="grey">{{ brand.unknown_rp }}</p>
 
     <div>
         <a href="{{ trust_root }}">{{ trust_root }}</a>

=== modified file 'identityprovider/tests/test_static.py'
--- identityprovider/tests/test_static.py	2010-04-21 15:29:24 +0000
+++ identityprovider/tests/test_static.py	2010-05-13 15:20:43 +0000
@@ -40,13 +40,13 @@
         req = DummyRequest()
         context = RequestContext(req, {'trust_root': 'foo', })
         response = render_to_response('decide.html', context)
-        self.assertContains(response, 'recognised by\nUbuntu')
+        self.assertContains(response, 'recognised by Ubuntu')
 
         self.set_branding('Launchpad')
         req = DummyRequest()
         context = RequestContext(req, {'trust_root': 'foo', })
         response = render_to_response('decide.html', context)
-        self.assertContains(response, 'recognised by\nLaunchpad')
+        self.assertContains(response, 'recognised by Launchpad')
 
 
 class StaticPageTestCase(SQLCachedTestCase):

=== modified file 'identityprovider/views/ui.py'
--- identityprovider/views/ui.py	2010-05-12 16:24:02 +0000
+++ identityprovider/views/ui.py	2010-05-13 15:20:43 +0000
@@ -139,10 +139,10 @@
                     replacements = {
                         'forgotten_password_url':
                         urljoin(settings.SSO_ROOT_URL, '+forgot_password'),
-                        'sso_brand_name': current_brand.name,
                     }
                     message = render_to_string(
-                        'email/impersonate-warning.txt', replacements)
+                        '%s/email/impersonate-warning.txt' %
+                            current_brand.template_dir, replacements)
                     subject = current_brand.name + ": " + _("Warning")
                     from_address = format_address(
                         settings.NOREPLY_FROM_ADDRESS, current_brand.name)