Merge lp:~adiroiban/launchpad/bug-359180-take-2 into lp:launchpad

[Adi Roiban]

Add keybindings on translating pofiles or translation messages.

= Bug 35180 =

Would be useful if the First - Previous - Next - Last link in the translation interface had a keyboard shortcut for fast accessing them. Don't need to be visible, but at least documented somewhere.

Maybe even the Save & Continue button.

== Proposed Fix ==
Add the following keybindings on +translate page for pofile and translaitonmessage

First field is autofocused.
Shift+Alt+b - Focus first translation field
Shift+Alt+a - First page
Shift+Alt+n - Next page
Shift+Alt+p - Previous page
Shift+Alt+l - Last page
Shift+Alt+s - Save and continue
Shift+Alt+Down - Next field
Shift+Alt+Up - Previous field
Shift+Alt+j - Next field
Shift+Alt+k - Previous field
Shift+Alt+C - Copy original text (both singular and plural)
Shift+Alt+0 - Mark current translation
Shift+Alt+NUMBER - Mark suggestion NUMBER
Shift+Alt+d - Dismiss all suggestions
Shift+Alt+r - Tick "Someone should review this translation"

== Pre-implementation notes ==

I talked with Danilo about keybindng implementation using comments for bug 35180

Previous MPs:
https://code.edge.launchpad.net/~adiroiban/launchpad/bug-359180/+merge/16422
https://code.edge.launchpad.net/~adiroiban/launchpad/bug-359180-take-2/+merge/17785

Part of this branch was already approved in previous MPs, but I have refactored most of those functions.

== Implementation notes ==

The legacy JS code from canonical/launchpad/icing/build/lp/lp.js and from pofile-tranlate.pt was moved to javascript/translations/pofile.js.

Those functions from lp.js was rewritten using YUI3. Maybe we can no delete them from lp.js.

I have added a test for Bug #513625, since that bug was produces by some changes in this branch.

== Tests ==

I was not able to produce a reasonable windmill test since it is not trivial to find the current focused node or to see if a node is focused.
This requires adding onFocus and onBlur trigger for all DOM nodes.

./bin/test -t pofile-views

== Demo and QA ==

Log in as admin or as a person with rights on adding translations to a pofile.

Go to a pofile translate page:
https://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es/+translate?start=0

The first field should have focus and you can start translating right away.

Adding a new translation should automatically select the radio button in front of it.

Try the keybindings described in the "Proposed fix" section.

= Launchpad lint =

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

Linting changed files:
  lib/canonical/launchpad/javascript/translations/pofile.js

== JSLint notices ==
No handlers could be found for logger "bzr"
jslint: No problem found in '/home/adi/launchpad/lp-branches/bug-359180/lib/canonical/launchpad/javascript/translations/pofile.js'.

jslint: 1 file to lint.

[Adi Roiban (adiroiban)]

= Bug 359180 =
This is the follow up for the current commited branch for bug 359180 as it was discovered that Shift+Alt+up and Shift+Alt+Down are used by.

== Proposed fix ==
Use Shift+Alt+j and Shift+Alt+k for navigation.

Add fields in the translations_order only if the user can edit(add, change or suggest) the translation.

== Pre-implementation notes ==
Notes can be found on the previous MP:
https://code.edge.launchpad.net/~adiroiban/launchpad/bug-359180/+merge/16422

== Implementation details ==
There was a small refactorization for getting translations_order and autofocus_html_id.

== Tests ==
I was not able to produce a reasonable windmill test since it is not trivial to find the current focused node or to see if a node is focused.
This requires adding onFocus and onBlur trigger for all DOM nodes.

The test for the view is here:
./bin/test -t pofile-views

== Demo and Q/A ==
Demo and Q/A can be found on the previous MP
https://code.edge.launchpad.net/~adiroiban/launchpad/bug-359180/+merge/16422

Instead of UP and DOWN, use j and k

= Launchpad lint =

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

Linting changed files:
  lib/canonical/launchpad/javascript/translations/pofile.js

== JSLint notices ==
No handlers could be found for logger "bzr"
jslint: No problem found in '/home/adi/launchpad/lp-branches/bug-359180-take-2/lib/canonical/launchpad/javascript/translations/pofile.js'.

jslint: 1 file to lint.

[Paul Hummer (rockstar)]

Please change line 140 of this diff so that the page tests conform with the 80 character line rule. Other than that, thanks for looking into this.

review: Approve (code)

[Adi Roiban (adiroiban)]

Due to bug 513625, the original branch was removed from lp/devel.

I have added a testcase for bug 513625 and I'm resubmitting this branch for review.

[Graham Binns (gmb)]

After talking with Adi, it's clear that the branch is actually an update to an older branch which was landed on devel and then pulled before 10.01 was released due to issue with the keybindings. However, I'm unable to get a sane diff for the changes since then.

Adi, in order to be able to review this branch I need a sane diff for it. At the moment I can't get one because I get a bunch of conflicts when trying to merge it into devel. Here's how you can produce one for me:

 1. Branch devel.
 2. Merge your original branch into your branch of devel.
 3. Merge this branch and paste the diff into the merge proposal.

