Merge lp:~danilo/launchpad/bug-427843 into lp:launchpad

[Данило Шеган]

[Данило Шеган (danilo)]

= Bug #427843 =

This includes mechanical changes to convert distribution and
distroseries translations pages to 3.0.

All links from the navigation menus are moved inline.

= Demo & QA =

https://translations.launchpad.dev/ubuntu/
https://translations.launchpad.dev/ubuntu/hoary
https://translations.launchpad.dev/ubuntu/breezy-autotest

= Tests =

bin/test -vvt translation-import-queue-targets -t
'translations.*stories.distroseries' -t
'translations.*stories.distribution' -t stories.translationgroups

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/translations/browser/configure.zcml
  lib/lp/translations/browser/distroseries.py

lib/lp/translations/stories/distribution/xx-distribution-change-language-pack-admins.txt

lib/lp/translations/stories/distribution/xx-distribution-translations.txt

lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt
  lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt

lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt

lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt

lib/lp/translations/stories/translationgroups/10-distro-translation-group.txt
  lib/lp/translations/templates/distribution-language-pack-admin-info.pt
  lib/lp/translations/templates/distribution-translations.pt
  lib/lp/translations/templates/distroseries-translations.pt

[Aaron Bentley (abentley)]

Looks pretty straightforward.

review: Approve

=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml	2009-09-11 10:55:54 +0000
+++ lib/lp/translations/browser/configure.zcml	2009-09-13 20:24:35 +0000
@@ -887,6 +887,13 @@
         permission="launchpad.TranslationsAdmin"
         template="../../app/templates/generic-edit.pt"
         layer="canonical.launchpad.layers.TranslationsLayer"/>
+    <!-- Language pack admin portlet -->
+    <browser:page
+        name="+language-pack-admin-info"
+        for="lp.registry.interfaces.distribution.IDistribution"
+        permission="launchpad.View"
+        template="../templates/distribution-language-pack-admin-info.pt"
+        layer="canonical.launchpad.layers.TranslationsLayer"/>
 
 <!-- DistroSeries -->
 

=== modified file 'lib/lp/translations/browser/distroseries.py'
--- lib/lp/translations/browser/distroseries.py	2009-08-31 13:49:49 +0000
+++ lib/lp/translations/browser/distroseries.py	2009-09-13 20:24:35 +0000
@@ -248,6 +248,10 @@
     def potemplates(self):
         return list(self.context.getCurrentTranslationTemplates())
 
+    @property
+    def is_translation_focus(self):
+        """Is this DistroSeries the translation focus."""
+        return self.context.distribution.translation_focus == self.context
 
 class DistroSeriesTranslationsMenu(NavigationMenu):
 

=== modified file 'lib/lp/translations/stories/distribution/xx-distribution-change-language-pack-admins.txt'
--- lib/lp/translations/stories/distribution/xx-distribution-change-language-pack-admins.txt	2009-08-13 19:03:36 +0000
+++ lib/lp/translations/stories/distribution/xx-distribution-change-language-pack-admins.txt	2009-09-14 13:47:28 +0000
@@ -7,7 +7,7 @@
 
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
     >>> browser.open('http://translations.launchpad.dev/ubuntu/')
-    >>> browser.getLink('Language pack admin')
+    >>> browser.getLink('Set language pack administrator')
     Traceback (most recent call last):
     ...
     LinkNotFoundError
@@ -22,7 +22,7 @@
 
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
     >>> browser.open('http://translations.launchpad.dev/ubuntu/')
-    >>> browser.getLink('Language pack admin').click()
+    >>> browser.getLink('Set language pack administrator').click()
 
 Current value is empty.
 

=== modified file 'lib/lp/translations/stories/distribution/xx-distribution-translations.txt'
--- lib/lp/translations/stories/distribution/xx-distribution-translations.txt	2009-08-23 05:28:49 +0000
+++ lib/lp/translations/stories/distribution/xx-distribution-translations.txt	2009-09-14 13:47:28 +0000
@@ -52,7 +52,7 @@
 And the other Ubuntu distributions should be there too.
 
     >>> content = find_main_content(browser.contents)
