Use proper multiplication sign instead of letter x (#1005)

* Use proper multiplication sign instead of letter x

* Change to multiplier in library and correct discovery

---------

Co-authored-by: Andrew Jackson <[email protected]>

Author: bartkummel

custom_components/battery_notes/coordinator.py

@@ -144,7 +144,7 @@ def current_battery_level(self, value):
     def battery_type_and_quantity(self) -> str:
         """Merge battery type & quantity."""
         if self.battery_quantity and int(self.battery_quantity) > 1:
-            return str(self.battery_quantity) + "x " + self.battery_type
+            return str(self.battery_quantity) + "× " + self.battery_type
         return self.battery_type
 
     @property

custom_components/battery_notes/discovery.py

@@ -16,6 +16,7 @@
     CONF_MANUFACTURER,
     CONF_MODEL,
     CONF_BATTERY_TYPE,
+    CONF_BATTERY_QUANTITY,
     DOMAIN,
 )
 from .library import ModelInfo, DeviceBatteryDetails, Library
@@ -145,7 +146,10 @@ def _init_entity_discovery(
         if device_battery_details:
             discovery_data[
                 CONF_BATTERY_TYPE
-            ] = device_battery_details.battery_type_and_quantity
+            ] = device_battery_details.battery_type
+            discovery_data[
+                CONF_BATTERY_QUANTITY
+            ] = device_battery_details.battery_quantity
         discovery_data[CONF_MANUFACTURER] = device_battery_details.manufacturer
         discovery_data[CONF_MODEL] = device_battery_details.model
         discovery_data[CONF_DEVICE_NAME] = get_wrapped_device_name(

custom_components/battery_notes/library.py

@@ -140,7 +140,7 @@ def battery_type_and_quantity(self):
             quantity = 0
 
         if quantity > 1:
-            batteries = str(quantity) + "x " + self.battery_type
+            batteries = str(quantity) + "× " + self.battery_type
         else:
             batteries = self.battery_type