From 27e81fe0edc2fa8f6156cf4f8a69f03ecfd7bd55 Mon Sep 17 00:00:00 2001
From: Manu <4445816+tr4nt0r@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:23:43 +0100
Subject: [PATCH] Improve error messages in Habitica (#129948)

Improve error messages
---
 homeassistant/components/habitica/coordinator.py | 4 ++--
 homeassistant/components/habitica/strings.json   | 4 ++--
 tests/components/habitica/test_button.py         | 4 ++--
 tests/components/habitica/test_init.py           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/habitica/coordinator.py b/homeassistant/components/habitica/coordinator.py
index 4e949b703fb..cce2c684ba8 100644
--- a/homeassistant/components/habitica/coordinator.py
+++ b/homeassistant/components/habitica/coordinator.py
@@ -59,9 +59,9 @@ class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
             tasks_response.extend(await self.api.tasks.user.get(type="completedTodos"))
         except ClientResponseError as error:
             if error.status == HTTPStatus.TOO_MANY_REQUESTS:
-                _LOGGER.debug("Currently rate limited, skipping update")
+                _LOGGER.debug("Rate limit exceeded, will try again later")
                 return self.data
-            raise UpdateFailed(f"Error communicating with API: {error}") from error
+            raise UpdateFailed(f"Unable to connect to Habitica: {error}") from error
 
         return HabiticaData(user=user_response, tasks=tasks_response)
 
diff --git a/homeassistant/components/habitica/strings.json b/homeassistant/components/habitica/strings.json
index 45824c484e9..f7d2f20b8f9 100644
--- a/homeassistant/components/habitica/strings.json
+++ b/homeassistant/components/habitica/strings.json
@@ -209,10 +209,10 @@
       "message": "Unable to create new to-do `{name}` for Habitica, please try again"
     },
     "setup_rate_limit_exception": {
-      "message": "Currently rate limited, try again later"
+      "message": "Rate limit exceeded, try again later"
     },
     "service_call_unallowed": {
-      "message": "Unable to carry out this action, because the required conditions are not met"
+      "message": "Unable to complete action, the required conditions are not met"
     },
     "service_call_exception": {
       "message": "Unable to connect to Habitica, try again later"
diff --git a/tests/components/habitica/test_button.py b/tests/components/habitica/test_button.py
index e7eda1609c8..6bd62f3a58e 100644
--- a/tests/components/habitica/test_button.py
+++ b/tests/components/habitica/test_button.py
@@ -207,7 +207,7 @@ async def test_button_press(
     [
         (
             HTTPStatus.TOO_MANY_REQUESTS,
-            "Currently rate limited",
+            "Rate limit exceeded, try again later",
             ServiceValidationError,
         ),
         (
@@ -217,7 +217,7 @@ async def test_button_press(
         ),
         (
             HTTPStatus.UNAUTHORIZED,
-            "Unable to carry out this action",
+            "Unable to complete action, the required conditions are not met",
             ServiceValidationError,
         ),
     ],
diff --git a/tests/components/habitica/test_init.py b/tests/components/habitica/test_init.py
index 0ee2d872954..fd8a18b2d44 100644
--- a/tests/components/habitica/test_init.py
+++ b/tests/components/habitica/test_init.py
@@ -165,4 +165,4 @@ async def test_coordinator_rate_limited(
         async_fire_time_changed(hass)
         await hass.async_block_till_done()
 
-        assert "Currently rate limited, skipping update" in caplog.text
+        assert "Rate limit exceeded, will try again later" in caplog.text