1
=== modified file 'identityprovider/branding.py'
2
--- identityprovider/branding.py	2010-05-12 17:15:50 +0000
3
+++ identityprovider/branding.py	2010-05-13 15:20:43 +0000
4
@@ -15,6 +15,16 @@
5
15
    server_info = _('This is the Launchpad login service, built on OpenID. '
15
    server_info = _('This is the Launchpad login service, built on OpenID. '
6
16
                    'The service enables you to use your Launchpad account '
16
                    'The service enables you to use your Launchpad account '
7
17
                    'to log into OpenID-enabled sites around the Internet.')
17
                    'to log into OpenID-enabled sites around the Internet.')
8
18
    unknown_rp = _('You have used your Single Sign On ID to access a site '
9
19
                   'which is <em>not</em> recognised by Launchpad Login '
10
20
                   'Service:')
11
21
    complete_reg = _('Complete your Launchpad Login Service registration')
12
22
    reset_password = _('Reset your Launchpad Login Service password')
13
23
    not_found_error = _('There\'s no page with this address in the Launchpad '
14
24
                        'Login Service. Check that you entered the address '
15
25
                        'correctly and try again.')
16
26
    oops_error = _('Sorry, something just went wrong in Launchpad Login '
17
27
                   'Service.')
18
18
28
19
19
29
20
20
class Ubuntu(object):
30
class Ubuntu(object):
21
@@ -27,5 +37,15 @@
22
27
    server_info = _('This is the Ubuntu SSO service, built on OpenID. The '
37
    server_info = _('This is the Ubuntu SSO service, built on OpenID. The '
23
28
                    'service enables you to use your Ubuntu SSO account to '
38
                    'service enables you to use your Ubuntu SSO account to '
24
29
                    'log into various sites run by Canonical and Ubuntu.')
39
                    'log into various sites run by Canonical and Ubuntu.')
25
40
    unknown_rp = _('You have used your Single Sign On ID to access a site '
26
41
                   'which is <em>not</em> recognised by Ubuntu Single Sign '
27
42
                   'On:')
28
43
    complete_reg = _('Complete your Ubuntu Single Sign On registration')
29
44
    reset_password = _('Reset your Ubuntu Single Sign On password')
30
45
    not_found_error = _('There\'s no page with this address in the Ubuntu '
31
46
                        'Single Sign On service. Check that you entered the '
32
47
                        'address correctly and try again.')
33
48
    oops_error = _('Sorry, something just went wrong in Ubuntu Single Sign '
34
49
                   'On.')
35
30
50
36
31
current_brand = globals()[settings.BRAND]()
51
current_brand = globals()[settings.BRAND]()
37
32
52
38
=== modified file 'identityprovider/context_processors.py'
39
--- identityprovider/context_processors.py	2010-04-21 15:29:24 +0000
40
+++ identityprovider/context_processors.py	2010-05-13 15:20:43 +0000
41
@@ -22,6 +22,5 @@
42
22
def branding(request):
22
def branding(request):
43
23
    return {
23
    return {
44
24
            'template_dir': current_brand.template_dir,
24
            'template_dir': current_brand.template_dir,
45
25
            'sso_brand_name': u'%s' % current_brand.name,
46
26
            'brand': current_brand,
25
            'brand': current_brand,
47
27
            }
26
            }
48
28
27
49
=== modified file 'identityprovider/models/authtoken.py'
50
--- identityprovider/models/authtoken.py	2010-04-21 15:29:24 +0000
51
+++ identityprovider/models/authtoken.py	2010-05-13 15:20:43 +0000
52
@@ -78,9 +78,9 @@
53
78
            'toaddress': self.email,
78
            'toaddress': self.email,
54
79
            'token_url': self.get_absolute_url(),
79
            'token_url': self.get_absolute_url(),
55
80
            'support_form_url': settings.SUPPORT_FORM_URL,
80
            'support_form_url': settings.SUPPORT_FORM_URL,
56
81
            'sso_brand_name': unicode(current_brand.name),
57
82
        }
81
        }
59
83
        message = render_to_string('email/validate-email.txt', replacements)
82
        message = render_to_string('%s/email/validate-email.txt' %
60
83
            current_brand.template_dir, replacements)
61
84
        subject = u'%s' % current_brand.name + ": Validate your email address"
84
        subject = u'%s' % current_brand.name + ": Validate your email address"
62
85
        self._send_email(u"%s Email Validator" % current_brand.name, subject,
85
        self._send_email(u"%s Email Validator" % current_brand.name, subject,
63
86
                         message)
86
                         message)
64
@@ -89,10 +89,9 @@
65
89
        replacements = {
89
        replacements = {
66
90
            'token': self.token,
90
            'token': self.token,
67
91
            'toaddress': self.email,
91
            'toaddress': self.email,
68
92
            'sso_brand_name': unicode(current_brand.name),
69
93
        }
92
        }
72
94
        message = render_to_string('email/email-validation-token.txt',
93
        message = render_to_string('%s/email/email-validation-token.txt' %
73
95
            replacements)
94
            current_brand.template_dir, replacements)
74
96
        subject = u"%s: Validate your email address" % current_brand.name
95
        subject = u"%s: Validate your email address" % current_brand.name
75
97
        self._send_email(u"%s Email Validator" % current_brand.name, subject,
96
        self._send_email(u"%s Email Validator" % current_brand.name, subject,
76
98
                         message)
97
                         message)
77
@@ -100,20 +99,20 @@
78
100
    def sendPasswordResetEmail(self):
99
    def sendPasswordResetEmail(self):
79
101
        replacements = {
100
        replacements = {
80
102
            'token_url': self.get_absolute_url(),
101
            'token_url': self.get_absolute_url(),
81
103
            'sso_brand_name': unicode(current_brand.name)
82
104
        }
102
        }
83
105
        from_name = unicode(current_brand.name)
103
        from_name = unicode(current_brand.name)
85
106
        message = render_to_string('email/forgottenpassword.txt', replacements)
104
        message = render_to_string('%s/email/forgottenpassword.txt' %
86
105
            current_brand.template_dir, replacements)
87
107
        subject = u"%s: Forgotten Password" % current_brand.name
106
        subject = u"%s: Forgotten Password" % current_brand.name
88
108
        self._send_email(from_name, subject, message)
107
        self._send_email(from_name, subject, message)
89
109
108
90
110
    def sendNewUserEmail(self):
109
    def sendNewUserEmail(self):
91
111
        replacements = {
110
        replacements = {
92
112
            'token_url': self.get_absolute_url(),
111
            'token_url': self.get_absolute_url(),
93
113
            'sso_brand_name': unicode(current_brand.name)
94
114
        }
112
        }
95
115
        from_name = unicode(current_brand.name)
113
        from_name = unicode(current_brand.name)
97
116
        message = render_to_string('email/newuser.txt', replacements)
114
        message = render_to_string('%s/email/newuser.txt' %
98
115
            current_brand.template_dir, replacements)
99
117
        subject = u"%s: Finish your registration" % current_brand.name
116
        subject = u"%s: Finish your registration" % current_brand.name
100
118
        self._send_email(from_name, subject, message)