That should give us just the changes that you've made since your last branch was approved; I'll be happy to review the new diff.

review: Needs Information (code)

[Adi Roiban (adiroiban)]

Hi,

$ bzr branch devel merge
$ bzr branch lp:~adiroiban/launchpad/bug-359180/ merge-1
$ cd merge
$ bzr merge ../merge-1/
Nothing to do.

The original branch is part of devel... just that a new commit is reverting those changes. There was no "hard rebase" to revert the branch.

I can not get a clean diff.

Is there an option for a filter to diff to only show lines changed be me?

Maybe it will be easier to have a new full review.

[Adi Roiban (adiroiban)]

Hi,

This is the diff.
It is still quite big as the original branch was submitted 2 months ago and was one of my first patch for LP.
Meanwhile I discovered the JavaScript guidelines and looking again at the code I found many places where the previous code could be improved.

Please let me know if there are any other actions I need to do to make this branch ready for review?

=== modified file 'lib/canonical/launchpad/javascript/translations/pofile.js'
--- lib/canonical/launchpad/javascript/translations/pofile.js 2010-02-22 11:41:11 +0000
+++ lib/canonical/launchpad/javascript/translations/pofile.js 2010-02-25 00:53:26 +0000
@@ -1,7 +1,7 @@
 /** Copyright (c) 2009, Canonical Ltd. All rights reserved.
  *
  * @module lp.pofile
- * @requires event, node
+ * @requires anim, cookie, event-key, event, node
  */

 YUI.add('lp.pofile', function(Y) {
@@ -42,8 +42,48 @@
 };

+var hide_notification = function(node) {
+ var hide_anim = new Y.Anim({
+ node: node,
+ to: { height: 0,
+ marginTop: 0, marginBottom: 0,
+ paddingTop: 0, paddingBottom: 0 }
+ });
+ node.setStyle('border', 'none');
+ hide_anim.set('duration', 0.4);
+ hide_anim.on('end', function(e) {
+ node.setStyle('display', 'none');
+ });
+ hide_anim.run();
+}
+
+self.updateNotificationBox = function(e) {
+ var notice = Y.one('.important-notice-container');
+ var balloon = notice.one('.important-notice-balloon');
+ var dismiss_notice_cookie = ('translation-docs-for-' +
+ documentation_cookie);
+
+ // Check the cookie to see if the user has already dismissed
+ // the notification box for this session.
+ var already_seen = Y.Cookie.get(dismiss_notice_cookie, Boolean);
+ if (already_seen) {
+ notice.setStyle('display', 'none');
+ }
+
+ var cancel_button = notice.one(
+ '.important-notice-cancel-button');
+ // Cancel button starts out hidden. If user has JavaScript,
+ // then we want to show it.
+ cancel_button.setStyle('visibility', 'visible');
+ cancel_button.on('click', function(e) {
+ e.halt();
+ hide_notification(balloon);
+ Y.Cookie.set(dismiss_notice_cookie, true);
+ });
+};
+
+
 self.setFocus = function(field) {
- //Y.log(e.type + ":" + e.keyCode + ': ' + field);
     // if there is nofield, do nothing
     if (Y.one('#' + field)) {
         Y.one('#' + field).focus();
@@ -75,7 +115,7 @@
     // The replacement regex strips all tags from the html.
     to.set('value', unescapeHTML(
         from.get('innerHTML').replace(/<\/?[^>]+>/gi, "")));
- selectWidget(select_id);
+ selectWidgetByID(select_id);
 };

@@ -97,7 +137,6 @@
     var singular_select = translation_stem + '_translation_0_new_select';
     var translation_singular = translation_stem + '_translation_0_new';
     var translation_plural = translation_stem + '_translation_';
- //Y.log(e.type + ":" + e.keyCode + ': ' + singular_select);
     // Copy singular text
     copyOriginalTextOne(
         original_singular, translation_singular, singular_select);
@@ -112,43 +151,102 @@
 };

-var selectWidget = function(widget) {
- if (Y.one('#' + widget)) {
- Y.one('#' + widget).set('checked', true)...

[Graham Binns (gmb)]

Hi Adi,

I really like this branch; good job! I'm not entirely happy about the lack of Windmill tests, but I understand what you mean about it being non-trivial to write one for this case. Please file a bug about adding some Windmill tests for this, detailing the difficulties you had. It might be worth mailing the launchpad-dev list to see if anyone has any suggestions.

review: Approve (code, js)

=== modified file 'lib/canonical/launchpad/javascript/translations/pofile.js'
--- lib/canonical/launchpad/javascript/translations/pofile.js	2010-01-27 07:38:02 +0000
+++ lib/canonical/launchpad/javascript/translations/pofile.js	2010-02-25 13:03:21 +0000
@@ -1,7 +1,7 @@
 /** Copyright (c) 2009, Canonical Ltd. All rights reserved.
  *
  * @module lp.pofile
- * @requires event, node
+ * @requires anim, cookie, event-key, event, node
  */
 
 YUI.add('lp.pofile', function(Y) {
@@ -41,4 +41,308 @@
     }
 };
 
-}, "0.1", {"requires": ["event", "node"]});
+
+var hide_notification = function(node) {
+  var hide_anim = new Y.Anim({
+      node: node,
+      to: { height: 0,
+            marginTop: 0, marginBottom: 0,
+            paddingTop: 0, paddingBottom: 0 }
+  });
+  node.setStyle('border', 'none');
+  hide_anim.set('duration', 0.4);
+  hide_anim.on('end', function(e) {
+      node.setStyle('display', 'none');
+  });
+  hide_anim.run();
+}
+
+self.updateNotificationBox = function(e) {
+  var notice = Y.one('.important-notice-container');
+  var balloon = notice.one('.important-notice-balloon');
+  var dismiss_notice_cookie = ('translation-docs-for-' +
+                               documentation_cookie);
+
+  // Check the cookie to see if the user has already dismissed
+  // the notification box for this session.
+  var already_seen = Y.Cookie.get(dismiss_notice_cookie, Boolean);
+  if (already_seen) {
+     notice.setStyle('display', 'none');
+  }
+
+  var cancel_button = notice.one(
+      '.important-notice-cancel-button');
+  // Cancel button starts out hidden.  If user has JavaScript,
+  // then we want to show it.
+  cancel_button.setStyle('visibility', 'visible');
+  cancel_button.on('click', function(e) {
+      e.halt();
+      hide_notification(balloon);
+      Y.Cookie.set(dismiss_notice_cookie, true);
+  });
+};
+
+
+self.setFocus = function(field) {
+    // if there is nofield, do nothing
+    if (Y.one('#' + field)) {
+        Y.one('#' + field).focus();
+    }
+};
+
+
+var setNextFocus = function(e, field) {
+    self.setFocus(field);
+    // stopPropagation() and preventDefault()
+    e.halt();
+};
+
+
+var setPreviousFocus = function(e, field, original) {
+
+    // Original singular test is focused first to make sure
+    // it is visible when scrolling up
+    self.setFocus(original);
+    self.setFocus(field);
+    // stopPropagation() and preventDefault()
+    e.halt();
+};
+
+
+var copyOriginalTextOne = function(from_id, to_id, select_id) {
+    var from = Y.one('#' + from_id);
+    var to = Y.one('#' + to_id);
+    // The replacement regex strips all tags from the html.
+    to.set('value', unescapeHTML(
+        from.get('innerHTML').replace(/<\/?[^>]+>/gi, "")));
+    selectWidgetByID(select_id);
+};
+
+
+var copyOriginalTextPlural = function (from_id,
+                                              to_id_pattern, nplurals) {
+    // skip when x is 0, as that is the singular
+    for (var x = 1; x < nplurals; x++) {
+        var to_id = to_id_pattern + x + "_new";
+        var to_select = to_id_pattern + x + "_new_select";
+        copyOriginalTextOne(from_id, to_id, to_select);
+    }
+};
+
+
+var copyOriginalTextAll = function(e, original_stem, translation_stem) {
+
+    var original_singular = original_stem + '_singular';
+    var original_plural = original_stem + '_plural';
+    var singular_select = translation_stem + '_translation_0_new_select';
+    var translation_singular = translation_stem + '_translation_0_new';
+    var translation_plural = translation_stem + '_translation_';
+    // Copy singular text
+    copyOriginalTextOne(
+        original_singular, translation_singular, singular_select);
+
+    // Copy plural text if needed
+    if (Y.one('#' + translation_plural + '1')) {
+        copyOriginalTextPlural(
+            original_plural, translation_plural, plural_forms);
+    }
+    // stopPropagation() and preventDefault()
+    e.halt();
+};
+
+
+var selectWidgetByID = function(widget) {
+    var node = Y.one('#' + widget);
+    if (node) {
+        node.set('checked', true);
+    }
+};
+
+
+var toggleWidget = function(widget) {
+    var node = Y.one('#' + widget);
+    if (node) {
+        if (node.get('checked')) {
+            node.set('checked', false);
+        } else {
+            node.set('checked', true);
+        }
+    }
+};
+
+
+var selectTranslation = function(e, widget) {
+    // Don't select when tabbing, navigating and simply pressing
+    // enter to submit the form.
+    // Looks like this is not needed for Epiphany and Chromium
+    if (e.keyCode == 9 || e.keyCode == 13 ||
+        e.keyCode == 38 || e.keyCode == 40 ||
+        (e.shiftKey && e.altKey && e.keyCode == 74) ||
+        (e.shiftKey && e.altKey && e.keyCode == 75)) {
+            return;
+    }
+    selectWidgetByID(widget);
+};
+
+
+var initializeGlobalKeyBindings = function(fields) {
+
+	Y.get('document').on("keyup", function(e) {
+        // Shift+Alt+s - Save form
+	    if (e.shiftKey && e.altKey && e.keyCode == 83) {
+	        Y.one('#save_and_continue_button').invoke('click');
+	    }
+        // Shift+Alt+f - Go to search field
+	    if (e.shiftKey && e.altKey && e.keyCode == 70) {
+	        self.setFocus('search_box');
+	    }
+        // Shift+Alt+b - Go to first translation field
+	    if (e.shiftKey && e.altKey && e.keyCode == 66) {
+	        self.setFocus(fields[0]);
+	    }
+        // Shift+Alt+n - Go to next page in batch
+	    if (e.shiftKey && e.altKey && e.keyCode == 78) {
+	        if (link = Y.one('#batchnav_next')){
+	            window.location.assign(link.get('href'))
+	        }
+	    }
+        // Shift+Alt+p - Go to previous page in batch
+	    if (e.shiftKey && e.altKey && e.keyCode == 80) {
+	        if (link = Y.one('#batchnav_previous')){
+	            window.location.assign(link.get('href'))
+	        }
+	    }
+        // Shift+Alt+a - Go to first page in batch
+	    if (e.shiftKey && e.altKey && e.keyCode == 65) {
+	        if (link = Y.one('#batchnav_first')){
+	            window.location.assign(link.get('href'))
+	        }
+	    }
+        // Shift+Alt+l - Go to last page in batch
+	    if (e.shiftKey && e.altKey && e.keyCode == 76) {
+	        if (link = Y.one('#batchnav_last')){
+	            window.location.assign(link.get('href'))
+	        }
+	    }
+	});
+}
+
+
+var initializeSuggestionsKeyBindings = function(stem) {
+
+    suggestions = Y.all('.' + stem.replace(/_new/,"") + ' input');
+    suggestions.each(function(node) {
+        // Only add keybinding for the first 9 suggestions
+        var index = suggestions.indexOf(node);
+        if (index < 10) {
+            // Shift+Alt+NUMBER - Mark suggestion NUMBER
+            Y.on('key', function(e, id) {
+                    selectWidgetByID(id);
+                },
+                '#' + stem, 'down:' + Number(index+49) + '+shift+alt',
+                Y, node.get('id'));
+        }
+    });
+}
+
+
+var initializeFieldsKeyBindings = function (fields) {
+    for (var key = 0; key < fields.length; key++) {
+        var next = key + 1;
+        var previous = key - 1;
+
+        var html_parts = fields[key].split('_');
+        var original_stem = html_parts[0] + '_' + html_parts[1];
+        var translation_stem = fields[key].replace(/_translation_(\d)+_new/,"");
+        var select_widget = (
+            translation_stem + '_' + html_parts[3] + '_' +
+            html_parts[4] + '_new_select');
+
+        Y.on(
+            'change', selectTranslation,
+            '#' + fields[key], Y, select_widget);
+        Y.on(
+            'keypress', selectTranslation,
+            '#' + fields[key], Y, select_widget);
+
+        // Set next field and copy text for all but last field
+        // (last is Save & Continue button)
+        if (key < fields.length - 1) {
+            // Shift+Alt+j - Go to next translation
+            Y.on(
+                'key', setNextFocus, '#' + fields[key],
+                'down:74+shift+alt', Y, fields[next]);
+            // Shift+Alt+KEY_DOWN - Go to next translation
+            Y.on(
+                'key', setNextFocus, '#' + fields[key],
+                'down:40+shift+alt', Y, fields[next]);
+            // Shift+Alt+c - Copy original text
+            Y.on(
+                'key', copyOriginalTextAll, '#' + fields[key],
+                'down:67+shift+alt', Y, original_stem, translation_stem);
+
+            // Shift+Alt+r - Toggle someone should review
+            Y.on(
+                'key',
+                function(e, stem) {
+                    toggleWidget(stem + '_force_suggestion');
+                },
+                '#' + fields[key], 'down:82+shift+alt', Y, original_stem);
+
+            // Shift+Alt+d - Toggle dismiss all translations
+            Y.on(
+                'key', function(e, stem) {
+                    toggleWidget(stem + '_dismiss');
+                }, '#' + fields[key], 'down:68+shift+alt', Y, original_stem);
+
+            // Shift+Alt+0 - Mark current translation
+            Y.on(
+                'key', function(e, key) {
+                    selectWidgetByID(key.replace(/_new/, "_radiobutton"));
+                }, '#' + fields[key], 'down:48+shift+alt', Y, fields[key]);
+
+            initializeSuggestionsKeyBindings(fields[key]);
+        }
+
+        // Set previous field for all but first field
+        if (key > 0) {
+            var parts = fields[previous].split('_');
+            var singular_copy_text = (
+                parts[0] + '_' + parts[1] + '_singular_copy_text');
+            // Shift+Alt+k - Go to previous translation
+            Y.on(
+                'key', setPreviousFocus, '#' + fields[key],
+                'down:75+shift+alt', Y, fields[previous],
+                singular_copy_text);
+            // Shift+Alt+KEY_UP - Go to previous translation
+            Y.on(
+                'key', setPreviousFocus, '#' + fields[key],
+                'down:38+shift+alt', Y, fields[previous],
+                singular_copy_text);
+        }
+    }
+}
+
+
+/**
+ * Initialize event-key bindings such as moving to the next or previous
+ * field, or copying original text
+ */
+self.initializeKeyBindings = function(e) {
+
+    if (translations_order.length < 1) {
+        // If no translations fiels are displayed on the page
+        // don't initialize the translations order
+        return;
+    }
+
+    var fields = translations_order.split(' ');
+    // The last field is Save & Continue button
+    fields.push('save_and_continue_button');
+
+    initializeGlobalKeyBindings(fields);
+    initializeFieldsKeyBindings(fields); 
+};
+
+}, "0.1", {"requires": ["event", "event-key", "node", "cookie", "anim"]});
+

