Merge lp:~jamalta/launchpad/newtag-statement-redundancy into lp:launchpad

[Jamal Fanaian]

Changed the confirmation message when defining a new bug tag to 'The tag "[tagname]" hasn't been used by [targetname] before. (Create the new tag)'. to remove redundancy.

[Jamal Fanaian (jamalta)]

= Summary =

The message 'The tag "[tagname]" hasn't yet been used by [targetname] before. Is this a new tag?' is redundant and misleading. "Yet" and "before" should not are redundant in the statement. From bug 106924 and bug 87058.

== Proposed fix ==

Replace statement with 'The tag "[tagname]" hasn't been used by [targetname] before. (Create the new tag)'

== Pre-implementation notes ==

Spoke with bac to confirm the language that should be used to fix the issue.

== Tests ==

% bin/test -vvct xx-bug-edit

== Demo and Q/A ==

* https://bugs.launchpad.dev/firefox/+bug/1/+edit
  Enter "new-tag" as a tag and click Change

== 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/bugs/browser/bug.py
  lib/lp/bugs/stories/bugs/xx-bug-edit.txt

== Pylint notices ==

lib/lp/bugs/browser/bug.py
    28: [F0401] Unable to import 'email.MIMEMultipart' (No module named MIMEMultipart)
    29: [F0401] Unable to import 'email.MIMEText' (No module named MIMEText)
    43: [F0401] Unable to import 'lazr.enum' (No module named enum)
    44: [F0401] Unable to import 'lazr.lifecycle.event' (No module named lifecycle)
    45: [F0401] Unable to import 'lazr.lifecycle.snapshot' (No module named lifecycle)
    46: [F0401] Unable to import 'lazr.restful.interfaces' (No module named restful)

Confirmed that the lint notices are not related to my branch by gary_poster in #launchpad-dev

[Brad Crittenden (bac)]

Hi Jamal,

Thanks for the quick fix. As I pointed out on IRC you missed fixing a few tests.

These need updating:

...me/bac/canonical/lp-branches/reviewer> bzr ls -VR --kind=file --null | xargs -0 grep -In define\ new\ tag
lib/lp/bugs/browser/tests/bug-views.txt:619: Is this a new tag?...<input ...Yes, define new tag...>
lib/lp/bugs/browser/tests/bug-views.txt:632:If we click on the 'Yes, define new tag' button, we'll get redirected to
lib/lp/bugs/stories/bug-tags/xx-tags-on-bug-page.txt:40: >>> user_browser.getControl('Yes, define new tag', index=0).click()
lib/lp/bugs/stories/bug-tags/xx-tags-on-bug-page.txt:109: >>> user_browser.getControl('Yes, define new tag')
lib/lp/bugs/stories/bug-tags/xx-tags-on-bug-page.txt:112: LookupError: label 'Yes, define new tag'
lib/lp/bugs/stories/bugs/xx-bug-activity.txt:176: >>> admin_browser.getControl('Yes, define new tag', index=0).click()
lib/lp/bugs/stories/bugs/xx-bug-activity.txt:191: >>> admin_browser.getControl('Yes, define new tag', index=0).click()

Otherwise it looks really good. Just some rote test fixing and it'll be ready to land.

review: Needs Fixing (code)

[Curtis Hovey (sinzui)]

I like the wording change. It is very direct.

review: Approve (ui)

[Jamal Fanaian (jamalta)]

Updated tests that referenced changed language.

=== modified file 'lib/lp/bugs/browser/tests/bug-views.txt'
--- lib/lp/bugs/browser/tests/bug-views.txt 2009-12-24 01:41:54 +0000
+++ lib/lp/bugs/browser/tests/bug-views.txt 2010-01-19 21:33:16 +0000
@@ -615,8 +615,8 @@
     False
     >>> for message in bug_edit.view.notifications:
     ... print message
- The tag "new-tag" hasn't yet been used by Mozilla Firefox before.
- Is this a new tag?...<input ...Yes, define new tag...>
+ The tag "new-tag" hasn't been used by Mozilla Firefox before.
+ <input ...Create the new tag...>

     >>> bug_edit.wasRedirected()
     False
@@ -629,7 +629,7 @@
     >>> [action.label for action in bug_edit.view.actions]
     ['Change']

