Merge pull request #19 from openkfw/translations-state-class-update

Translations state class update
openkfw · Feb 21, 2023 · fc7dfea · fc7dfea
2 parents 31d2615 + 036d5ec
commit fc7dfea
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## 0.5.0
+
+### Changed
+
+- Moved translations to `strings.json`
+
+### Fixed
+
+- Fixed wrong sensor state classes
+
 ## 0.4.0
 
 ### Changed

diff --git a/configuration.dev.yaml b/configuration.dev.yaml
@@ -11,8 +11,7 @@ logger:
 sensor:
   - platform: time_date
     display_options:
-      - 'date_time'
-
+      - "date_time"
 smartenergy_goecharger:
   chargers:
     - name: charger1

diff --git a/custom_components/smartenergy_goecharger/config_flow.py b/custom_components/smartenergy_goecharger/config_flow.py
@@ -22,16 +22,6 @@ class InvalidAuth(HomeAssistantError):
     """Error to indicate there is invalid auth."""
 
 
-def _get_config_values(data_input: dict) -> dict:
-    data: dict = {}
-    config: list[str] = [CONF_NAME, CONF_HOST, CONF_API_TOKEN, CONF_SCAN_INTERVAL]
-
-    for config_name in config:
-        data[config_name] = data_input.get(config_name)
-
-    return data
-
-
 def _get_config_schema(default_values: dict) -> dict:
     return vol.Schema(
         {
@@ -127,8 +117,8 @@ async def async_step_user(
             if not errors:
                 return self.async_create_entry(
                     title=user_input.get(CONF_NAME, ""),
-                    data=_get_config_values(user_input),
-                    options=_get_config_values(user_input),
+                    data=user_input,
+                    options=user_input,
                 )
 
         return self.async_show_form(

diff --git a/custom_components/smartenergy_goecharger/manifest.json b/custom_components/smartenergy_goecharger/manifest.json
@@ -1,17 +1,11 @@
 {
   "domain": "smartenergy_goecharger",
   "name": "go-e Charger Cloud",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "documentation": "https://github.com/openkfw/smartenergy.goecharger",
   "issue_tracker": "https://github.com/openkfw/smartenergy.goecharger/issues",
   "iot_class": "cloud_polling",
   "config_flow": true,
-  "dependencies": [
-    "sensor",
-    "button",
-    "number",
-    "select"
-  ],
   "codeowners": [
     "@openkfw"
   ],

diff --git a/custom_components/smartenergy_goecharger/sensor.py b/custom_components/smartenergy_goecharger/sensor.py
@@ -69,9 +69,9 @@
         "name": {"unit": "", "name": "Charger name"},
     },
     "state_classes": {
-        CHARGER_MAX_CURRENT: SensorStateClass.TOTAL,
-        ENERGY_SINCE_CAR_CONNECTED: K_WATT_HOUR,
-        ENERGY_TOTAL: K_WATT_HOUR,
+        CHARGER_MAX_CURRENT: SensorStateClass.MEASUREMENT,
+        ENERGY_SINCE_CAR_CONNECTED: SensorStateClass.TOTAL,
+        ENERGY_TOTAL: SensorStateClass.TOTAL,
     },
     "device_classes": {
         CHARGER_ACCESS: f"{DOMAIN}__access_control",

diff --git a/custom_components/smartenergy_goecharger/strings.json b/custom_components/smartenergy_goecharger/strings.json
@@ -0,0 +1,36 @@
+{
+    "config": {
+        "error": {
+            "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
+            "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "name": "[%key:common::config_flow::data::name%]",
+                    "host": "[%key:common::config_flow::data::host%]",
+                    "api_token": "[%key:common::config_flow::data::api_token%]",
+                    "scan_interval": "Scan interval for data updates"
+                },
+                "description": "Configure your go-e Charger Cloud car charger."
+            }
+        }
+    },
+    "options": {
+        "error": {
+            "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
+            "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "name": "[%key:common::config_flow::data::name%]",
+                    "host": "[%key:common::config_flow::data::host%]",
+                    "api_token": "[%key:common::config_flow::data::api_token%]",
+                    "scan_interval": "Scan interval for data updates"
+                },
+                "description": "Configure your go-e Charger Cloud car charger."
+            }
+        }
+    }
+}
diff --git a/custom_components/smartenergy_goecharger/translations/en.json b/custom_components/smartenergy_goecharger/translations/en.json
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,7 +19,7 @@ keywords = ["goecharger", "kfw", "homeassistant", "cloud"]
 name = "smartenergy.goecharger"
 readme = "README.md"
 requires-python = ">=3.7"
-version = "0.4.0"
+version = "0.5.0"
 
 [project.optional-dependencies]
 dev = ["black", "pylint", "pytest-homeassistant-custom-component", "Flask", "pre-commit", "isort"]