=== modified file 'lib/canonical/launchpad/templates/batchnavigator-navigation-links.pt'
--- lib/canonical/launchpad/templates/batchnavigator-navigation-links.pt	2010-01-27 07:38:02 +0000
+++ lib/canonical/launchpad/templates/batchnavigator-navigation-links.pt	2010-02-25 13:03:21 +0000
@@ -29,6 +29,7 @@
           tal:condition="first_page_url"
           tal:attributes="href first_page_url"
           class="first"
+          id="batchnav_first"
           rel="first"
         >First</a>
         <span tal:condition="not:first_page_url" class="first inactive"
@@ -38,6 +39,7 @@
           tal:condition="prev_page_url"
           tal:attributes="href prev_page_url"
           class="previous"
+          id="batchnav_previous"
           rel="previous"
         >Previous</a>
         <span tal:condition="not:prev_page_url" class="previous inactive"
@@ -46,6 +48,7 @@
         <a
           tal:condition="next_page_url"
           tal:attributes="href next_page_url"
+          id="batchnav_next"
           class="next"
           rel="next"
         ><strong>Next</strong></a>
@@ -57,6 +60,7 @@
             tal:condition="last_page_url"
             tal:attributes="href last_page_url"
             class="last"
+            id="batchnav_last"
             rel="last"
           >Last</a>
           <span tal:condition="not:last_page_url" class="last inactive"