-If we click on the 'Yes, define new tag' button, we'll get redirected to
+If we click on the 'Create the new tag' button, we'll get redirected to
 the bug page, and the bug will have the new tag.

     >>> bug_edit.submit('confirm_tag', edit_values)

=== modified file 'lib/lp/bugs/stories/bug-tags/xx-tags-on-bug-page.txt'
--- lib/lp/bugs/stories/bug-tags/xx-tags-on-bug-page.txt 2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bug-tags/xx-tags-on-bug-page.txt 2010-01-19 21:33:16 +0000
@@ -37,7 +37,7 @@

     >>> user_browser.url
     'http://bugs.launchpad.dev/firefox/+bug/1/+edit'
- >>> user_browser.getControl('Yes, define new tag', index=0).click()
+ >>> user_browser.getControl('Create the new tag', index=0).click()
     >>> user_browser.url
     'http://bugs.launchpad.dev/firefox/+bug/1'

@@ -106,9 +106,9 @@
     >>> user_browser.open('http://bugs.launchpad.dev/firefox/+bug/1/+edit')
     >>> user_browser.getControl('Tags').value = 'an-official-tag'
     >>> user_browser.getControl('Change').click()
- >>> user_browser.getControl('Yes, define new tag')
+ >>> user_browser.getControl('Create the new tag')
     Traceback (most recent call last):
     ...
- LookupError: label 'Yes, define new tag'
+ LookupError: label 'Create the new tag'
     >>> print user_browser.url
     http://bugs.launchpad.dev/firefox/+bug/1

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2009-12-16 21:26:57 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2010-01-19 21:33:16 +0000
@@ -173,7 +173,7 @@
     ... 'http://bugs.launchpad.dev/redfish/+bug/15/+edit')
     >>> admin_browser.getControl("Tags").value = "tag1 tag2 tag3"
     >>> admin_browser.getControl("Change").click()
- >>> admin_browser.getControl('Yes, define new tag', index=0).click()
+ >>> admin_browser.getControl('Create the new tag', index=0).click()

     >>> admin_browser.open('http://launchpad.dev/bugs/15')
     >>> print_comments(admin_browser.contents)
@@ -188,7 +188,7 @@
     ... 'http://bugs.launchpad.dev/redfish/+bug/15/+edit')
     >>> admin_browser.getControl("Tags").value = "tag1 tag2 tag4"
     >>> admin_browser.getControl("Change").click()
