Merge lp:~nhandler/launchpad/bugfix296469 into lp:launchpad

Summary

Bug #296469 describes how the propose branch for merging page (+register-merge) has a description for the 'Review type' field that says "Lowercase keywords describing the type of review you're performing." You are requesting that someone else review your branch, you are not doing the actual reviewing. As a result, the description should be updated to make this more clear.

Proposed fix

The proposed fix is to set the review_type description to "Lowercase keywords describing the type of review you would like to be performed."

Pre-implementation notes

It is a pretty straightforward patch. It involves modifying the review_type description in lp/code/interfaces/codereviewvote.py
Implementation details

lp/code/interfaces/codereviewvote.py:
  * Modify review_type description

Tests

< sinzui> nhandler: This text change may no have a test. We do not normally test for grammar

Demo and Q/A

  * Log on as Sample Person (<email address hidden>:test)

  * Visit https://code.launchpad.dev/~name12/firefox/main/+register-merge

  * Observe the modified description for the 'Review type' field.

lint

$ make lint
utilities/shhh.py PYTHONPATH= python2.4 bootstrap.py\
                --ez_setup-source=ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
= 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/code/interfaces/codereviewvote.py

== Pylint notices ==

lib/lp/code/interfaces/codereviewvote.py
    20: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    21: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)

I was told by Curtis Hovey (sinzui) that I can ignore these warnings.

< sinzui> There are several lazr.* false warnings

diff

{{{
=== modified file 'lib/lp/code/interfaces/codereviewvote.py'
--- lib/lp/code/interfaces/codereviewvote.py 2009-06-25 04:06:00 +0000
+++ lib/lp/code/interfaces/codereviewvote.py 2009-10-08 02:02:22 +0000
@@ -58,8 +58,8 @@
         TextLine(
             title=_('Review type'), required=False,
             description=_(
- "Lowercase keywords describing the type of review you're "
- "performing.")))
+ "Lowercase keywords describing the type of review you would "
+ "like to be performed.")))

     comment = exported(
         Reference(

}}}

Unfortunately, the wording from the schema field is present on two forms: the request a review form, where the current wording is inappropriate and the form for performing a review, where the wording in this branch is inappropriate.

I think the fix is to consider all the browser interfaces that reference review_type (such as lp.code.browser.branch.RegisterProposalSchema, lp.code.browser.codereviewcomment.IEditCodeReviewComment...) and adjust the call to copy_field to override description to something sensible for that form.

As a general rule, we need to do this *way* more in Launchpad than we currently do, but this is a good place to start...