=== modified file 'lib/lp/translations/browser/pofile.py'
--- lib/lp/translations/browser/pofile.py	2010-01-27 07:38:02 +0000
+++ lib/lp/translations/browser/pofile.py	2010-02-25 13:03:21 +0000
@@ -503,8 +503,6 @@
 
     DEFAULT_BATCH_SIZE = 50
 
-    page_title = "Contributions"
-
     @property
     def _person_name(self):
         """Person's display name.  Graceful about unknown persons."""
@@ -930,6 +928,26 @@
     def completeness(self):
         return '%.0f%%' % self.context.translatedPercentage()
 
+    def _messages_html_id(self):
+        order = []
+        for message in self.translationmessage_views:
+            if (message.form_is_writeable):
+                for dictionary in message.translation_dictionaries:
+                    order.append(
+                        dictionary['html_id_translation'] + '_new')
+        return order
+
+    @property
+    def autofocus_html_id(self):
+        if (len(self._messages_html_id()) > 0):
+            return self._messages_html_id()[0]
+        else:
+            return ""
+
+    @property
+    def translations_order(self):
+        return ' '.join(self._messages_html_id())
+
 
 class POExportView(BaseExportView):
 

=== modified file 'lib/lp/translations/browser/tests/pofile-views.txt'
--- lib/lp/translations/browser/tests/pofile-views.txt	2009-09-17 16:22:32 +0000
+++ lib/lp/translations/browser/tests/pofile-views.txt	2010-02-25 13:03:21 +0000
@@ -145,6 +145,23 @@
     >>> translationmessage_view.context.translations
     [u'libreta de direcciones de Evolution']
 