117
        self._send_email(from_name, subject, message)
101
119
118
102
120
119
103
=== modified file 'identityprovider/templates/404.html'
104
--- identityprovider/templates/404.html	2010-04-21 15:29:24 +0000
105
+++ identityprovider/templates/404.html	2010-05-13 15:20:43 +0000
106
@@ -12,11 +12,7 @@
107
12
    <div id="box">
12
    <div id="box">
108
13
        <h1 class="main">Lost something?</h1>
13
        <h1 class="main">Lost something?</h1>
109
14
        <div>
14
        <div>
115
15
          <p>{% blocktrans %}There's no page with this address in the
15
          <p>{{ brand.not_found }}</p>
111
16
{{ sso_brand_name }} service.
112
17
113
18
Check that you entered the address correctly and try again.{% endblocktrans %}
114
19
          </p>
116
20
          <p>
16
          <p>
117
21
            {% blocktrans %}(Error <abbr>ID</abbr>: {{oopsid}}){% endblocktrans %}
17
            {% blocktrans %}(Error <abbr>ID</abbr>: {{oopsid}}){% endblocktrans %}
118
22
          </p>
18
          </p>
119
23
19
120
=== modified file 'identityprovider/templates/500.html'
121
--- identityprovider/templates/500.html	2010-04-21 15:29:24 +0000
122
+++ identityprovider/templates/500.html	2010-05-13 15:20:43 +0000
123
@@ -13,7 +13,7 @@
124
13
        <h1 class="main">Oops!</h1>
13
        <h1 class="main">Oops!</h1>
125
14
        <div>
14
        <div>
126
15
          <p>
15
          <p>
128
16
            {% blocktrans %}Sorry, something just went wrong in {{ sso_brand_name }}.{% endblocktrans %}
16
            {{ brand.oops_error }}
129
17
          </p>
17
          </p>
130
18
          <p>
18
          <p>
131
19
            {% blocktrans %}We&#8217;ve recorded what happened,
19
            {% blocktrans %}We&#8217;ve recorded what happened,
132
20
20
133
=== modified file 'identityprovider/templates/account/confirm_new_email.html'
134
--- identityprovider/templates/account/confirm_new_email.html	2010-04-21 15:29:24 +0000
135
+++ identityprovider/templates/account/confirm_new_email.html	2010-05-13 15:20:43 +0000
136
@@ -11,8 +11,7 @@
137
11
	<h2 class="main">{% blocktrans %}Validate {{ email }}?{% endblocktrans %}</h2>
11
	<h2 class="main">{% blocktrans %}Validate {{ email }}?{% endblocktrans %}</h2>
138
12
12
139
13
	<div class="info">
13
	<div class="info">
142
14
		<p>{% blocktrans %}Are you sure you want to confirm and validate this
14
		<p>{% blocktrans %}Are you sure you want to confirm and validate this email address?{% endblocktrans %}</p>
141
15
		email address? {% endblocktrans %}</p>
143
16
	</div>
15
	</div>
144
17
16
145
18
    <div class="actions">
17
    <div class="actions">
146
19
18
147
=== modified file 'identityprovider/templates/account/delete_email.html'
148
--- identityprovider/templates/account/delete_email.html	2010-04-21 15:29:24 +0000
149
+++ identityprovider/templates/account/delete_email.html	2010-05-13 15:20:43 +0000
150
@@ -13,8 +13,7 @@
151
13
    <h2 class="main">{% blocktrans %}Remove {{ email }}?{% endblocktrans %}</h2>
13
    <h2 class="main">{% blocktrans %}Remove {{ email }}?{% endblocktrans %}</h2>
152
14
    
14
    
153
15
    <div class="info">
15
    <div class="info">
156
16
        <p>{% blocktrans %}Are you sure you want to remove this unverified email
16
        <p>{% blocktrans %}Are you sure you want to remove this unverified email address?{% endblocktrans %}</p>
155
17
address?{% endblocktrans %}</p>
157
18
    </div>
17
    </div>
158
19
    
18
    
159
20
    <div class="actions">
19
    <div class="actions">
160
21
20
161
=== modified file 'identityprovider/templates/account/edit.html'
162
--- identityprovider/templates/account/edit.html	2010-04-21 15:29:24 +0000
163
+++ identityprovider/templates/account/edit.html	2010-05-13 15:20:43 +0000
164
@@ -69,8 +69,7 @@
165
69
            <label class="formLabel tooltip"
69
            <label class="formLabel tooltip"
166
70
                for="id_preferred_email">{% trans "Preferred email" %}
70
                for="id_preferred_email">{% trans "Preferred email" %}
167
71
                <span class="description tooltip">? <span class="tooltip-content">
71
                <span class="description tooltip">? <span class="tooltip-content">
170
72
                    {% blocktrans %}This email address is passed on to other
72
                    {% blocktrans %}This email address is passed on to other sites when requested as part of the login process.{% endblocktrans %}
169
73
sites when requested as part of the login process.{% endblocktrans %}
171
74
                </span>
73
                </span>
172
75
                <span class="tooltip-tail">&nbsp;</span></span></label>
74
                <span class="tooltip-tail">&nbsp;</span></span></label>
173
76
            {{ form.preferred_email }}
75
            {{ form.preferred_email }}
174
@@ -122,8 +121,7 @@
175
122
            {% endif %}
121
            {% endif %}
176
123
            {% if not form.newpassword.errors %}
122
            {% if not form.newpassword.errors %}
177
124
            <div id="pwhint">
123
            <div id="pwhint">
180
125
                {% blocktrans %}Password must be at least 8 characters long,
124
                {% blocktrans %}Password must be at least 8 characters long, and must contain at least one number and an upper case letter.{% endblocktrans %}
179
126
and must contain at least one number and an upper case letter.{% endblocktrans %}
181
127
            </div>
125
            </div>
182
128
            {% endif %}
126
            {% endif %}
183
129
            {% if form.non_field_errors %}
127
            {% if form.non_field_errors %}
184
130
128
185
=== modified file 'identityprovider/templates/account/new_email.html'
186
--- identityprovider/templates/account/new_email.html	2010-04-21 15:29:24 +0000
187
+++ identityprovider/templates/account/new_email.html	2010-05-13 15:20:43 +0000
188
@@ -10,8 +10,7 @@
189
10
<div id="auth">
10
<div id="auth">
190
11
    <h2 class="main">{% trans "Add an email address to your account" %}</h2>
11
    <h2 class="main">{% trans "Add an email address to your account" %}</h2>
191
12
12
194
13
    <p>{% blocktrans %}Enter your email address, and we will send you
13
    <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to confirm your account.{% endblocktrans %}</p>
193
14
instructions on how to confirm your account.{% endblocktrans %}</p>
195
15
14
196
16
    <form action="+new-email" method="post">
15
    <form action="+new-email" method="post">
197
17
        <p class="input-row{% if form.newemail.errors %} haserrors{% endif %}">
16
        <p class="input-row{% if form.newemail.errors %} haserrors{% endif %}">
