Merge lp:~seb128/ubuntu-system-settings/battery-charge-hours into lp:ubuntu-system-settings

[Sebastien Bacher]

[battery] display last charge info in hours rather than days

[battery] display last charge info in hours rather than days

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1393
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2079/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2071
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2361
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2361/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19821

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2079/rebuild

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Nice, thanks.

review: Approve

=== modified file 'plugins/battery/PageComponent.qml'
--- plugins/battery/PageComponent.qml	2015-04-20 15:47:53 +0000
+++ plugins/battery/PageComponent.qml	2015-04-21 09:56:23 +0000
@@ -38,20 +38,16 @@
     function timeDeltaString(timeDelta) {
         var sec = timeDelta,
             min = Math.round (timeDelta / 60),
-            hr = Math.round (timeDelta / 3600),
-            day = Math.round (timeDelta / 86400);
+            hr = Math.round (timeDelta / 3600);
         if (sec < 60)
             // TRANSLATORS: %1 is the number of seconds
             return i18n.tr("%1 second ago", "%1 seconds ago", sec).arg(sec)
         else if (min < 60)
             // TRANSLATORS: %1 is the number of minutes
             return i18n.tr("%1 minute ago", "%1 minutes ago", min).arg(min)
-        else if (hr < 24)
+        else
             // TRANSLATORS: %1 is the number of hours
             return i18n.tr("%1 hour ago", "%1 hours ago", hr).arg(hr)
-        else
-            // TRANSLATORS: %1 is the number of days
-            return i18n.tr("%1 day ago", "%1 days ago", day).arg(day)
     }
 
     GSettings {