← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~huwshimi/launchpad/tag-label-687546 into lp:launchpad

 

Huw Wilkins has proposed merging lp:~huwshimi/launchpad/tag-label-687546 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #687546 "Tags" field on bug reporting page has weird caption ("Web service", "Launchpadlib")
  https://bugs.launchpad.net/bugs/687546

For more details, see:
https://code.launchpad.net/~huwshimi/launchpad/tag-label-687546/+merge/48577

Changed the tag label to something a little more sensible on the bug report form.

To test:
Go to the Report Bug form (e.g. https://bugs.launchpad.net/launchpad/+filebug) and expand Extra Options. The help text should now read "Space-separated keywords for classifying this bug report."
-- 
https://code.launchpad.net/~huwshimi/launchpad/tag-label-687546/+merge/48577
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~huwshimi/launchpad/tag-label-687546 into lp:launchpad.
=== modified file 'lib/lp/bugs/interfaces/bug.py'
--- lib/lp/bugs/interfaces/bug.py	2011-01-31 16:58:27 +0000
+++ lib/lp/bugs/interfaces/bug.py	2011-02-04 05:01:06 +0000
@@ -20,9 +20,12 @@
     'IProjectGroupBugAddForm',
     ]
 
+<<<<<<< TREE
 from textwrap import dedent
 
 from lazr.enum import DBEnumeratedType
+=======
+>>>>>>> MERGE-SOURCE
 from lazr.lifecycle.snapshot import doNotSnapshot
 from lazr.restful.declarations import (
     call_with,
@@ -309,15 +312,8 @@
             readonly=True))
     tags = exported(List(
         title=_("Tags"),
-        description=_(dedent("""
-            The tags applied to this bug.
-
-            Web service:
-                The list of tags is whitespace delimited.
-
-            Launchpadlib:
-                The list of tags is represented as a sequence of strings.
-            """)),
+        description=_("Space-separated keywords for classifying "
+            "this bug report."),
             value_type=Tag(), required=False))
     is_complete = Bool(
         title=_("Is Complete?"),