-    >>> print extract_text(content.findAll('h2')[1])
+    >>> print extract_text(content.findAll('h2')[2])
     Other versions of Ubuntu
 
     >>> print extract_text(content.find(id='distroseries-list'))
@@ -94,7 +94,7 @@
 And the other Ubuntu distributions should be there too.
 
     >>> content = find_main_content(browser.contents)
-    >>> print extract_text(content.findAll('h2')[1])
+    >>> print extract_text(content.findAll('h2')[2])
     Other versions of Debian
 
     >>> print extract_text(content.find(id='distroseries-list'))

=== modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt'
--- lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt	2009-09-01 21:12:37 +0000
+++ lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt	2009-09-14 13:54:29 +0000
@@ -16,7 +16,7 @@
 
     >>> admin_browser.open(
     ...     'http://translations.launchpad.dev/ubuntu/hoary')
-    >>> admin_browser.getLink('Language packs').click()
+    >>> admin_browser.getLink('See all language packs').click()
 
 Initially, there is no package selected.
 
@@ -50,7 +50,7 @@
 Also, that change is shown in the public language pack listing web page:
 
     >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary')
-    >>> browser.getLink('Language packs').click()
+    >>> browser.getLink('See all language packs').click()
     >>> print extract_text(find_tag_by_id(browser.contents, "language_packs"))
     Language packs for Ubuntu 5.04
     ...

=== modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt'
--- lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt	2009-07-16 14:40:28 +0000
+++ lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt	2009-09-14 13:54:29 +0000
@@ -11,14 +11,14 @@
 
     >>> user_browser.open(
     ...     'http://translations.launchpad.dev/ubuntu/hoary')
-    >>> user_browser.getLink('Templates')
+    >>> user_browser.getLink('full list of templates')
     Traceback (most recent call last):
     ...
     LinkNotFoundError
 
     >>> admin_browser.open(
     ...     'http://translations.launchpad.dev/ubuntu/hoary')
-    >>> admin_browser.getLink('Templates').click()
+    >>> admin_browser.getLink('full list of templates').click()
     >>> print admin_browser.url
     http://translations.launchpad.dev/ubuntu/hoary/+templates
 

=== modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt'
--- lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt	2009-07-16 13:28:25 +0000
+++ lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt	2009-09-14 13:54:29 +0000
@@ -50,7 +50,7 @@
 Launchpad has an option to hide all of the translations for a distribution
 series.  The link to hide translations is not available to anonymous users:
 
-    >>> anon_browser.getLink('Settings')
+    >>> anon_browser.getLink('Change settings')
     Traceback (most recent call last):
     ...
     LinkNotFoundError
@@ -67,7 +67,7 @@
 
     >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary')
 
-    >>> admin_browser.getLink('Settings').click()
+    >>> admin_browser.getLink('Change settings').click()
 
 Once the administrator hides all translations...
 
@@ -151,7 +151,7 @@
 form where we hide all translations and an admin is able to change it:
 
     >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary')
-    >>> admin_browser.getLink('Settings').click()
+    >>> admin_browser.getLink('Change settings').click()
     >>> admin_browser.getControl(
     ...     'Defer translation imports').selected
     False
@@ -163,7 +163,7 @@
 
 Once the system accepts the submission, we can see such change applied.
 
-    >>> admin_browser.getLink('Settings').click()
+    >>> admin_browser.getLink('Change settings').click()
     >>> admin_browser.getControl(
     ...     'Defer translation imports').selected
     True

=== modified file 'lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt'
--- lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt	2009-09-10 18:35:28 +0000
+++ lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt	2009-09-14 13:54:29 +0000
@@ -10,7 +10,7 @@
 The import queue is linked from the translations page for distribution.
 
     >>> user_browser.open('http://translations.launchpad.dev/ubuntu')
-    >>> user_browser.getLink('Import queue').click()
+    >>> user_browser.getLink('Ubuntu import queue').click()
 
 There is no content for Ubuntu.
 
