Git commit ba279438fc7ca02e5eb33384b622c97817c01e10 by Kai Uwe Broulik.
Committed on 08/07/2013 at 11:09.
Pushed by broulik into branch 'master'.

Use KLocale prettyFormatDuration for remaining time and drop custom JS func=
tion
CCMAIL: kde-i18n-doc@kde.org

M  +0    -15   plasma/generic/applets/batterymonitor/contents/code/logic.js
M  +4    -1    plasma/generic/applets/batterymonitor/contents/ui/BatteryIte=
m.qml

http://commits.kde.org/kde-workspace/ba279438fc7ca02e5eb33384b622c97817c01e=
10

diff --git a/plasma/generic/applets/batterymonitor/contents/code/logic.js b=
/plasma/generic/applets/batterymonitor/contents/code/logic.js
index 3ee2d45..226db61 100644
--- a/plasma/generic/applets/batterymonitor/contents/code/logic.js
+++ b/plasma/generic/applets/batterymonitor/contents/code/logic.js
@@ -206,18 +206,3 @@ function updateBrightness(source) {
     }
     dialogItem.disableBrightnessUpdate =3D false;
 }
-
-// TODO: give translated and formatted string with KGlobal::locale()->pret=
tyFormatDuration(msec);
-function formatDuration(msec) {
-    if (msec =3D=3D 0 || msec =3D=3D=3D undefined)
-        return "";
-
-    var time =3D new Date(msec);
-    var hours =3D time.getUTCHours();
-    var minutes =3D time.getUTCMinutes();
-
-    var str =3D "";
-    if (hours > 0) str +=3D i18np("1 hour ", "%1 hours ", hours);
-    if (minutes > 0) str +=3D i18np("1 minute", "%1 minutes", minutes);
-    return str;
-}
diff --git a/plasma/generic/applets/batterymonitor/contents/ui/BatteryItem.=
qml b/plasma/generic/applets/batterymonitor/contents/ui/BatteryItem.qml
index 9bc9522..3eb250c 100644
--- a/plasma/generic/applets/batterymonitor/contents/ui/BatteryItem.qml
+++ b/plasma/generic/applets/batterymonitor/contents/ui/BatteryItem.qml
@@ -22,6 +22,7 @@ import QtQuick 1.1
 import org.kde.plasma.core 0.1 as PlasmaCore
 import org.kde.plasma.components 0.1 as Components
 import org.kde.qtextracomponents 0.1
+import org.kde.locale 0.1 as KLocale
 import "plasmapackage:/code/logic.js" as Logic
 =

 Item {
@@ -43,6 +44,8 @@ Item {
 =

     property int remainingTime
 =

+    KLocale.Locale { id: locale }
+
     function updateSelection() {
         var containsMouse =3D mouseArea.containsMouse;
 =

@@ -274,7 +277,7 @@ Item {
                     width: parent.width
                     elide: Text.ElideRight
                     // FIXME Uses overall remaining time, not bound to ind=
ividual battery
-                    text: Logic.formatDuration(dialogItem.remainingTime)
+                    text: locale.prettyFormatDuration(dialogItem.remaining=
Time)
                     visible: showRemainingTime && model["Is Power Supply"]=
 && model["State"] !=3D "NoCharge" && text !=3D ""
                     font.pointSize: theme.smallestFont.pointSize
                     color: "#99"+(theme.textColor.toString().substr(1))