Merge lp:~dholbach/developer-ubuntu-com/logout into lp:developer-ubuntu-com

[Daniel Holbach]

[David Planella (dpm)]

Great, thanks!

Could you mark the "Log in" and "Log out" strings for translation with {% trans %}?

review: Needs Fixing

[David Planella (dpm)]

Also, could we make it so that on logout you're not redirected to the home page, but to the page you were in?

I've seen some templates doing it like:

href="<some url here>?next={{request.path}}"

But perhaps we can do it in the view?

review: Needs Fixing

[lp:~dholbach/developer-ubuntu-com/logout]

52. By Daniel Holbach on 2014-12-17

mark a couple of strings as translatable

53. By Daniel Holbach on 2014-12-17

update .pot file

54. By Daniel Holbach on 2014-12-17

merge from trunk, resolve conflicts

55. By Daniel Holbach on 2014-12-17

mark strings for translation

56. By Daniel Holbach on 2014-12-17

update .pot file

57. By Daniel Holbach on 2014-12-17

redirect logout gracefully

[David Planella (dpm)]

Looks good to me and works well, thanks for taking care of the extra translations!

review: Approve

=== modified file 'developer_portal/urls.py'
--- developer_portal/urls.py	2014-12-10 04:09:01 +0000
+++ developer_portal/urls.py	2014-12-17 13:24:16 +0000
@@ -10,6 +10,7 @@
 
 urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^logout$', 'developer_portal.views.site_logout', name='logout')
 )
 
 urlpatterns += patterns(
@@ -22,11 +23,9 @@
 )
 listen_for_login()
 