198
18
17
199
=== modified file 'identityprovider/templates/admin/readonly_confirm.html'
200
--- identityprovider/templates/admin/readonly_confirm.html	2010-04-21 15:29:24 +0000
201
+++ identityprovider/templates/admin/readonly_confirm.html	2010-05-13 15:20:43 +0000
202
@@ -23,16 +23,14 @@
203
23
    {% blocktrans %}You're not operating on all appservers{% endblocktrans %}
23
    {% blocktrans %}You're not operating on all appservers{% endblocktrans %}
204
24
    </p>
24
    </p>
205
25
    <p>
25
    <p>
208
26
    {% blocktrans %}Changing readonly mode on a single application server can
26
    {% blocktrans %}Changing readonly mode on a single application server can lead to inconsistent states and unexpected behaviour.{% endblocktrans %}
207
27
lead to inconsistent states and unexpected behaviour.{% endblocktrans %}
209
28
    </p>
27
    </p>
210
29
    </div>
28
    </div>
211
30
    {% else %}
29
    {% else %}
212
31
    {% ifequal action "clear" %}
30
    {% ifequal action "clear" %}
213
32
    <div class="system-message">
31
    <div class="system-message">
214
33
    <p class="system-message-title">
32
    <p class="system-message-title">
217
34
    {% blocktrans %}Make sure the master database connection is enabled on all
33
    {% blocktrans %}Make sure the master database connection is enabled on all app servers <b>before</b> leaving readonly mode!{% endblocktrans %}
216
35
app servers <b>before</b> leaving readonly mode!{% endblocktrans %}
218
36
    </p>
34
    </p>
219
37
    </div>
35
    </div>
220
38
    {% endifequal %}
36
    {% endifequal %}
221
@@ -45,29 +43,23 @@
222
45
<b>{{ appserver }}</b>.{% endblocktrans %}
43
<b>{{ appserver }}</b>.{% endblocktrans %}
223
46
        {% else %}
44
        {% else %}
224
47
            {% blocktrans %}You are about to enable readonly mode globally.{% endblocktrans %}</p><p>
45
            {% blocktrans %}You are about to enable readonly mode globally.{% endblocktrans %}</p><p>
227
48
            {% blocktrans %}All appservers will be passed to read-only mode if
46
            {% blocktrans %}All appservers will be passed to read-only mode if you confirm.{% endblocktrans %}
226
49
you confirm.{% endblocktrans %}
228
50
        {% endif %}
47
        {% endif %}
229
51
    {% else %}
48
    {% else %}
230
52
    {% ifequal action "clear" %}
49
    {% ifequal action "clear" %}
231
53
        {% if appserver %}
50
        {% if appserver %}
236
54
            {% blocktrans %}You are about to clear readonly mode on appserver
51
            {% blocktrans %}You are about to clear readonly mode on appserver <b>{{ appserver }}</b>.{% endblocktrans %}</p><p>
237
55
<b>{{ appserver }}</b>.{% endblocktrans %}</p><p>
52
            {% blocktrans %}If you confirm, <b>{{ appserver }}</b> will attempt to resume normal operation with its master database connection.{% endblocktrans %}</p>
234
56
            {% blocktrans %}If you confirm, <b>{{ appserver }}</b> will attempt
235
57
to resume normal operation with its master database connection.{% endblocktrans %}</p>
238
58
        {% else %}
53
        {% else %}
239
59
            {% blocktrans %}You are about to clear readonly mode globally.{% endblocktrans %}</p><p>
54
            {% blocktrans %}You are about to clear readonly mode globally.{% endblocktrans %}</p><p>
242
60
            {% blocktrans %}If you confirm, all appservers will attempt to
55
            {% blocktrans %}If you confirm, all appservers will attempt to resume normal operation.{% endblocktrans %}
241
61
resume normal operation.{% endblocktrans %}
243
62
        {% endif %}
56
        {% endif %}
244
63
    {% else %}
57
    {% else %}
245
64
    {% ifequal action "enable" %}
58
    {% ifequal action "enable" %}
248
65
    {% blocktrans %}You are about to enable the <b>{{ conn }}</b> database connection on appserver
59
    {% blocktrans %}You are about to enable the <b>{{ conn }}</b> database connection on appserver <b>{{ appserver }}</b>.{% endblocktrans %}
247
66
<b>{{ appserver }}</b>.{% endblocktrans %}
249
67
    {% else %}
60
    {% else %}
250
68
    {% ifequal action "disable" %}
61
    {% ifequal action "disable" %}
253
69
    {% blocktrans %}You are about to disable the <b>{{ conn }}</b> database connection on appserver
62
    {% blocktrans %}You are about to disable the <b>{{ conn }}</b> database connection on appserver <b>{{ appserver }}</b>.{% endblocktrans %}
252
70
<b>{{ appserver }}</b>.{% endblocktrans %}
254
71
    {% endifequal %}
63
    {% endifequal %}
255
72
    {% endifequal %}
64
    {% endifequal %}
256
73
    {% endifequal %}
65
    {% endifequal %}
257
74
66
258
=== modified file 'identityprovider/templates/launchpad/base.html'
259
--- identityprovider/templates/launchpad/base.html	2010-04-21 15:29:24 +0000
260
+++ identityprovider/templates/launchpad/base.html	2010-05-13 15:20:43 +0000
261
@@ -27,9 +27,7 @@
262
27
            <div id="maincontent">
27
            <div id="maincontent">
263
28
                {% if readonly %}
28
                {% if readonly %}
264
29
                <div class="message">
29
                <div class="message">
268
30
                  {% blocktrans %}We are currently in read-only mode. That
30
                  {% 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 %}
266
31
means that at the moment you can't create new accounts, update your personal
267
32
information, or request password reminders.{% endblocktrans %}
269
33
                </ul>
31
                </ul>
270
34
                </div>
32
                </div>
271
35
                {% endif %}
33
                {% endif %}
272
36
34
273
=== added directory 'identityprovider/templates/launchpad/email'
274
=== added file 'identityprovider/templates/launchpad/email/email-validation-token.txt'
275
--- identityprovider/templates/launchpad/email/email-validation-token.txt	1970-01-01 00:00:00 +0000
276
+++ identityprovider/templates/launchpad/email/email-validation-token.txt	2010-05-13 15:20:43 +0000
277
@@ -0,0 +1,14 @@
278
1
{% load i18n %}
279
2
{% blocktrans %}Hello
280
3
281
4
We received a request to validate the email address {{ toaddress }} for use in the Launchpad Login Service.
282
5
283
6
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.
284
7
285
8
    {{ token }}
286
9
287
10
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.
288
11
289
12
Thank you,
290
13
291
14
The Launchpad Login Service team{% endblocktrans %}
292
0
15
293
=== added file 'identityprovider/templates/launchpad/email/forgottenpassword.txt'
294
--- identityprovider/templates/launchpad/email/forgottenpassword.txt	1970-01-01 00:00:00 +0000
295
+++ identityprovider/templates/launchpad/email/forgottenpassword.txt	2010-05-13 15:20:43 +0000
296
@@ -0,0 +1,14 @@
297
1
{% load i18n %}
298
2
{% blocktrans %}Hello
299
3
300
4
You have requested a new password for your Launchpad Login Service account.
301
5
302
6
To change your password:
303
7
304
8
    {{ token_url }}
