Merge lp:~deryck/launchpad/upstream-empty-display-707825 into lp:launchpad

[Deryck Hodge]

[r=adeuring][bug=707825] When sharing translations between upstream and a package, display a "(not translated yet)" message if one side has set the translation to an empty string.

This is a fix for bug 707825, which outlines the situation
where a translation has been set to an empty string upstram,
causing the message to not appear as a suggestion for the
package side.

This fix ensure that a "(not translated yet)" message
appears if the suggested text is ''.

I discussed this a couple different times with Henning.

I fixed up the existing page test to display the text I
expected and then added a couple conditions in the template
to make this work out.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/translations/templates/translations-macros.pt
  lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt

./lib/lp/translations/templates/translations-macros.pt
     151: not well-formed (invalid token)
     150: Line has trailing whitespace.

[Abel Deuring (adeuring)]

nice branch! Just a minor remark:

@@ -65,7 +68,8 @@
     </tr>
     <tr
       tal:attributes="id string:${submission/origin_html_id};
- class string:discreet secondary ${dismissable}">
+ class string:discreet secondary ${dismissable}"
+ tal:condition="submission/suggestion_text">

I'd prefer to have "tal:condition" before "tal:attributes". While the ZPT machinery does not care about the order of tag attributes, I find it easier to read the tal: attributes in ZPT's execution order.

review: Approve (code)

[Deryck Hodge (deryck)]

Fixed up. Thanks for the suggestion! It's a good one.

=== modified file 'lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt'
--- lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt	2011-01-26 15:01:36 +0000
+++ lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt	2011-03-11 18:57:22 +0000
@@ -580,13 +580,10 @@
     ...              '+source/evolution/+pots/evolution-2.2/es/5/+translate')
     >>> packaged = find_tag_by_id(browser.contents, 'msgset_134_other')
 
-XXX: 2011-01-25 henninge, bug=707825: This should either display nothing or
-a string like "(no translation)". This documents the current behavior although
-it would be different if the translation had been properly reset. Also the
-wording here ("packaged") needs to be adapted.
+Also, the page now displays a "(not translated yet)" message.
 
     >>> print extract_text(packaged)
-    In upstream:
+    In upstream: (not translated yet)
 
 
 Shared and diverged translations

=== modified file 'lib/lp/translations/templates/translations-macros.pt'
--- lib/lp/translations/templates/translations-macros.pt	2010-12-02 16:13:51 +0000
+++ lib/lp/translations/templates/translations-macros.pt	2011-03-11 18:57:22 +0000
@@ -41,8 +41,11 @@
         </tal:form-writeable>
       </td>
       <td>
+        <div tal:condition="not:submission/suggestion_text">
+          (not translated yet)
+        </div>
         <div
-          tal:condition="not:user_is_official_translator"
+          tal:condition="python: not user_is_official_translator and submission.suggestion_text"
           tal:attributes="
             lang submission/language/dashedcode;
             dir submission/language/abbreviated_text_dir;
@@ -52,7 +55,7 @@
         </div>
         <label
           style="white-space: normal"
-          tal:condition="user_is_official_translator"
+          tal:condition="python: user_is_official_translator and submission.suggestion_text"
           tal:attributes="
             lang submission/language/dashedcode;
             dir submission/language/abbreviated_text_dir;
@@ -64,6 +67,7 @@
       </td>
     </tr>
     <tr
+      tal:condition="submission/suggestion_text"
       tal:attributes="id string:${submission/origin_html_id};
                       class string:discreet secondary ${dismissable}">
       <td colspan="3"></td>
@@ -144,7 +148,7 @@
 <metal:pofile-js-footer define-macro="pofile-js-footer">
     <script type="text/javascript"
         tal:content="
-        structure string:<!-- 
+        structure string:<!--
         var autofocus_field = '${view/autofocus_html_id}';
         var translations_order = '${view/translations_order}';
         var plural_forms = ${context/plural_forms};