← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~stevenk/launchpad/contains-to-match into lp:launchpad

 

Steve Kowalik has proposed merging lp:~stevenk/launchpad/contains-to-match into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/contains-to-match/+merge/121354

While performing QA for another bug, I noticed that the +filebug privacy banner is different from the bug privacy banner -- the +filebug banner uses 'has', as in 'This report has Private ...', whereas the bug privacy banner uses 'contains', as in 'This report contains Private ...'.

Since I like matching things, I have fixed the +filebug JS to also use contains.
-- 
https://code.launchpad.net/~stevenk/launchpad/contains-to-match/+merge/121354
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/contains-to-match into lp:launchpad.
=== modified file 'lib/lp/bugs/javascript/filebug.js'
--- lib/lp/bugs/javascript/filebug.js	2012-08-21 13:27:00 +0000
+++ lib/lp/bugs/javascript/filebug.js	2012-08-27 00:48:22 +0000
@@ -69,7 +69,7 @@
     Y.Array.forEach(LP.cache.information_type_data, function(item) {
         info_type_descriptions[item.value] = item.name;
     });
-    var text_template = "This report has {info_type} information." +
+    var text_template = "This report contains {info_type} information." +
         " You can change the information type later.";
     value = info_type_descriptions[value];
     return Y.Lang.substitute(text_template, {'info_type': value});

=== modified file 'lib/lp/bugs/javascript/tests/test_filebug.js'
--- lib/lp/bugs/javascript/tests/test_filebug.js	2012-07-19 03:18:37 +0000
+++ lib/lp/bugs/javascript/tests/test_filebug.js	2012-08-27 00:48:22 +0000
@@ -91,7 +91,7 @@
             Y.Assert.isNull(banner_hidden);
             var banner_text = Y.one('.banner-text').get('text');
             Y.Assert.areEqual(
-                'This report has Private Security information. ' +
+                'This report contains Private Security information. ' +
                 'You can change the information type later.', banner_text);
         },
 
@@ -281,7 +281,7 @@
             Y.Assert.isNull(banner_hidden);
             var banner_text = Y.one('.banner-text').get('text');
             Y.Assert.areEqual(
-                'This report has Private information. ' +
+                'This report contains Private information. ' +
                 'You can change the information type later.', banner_text);
         },
 


Follow ups