305
9
306
10
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.
307
11
308
12
Regards,
309
13
310
14
The Launchpad Login Service team{% endblocktrans %}
311
0
15
312
=== added file 'identityprovider/templates/launchpad/email/impersonate-warning.txt'
313
--- identityprovider/templates/launchpad/email/impersonate-warning.txt	1970-01-01 00:00:00 +0000
314
+++ identityprovider/templates/launchpad/email/impersonate-warning.txt	2010-05-13 15:20:43 +0000
315
@@ -0,0 +1,12 @@
316
1
{% load i18n %}
317
2
{% blocktrans %}We've received a request to create a new account with your email address.
318
3
319
4
If this was you, perhaps you've forgotten your password?
320
5
321
6
    {{ forgotten_password_url }}
322
7
323
8
If not, someone may be trying to impersonate you. If you get more requests like this, please let us know.
324
9
325
10
Regards,
326
11
327
12
The Launchpad Login Service team{% endblocktrans %}
328
0
13
329
=== added file 'identityprovider/templates/launchpad/email/newuser.txt'
330
--- identityprovider/templates/launchpad/email/newuser.txt	1970-01-01 00:00:00 +0000
331
+++ identityprovider/templates/launchpad/email/newuser.txt	2010-05-13 15:20:43 +0000
332
@@ -0,0 +1,14 @@
333
1
{% load i18n %}
334
2
{% blocktrans %}Hello
335
3
336
4
Thank you for registering with the Launchpad Login Service.
337
5
338
6
To complete your registration:
339
7
340
8
    {{ token_url }}
341
9
342
10
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.
343
11
344
12
Regards,
345
13
346
14
The Launchpad Login Service team{% endblocktrans %}
347
0
15
348
=== added file 'identityprovider/templates/launchpad/email/validate-email.txt'
349
--- identityprovider/templates/launchpad/email/validate-email.txt	1970-01-01 00:00:00 +0000
350
+++ identityprovider/templates/launchpad/email/validate-email.txt	2010-05-13 15:20:43 +0000
351
@@ -0,0 +1,18 @@
352
1
{% load i18n %}
353
2
{% blocktrans %}Hello
354
3
355
4
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.
356
5
357
6
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.
358
7
359
8
    {{ token_url }}
360
9
361
10
If you did not make this request, please ignore this message or report it on
362
11
363
12
    {{ support_form_url }}
364
13
365
14
as a possible attempt at a security attack on your data.
366
15
367
16
Thank you,
368
17
369
18
The Launchpad Login Service team{% endblocktrans %}
370
0
19
371
=== modified file 'identityprovider/templates/launchpad/registration/login.html'
372
--- identityprovider/templates/launchpad/registration/login.html	2010-04-21 15:29:24 +0000
373
+++ identityprovider/templates/launchpad/registration/login.html	2010-05-13 15:20:43 +0000
374
@@ -15,14 +15,13 @@
375
15
    {% if rpconfig %}
15
    {% if rpconfig %}
376
16
        {% include "widgets/trusted_rp.html" %}
16
        {% include "widgets/trusted_rp.html" %}
377
17
    {% else %}
17
    {% else %}
379
18
        <h2 class="main">{% blocktrans %}Log in to {{ sso_brand_name }}{% endblocktrans %}</h2>
18
        <h2 class="main">{% blocktrans %}Log in to Launchpad Login Service{% endblocktrans %}</h2>
380
19
    {% endif %}
19
    {% endif %}
381
20
20
382
21
    <div id="auth-text">
21
    <div id="auth-text">
383
22
        {% if token and rpconfig %}
22
        {% if token and rpconfig %}
384
23
        <p>
23
        <p>
387
24
          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses
24
          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses the Launchpad Login Service.{% endblocktrans %}
386
25
the {{ sso_brand_name }} service.{% endblocktrans %}
388
26
        </p>
25
        </p>
389
27
        {% endif %}
26
        {% endif %}
390
28
    </div>
27
    </div>
391
@@ -61,27 +60,19 @@
392
61
	  <h2>{% trans "What is Launchpad and a Launchpad Account?" %}</h2>
60
	  <h2>{% trans "What is Launchpad and a Launchpad Account?" %}</h2>
393
62
	
61
	
394
63
	  <p>
62
	  <p>
399
64
            {% blocktrans %}Launchpad is the central point where we gather all
63
            {% 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 %}
396
65
sorts of interactions around Ubuntu, Canonical and free software generally.
397
66
You can use your Launchpad account to report bugs, to find or contribute
398
67
translations, to find specs, to contribute code.{% endblocktrans %}
400
68
	  </p>
64
	  </p>
401
69
	</div>
65
	</div>
402
70
{% endblock %}
66
{% endblock %}
403
71
67
404
72
{% block rightcol %}
68
{% block rightcol %}
405
73
   <p>
69
   <p>
418
74
     {% blocktrans %}This is the Launchpad login service utilizing
70
     {% 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 %}
419
75
<a href="http://openid.net/">OpenID</a> technology. This site allows you to use
71
   </p>
420
76
<a href="https://launchpad.net/people/+me">your Launchpad account</a> to log
72
   <p>
421
77
into OpenID-enabled sites around the Internet.{% endblocktrans %}
73
     {% blocktrans %}To learn more about using this service, please review the <a href="https://help.launchpad.net/OpenID">instructions</a>.{% endblocktrans %}
422
78
   </p>
74
   </p>
423
79
   <p>
75
   <p>
424
80
     {% blocktrans %}To learn more about using this service, please review the
76
     {% blocktrans %}If you want to change any of your account's details, you can do so by logging in using the form beside.{% endblocktrans %}
413
81
<a href="https://help.launchpad.net/OpenID">instructions</a>.{% endblocktrans %}
414
82
   </p>
415
83
   <p>
416
84
     {% blocktrans %}If you want to change any of your account's details, you
417
85
can do so by logging in using the form beside.{% endblocktrans %}
425
86
   </p>
77
   </p>
426
87
{% endblock %}
78
{% endblock %}
427
88
79
428
=== modified file 'identityprovider/templates/registration/bad_token.html'
429
--- identityprovider/templates/registration/bad_token.html	2010-04-21 15:29:24 +0000
430
+++ identityprovider/templates/registration/bad_token.html	2010-05-13 15:20:43 +0000
431
@@ -9,8 +9,6 @@
432
9
{% block "content" %}
9
{% block "content" %}
433
10
<h1 class="main">{% trans "Unauthorized token" %}</h1>
10
<h1 class="main">{% trans "Unauthorized token" %}</h1>
434
11
11
438
12
<p>{% blocktrans %}You are not authorized to use this token. If this URL
12
<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>
436
13
was sent to you by email, please make sure you open it in the same browser
437
14
where you requested it.{% endblocktrans %}</p>
439
15
{% endblock %}
13
{% endblock %}
440
16
14
441
17
15
442
=== modified file 'identityprovider/templates/registration/confirm_new_account.html'
443
--- identityprovider/templates/registration/confirm_new_account.html	2010-04-21 15:29:24 +0000
444
+++ identityprovider/templates/registration/confirm_new_account.html	2010-05-13 15:20:43 +0000
445
@@ -12,7 +12,7 @@
446
12
12
447
13
{% block "content" %}
13
{% block "content" %}
448
14
<div id="auth">
14
<div id="auth">
450
15
    <h1 class="main">{% blocktrans %}Complete your {{ sso_brand_name }} registration{% endblocktrans %}</h1>
