launchpad-reviewers team mailing list archive

Thread
Date

[Merge] lp:~huwshimi/launchpad/language-link-510363 into lp:launchpad

To: mp+66628@xxxxxxxxxxxxxxxxxx
From: Huw Wilkins <huw.wilkins@xxxxxxxxxxxxx>
Date: Fri, 01 Jul 2011 15:36:07 -0000
Reply-to: mp+66628@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Huw Wilkins has proposed merging lp:~huwshimi/launchpad/language-link-510363 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #510363 in Launchpad itself: "Translation page should have a link to language preferences"
  https://bugs.launchpad.net/launchpad/+bug/510363

For more details, see:
https://code.launchpad.net/~huwshimi/launchpad/language-link-510363/+merge/66628

This branch adds a "Change your preferred languages" link to the sidebar of a person's translations page. This link used to only appear in the main content if you had not set any preferred languages.

A screenshot of the fix is here:
https://launchpadlibrarian.net/74403553/preferences_link.png

There was also an inconsistency with the link title between https://translations.launchpad.net/ and https://translations.launchpad.net/ubuntu/+translations ("Change your preferred languages" vs "Choose preferred languages"). so I have made them all "Change your preferred languages".
-- 
https://code.launchpad.net/~huwshimi/launchpad/language-link-510363/+merge/66628
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~huwshimi/launchpad/language-link-510363 into lp:launchpad.

=== modified file 'lib/lp/translations/templates/object-pots.pt'
--- lib/lp/translations/templates/object-pots.pt	2009-12-17 16:48:18 +0000
+++ lib/lp/translations/templates/object-pots.pt	2011-07-01 15:36:02 +0000
@@ -81,7 +81,7 @@
         <div tal:replace="structure potemplate/@@+preferred-chart" />
 
         <div align="right">
-          [ <a href="/+editmylanguages">Choose preferred languages...</a> 
+          [ <a href="/+editmylanguages">Change your preferred languages...</a> 
             &mdash;
             <a tal:attributes="href potemplate/fmt:url">
               View template &amp; all languages...</a> 

=== modified file 'lib/lp/translations/templates/person-translations.pt'
--- lib/lp/translations/templates/person-translations.pt	2010-01-08 12:28:42 +0000
+++ lib/lp/translations/templates/person-translations.pt	2011-07-01 15:36:02 +0000
@@ -3,12 +3,18 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal";
   xmlns:metal="http://xml.zope.org/namespaces/metal";
   xmlns:i18n="http://xml.zope.org/namespaces/i18n";
-  metal:use-macro="view/macro:page/main_only"
+  metal:use-macro="view/macro:page/main_side"
   i18n:domain="launchpad"
 >
 
 <body>
 
+<metal:side fill-slot="side">
+    <div class="portlet">
+      <a href="/+editmylanguages" class="sprite edit">Change your preferred languages</a>
+    </div>
+</metal:side>
+
 <div metal:fill-slot="heading">
   <h1 tal:content="view/page_title" />
 </div>

=== modified file 'lib/lp/translations/templates/translations-macros.pt'
--- lib/lp/translations/templates/translations-macros.pt	2011-03-11 18:55:17 +0000
+++ lib/lp/translations/templates/translations-macros.pt	2011-07-01 15:36:02 +0000
@@ -182,7 +182,7 @@
 
 <metal:languages-table-actions define-macro="languages-table-actions">
   <div align="right">
-    [ <a href="/+editmylanguages">Choose preferred languages...</a>
+    [ <a href="/+editmylanguages">Change your preferred languages...</a>
       <tal:has-preferred condition="view/translatable_languages">&mdash;
         <a href="#" id="toggle-languages-visibility">
           View all languages</a>