- >>> admin_browser.getControl('Yes, define new tag', index=0).click()
+ >>> admin_browser.getControl('Create the new tag', index=0).click()

     >>> admin_browser.open('http://l...

[Brad Crittenden (bac)]

Thanks for fixing the additional tests, Jamal. It looks great now.

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2010-01-06 12:05:32 +0000
+++ lib/lp/bugs/browser/bug.py	2010-01-19 21:36:19 +0000
@@ -621,8 +621,7 @@
                 confirm_action.label, confirm_action.__name__))
         for new_tag in newly_defined_tags:
             self.notifications.append(
-                'The tag "%s" hasn\'t yet been used by %s before.'
-                ' Is this a new tag? %s' % (
+                'The tag "%s" hasn\'t been used by %s before. %s' % (
                     new_tag, bugtarget.bugtargetdisplayname, confirm_button))
             self._confirm_new_tags = True
 
@@ -633,7 +632,7 @@
             self.updateBugFromData(data)
             self.next_url = canonical_url(self.context)
 
-    @action('Yes, define new tag', name='confirm_tag')
+    @action('Create the new tag', name='confirm_tag')
     def confirm_tag_action(self, action, data):
         """Define a new tag."""
         self.actions['field.actions.change'].success(data)

=== modified file 'lib/lp/bugs/browser/tests/bug-views.txt'
--- lib/lp/bugs/browser/tests/bug-views.txt	2009-12-24 01:41:54 +0000
+++ lib/lp/bugs/browser/tests/bug-views.txt	2010-01-19 21:36:19 +0000
@@ -615,8 +615,8 @@
     False
     >>> for message in bug_edit.view.notifications:
     ...     print message
-    The tag "new-tag" hasn't yet been used by Mozilla Firefox before.
-    Is this a new tag?...<input ...Yes, define new tag...>
+    The tag "new-tag" hasn't been used by Mozilla Firefox before. 
+    <input ...Create the new tag...>
 
     >>> bug_edit.wasRedirected()
     False
@@ -629,7 +629,7 @@
     >>> [action.label for action in bug_edit.view.actions]
     ['Change']
 
-If we click on the 'Yes, define new tag' button, we'll get redirected to
+If we click on the 'Create the new tag' button, we'll get redirected to
 the bug page, and the bug will have the new tag.
 
     >>> bug_edit.submit('confirm_tag', edit_values)

=== modified file 'lib/lp/bugs/stories/bug-tags/xx-tags-on-bug-page.txt'
--- lib/lp/bugs/stories/bug-tags/xx-tags-on-bug-page.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bug-tags/xx-tags-on-bug-page.txt	2010-01-19 21:36:19 +0000
@@ -37,7 +37,7 @@
 
     >>> user_browser.url
     'http://bugs.launchpad.dev/firefox/+bug/1/+edit'
-    >>> user_browser.getControl('Yes, define new tag', index=0).click()
+    >>> user_browser.getControl('Create the new tag', index=0).click()
     >>> user_browser.url
     'http://bugs.launchpad.dev/firefox/+bug/1'
 
@@ -106,9 +106,9 @@
     >>> user_browser.open('http://bugs.launchpad.dev/firefox/+bug/1/+edit')
     >>> user_browser.getControl('Tags').value = 'an-official-tag'
     >>> user_browser.getControl('Change').click()
-    >>> user_browser.getControl('Yes, define new tag')
+    >>> user_browser.getControl('Create the new tag')
     Traceback (most recent call last):
     ...
-    LookupError: label 'Yes, define new tag'
+    LookupError: label 'Create the new tag'
     >>> print user_browser.url
     http://bugs.launchpad.dev/firefox/+bug/1

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2009-12-16 21:26:57 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2010-01-19 21:36:19 +0000
@@ -173,7 +173,7 @@
     ...     'http://bugs.launchpad.dev/redfish/+bug/15/+edit')
     >>> admin_browser.getControl("Tags").value = "tag1 tag2 tag3"
     >>> admin_browser.getControl("Change").click()
-    >>> admin_browser.getControl('Yes, define new tag', index=0).click()
+    >>> admin_browser.getControl('Create the new tag', index=0).click()
 
     >>> admin_browser.open('http://launchpad.dev/bugs/15')
     >>> print_comments(admin_browser.contents)
@@ -188,7 +188,7 @@
     ...     'http://bugs.launchpad.dev/redfish/+bug/15/+edit')
     >>> admin_browser.getControl("Tags").value = "tag1 tag2 tag4"
     >>> admin_browser.getControl("Change").click()
-    >>> admin_browser.getControl('Yes, define new tag', index=0).click()
+    >>> admin_browser.getControl('Create the new tag', index=0).click()
 
     >>> admin_browser.open('http://launchpad.dev/bugs/15')
     >>> print_comments(admin_browser.contents)

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-edit.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-edit.txt	2009-10-30 15:33:43 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-edit.txt	2010-01-19 21:36:19 +0000
@@ -83,13 +83,12 @@
   >>> user_browser.url
   'http://bugs.launchpad.dev/firefox/+bug/1/+edit'
   >>> print user_browser.contents
-  <...The tag "new-tag" hasn't yet been used by Mozilla Firefox before.
-  Is this a new tag?...
+  <...The tag "new-tag" hasn't been used by Mozilla Firefox before...
 
 Here we can confirm that we want to add the tag, or change the tag name
 and submit the form again.
 
-  >>> user_browser.getControl('Yes, define new tag') is not None
+  >>> user_browser.getControl('Create the new tag') is not None
   True
   >>> user_browser.getControl('Change') is not None
   True
@@ -114,7 +113,7 @@
   >>> user_browser.getControl('Tags').value = 'new-tag'
   >>> user_browser.getControl('Change').click()
 
-  >>> user_browser.getControl('Yes, define new tag').click()
+  >>> user_browser.getControl('Create the new tag').click()
   >>> user_browser.url
   'http://bugs.launchpad.dev/firefox/+bug/1'