15
    <h1 class="main">{{ brand.complete_reg }}</h1>
451
16
16
452
17
    <form id="login-form" class="longfields" action="+newaccount" method="post">
17
    <form id="login-form" class="longfields" action="+newaccount" method="post">
453
18
        <p class="input-row{% if form.displayname.errors %} haserrors{% endif %}">
18
        <p class="input-row{% if form.displayname.errors %} haserrors{% endif %}">
454
@@ -27,8 +27,7 @@
455
27
            <span class="error">{{ form.password.errors|first }}</span>
27
            <span class="error">{{ form.password.errors|first }}</span>
456
28
        {% else %}
28
        {% else %}
457
29
            <span id="pwhint">
29
            <span id="pwhint">
460
30
              {% blocktrans %}Password must be at least 8 characters long,
30
              {% blocktrans %}Password must be at least 8 characters long, and must contain at least one number and an upper case letter.{% endblocktrans %}
459
31
and must contain at least one number and an upper case letter.{% endblocktrans %}
461
32
            </span>
31
            </span>
462
33
        {% endif %}
32
        {% endif %}
463
34
        </p>
33
        </p>
464
35
34
465
=== modified file 'identityprovider/templates/registration/email_sent.html'
466
--- identityprovider/templates/registration/email_sent.html	2010-04-21 15:29:24 +0000
467
+++ identityprovider/templates/registration/email_sent.html	2010-05-13 15:20:43 +0000
468
@@ -25,22 +25,14 @@
469
25
</div>
25
</div>
470
26
<div id="col2">
26
<div id="col2">
471
27
    <h2 class="main">{% trans "Haven&rsquo;t received it?" %}</h2>
27
    <h2 class="main">{% trans "Haven&rsquo;t received it?" %}</h2>
482
28
    <p>{% blocktrans %}If you don&rsquo;t receive the message
28
    <p>{% blocktrans %}If you don&rsquo;t receive the message within a few minutes, it might be because:{% endblocktrans %}</p>
483
29
within a few minutes, it might be because:{% endblocktrans %}</p>
29
    <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>
484
30
    <p>{% blocktrans %}Your mail provider uses &ldquo;greylisting&rdquo; to
30
    <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 %}
475
31
reduce spam. If so, you&rsquo;ll need to wait an hour or two for the
476
32
message to arrive.{% endblocktrans %}</p>
477
33
    <p>{% blocktrans %}Your mail provider mistakenly blocks messages from
478
34
this site. Try signing up using a service like
479
35
<a href="http://gmail.com/">Gmail</a> or
480
36
<a href="http://mail.yahoo.com/">Yahoo Mail</a>.
481
37
If that works, complain to your usual mail provider.{% endblocktrans %}
485
38
    </p>
31
    </p>
486
39
    {% if email_notreceived_extra %}
32
    {% if email_notreceived_extra %}
487
40
    <p>{{ email_notreceived_extra|safe }}</p>
33
    <p>{{ email_notreceived_extra|safe }}</p>
488
41
    {% endif %}
34
    {% endif %}
491
42
    <p>{% blocktrans %}If neither of those work, the Login Service might be
35
    <p>{% blocktrans %}If neither of those work, our service might be having a problem.{% endblocktrans %}
490
43
having a problem.{% endblocktrans %}
492
44
    </p>
36
    </p>
493
45
</div>
37
</div>
494
46
{% if user.is_authenticated %}</div>{% endif %}
38
{% if user.is_authenticated %}</div>{% endif %}
495
47
39
496
=== modified file 'identityprovider/templates/registration/forgot_password.html'
497
--- identityprovider/templates/registration/forgot_password.html	2010-04-21 15:29:24 +0000
498
+++ identityprovider/templates/registration/forgot_password.html	2010-05-13 15:20:43 +0000
499
@@ -8,10 +8,9 @@
500
8
8
501
9
{% block "content" %}
9
{% block "content" %}
502
10
<div id="auth">
10
<div id="auth">
504
11
    <h1 class="main">{% blocktrans %}Reset your {{ sso_brand_name }} password{% endblocktrans %}</h1>
11
    <h1 class="main">{{ brand.reset_password }}</h1>
505
12
12
508
13
    <p>{% blocktrans %}Enter your email address, and we will send you
13
    <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to reset your password.{% endblocktrans %}</p>
507
14
instructions on how to reset your password.{% endblocktrans %}</p>
509
15
14
510
16
    <form action="+forgot_password" method="post">
15
    <form action="+forgot_password" method="post">
511
17
        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
16
        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
512
18
17
513
=== modified file 'identityprovider/templates/registration/logout_to_confirm.html'
514
--- identityprovider/templates/registration/logout_to_confirm.html	2010-05-11 13:09:30 +0000
515
+++ identityprovider/templates/registration/logout_to_confirm.html	2010-05-13 15:20:43 +0000
516
@@ -9,7 +9,6 @@
517
9
{% block "content" %}
9
{% block "content" %}
518
10
	<h1 class="main">{% trans "Can not confirm token while logged in" %}</h1>
10
	<h1 class="main">{% trans "Can not confirm token while logged in" %}</h1>
519
11
11
522
12
	<p>{% blocktrans %}You can not confirm this token because you are logged in as
12
	<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>
521
13
	a different user. Please log out and try again.{% endblocktrans %}</p>
523
14
{% endblock %}
13
{% endblock %}
524
15
14
525
16
15
526
=== modified file 'identityprovider/templates/registration/new_account.html'
527
--- identityprovider/templates/registration/new_account.html	2010-04-21 15:29:24 +0000
528
+++ identityprovider/templates/registration/new_account.html	2010-05-13 15:20:43 +0000
529
@@ -12,8 +12,7 @@
530
12
	    {{ brand.create_account }}
12
	    {{ brand.create_account }}
531
13
   </h2>
13
   </h2>
532
14
14
535
15
    <p>{% blocktrans %}Enter your email address, and we will send you
15
    <p>{% blocktrans %}Enter your email address, and we will send you instructions on how to create your account.{% endblocktrans %}</p>
534
16
instructions on how to create your account.{% endblocktrans %}</p>
536
17
16
537
18
    <form action="+new_account" method="post">
17
    <form action="+new_account" method="post">
538
19
        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
18
        <p class="input-row{% if form.email.errors %} haserrors{% endif %}">
539
20
19
540
=== modified file 'identityprovider/templates/registration/reset_password.html'
541
--- identityprovider/templates/registration/reset_password.html	2010-04-21 15:29:24 +0000
542
+++ identityprovider/templates/registration/reset_password.html	2010-05-13 15:20:43 +0000
543
@@ -13,7 +13,7 @@
544
13
{% block "content" %}
13
{% block "content" %}
545
14
    <div id="box">
14
    <div id="box">
