From 21018b52b850ecb7e330fa7d41854afec51bef1f Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Tue, 14 Mar 2023 18:32:18 -0700
Subject: [PATCH] kcms/powermanagement: Make battery page localizable

---
 kcms/powermanagement/package/contents/ui/BatteryPage.qml | 5 ++---
 kcms/powermanagement/package/contents/ui/Graph.qml       | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/kcms/powermanagement/package/contents/ui/BatteryPage.qml b/kcms/powermanagement/package/contents/ui/BatteryPage.qml
index 41493f45..016d424a 100644
--- a/kcms/powermanagement/package/contents/ui/BatteryPage.qml
+++ b/kcms/powermanagement/package/contents/ui/BatteryPage.qml
@@ -79,7 +79,6 @@ Kirigami.ScrollablePage {
                             xMax: history.lastDataPointTime
                             xDuration: history.duration
                 
-                            yUnits: i18nc("literal percent sign","%")
                             yMax: 100
                             yStep: 20
                             visible: history.count > 1
@@ -127,7 +126,7 @@ Kirigami.ScrollablePage {
                 MobileForm.FormTextDelegate {
                     id: currentChargeDelegate
                     text: i18n("Current Charge")
-                    description: i18nc("%1 is value, %2 is unit", "%1 %2", Number(battery.chargePercent).toLocaleString(Qt.locale(), "f", 0), i18n("%"))
+                    description: i18nc("%1 is percentage value", "%1 %", Number(battery.chargePercent).toLocaleString(Qt.locale(), "f", 0))
                 }
                 
                 MobileForm.FormDelegateSeparator {}
@@ -135,7 +134,7 @@ Kirigami.ScrollablePage {
                 MobileForm.FormTextDelegate {
                     id: healthDelegate
                     text: i18n("Health")
-                    description: i18nc("%1 is value, %2 is unit", "%1 %2", Number(battery.capacity).toLocaleString(Qt.locale(), "f", 0), i18n("%"))
+                    description: i18nc("%1 is percentage value", "%1 %", Number(battery.capacity).toLocaleString(Qt.locale(), "f", 0))
                 }
                 
                 MobileForm.FormDelegateSeparator {}
diff --git a/kcms/powermanagement/package/contents/ui/Graph.qml b/kcms/powermanagement/package/contents/ui/Graph.qml
index d2b89899..1b9f4842 100644
--- a/kcms/powermanagement/package/contents/ui/Graph.qml
+++ b/kcms/powermanagement/package/contents/ui/Graph.qml
@@ -40,9 +40,6 @@ Canvas
     property real xMin: 0
     property real yStep: 20
 
-    property string yUnits: ""
-    property string xUnits: ""
-
     property real xDuration: 3600
     property real xDivisions: 6
     property real xDivisionWidth: 600000
@@ -141,7 +138,7 @@ Canvas
         for(var i = 0; i <=  yMax; i += yStep) {
             var y = scalePoint(Qt.point(0,i)).y;
 
-            c.fillText(i + canvas.yUnits, xPadding - 10, y);
+            c.fillText(i18nc("%1 is a percentage value", "%1%", i), xPadding - 10, y);
 
             //grid line
             c.moveTo(xPadding, y)