+To help the JavaScript key navigation the view is exposing the autofocus
+field and a list of all translation fields ordered by the way they are
+listed in the page.
+
+    >>> for translationmessage_view in (
+    ...     pofile_view.translationmessage_views):
+    ...     translationmessage_view.initialize()
+    >>> print pofile_view.autofocus_html_id
+    msgset_130_es_translation_0_new
+    >>> print pofile_view.translations_order
+    msgset_130_es_translation_0_new msgset_131_es_translation_0_new
+    msgset_132_es_translation_0_new msgset_133_es_translation_0_new
+    msgset_134_es_translation_0_new msgset_135_es_translation_0_new
+    msgset_136_es_translation_0_new msgset_137_es_translation_0_new
+    msgset_138_es_translation_0_new msgset_139_es_translation_0_new
+    msgset_130_es_translation_0_new
+
 It's time to check the submission of translations and the IPOFile statistics
 update.
 
@@ -403,7 +420,8 @@
 
 = POFileNavigation =
 
-This class is used to traverse from IPOFile objects to ITranslationMessage ones.
+This class is used to traverse from IPOFile objects to ITranslationMessage
+ones.
 
     >>> from zope.security.proxy import isinstance
     >>> from lp.translations.browser.pofile import POFileNavigation
@@ -483,4 +501,4 @@
 And we are redirected to the index page, as expected:
 
     >>> print pofile_view.request.response.getHeader('Location')