546
15
        <div id="auth">
15
        <div id="auth">
548
16
            <h2 class="main">{% blocktrans %}Reset your {{ sso_brand_name }} password{% endblocktrans %}</h2>
16
            <h2 class="main">{{ brand.reset_password }}</h2>
549
17
17
550
18
            <form id="login-form" class="longfields" action="+resetpassword" method="post">
18
            <form id="login-form" class="longfields" action="+resetpassword" method="post">
551
19
                <p class="input-row{% if form.password.errors or form.non_field_errors %} haserrors{% endif %}">
19
                <p class="input-row{% if form.password.errors or form.non_field_errors %} haserrors{% endif %}">
552
@@ -23,8 +23,7 @@
553
23
                    <span class="error">{{ form.password.errors|first }}</span>
23
                    <span class="error">{{ form.password.errors|first }}</span>
554
24
                {% else %}
24
                {% else %}
555
25
                    <span id="pwhint">
25
                    <span id="pwhint">
558
26
                      {% blocktrans %}Password must be at least 8 characters
26
                      {% blocktrans %}Password must be at least 8 characters long, and must contain at least one number and an upper case letter.{% endblocktrans %}
557
27
long, and must contain at least one number and an upper case letter.{% endblocktrans %}
559
28
                    </span>
27
                    </span>
560
29
                {% endif %}
28
                {% endif %}
561
30
                </p>
29
                </p>
562
31
30
563
=== modified file 'identityprovider/templates/ubuntu/base.html'
564
--- identityprovider/templates/ubuntu/base.html	2010-04-21 15:29:24 +0000
565
+++ identityprovider/templates/ubuntu/base.html	2010-05-13 15:20:43 +0000
566
@@ -18,9 +18,9 @@
567
18
                    <div id="header">
18
                    <div id="header">
568
19
                        <div id="logo">
19
                        <div id="logo">
569
20
                            <h1 id="title">
20
                            <h1 id="title">
573
21
                            <a href="/">{%if sso_brand_name%}
21
                            <a href="/">
574
22
                            {% blocktrans %}{{sso_brand_name}}{%endblocktrans%}
22
                            {% blocktrans %}Ubuntu Single Sign On{% endblocktrans %}
575
23
                            {%endif%}</a></h1>
23
                            </a></h1>
576
24
                        </div>
24
                        </div>
577
25
                    </div>
25
                    </div>
578
26
                    <div id="content">
26
                    <div id="content">
579
@@ -29,12 +29,7 @@
580
29
                        {% endif %}
29
                        {% endif %}
581
30
                {% if readonly %}
30
                {% if readonly %}
582
31
                <span class="warning">
31
                <span class="warning">
589
32
                  {% blocktrans %}
32
{% 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 %}
584
33
                    We are currently in read-only mode.  That means that
585
34
                    at the moment you can't create new accounts,
586
35
                    update your personal information, or
587
36
                    request password reminders.                  
588
37
                  {% endblocktrans %}
590
38
                    </ul>
33
                    </ul>
591
39
                </span>
34
                </span>
592
40
                {% endif %}
35
                {% endif %}
593
@@ -51,12 +46,8 @@
594
51
            </div>
46
            </div>
595
52
            <div id="footer">
47
            <div id="footer">
596
53
                <p>{% blocktrans %}&copy; 2009-2010 Canonical Ltd.<br />
48
                <p>{% blocktrans %}&copy; 2009-2010 Canonical Ltd.<br />
603
54
                Ubuntu and Canonical are registered trademarks of Canonical
49
Ubuntu and Canonical are registered trademarks of Canonical Group Ltd.<br />
604
55
                Group Ltd.<br />Please review our
50
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>
599
56
                <a href="http://ubuntu.com/legal">Terms of Service</a> as well
600
57
                as our
601
58
                <a href="http://ubuntu.com/legal#privacy">Privacy Policy</a>.
602
59
                {% endblocktrans %}</p>
605
60
            </div>
51
            </div>
606
61
        </div>
52
        </div>
607
62
    </body>
53
    </body>
608
63
54
609
=== renamed directory 'identityprovider/templates/email' => 'identityprovider/templates/ubuntu/email'
610
=== modified file 'identityprovider/templates/ubuntu/email/email-validation-token.txt'
611
--- identityprovider/templates/email/email-validation-token.txt	2010-04-21 15:29:24 +0000
612
+++ identityprovider/templates/ubuntu/email/email-validation-token.txt	2010-05-13 15:20:43 +0000
613
@@ -1,19 +1,14 @@
614
1
{% load i18n %}
1
{% load i18n %}
615
2
{% blocktrans %}Hello
2
{% blocktrans %}Hello
616
3
3
619
4
We received a request to validate the email address
4
We received a request to validate the email address {{ toaddress }} for use in the Ubuntu Single Sign On service.
618
5
{{ toaddress }} for use in the {{ sso_brand_name }} service.
620
6
5
625
7
If you made this request, please copy and paste the token
6
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.
622
8
below into the desktop application to complete the process
623
9
to add {{ toaddress }} to your existing {{ sso_brand_name }}
624
10
service account.
626
11
7
627
12
    {{ token }}
8
    {{ token }}
628
13
9
631
14
If you did not make this request, please ignore this message or report
10
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.
630
15
it as a possible attempt at a security attack on your data.
632
16
11
633
17
Thank you,
12
Thank you,
634
18
13
636
19
The {{ sso_brand_name }} service team{% endblocktrans %}
14
The Ubuntu Single Sign On team{% endblocktrans %}
637
20
15
638
=== modified file 'identityprovider/templates/ubuntu/email/forgottenpassword.txt'
639
--- identityprovider/templates/email/forgottenpassword.txt	2010-04-21 15:29:24 +0000
640
+++ identityprovider/templates/ubuntu/email/forgottenpassword.txt	2010-05-13 15:20:43 +0000
641
@@ -1,16 +1,14 @@
642
1
{% load i18n %}
1
{% load i18n %}
643
2
{% blocktrans %}Hello
2
{% blocktrans %}Hello
644
3
3
646
4
You have requested a new password for your {{ sso_brand_name }} account.
4
You have requested a new password for your Ubuntu Single Sign On account.
647
5
5
648
6
To change your password:
6
To change your password:
649
7
7
650
8
    {{ token_url }}
8
    {{ token_url }}
651
9
9
655
10
If you don't know what this is about, then someone else has entered your
10
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.
653
11
email address at the {{ sso_brand_name }} service. Sorry about that.
654
12
You don't need to do anything further, just delete this message.
656
13
11
657
14
Regards,
12
Regards,
658
15
13
660
16
The {{ sso_brand_name }} team{% endblocktrans %}
14
The Ubuntu Single Sign On team{% endblocktrans %}
661
17
15
662
=== modified file 'identityprovider/templates/ubuntu/email/impersonate-warning.txt'
663
--- identityprovider/templates/email/impersonate-warning.txt	2010-04-21 15:29:24 +0000
664
+++ identityprovider/templates/ubuntu/email/impersonate-warning.txt	2010-05-13 15:20:43 +0000
665
@@ -1,14 +1,12 @@
666
1
{% load i18n %}
1
{% load i18n %}
669
2
{% blocktrans %}We've received a request to create a new account with your
2
{% blocktrans %}We've received a request to create a new account with your email address.
668
3
email address.
670
4
3
671
5
If this was you, perhaps you've forgotten your password?
4
If this was you, perhaps you've forgotten your password?
672
6
5
673
7
    {{ forgotten_password_url }}
