Ubuntu QA Website

Merge lp:~hjarrell555/ubuntu-qa-website/bug_1207877 into lp:ubuntu-qa-website

  1. bug_1207877
  2. Merge into drupal7-rewrite
Proposed by Hunter
Status: Merged
Merged at revision: 406
Proposed branch: lp:~hjarrell555/ubuntu-qa-website/bug_1207877
Merge into: lp:ubuntu-qa-website
Diff against target: 75 lines (+8/-8)
2 files modified
modules/qatracker/user/qatracker.user.results.php (+4/-4)
modules/qatracker/user/qatracker.user.testcases.php (+4/-4)
To merge this branch: bzr merge lp:~hjarrell555/ubuntu-qa-website/bug_1207877
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Review via email: mp+280084@code.launchpad.net

Description of the change

Changed the title from "Testcases for $PRODUCT in $MILESTONE" to "$PRODUCT testcases in $MILESTONE" to help fix wording problems with product and milestone names.

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

This looks excellent, however double check and make sure you have all instances of the wording changed. For instance, /modules/qatracker/user/qatracker.user.results.php also needs to be fixed.

review: Needs Fixing
lp:~hjarrell555/ubuntu-qa-website/bug_1207877 updated
407. By Hunter

Fixed title on user results to fix weird wording issue

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/qatracker/user/qatracker.user.results.php'
2--- modules/qatracker/user/qatracker.user.results.php 2014-10-26 20:04:28 +0000
3+++ modules/qatracker/user/qatracker.user.results.php 2015-12-10 22:12:16 +0000
4@@ -97,7 +97,7 @@
5 if ($build->milestone_status != 0 || $build->build_status == 2 || $build->build_status == 3 || $testcase->status == 1) {
6 $admin_acl = False;
7 $user_acl = False;
8- drupal_set_title(t("!testcase in !product for !milestone (archived)", array(
9+ drupal_set_title(t("!testcase in !product in !milestone (archived)", array(
10 "!testcase" => ucfirst($testcase->title),
11 "!product" => $build->product_title,
12 "!milestone" => $build->milestone_title,
13@@ -106,7 +106,7 @@
14 elseif ($build->build_status == 1) {
15 $admin_acl = False;
16 $user_acl = False;
17- drupal_set_title(t("!testcase in !product for !milestone (rebuilding)", array(
18+ drupal_set_title(t("!testcase in !product in !milestone (rebuilding)", array(
19 "!testcase" => ucfirst($testcase->title),
20 "!product" => $build->product_title,
21 "!milestone" => $build->milestone_title,
22@@ -115,7 +115,7 @@
23 elseif ($build->build_status == 4) {
24 $admin_acl = qatracker_acl_product($build->product_id);
25 $user_acl = qatracker_acl("administer site configuration", array("user"), $site);
26- drupal_set_title(t("!testcase in !product for !milestone (ready)", array(
27+ drupal_set_title(t("!testcase in !product in !milestone (ready)", array(
28 "!testcase" => ucfirst($testcase->title),
29 "!product" => $build->product_title,
30 "!milestone" => $build->milestone_title,
31@@ -124,7 +124,7 @@
32 else {
33 $admin_acl = qatracker_acl_product($build->product_id);
34 $user_acl = qatracker_acl("administer site configuration", array("user"), $site);
35- drupal_set_title(t("!testcase in !product for !milestone", array(
36+ drupal_set_title(t("!testcase in !product in !milestone", array(
37 "!testcase" => ucfirst($testcase->title),
38 "!product" => $build->product_title,
39 "!milestone" => $build->milestone_title,
40
41=== modified file 'modules/qatracker/user/qatracker.user.testcases.php'
42--- modules/qatracker/user/qatracker.user.testcases.php 2012-11-19 20:45:49 +0000
43+++ modules/qatracker/user/qatracker.user.testcases.php 2015-12-10 22:12:16 +0000
44@@ -65,27 +65,27 @@
45 $readonly = False;
46 if ($build->milestone_status != 0 || $build->build_status == 2 || $build->build_status == 3) {
47 $readonly = True;
48- drupal_set_title(t("Testcases for !product in !milestone (archived)", array(
49+ drupal_set_title(t("!product testcases in !milestone (archived)", array(
50 "!product" => $build->product_title,
51 "!milestone" => $build->milestone_title,
52 )));
53 }
54 elseif ($build->build_status == 1) {
55 $readonly = True;
56- drupal_set_title(t("Testcases for !product in !milestone (rebuilding)", array(
57+ drupal_set_title(t("!product testcases in !milestone (rebuilding)", array(
58 "!product" => $build->product_title,
59 "!milestone" => $build->milestone_title,
60 )));
61 }
62 elseif ($build->build_status == 4) {
63- drupal_set_title(t("Testcases for !product in !milestone (ready)", array(
64+ drupal_set_title(t("!product testcases in !milestone (ready)", array(
65 "!product" => $build->product_title,
66 "!milestone" => $build->milestone_title,
67 )));
68 }
69 else {
70 $admin = qatracker_acl("administer site configuration", array("user"), $site);
71- drupal_set_title(t("Testcases for !product in !milestone", array(
72+ drupal_set_title(t("!product testcases in !milestone", array(
73 "!product" => $build->product_title,
74 "!milestone" => $build->milestone_title,
75 )));

Subscribers

People subscribed via source and target branches