@@ -30,7 +30,7 @@
 The import queue is linked from the translations page for distribution series.
 
     >>> user_browser.open('http://translations.launchpad.dev/ubuntu/hoary')
-    >>> user_browser.getLink('Import queue').click()
+    >>> user_browser.getLink('Hoary import queue').click()
 
 And obviously, given that the ubuntu distribution had no content, Hoary, an
 Ubuntu distro series has also no content.

=== modified file 'lib/lp/translations/stories/translationgroups/10-distro-translation-group.txt'
--- lib/lp/translations/stories/translationgroups/10-distro-translation-group.txt	2009-08-31 22:13:07 +0000
+++ lib/lp/translations/stories/translationgroups/10-distro-translation-group.txt	2009-09-14 13:47:28 +0000
@@ -26,14 +26,14 @@
     >>> ubuntu_owner_browser = setupBrowser(
     ...     auth='Basic [e-mail]:test')
     >>> ubuntu_owner_browser.open(anon_browser.url)
-    >>> ubuntu_owner_browser.getLink('Settings').click()
+    >>> ubuntu_owner_browser.getLink('Change permissions').click()
     >>> print ubuntu_owner_browser.title
     Set translation permissions for Ubuntu
 
 Other users cannot access this page, nor see the menu link to it.
 
     >>> user_browser.open(anon_browser.url)
-    >>> user_browser.getLink('Settings').click()
+    >>> user_browser.getLink('Change permissions').click()
     Traceback (most recent call last):
     ...
     LinkNotFoundError

=== added file 'lib/lp/translations/templates/distribution-language-pack-admin-info.pt'
--- lib/lp/translations/templates/distribution-language-pack-admin-info.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/templates/distribution-language-pack-admin-info.pt	2009-09-13 20:24:35 +0000
@@ -0,0 +1,30 @@
+<tal:root
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  omit-tag="">
+
+  <p tal:condition="context/language_pack_admin">
+    Language packs are administered by
+    <span tal:replace="structure
+                       context/language_pack_admin/fmt:link"
+                    >Mr. No
+    </span>.
+    <tal:admin
+       condition="context/required:launchpad.Edit">
+      <a tal:attributes="
+           href
+           context/fmt:url/+select-language-pack-admin"
+         class="edit sprite"></a>
+    </tal:admin>
+  </p>
+  <tal:admin
+     condition="context/required:launchpad.Edit">
+    <p tal:condition="not:context/language_pack_admin">
+      <a tal:attributes="
+           href
+           context/fmt:url/+select-language-pack-admin"
+         class="edit sprite">Set language pack administrator</a>
+    </p>
+  </tal:admin>
+</tal:root>

=== modified file 'lib/lp/translations/templates/distribution-translations.pt'
--- lib/lp/translations/templates/distribution-translations.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/distribution-translations.pt	2009-09-13 20:24:35 +0000
@@ -3,59 +3,69 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="view/macro:page/onecolumn"
-  i18n:domain="launchpad" >
+  metal:use-macro="view/macro:page/main_only"
+>
 
   <body>
   <div metal:fill-slot="main">
+    <ul class="helplinks">
+      <li>
+        <a href="https://help.launchpad.net/Translations"
+           id="link-to-translations-help"
+           >Help for translations
+        </a>
+      </li>
+    </ul>
     <h1>Translations</h1>
 