6
    {{ forgotten_password_url }}
674
8
7
677
9
If not, someone may be trying to impersonate you. If you get more requests
8
If not, someone may be trying to impersonate you. If you get more requests like this, please let us know.
676
10
like this, please let us know.
678
11
9
679
12
Regards,
10
Regards,
680
13
11
682
14
The {{ sso_brand_name }} team{% endblocktrans %}
12
The Ubuntu Single Sign On team{% endblocktrans %}
683
15
13
684
=== modified file 'identityprovider/templates/ubuntu/email/newuser.txt'
685
--- identityprovider/templates/email/newuser.txt	2010-04-21 15:29:24 +0000
686
+++ identityprovider/templates/ubuntu/email/newuser.txt	2010-05-13 15:20:43 +0000
687
@@ -1,17 +1,14 @@
688
1
{% load i18n %}
1
{% load i18n %}
689
2
{% blocktrans %}Hello
2
{% blocktrans %}Hello
690
3
3
692
4
Thank you for registering with the {{ sso_brand_name }} service.
4
Thank you for registering with the Ubuntu Single Sign On service.
693
5
5
694
6
To complete your registration:
6
To complete your registration:
695
7
7
696
8
    {{ token_url }}
8
    {{ token_url }}
697
9
9
702
10
If you don't know what this is about, then someone has probably entered your
10
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.
699
11
email address by mistake at the {{ sso_brand_name }} service web site.
700
12
Sorry about that. You don't need to do anything further, just delete this
701
13
message.
703
14
11
704
15
Regards,
12
Regards,
705
16
13
707
17
The {{ sso_brand_name }} service team{% endblocktrans %}
14
The Ubuntu Single Sign On team{% endblocktrans %}
708
18
15
709
=== modified file 'identityprovider/templates/ubuntu/email/validate-email.txt'
710
--- identityprovider/templates/email/validate-email.txt	2010-04-21 15:29:24 +0000
711
+++ identityprovider/templates/ubuntu/email/validate-email.txt	2010-05-13 15:20:43 +0000
712
@@ -1,13 +1,9 @@
713
1
{% load i18n %}
1
{% load i18n %}
714
2
{% blocktrans %}Hello
2
{% blocktrans %}Hello
715
3
3
719
4
We received a request from {{ requester }} using email address
4
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.
717
5
{{ requester_email }}, trying to validate the email address
718
6
{{ toaddress }} for use in the {{ sso_brand_name }} service.
720
7
5
724
8
If you made this request, please click on the link below
6
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.
722
9
and complete the process to add {{ toaddress }}
723
10
to your existing {{ sso_brand_name }} service account.
725
11
7
726
12
    {{ token_url }}
8
    {{ token_url }}
727
13
9
728
@@ -19,4 +15,4 @@
729
19
15
730
20
Thank you,
16
Thank you,
731
21
17
733
22
The {{ sso_brand_name }} service team{% endblocktrans %}
18
The Ubuntu Single Sign On team{% endblocktrans %}
734
23
19
735
=== modified file 'identityprovider/templates/ubuntu/registration/login.html'
736
--- identityprovider/templates/ubuntu/registration/login.html	2010-04-21 15:29:24 +0000
737
+++ identityprovider/templates/ubuntu/registration/login.html	2010-05-13 15:20:43 +0000
738
@@ -15,19 +15,17 @@
739
15
    {% if rpconfig %}
15
    {% if rpconfig %}
740
16
        {% include "widgets/trusted_rp.html" %}
16
        {% include "widgets/trusted_rp.html" %}
741
17
    {% else %}
17
    {% else %}
743
18
        <h2 class="main">{% blocktrans %}Log in to {{ sso_brand_name }}{% endblocktrans %}</h2>
18
        <h2 class="main">{% blocktrans %}Log in to Ubuntu Single Sign On{% endblocktrans %}</h2>
744
19
    {% endif %}
19
    {% endif %}
745
20
20
746
21
    <div id="auth-text">
21
    <div id="auth-text">
747
22
        {% if token and rpconfig %}
22
        {% if token and rpconfig %}
748
23
        <p>
23
        <p>
751
24
          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses
24
          {% blocktrans with rpconfig.displayname as rpconfigname %}You are here because {{ rpconfigname }} uses the Ubuntu Single Sign On service.{% endblocktrans %}
750
25
the {{ sso_brand_name }} service.{% endblocktrans %}
752
26
        </p>
25
        </p>
753
27
        {% endif %}
26
        {% endif %}
754
28
        <p>
27
        <p>
757
29
        {% blocktrans %}Please note that if you've registered with Launchpad you
28
        {% blocktrans %}Please note that if you've registered with Launchpad you can use your existing Launchpad credentials to log in.{% endblocktrans %}
756
30
can use your existing Launchpad credentials to log in.{% endblocktrans %}
758
31
        </p>
29
        </p>
759
32
    </div>
30
    </div>
760
33
31
761
@@ -64,8 +62,7 @@
762
64
{% block rightcol %}
62
{% block rightcol %}
763
65
    <h2 class="main">{% trans "Are you new?" %}</h2>
63
    <h2 class="main">{% trans "Are you new?" %}</h2>
764
66
    <p>
64
    <p>
767
67
      {% blocktrans %}This is a new service to provide a single, central login
65
      {% blocktrans %}This is a new service to provide a single, central login service for all Ubuntu-related sites.{% endblocktrans %}
766
68
service for all Ubuntu-related sites.{% endblocktrans %}
768
69
    </p>
66
    </p>
769
70
    <p class="findoutmore">
67
    <p class="findoutmore">
770
71
      <a href="/+description">{% trans "Find out more" %}</a>
68
      <a href="/+description">{% trans "Find out more" %}</a>