-    http://translations.../ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es
+    http://trans.../ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es

=== modified file 'lib/lp/translations/browser/translationmessage.py'
--- lib/lp/translations/browser/translationmessage.py	2010-01-27 07:38:02 +0000
+++ lib/lp/translations/browser/translationmessage.py	2010-02-25 13:03:21 +0000
@@ -829,6 +829,30 @@
         self._redirectToNextPage()
         return True
 
+    def _messages_html_id(self):
+        order = []
+        message = self.translationmessage_view
+        # If we don't know about plural forms, or there are some other
+        # reason that prevent translations, translationmessage_view is
+        # not created
+        if ((message is not None) and (message.form_is_writeable)):
+            for dictionary in message.translation_dictionaries:
+                order.append(
+                    dictionary['html_id_translation'] + '_new')
+        return order
+
+    @property
+    def autofocus_html_id(self):
+        if (len(self._messages_html_id()) > 0):
+            return self._messages_html_id()[0]
+        else:
+            return ""
+
+    @property
+    def translations_order(self):
+        return ' '.join(self._messages_html_id())
+
+
 class CurrentTranslationMessageView(LaunchpadView):
     """Holds all data needed to show an ITranslationMessage.
 

=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-translate-newlines-check.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-translate-newlines-check.txt	2010-01-27 07:38:02 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-translate-newlines-check.txt	2010-02-25 13:03:21 +0000
@@ -43,7 +43,7 @@
     >>> print browser.url
     http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es/+translate?start=19&batch=1
     >>> print find_tag_by_id(browser.contents, 'msgset_149_es_translation_0_new')
-    <textarea ... name="msgset_149_es_translation_0_new" ...>
+    <textarea ... name="msgset_149_es_translation_0_new"...>
 
     foo
 
@@ -63,7 +63,7 @@
     >>> print find_tag_by_id(
     ...     browser.contents,
     ...     'msgset_149_es_translation_0_new') #doctest: -NORMALIZE_WHITESPACE
-    <textarea ... name="msgset_149_es_translation_0_new" ...>
+    <textarea ... name="msgset_149_es_translation_0_new"...>
     foo</textarea>
 
 Now, Check that even though the user forgot the trailing new line char,

=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-translate.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-translate.txt	2010-01-27 07:38:02 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-translate.txt	2010-02-25 13:03:21 +0000
@@ -30,7 +30,8 @@
 
 The page is rendered in read-only mode, without any textareas for input.
 
-    >>> main_content = find_tag_by_id(browser.contents, 'messages_to_translate')
+    >>> main_content = find_tag_by_id(
+    ...     browser.contents, 'messages_to_translate')
     >>> for textarea in main_content.findAll('textarea'):
     ...     print 'Found textarea:\n%s' % textarea
 
@@ -145,8 +146,8 @@
 
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
     >>> browser.open("http://translations.launchpad.dev/"
-    ...              "ubuntu/hoary/+source/evolution/+pots/evolution-2.2/en_AU/"
-    ...              "+translate?field.alternative_language=es")
+    ...              "ubuntu/hoary/+source/evolution/+pots/evolution-2.2"
+    ...              "/en_AU/+translate?field.alternative_language=es")
 
 Elements related 1:1 to a translatable message on this form have names and
 identifiers constructed as "msgset_<id>," where <id> is the unpadded decimal
@@ -158,7 +159,7 @@
     ...     print id
     msgset_130
     ...
-    msgset_130_singular
+    msgset_130_singular...
 
 HTML element identifiers for suggestions and translations on this form are
 constructed as an underscore-separated sequence of:
@@ -180,7 +181,9 @@
     msgset_130_es_suggestion_562_0
     msgset_130_es_suggestion_562_0_origin
     msgset_130_es_suggestion_562_0_radiobutton
+    msgset_130_force_suggestion
     msgset_130_singular
+    msgset_130_singular_copy_text
 
 Radio buttons are grouped by their name attribute. The translate page shows
 each translatable message with one radiobutton to select the existing
@@ -190,7 +193,9 @@
 Here we see an example where three suggestions are offered, making for five
 identically-named radio buttons and sundry other HTML tags.
 
-    >>> browser.open('http://translations.launchpad.dev/alsa-utils/trunk/+pots/alsa-utils/es/+translate')
+    >>> browser.open(
+    ...     'http://translations.launchpad.dev/alsa-utils/trunk/'
+    ...     '+pots/alsa-utils/es/+translate')
     >>> msgset_198 = get_tags(browser, 'name', 'msgset_198')
     >>> for name in msgset_198:
     ...     print name
@@ -213,3 +218,26 @@
     ...     browser.contents, 'msgset_134_es_suggestion_694_0'))
     tarjetas
 
+
+Missing plural forms information
+--------------------------------
+
+If the plural forms are not known for a language, users can not add
+new translations and are asked to help Launchpad Translations by providing
+the plural form informations.
+
+This notice is display when doing batch translations or translating a
+single message.
+
+    >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary/'
+    ...     '+source/evolution/+pots/evolution-2.2/ab/+translate')
+    >>> print extract_text(find_tag_by_id(
+    ...     browser.contents, 'maincontent'))
+    Launchpad can&#8217;t handle the plural items ...
+
+    >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary/'
+    ...     '+source/evolution/+pots/evolution-2.2/ab/5/+translate')
+    >>> print extract_text(find_tag_by_id(
+    ...     browser.contents, 'maincontent'))
+    Launchpad can&#8217;t handle the plural items ...
+

=== modified file 'lib/lp/translations/templates/currenttranslationmessage-translate-one.pt'
--- lib/lp/translations/templates/currenttranslationmessage-translate-one.pt	2010-01-27 07:38:02 +0000
+++ lib/lp/translations/templates/currenttranslationmessage-translate-one.pt	2010-02-25 13:03:21 +0000
@@ -42,6 +42,7 @@
       <a href=""
          tal:condition="not:context/potmsgset/is_translation_credit"
          tal:attributes="
+           id string:${view/html_id}_singular_copy_text;
            onClick string:
              javascript:copyInnerHTMLById(
                '${view/html_id}_singular',
@@ -172,7 +173,7 @@
   <tal:translation-dictionaries
        repeat="translation_dictionary view/translation_dictionaries">
   <tal:plural-form define="plural_index translation_dictionary/plural_index">
-    <tr class="secondary translation">
+    <tr tal:attributes="class string:secondary translation ${view/html_id}">
       <th colspan="3">
         <label class="language-code">Current
           <span tal:replace="context/pofile/language/englishname">
@@ -321,9 +322,10 @@
         </td>
       </tal:locked>
     </tr>
-      <tr class="secondary confirm_and_dismiss"
-          tal:define="name_id string:${view/html_id}_dismiss"
-          tal:condition="view/can_confirm_and_dismiss">
+      <tr tal:define="name_id string:${view/html_id}_dismiss"
+          tal:condition="view/can_confirm_and_dismiss"
+          tal:attributes="
+            class string:secondary confirm_and_dismiss ${view/html_id}">
         <td colspan="4"></td>
         <td>
           <label class="fuzzy-checkbox" tal:attributes="for name_id">
@@ -504,8 +506,6 @@
               lang context/pofile/language/dashedcode;
               dir context/pofile/language/abbreviated_text_dir;
               value translation_dictionary/submitted_translation;
-              onKeyPress string:javascript:selectWidget('${translation_dictionary/html_id_translation}_new_select', event);
-              onChange string:javascript:selectWidget('${translation_dictionary/html_id_translation}_new_select', event);
             "
             class="translate expandable"
           />
@@ -528,8 +528,6 @@
                   name string:${translation_dictionary/html_id_translation}_new;
                   lang context/pofile/language/dashedcode;
                   dir context/pofile/language/abbreviated_text_dir;
-                  onKeyPress string:javascript:selectWidget('${translation_dictionary/html_id_translation}_new_select', event);
-                  onChange string:javascript:selectWidget('${translation_dictionary/html_id_translation}_new_select', event);
                 ">
 <tal:content replace="translation_dictionary/submitted_translation" /></textarea>
             </tal:with-content>
@@ -548,8 +546,6 @@
                   name string:${translation_dictionary/html_id_translation}_new;
                   lang context/pofile/language/dashedcode;
                   dir context/pofile/language/abbreviated_text_dir;
-                  onKeyPress string:javascript:selectWidget('${translation_dictionary/html_id_translation}_new_select', event);
-                  onChange string:javascript:selectWidget('${translation_dictionary/html_id_translation}_new_select', event);
                 "></textarea>
             </tal:without-content>
           </tal:multi-line>
@@ -595,7 +591,8 @@
              value="force_suggestion"
              tal:attributes="
                checked view/force_suggestion;
-               name string:${view/html_id}_${language_code}_needsreview"
+               name string:${view/html_id}_${language_code}_needsreview;
+               id string:${view/html_id}_force_suggestion;"
              />
            <tal:block condition="not:view/is_plural">
              Someone should review this translation

=== modified file 'lib/lp/translations/templates/pofile-translate.pt'
--- lib/lp/translations/templates/pofile-translate.pt	2010-01-27 07:38:02 +0000
+++ lib/lp/translations/templates/pofile-translate.pt	2010-02-25 13:03:21 +0000
@@ -13,6 +13,7 @@
         color: lightgray;
     }
     </style>
+
     <script type="text/javascript"
       tal:condition="devmode"
       tal:define="lp_js string:${icingroot}/build"
@@ -20,50 +21,13 @@
     <script type="text/javascript">
       registerLaunchpadFunction(insertAllExpansionButtons);
 
-      LPS.use('node', 'cookie', 'anim', 'lp.pofile', function(Y) {
-
-          var hide_notification = function(node) {
-              var hide_anim = new Y.Anim({
-                  node: node,
-                  to: { height: 0,
-                        marginTop: 0, marginBottom: 0,
-                        paddingTop: 0, paddingBottom: 0 }
-              });
-              node.setStyle('border', 'none');
-              hide_anim.set('duration', 0.4);
-              hide_anim.on('end', function(e) {
-                  node.setStyle('display', 'none');
-              });
-              hide_anim.run();
-          }
-
-          var updateNotificationBox = function(e) {
-              var notice = Y.one('.important-notice-container');
-              var balloon = notice.one('.important-notice-balloon');
-              var dismiss_notice_cookie = ('translation-docs-for-' +
-                                           documentation_cookie);
-
-              // Check the cookie to see if the user has already dismissed
-              // the notification box for this session.
-              var already_seen = Y.Cookie.get(dismiss_notice_cookie, Boolean);
-              if (already_seen) {
-                 notice.setStyle('display', 'none');
-              }
-
-              var cancel_button = notice.one(
-                  '.important-notice-cancel-button');
-              // Cancel button starts out hidden.  If user has JavaScript,
-              // then we want to show it.
-              cancel_button.setStyle('visibility', 'visible');
-              cancel_button.on('click', function(e) {
-                  e.halt();
-                  hide_notification(balloon);
-                  Y.Cookie.set(dismiss_notice_cookie, true);
-              });
-          };
-
+      LPS.use('lp.pofile', function(Y) {
           Y.on('domready', Y.lp.pofile.setupSuggestionDismissal);
-          Y.on('domready', updateNotificationBox);
+          Y.on('domready', Y.lp.pofile.updateNotificationBox);
+          Y.on('domready', Y.lp.pofile.initializeKeyBindings);
+          Y.on('domready', function(e) {
+            Y.lp.pofile.setFocus(autofocus_field);
+          });
       });
     </script>
     </div>
@@ -262,6 +226,7 @@
                   <td style="text-align: right;">
                     <input type="submit"
                            name="submit_translations"
+                           id="save_and_continue_button"
                            value="Save &amp; Continue"
                     />
                   </td>
@@ -277,6 +242,8 @@
         <tal:status replace="structure context/@@+access" />
         <tal:contributors replace="structure context/@@+contributors" />
       </tal:havepluralforms>
+      <metal:pofile-js-footer 
+        use-macro="context/@@+translations-macros/pofile-js-footer" />
     </div>
   </body>
 </html>

=== modified file 'lib/lp/translations/templates/translationmessage-translate.pt'
--- lib/lp/translations/templates/translationmessage-translate.pt	2010-01-27 07:38:02 +0000
+++ lib/lp/translations/templates/translationmessage-translate.pt	2010-02-25 13:03:21 +0000
@@ -20,6 +20,10 @@
     <script type="text/javascript">
       LPS.use('node', 'lp.pofile', function(Y) {
           Y.on('domready', Y.lp.pofile.setupSuggestionDismissal);
+          Y.on('domready', Y.lp.pofile.initializeKeyBindings);
+          Y.on('domready', function(e) {
+            Y.lp.pofile.setFocus(autofocus_field);
+          });
       });
     </script>
     </div>
@@ -76,6 +80,7 @@
                 <th colspan="5" style="text-align: right;">
                   <input type="submit"
                          name="submit_translations"
+                         id="save_and_continue_button"
                          value="Save &amp; Continue" />
                 </th>
               </tr>
@@ -89,6 +94,8 @@
           replace="structure view/batchnav/@@+navigation-links-lower" />
       <tal:status replace="structure context/pofile/@@+access" />
       </tal:havepluralforms>
+      <metal:pofile-js-footer 
+        use-macro="context/@@+translations-macros/pofile-js-footer" />
     </div>
 
   </body>

=== modified file 'lib/lp/translations/templates/translations-macros.pt'
--- lib/lp/translations/templates/translations-macros.pt	2010-01-27 07:38:02 +0000
+++ lib/lp/translations/templates/translations-macros.pt	2010-02-25 13:03:21 +0000
@@ -6,7 +6,7 @@
 <metal:render-suggestion define-macro="render-suggestion">
 <tal:submission condition="submission">
   <tal:not-empty condition="not:submission/is_empty">
-    <tr tal:attributes="class string:secondary ${dismissable};
+    <tr tal:attributes="class string:secondary ${dismissable} ${submission/translation_html_id};
                         id submission/row_html_id">
       <th colspan="3" tal:content="section_title">
         Packaged:
@@ -130,6 +130,17 @@
 </metal:nav-pofile-subpages>
 
 
+<metal:pofile-js-footer define-macro="pofile-js-footer">
+    <script type="text/javascript"
+        tal:content="
+        structure string:<!-- 
+        var autofocus_field = '${view/autofocus_html_id}';
+        var translations_order = '${view/translations_order}';
+        var plural_forms = ${context/plural_forms};
+        // -->" />
+</metal:pofile-js-footer>
+
+
 <metal:translations-js define-macro="translations-js">
       <script
         type="text/javascript"