-  <ul class="helplinks">
-    <li>
-      <a href="https://help.launchpad.net/Translations"
-         id="link-to-translations-help"
-         >Help for translations
-      </a>
-      </li>
-  </ul>
-  <tal:translation_focus condition="view/translation_focus">
-    <p>
-      The current translation focus for
-      <span tal:replace="context/displayname">Ubuntu</span> is
-      <span tal:replace="view/translation_focus/version">6.06</span>
-      (<span tal:replace="view/translation_focus/displayname">Dapper</span>),
-      and we encourage you to translate it first.
-      </p>
-          <p id="translation-permissions">
-            <tal:distro replace="context/displayname">This
-            distribution</tal:distro> is translated
-            <tal:hasgroup condition="context/translationgroup">by
-              <a tal:attributes="href context/translationgroup/fmt:url"
-                 tal:content="context/translationgroup/title">translators</a>
-            </tal:hasgroup>
-            with <a target="help" href="/+help/permissions-policies.html"
-              tal:content="context/translationpermission/title">certain</a>
-            permissions.
-            <tal:permissions condition="context/required:launchpad.Edit">
-              You can modify permissions on the
-              <a
-                tal:define="link context/menu:navigation/settings"
-                tal:attributes="href link/url"
-              >Settings</a> page.
-            </tal:permissions>
-          </p>
-
-    <h2>
-      <span tal:replace="view/translation_focus/version">5.04</span>:
-      <span tal:replace="view/translation_focus/title">
-        Hoary Hedgehog
-      </span>
-    </h2>
-    <div tal:replace="structure view/translation_focus/@@+langchart" />
-  </tal:translation_focus>
+    <tal:translation_focus condition="view/translation_focus"
+                           define="target view/translation_focus">
+
+      <div class="top-portlet">
+        <p>
+          Launchpad currently recommends translating
+          <tal:target replace="structure target/fmt:link/+translations"
+                      >trunk</tal:target>.
+        </p>
+      </div>
+      <div class="yui-g">
+        <div class="yui-u first">
+          <div class="portlet">
+            <h3>Permissions</h3>
+            <p>
+              <tal:permissions replace="
+                  structure
+                  context/@@+portlet-translation-groups-and-permission"/>
+            </p>
+          </div>
+        </div>
+        <div class="yui-u">
+          <div class="portlet">
+            <h3>Administration</h3>
+            <p>To see all the translation files that are waiting to be
+              imported, please look at
+              <a tal:attributes="href context/fmt:url/+imports"
+                 tal:content="string:${context/displayname} import queue">
+                import queue</a>.
+            </p>
+
+            <div tal:replace="structure
+                              context/@@+language-pack-admin-info" />
+          </div>
+        </div>
+      </div>
+
+      <h2>
+        <span tal:replace="view/translation_focus/version">5.04</span>:
+        <span tal:replace="view/translation_focus/title">
+          Hoary Hedgehog
+        </span>
+      </h2>
+      <div tal:replace="structure view/translation_focus/@@+langchart" />
+      <div class="translations-legend">
+        <div tal:replace="structure context/@@+rosetta-status-legend" />
+      </div>
+    </tal:translation_focus>
 
   <tal:secondary condition="view/secondary_translatable_serieses">
     <h2 tal:condition="view/translation_focus">

=== modified file 'lib/lp/translations/templates/distroseries-translations.pt'
--- lib/lp/translations/templates/distroseries-translations.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/distroseries-translations.pt	2009-09-13 20:24:35 +0000
@@ -2,33 +2,140 @@
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="view/macro:page/onecolumn">
+  metal:use-macro="view/macro:page/main_only">
 
   <body>
