Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-cookie-string-translation into lp:canonical-identity-provider/release

  1. fix-cookie-string-translation
  2. Merge into trunk
Proposed by Szilveszter Farkas
Status: Merged
Merged at revision: 62
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/fix-cookie-string-translation
Merge into: lp:canonical-identity-provider/release
Diff against target: 13 lines (+1/-2)
1 file modified
identityprovider/templates/cookies.html (+1/-2)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-cookie-string-translation
Reviewer Review Type Date Requested Status
Canonical ISD hackers Pending
Review via email: mp+27709@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/templates/cookies.html'
2--- identityprovider/templates/cookies.html 2010-05-24 19:42:17 +0000
3+++ identityprovider/templates/cookies.html 2010-06-16 13:07:24 +0000
4@@ -11,8 +11,7 @@
5
6 <div>
7 <p>
8- {% blocktrans %}Cookies are required to use this service. Please
9- enable cookies in your browser.{% endblocktrans %}
10+ {% blocktrans %}Cookies are required to use this service. Please enable cookies in your browser.{% endblocktrans %}
11 </p>
12 </div>
13 {% endblock %}