Fixes

Author: Bre77

custom_components/teslemetry/manifest.json

@@ -1,21 +1,23 @@
 {
   "domain": "teslemetry",
   "name": "Teslemetry",
-  "codeowners": ["@Bre77"],
+  "codeowners": [
+    "@Bre77"
+  ],
   "config_flow": true,
-  "dependencies": ["application_credentials"],
+  "dependencies": [
+    "application_credentials"
+  ],
   "documentation": "https://www.home-assistant.io/integrations/teslemetry",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/Teslemetry/hass-teslemetry/issues",
-  "loggers": ["tesla-fleet-api"],
-<<<<<<< ours
-<<<<<<< ours
-  "requirements": ["tesla-fleet-api==1.3.0", "teslemetry-stream==0.8.2"]
-=======
-  "requirements": ["tesla-fleet-api==1.3.0", "teslemetry-stream==0.7.10"]
->>>>>>> theirs
-=======
-  "requirements": ["tesla-fleet-api==1.3.0", "teslemetry-stream==0.8.2"]
->>>>>>> theirs
+  "loggers": [
+    "tesla-fleet-api"
+  ],
+  "requirements": [
+    "tesla-fleet-api==1.3.0",
+    "teslemetry-stream==0.8.2"
+  ],
+  "version": "5.0.9"
 }

homeassistant/components/teslemetry/manifest.json

@@ -1,21 +1,23 @@
 {
   "domain": "teslemetry",
   "name": "Teslemetry",
-  "codeowners": ["@Bre77"],
+  "codeowners": [
+    "@Bre77"
+  ],
   "config_flow": true,
-  "dependencies": ["application_credentials"],
+  "dependencies": [
+    "application_credentials"
+  ],
   "documentation": "https://www.home-assistant.io/integrations/teslemetry",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/Teslemetry/hass-teslemetry/issues",
-  "loggers": ["tesla-fleet-api"],
-<<<<<<< ours
-<<<<<<< ours
-  "requirements": ["tesla-fleet-api==1.3.0", "teslemetry-stream==0.8.2"]
-=======
-  "requirements": ["tesla-fleet-api==1.3.0", "teslemetry-stream==0.7.10"]
->>>>>>> theirs
-=======
-  "requirements": ["tesla-fleet-api==1.3.0", "teslemetry-stream==0.8.2"]
->>>>>>> theirs
+  "loggers": [
+    "tesla-fleet-api"
+  ],
+  "requirements": [
+    "tesla-fleet-api==1.3.0",
+    "teslemetry-stream==0.8.2"
+  ],
+  "version": "5.0.9"
 }

homeassistant/components/teslemetry/translations/en.json

@@ -28,6 +28,10 @@
     "config": {
         "abort": {
             "already_configured": "Account is already configured",
+            "oauth_error": "Received invalid token data.",
+            "oauth_failed": "Error while obtaining access token.",
+            "oauth_timeout": "Timeout resolving OAuth token.",
+            "oauth_unauthorized": "OAuth authorization error while obtaining access token.",
             "reauth_account_mismatch": "The reauthentication account does not match the original account",
             "reauth_successful": "Re-authentication was successful"
         },
@@ -39,17 +43,8 @@
         },
         "step": {
             "reauth_confirm": {
-                "data": {
-                    "access_token": "Access token"
-                },
-                "description": "The {name} integration needs to re-authenticate your account, please enter an access token from {url}",
+                "description": "The {name} integration needs to re-authenticate your account",
                 "title": "Authentication expired for {name}"
-            },
-            "user": {
-                "data": {
-                    "access_token": "Access token"
-                },
-                "description": "Enter an access token from {url}."
             }
         }
     },
@@ -274,6 +269,14 @@
                 "name": "Wake"
             }
         },
+        "calendar": {
+            "tariff_content_v2": {
+                "name": "Buy tariff"
+            },
+            "tariff_content_v2_sell_tariff": {
+                "name": "Sell tariff"
+            }
+        },
         "climate": {
             "climate_state_cabin_overheat_protection": {
                 "name": "Cabin overheat protection"
@@ -1357,7 +1360,7 @@
                     "name": "Energy Site"
                 },
                 "tou_settings": {
-                    "description": "See https://developer.tesla.com/docs/fleet-api#time_of_use_settings for details.",
+                    "description": "See {time_of_use_url} for details.",
                     "name": "Settings"
                 }
             },