-<div metal:fill-slot="main">
-  <ul class="helplinks">
-    <li>
-      <a href="https://help.launchpad.net/Translations"
-         id="link-to-translations-help"
-         >Help for translations
-      </a>
-      </li>
-  </ul>
-  <h1>Translation status by language</h1>
-
-  <div tal:replace="structure context/@@+langchart" />
-  <div tal:replace="structure context/@@+rosetta-status-legend" />
-
-  <ul>
-    <li class="edit">
-      <a href="/+editmylanguages">Customize displayed languages</a>
-    </li>
-  </ul>
-
-</div>
-</body>
+    <div metal:fill-slot="main">
+      <ul class="helplinks">
+        <li>
+          <a href="https://help.launchpad.net/Translations"
+             id="link-to-translations-help"
+             >Help for translations
+          </a>
+        </li>
+      </ul>
+      <h1>Translation status by language</h1>
+
+      <div class="top-portlet">
+        <p tal:condition="not:view/is_translation_focus">
+          Launchpad currently recommends translating
+          <tal:target replace="
+             structure
+             context/distribution/translation_focus/fmt:link/+translations"
+                      >Hoary</tal:target>.
+        </p>
+        <p tal:condition="view/is_translation_focus">
+          <tal:target replace="context/displayname">Hoary</tal:target> is
+          the current translation focus for
+          <tal:distro replace="structure context/distribution/fmt:link">
+            Ubuntu
+          </tal:distro>.
+        </p>
+      </div>
+      <div class="yui-g">
+        <div class="yui-u first">
+          <div class="portlet">
+            <h3>Permissions</h3>
+            <p>
+              <tal:permissions replace="
+                  structure
+                  context/distribution/@@+portlet-translation-groups-and-permission"/>
+            </p>
+          </div>
+        </div>
+        <div class="yui-u">
+          <div class="portlet">
+            <h3>Administration</h3>
+            <p>Translation files that are waiting to be imported are shown in
+              the
+              <a tal:attributes="href context/fmt:url/+imports"
+                 tal:content="string:${context/displayname} import queue">
+                import queue</a>.
+            </p>
+            <p tal:condition="context/required:launchpad.Edit">
+              To manage all the translation templates in
+              <tal:series replace="context/displayname">Hoary</tal:series>,
+              see the
+              <a tal:attributes="href context/menu:navigation/templates/url">
+                full list of templates</a>.
+            </p>
+            <p>
+              <tal:series replace="context/displayname">Hoary</tal:series>
+              translations are
+              <em tal:condition="not:context/hide_all_translations">
+                visible to everyone<!--
+              --></em><em tal:condition="context/hide_all_translations">
+                hidden from everyone but translation admins</em>.
+              Import queue is
+              <em tal:condition="not:context/defer_translation_imports">
+                active<!--
+              --></em><em tal:condition="context/defer_translation_imports">
+                currently halted for
+                <tal:series replace="context/displayname">
+                  Hoary
+              </tal:series></em>.
+              <a tal:attributes="href context/menu:navigation/admin/url"
+                 tal:condition="context/required:launchpad.TranslationsAdmin"
+                 class="edit sprite">
+                Change settings
+              </a>
+            </p>
+          </div>
+        </div>
+
+        <div class="yui-u first">
+          <div class="portlet">
+            <h3>Language packs</h3>
+
+            <div tal:replace="
+                structure
+                context/distribution/@@+language-pack-admin-info" />
+
+            <div>
+              <strong>Current base pack:</strong>
+              <a tal:condition="context/language_pack_base"
+                 tal:attributes="href context/language_pack_base/file/http_url">
+                <tal:export-date
+                   replace="context/language_pack_base/date_exported/fmt:datetime" />
+                <img tal:condition="context/language_pack_base"
+                     alt="download icon" src="/@@/download" />
+              </a>
+              <tal:not-export-date condition="not: context/language_pack_base">
+                none yet
+              </tal:not-export-date>
+            </div>
+            <div>
+              <strong>Update pack:</strong>
+              <a tal:condition="context/language_pack_delta"
+                 tal:attributes="href context/language_pack_delta/file/http_url">
+                <tal:export-date
+                   replace="context/language_pack_delta/date_exported/fmt:datetime" />
+                <img tal:condition="context/language_pack_delta"
+                     alt="download icon" src="/@@/download" />
+              </a>
+              <tal:not-export-date condition="not: context/language_pack_delta">
+                none yet
+              </tal:not-export-date>
+            </div>
+            <p>
+              <a tal:attributes="
+                   href context/menu:navigation/language_packs/url">
+                See all language packs</a>
+            </p>
+          </div>
+        </div>
+      </div>
+
+      <tal:stats condition="view/distroserieslanguages">
+        <div class="yui-b top-portlet">
+          <h2>Translation statistics</h2>
+          <div tal:replace="structure context/@@+langchart" />
+          <div class="translations-legend">
+            <div tal:replace="structure context/@@+rosetta-status-legend" />
+          </div>
+        </div>
+      </tal:stats>
+    </div>
+  </body>
 </html>