-
 urlpatterns += i18n_patterns('',
     url(r'^ckeditor/', include('ckeditor.urls')),
     url(r'^blog/', include('zinnia.urls', namespace='zinnia')),
     url(r'^blog/comments/', include('django_comments.urls')),
     url(r'^', include('cms.urls')),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-

=== modified file 'developer_portal/views.py'
--- developer_portal/views.py	2014-11-28 20:17:54 +0000
+++ developer_portal/views.py	2014-12-17 13:24:16 +0000
@@ -17,9 +17,10 @@
 from django.shortcuts import render_to_response, redirect
 from django.template.loader import render_to_string
 from django.template import RequestContext
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.conf import settings
+from django.contrib.auth import logout
 
 from django_openid_auth.signals import openid_login_complete
 
@@ -57,3 +58,9 @@
     
 def listen_for_login():
     openid_login_complete.connect(promote_staff)
+
+def site_logout(request):
+    logout(request)
+    if "next" in request.GET:
+        return HttpResponseRedirect(request.GET['next'])
+    return HttpResponseRedirect('/')

=== modified file 'locale/developer_portal.pot'
--- locale/developer_portal.pot	2014-12-16 11:39:55 +0000
+++ locale/developer_portal.pot	2014-12-17 13:24:16 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-16 11:39+0000\n"
+"POT-Creation-Date: 2014-12-17 13:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -44,20 +44,120 @@
 msgid "developer"
 msgstr ""
 
+#: templates/base.html:74
+msgid "Ubuntu and Canonical are registered trademarks of Canonical Ltd."
+msgstr ""
+
+#: templates/base.html:78
+msgid "Report a bug on this site"
+msgstr ""
+
+#: templates/website_base.html:56
+msgid "Jump to content"
+msgstr ""
+
+#: templates/website_base.html:65 templates/comments/zinnia/entry/form.html:25
+msgid "Log out"
+msgstr ""
+
+#: templates/website_base.html:71
+msgid "Log in"
+msgstr ""
+
+#: templates/comments/zinnia/entry/form.html:25
+msgid "Comment as"
+msgstr ""
+
+#: templates/comments/zinnia/entry/form.html:28
+msgid "Post"
+msgstr ""
+
+#: templates/menu/menu_footer_first_level.html:8
 #: templates/menu/menu_header_first_level.html:8
 #: templates/menu/sub_menu.html:8 templates/menu/sub_menu.html.py:22
 #: templates/menu/sub_menu.html:25
 msgid "Overview"
 msgstr ""
 
-#: templates/zinnia/base.html:40
+#: templates/zinnia/_entry_detail_base.html:33
+#, python-format
+msgid "%(percent)s%% of %(object)s still remains to read."
+msgstr ""
+
+#: templates/zinnia/_entry_detail_base.html:33
+msgid "Continue reading"
+msgstr ""
+
+#: templates/zinnia/_entry_detail_base.html:47
+#: templates/zinnia/author_list.html:19
+#, python-format
+msgid "Show all %(author)s's entries"
+msgstr ""
+
+#: templates/zinnia/_entry_detail_base.html:50
+msgid "Written on"
+msgstr ""
+
+#: templates/zinnia/_entry_detail_base.html:62
+msgid "Filed under:"
+msgstr ""
+
+#: templates/zinnia/_entry_detail_base.html:64
+#: templates/zinnia/tag_list.html:19
+#, python-format
+msgid "Show all entries tagged by %(tag)s"
+msgstr ""
+
+#: templates/zinnia/_entry_detail_base.html:66
+msgid "No tags"
+msgstr ""
+
+#: templates/zinnia/author_list.html:4 templates/zinnia/author_list.html:12
+msgid "Author list"
+msgstr ""
+
+#: templates/zinnia/author_list.html:6
+msgid "Authors"
+msgstr ""
+
+#: templates/zinnia/author_list.html:21 templates/zinnia/category_list.html:19
+#: templates/zinnia/tag_list.html:20
+#, python-format
+msgid "%(entry_count)s entry"
+msgid_plural "%(entry_count)s entries"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/zinnia/author_list.html:25
+msgid "No authors yet."
+msgstr ""
+
+#: templates/zinnia/base.html:36
 msgid "RSS Feed of latest entries"
 msgstr ""
 
-#: templates/zinnia/base.html:41
+#: templates/zinnia/base.html:37
 msgid "RSS Feed of latest discussions"
 msgstr ""
 
+#: templates/zinnia/category_list.html:4
+#: templates/zinnia/category_list.html:12
+msgid "Category list"
+msgstr ""
+
+#: templates/zinnia/category_list.html:6
+msgid "Categories"
+msgstr ""
+
+#: templates/zinnia/category_list.html:18
+#, python-format
+msgid "Show all entries in %(category)s"
+msgstr ""
+
+#: templates/zinnia/category_list.html:24
+msgid "No categories yet."
+msgstr ""
+
 #: templates/zinnia/entry_detail_base.html:22
 msgid "RSS Feed of discussions on"
 msgstr ""
@@ -74,37 +174,108 @@
 msgid "RSS Feed of trackbacks on"
 msgstr ""
 
-#: templates/zinnia/entry_detail_base.html:47
-msgid "Next entry"
-msgstr ""
-
-#: templates/zinnia/entry_detail_base.html:61
-msgid "Previous entry"
-msgstr ""
-
-#: templates/zinnia/entry_detail_base.html:77
+#: templates/zinnia/entry_detail_base.html:43
 msgid "Comments"
 msgstr ""
 
-#: templates/zinnia/entry_detail_base.html:97
-msgctxt "on date"
-msgid "on"
-msgstr ""
-
-#: templates/zinnia/entry_detail_base.html:103
-msgid "Direct link to this comment"
-msgstr ""
-
-#: templates/zinnia/entry_detail_base.html:115
-#: templates/zinnia/entry_detail_base.html:121
+#: templates/zinnia/entry_detail_base.html:82
+#: templates/zinnia/entry_detail_base.html:88
 msgid "Comments are closed."
 msgstr ""
 
-#: templates/zinnia/entry_detail_base.html:119
+#: templates/zinnia/entry_detail_base.html:86
 msgid "No comments yet."
 msgstr ""
 
-#: templates/zinnia/entry_detail_base.html:138
-#: templates/zinnia/entry_detail_base.html:139
+#: templates/zinnia/entry_detail_base.html:96
+msgid "Add your comment"
+msgstr ""
+
+#: templates/zinnia/entry_detail_base.html:108
+#: templates/zinnia/entry_detail_base.html:109
 msgid "Edit the entry"
 msgstr ""
+
+#: templates/zinnia/entry_list.html:4
+msgid "Latest entries for"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:4
+msgid "the category"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:4
+msgid "the tag"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:4
+msgid "the author"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:6
+msgid "page"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:11 templates/zinnia/entry_list.html:14
+#: templates/zinnia/entry_list.html:17
+msgid "RSS Feed"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:21
+msgid "Category"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:21
+msgid "Tag"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:21
+msgid "Author"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:23
+msgid "Page"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:32
+#, python-format
+msgid "Category archives: %(category)s"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:41
+#, python-format
+msgid "Tag archives: %(tag)s"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:47
+#, python-format
+msgid "Author archives: %(author)s"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:58
+msgid "No entries yet."
+msgstr ""
+
+#: templates/zinnia/entry_list.html:75 templates/zinnia/entry_list.html:76
+msgid "Edit the category"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:82 templates/zinnia/entry_list.html:83
+msgid "Edit the tag"
+msgstr ""
+
+#: templates/zinnia/entry_list.html:89 templates/zinnia/entry_list.html:90
+msgid "Edit the author"
+msgstr ""
+
+#: templates/zinnia/tag_list.html:4 templates/zinnia/tag_list.html.py:12
+msgid "Tag list"
+msgstr ""
+
+#: templates/zinnia/tag_list.html:6
+msgid "Tags"
+msgstr ""
+
+#: templates/zinnia/tag_list.html:24
+msgid "No tags yet."
+msgstr ""

=== modified file 'templates/base.html'
--- templates/base.html	2014-12-17 12:43:23 +0000
+++ templates/base.html	2014-12-17 13:24:16 +0000
@@ -71,11 +71,11 @@
                 </li>
 {% endblock footer_inlines %}
 {% block footer_legal %}
-	<p class="twelve-col">© 2014 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
+       <p class="twelve-col">© 2014 Canonical Ltd. {% trans "Ubuntu and Canonical are registered trademarks of Canonical Ltd." %}</p>
         <ul class="inline clear">
             <li><a href="/legal">Legal information</a>
             </li>
-            <li><a href="https://bugs.launchpad.net/ubuntu-website-content/">Report a bug on this site</a>
+            <li><a href="https://bugs.launchpad.net/ubuntu-website-content/">{% trans "Report a bug on this site" %}</a>
             </li>
         </ul>
         <span class="accessibility-aid"><a href="#">Got to the top of the page</a></span>

=== modified file 'templates/website_base.html'
--- templates/website_base.html	2014-12-17 12:43:23 +0000
+++ templates/website_base.html	2014-12-17 13:24:16 +0000
@@ -53,7 +53,7 @@
                 </div>
 
                 <ul>
-                <li class="accessibility-aid"><a accesskey="s" href="#main-content">Jump to content</a></li>
+		 <li class="accessibility-aid"><a accesskey="s" href="#main-content">{% trans "Jump to content" %}</a></li>
                 {% block nav_primary_links %}{% endblock nav_primary_links %}
 		{% if user.is_authenticated %}
   		<li class="logout">
@@ -62,13 +62,13 @@
 			<li>
 			    <a href="https://myapps.developer.ubuntu.com/dev/click-apps/">My Apps</a>
 			<li>
-			    <a href="/admin/logout">Log out</a>
+			    <a href="/logout?next={{request.path}}"">{% trans "Log out" %}</a>
 			</li>
 		    </ul>
 		</li>
 		{% else %}
 		<li class="login">
-  		    <a href="/openid/login/?next={{request.path}}">Log in</a>
+		    <a href="/openid/login/?next={{request.path}}">{% trans "Log in" %}</a>
 		</li>		
 		{% endif %}
                 </ul>