Launchpad itself

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

  1. contains-to-match
  2. Merge into devel
Proposed by Steve Kowalik on 2012-08-27
Status: Merged
Approved by: Ian Booth on 2012-08-27
Approved revision: no longer in the source branch.
Merged at revision: 15865
Proposed branch: lp:~stevenk/launchpad/contains-to-match
Merge into: lp:launchpad
Diff against target: 33 lines (+3/-3)
2 files modified
lib/lp/bugs/javascript/filebug.js (+1/-1)
lib/lp/bugs/javascript/tests/test_filebug.js (+2/-2)
To merge this branch: bzr merge lp:~stevenk/launchpad/contains-to-match
Reviewer Review Type Date Requested Status
Ian Booth (community) 2012-08-27 Approve on 2012-08-27
Review via email: mp+121354@code.launchpad.net

Commit Message

Change the +filebug privacy banner to use 'contains' rather than 'has'.

Description of the Change

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.

To post a comment you must log in.
Ian Booth (wallyworld) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/javascript/filebug.js'
2--- lib/lp/bugs/javascript/filebug.js 2012-08-21 13:27:00 +0000
3+++ lib/lp/bugs/javascript/filebug.js 2012-08-27 00:48:22 +0000
4@@ -69,7 +69,7 @@
5 Y.Array.forEach(LP.cache.information_type_data, function(item) {
6 info_type_descriptions[item.value] = item.name;
7 });
8- var text_template = "This report has {info_type} information." +
9+ var text_template = "This report contains {info_type} information." +
10 " You can change the information type later.";
11 value = info_type_descriptions[value];
12 return Y.Lang.substitute(text_template, {'info_type': value});
13
14=== modified file 'lib/lp/bugs/javascript/tests/test_filebug.js'
15--- lib/lp/bugs/javascript/tests/test_filebug.js 2012-07-19 03:18:37 +0000
16+++ lib/lp/bugs/javascript/tests/test_filebug.js 2012-08-27 00:48:22 +0000
17@@ -91,7 +91,7 @@
18 Y.Assert.isNull(banner_hidden);
19 var banner_text = Y.one('.banner-text').get('text');
20 Y.Assert.areEqual(
21- 'This report has Private Security information. ' +
22+ 'This report contains Private Security information. ' +
23 'You can change the information type later.', banner_text);
24 },
25
26@@ -281,7 +281,7 @@
27 Y.Assert.isNull(banner_hidden);
28 var banner_text = Y.one('.banner-text').get('text');
29 Y.Assert.areEqual(
30- 'This report has Private information. ' +
31+ 'This report contains Private information. ' +
32 'You can change the information type later.', banner_text);
33 },
34