Merge lp:~seb128/ubuntu-system-settings/update-working-check-update into lp:ubuntu-system-settings

Proposed by Sebastien Bacher
Status: Merged
Approved by: Iain Lane
Approved revision: 426
Merged at revision: 427
Proposed branch: lp:~seb128/ubuntu-system-settings/update-working-check-update
Merge into: lp:ubuntu-system-settings
Diff against target: 21 lines (+2/-2)
1 file modified
plugins/system-update/PageComponent.qml (+2/-2)
To merge this branch: bzr merge lp:~seb128/ubuntu-system-settings/update-working-check-update
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Iain Lane Approve
Review via email: mp+189118@code.launchpad.net

Commit message

update: clean small unwanted changes that sneaked in a previous commit,
that should make the "check for update" button do the correct thing again,
rather than having the label hidding and the button stop working

Description of the change

update: clean small unwanted changes that sneaked in a previous commit,
that should make the "check for update" button do the correct thing again,
rather than having the label hidding and the button stop working

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

oops

review: Approve
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 'plugins/system-update/PageComponent.qml'
2--- plugins/system-update/PageComponent.qml 2013-09-30 18:59:41 +0000
3+++ plugins/system-update/PageComponent.qml 2013-10-03 15:31:49 +0000
4@@ -63,7 +63,7 @@
5 currentUpdateState = UbuntuUpdatePanel.CheckingError;
6 return;
7 }
8- currentUpdateStminutesate = UbuntuUpdatePanel.Checking;
9+ currentUpdateState = UbuntuUpdatePanel.Checking;
10 infoMessage = checkinfoMessage;
11 CheckForUpdate();
12 }
13@@ -106,7 +106,7 @@
14 if (sizeInMB > 1024)
15 // TRANSLATORS: %1 is the size of the update in GB
16 updateBackend.updateSize = i18n.tr("%1 GB").arg(Math.round(sizeInMB/1024*10)/10);
17-
18+ else
19 // TRANSLATORS: %1 is the size of the update in MB
20 updateBackend.updateSize = i18n.tr("%1 MB").arg(Math.round(sizeInMB*10)/10);
21 updateDescriptions = descriptions;

Subscribers

People subscribed via source and target branches