Merge lp:~townsend/unity/fix-installing-ellipsis into lp:unity

Proposed by Christopher Townsend
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3439
Proposed branch: lp:~townsend/unity/fix-installing-ellipsis
Merge into: lp:unity
Diff against target: 25 lines (+2/-2)
2 files modified
launcher/SoftwareCenterLauncherIcon.cpp (+1/-1)
tests/test_software_center_launcher_icon.cpp (+1/-1)
To merge this branch: bzr merge lp:~townsend/unity/fix-installing-ellipsis
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Stephen M. Webb (community) Approve
Review via email: mp+176413@code.launchpad.net

Commit message

Change to using ellipsis instead of three dots for the "Installing" tooltip.

Description of the change

= Issue =
Marco pointed out that revno. 3431 should have used ellipsis instead of three dots.

= Fix =
Change the tooltip to use ellipsis as well as changing the associated test to check for the ellipsis instead.

= Test =
Uses the same test as the original commit.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Seems straightforward.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

armhf failure is due to some test that is not related to this MP. Re-approving.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
2--- launcher/SoftwareCenterLauncherIcon.cpp 2013-07-17 18:35:09 +0000
3+++ launcher/SoftwareCenterLauncherIcon.cpp 2013-07-23 15:42:30 +0000
4@@ -254,7 +254,7 @@
5 {
6 SetQuirk(Quirk::PROGRESS, true);
7 finished_ = false;
8- tooltip_text = _("Installing...");
9+ tooltip_text = _("Installing…");
10 }
11
12 SetProgress(progress/100.0f);
13
14=== modified file 'tests/test_software_center_launcher_icon.cpp'
15--- tests/test_software_center_launcher_icon.cpp 2013-07-17 18:35:09 +0000
16+++ tests/test_software_center_launcher_icon.cpp 2013-07-23 15:42:30 +0000
17@@ -144,7 +144,7 @@
18
19 icon.OnPropertyChanged(params);
20
21- EXPECT_EQ(icon.tooltip_text(), "Installing...");
22+ EXPECT_EQ(icon.tooltip_text(), "Installing…");
23
24 g_variant_unref(params);
25 }