771
72
69
772
=== modified file 'identityprovider/templates/widgets/recaptcha.html'
773
--- identityprovider/templates/widgets/recaptcha.html	2010-04-21 15:29:24 +0000
774
+++ identityprovider/templates/widgets/recaptcha.html	2010-05-13 15:20:43 +0000
775
@@ -21,9 +21,7 @@
776
21
<div {% if captcha_error %}class='captchaError'{% endif %}>
21
<div {% if captcha_error %}class='captchaError'{% endif %}>
777
22
{% ifequal captcha_error "&error=no-challenge" %}
22
{% ifequal captcha_error "&error=no-challenge" %}
778
23
<p>
23
<p>
782
24
{% blocktrans %}It appears that our captcha service was unable to load on this
24
{% 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
780
25
page. This may be caused by a plugin on your browser. Please correct this and
781
26
try again. If the problem persists, please contact
783
27
<a href="https://forms.canonical.com/sso-support/">Ubuntu SSO support</a>{% endblocktrans %}
25
<a href="https://forms.canonical.com/sso-support/">Ubuntu SSO support</a>{% endblocktrans %}
784
28
</p>
26
</p>
785
29
{% endifequal %}
27
{% endifequal %}
786
30
28
787
=== modified file 'identityprovider/templates/widgets/unknown_rp.html'
788
--- identityprovider/templates/widgets/unknown_rp.html	2010-04-21 15:29:24 +0000
789
+++ identityprovider/templates/widgets/unknown_rp.html	2010-05-13 15:20:43 +0000
790
@@ -9,15 +9,11 @@
791
9
    {% if not sane_trust_root %}
9
    {% if not sane_trust_root %}
792
10
    <p class="warning message">
10
    <p class="warning message">
793
11
        <strong>{% trans "Warning:" %}</strong>
11
        <strong>{% trans "Warning:" %}</strong>
796
12
        {% blocktrans %}<em>{{ trust_root }}</em> does not look like
12
        {% blocktrans %}<em>{{ trust_root }}</em> does not look like a trustworthy URL.{% endblocktrans %}
795
13
a trustworthy URL.{% endblocktrans %}
797
14
    </p>
13
    </p>
798
15
    {% endif %}
14
    {% endif %}
799
16
15
804
17
    <p class="grey">{% blocktrans %}You have used your Single
16
    <p class="grey">{{ brand.unknown_rp }}</p>
801
18
Sign On ID to access a site which is <em>not</em> recognised by
802
19
{{sso_brand_name}}:{% endblocktrans %}
803
20
    </p>
805
21
17
806
22
    <div>
18
    <div>
807
23
        <a href="{{ trust_root }}">{{ trust_root }}</a>
19
        <a href="{{ trust_root }}">{{ trust_root }}</a>
808
24
20
809
=== modified file 'identityprovider/tests/test_static.py'
810
--- identityprovider/tests/test_static.py	2010-04-21 15:29:24 +0000
811
+++ identityprovider/tests/test_static.py	2010-05-13 15:20:43 +0000
812
@@ -40,13 +40,13 @@
813
40
        req = DummyRequest()
40
        req = DummyRequest()
814
41
        context = RequestContext(req, {'trust_root': 'foo', })
41
        context = RequestContext(req, {'trust_root': 'foo', })
815
42
        response = render_to_response('decide.html', context)
42
        response = render_to_response('decide.html', context)
817
43
        self.assertContains(response, 'recognised by\nUbuntu')
43
        self.assertContains(response, 'recognised by Ubuntu')
818
44
44
819
45
        self.set_branding('Launchpad')
45
        self.set_branding('Launchpad')
820
46
        req = DummyRequest()
46
        req = DummyRequest()
821
47
        context = RequestContext(req, {'trust_root': 'foo', })
47
        context = RequestContext(req, {'trust_root': 'foo', })
822
48
        response = render_to_response('decide.html', context)
48
        response = render_to_response('decide.html', context)
824
49
        self.assertContains(response, 'recognised by\nLaunchpad')
49
        self.assertContains(response, 'recognised by Launchpad')
825
50
50
826
51
51
827
52
class StaticPageTestCase(SQLCachedTestCase):
52
class StaticPageTestCase(SQLCachedTestCase):
828
53
53
829
=== modified file 'identityprovider/views/ui.py'
830
--- identityprovider/views/ui.py	2010-05-12 16:24:02 +0000
831
+++ identityprovider/views/ui.py	2010-05-13 15:20:43 +0000
832
@@ -139,10 +139,10 @@
833
139
                    replacements = {
139
                    replacements = {
834
140
                        'forgotten_password_url':
140
                        'forgotten_password_url':
835
141
                        urljoin(settings.SSO_ROOT_URL, '+forgot_password'),
141
                        urljoin(settings.SSO_ROOT_URL, '+forgot_password'),
836
142
                        'sso_brand_name': current_brand.name,
837
143
                    }
142
                    }
838
144
                    message = render_to_string(
143
                    message = render_to_string(
840
145
                        'email/impersonate-warning.txt', replacements)
144
                        '%s/email/impersonate-warning.txt' %
841
145
                            current_brand.template_dir, replacements)
842
146
                    subject = current_brand.name + ": " + _("Warning")
146
                    subject = current_brand.name + ": " + _("Warning")
843
147
                    from_address = format_address(
147
                    from_address = format_address(
844
148
                        settings.NOREPLY_FROM_ADDRESS, current_brand.name)
148
                        settings.NOREPLY_FROM_ADDRESS, current_brand.name)
Status:	Merged
Merged at revision:	22
Proposed branch:	lp:~canonical-isd-hackers/canonical-identity-provider/fix-translatable-strings
Merge into:	lp:canonical-identity-provider/release
Diff against target:	844 lines (+172/-159) 35 files modified identityprovider/branding.py (+20/-0) identityprovider/context_processors.py (+0/-1) identityprovider/models/authtoken.py (+8/-9) identityprovider/templates/404.html (+1/-5) identityprovider/templates/500.html (+1/-1) identityprovider/templates/account/confirm_new_email.html (+1/-2) identityprovider/templates/account/delete_email.html (+1/-2) identityprovider/templates/account/edit.html (+2/-4) identityprovider/templates/account/new_email.html (+1/-2) identityprovider/templates/admin/readonly_confirm.html (+8/-16) identityprovider/templates/launchpad/base.html (+1/-3) identityprovider/templates/launchpad/email/email-validation-token.txt (+14/-0) identityprovider/templates/launchpad/email/forgottenpassword.txt (+14/-0) identityprovider/templates/launchpad/email/impersonate-warning.txt (+12/-0) identityprovider/templates/launchpad/email/newuser.txt (+14/-0) identityprovider/templates/launchpad/email/validate-email.txt (+18/-0) identityprovider/templates/launchpad/registration/login.html (+10/-19) identityprovider/templates/registration/bad_token.html (+1/-3) identityprovider/templates/registration/confirm_new_account.html (+2/-3) identityprovider/templates/registration/email_sent.html (+4/-12) identityprovider/templates/registration/forgot_password.html (+2/-3) identityprovider/templates/registration/logout_to_confirm.html (+1/-2) identityprovider/templates/registration/new_account.html (+1/-2) identityprovider/templates/registration/reset_password.html (+2/-3) identityprovider/templates/ubuntu/base.html (+6/-15) identityprovider/templates/ubuntu/email/email-validation-token.txt (+4/-9) identityprovider/templates/ubuntu/email/forgottenpassword.txt (+3/-5) identityprovider/templates/ubuntu/email/impersonate-warning.txt (+3/-5) identityprovider/templates/ubuntu/email/newuser.txt (+3/-6) identityprovider/templates/ubuntu/email/validate-email.txt (+3/-7) identityprovider/templates/ubuntu/registration/login.html (+4/-7) identityprovider/templates/widgets/recaptcha.html (+1/-3) identityprovider/templates/widgets/unknown_rp.html (+2/-6) identityprovider/tests/test_static.py (+2/-2) identityprovider/views/ui.py (+2/-2)
To merge this branch:	bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-translatable-strings
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Łukasz Czyżykowski (community)		2010-05-13	Approve on 2010-05-13
Review via email: mp+25237@code.launchpad.net