Merge pull request #22 from JackJPowell:multi-language-support

Multi language support
JackJPowell · Nov 9, 2024 · 7f3a590 · 7f3a590
2 parents 8e84bed + 89e2ee1
commit 7f3a590
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/custom_components/playstation_network/coordinator.py b/custom_components/playstation_network/coordinator.py
@@ -62,9 +62,7 @@ async def _async_update_data(self) -> dict[str, Any]:
                 == "availableToPlay"
             )
             self.data["platform"] = (
-                self.data["presence"]
-                .get("basicPresence")
-                .get("primaryPlatformInfo")
+                self.data["presence"].get("basicPresence").get("primaryPlatformInfo")
             )
             try:
                 self.data["title_metadata"] = (
@@ -76,9 +74,7 @@ async def _async_update_data(self) -> dict[str, Any]:
                 self.data["title_metadata"] = {}
 
             # self.data["friends"] = await self.client.available_to_play()
-            self.data[
-                "trophy_summary"
-            ] = await self.hass.async_add_executor_job(
+            self.data["trophy_summary"] = await self.hass.async_add_executor_job(
                 lambda: self.client.trophy_summary()
             )
 
@@ -90,11 +86,17 @@ async def _async_update_data(self) -> dict[str, Any]:
                 title = await self.hass.async_add_executor_job(
                     lambda: self.api.game_title(title_id, "me")
                 )
-                self.data[
-                    "title_details"
-                ] = await self.hass.async_add_executor_job(
-                    lambda: title.get_details()
+                ## Attempt to pull details with user's country and language code
+                self.data["title_details"] = await self.hass.async_add_executor_job(
+                    lambda: title.get_details(
+                        self.hass.config.country, self.hass.config.language
+                    )
                 )
+                ## If we receive an error, fall back to english
+                if self.data["title_details"][0].get("errorCode") is not None:
+                    self.data["title_details"] = await self.hass.async_add_executor_job(
+                        lambda: title.get_details()
+                    )
 
                 trophy_titles = await self.hass.async_add_executor_job(
                     lambda: self.client.trophy_titles_for_title(

diff --git a/custom_components/playstation_network/manifest.json b/custom_components/playstation_network/manifest.json
@@ -9,7 +9,7 @@
   "integration_type": "device",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/JackJPowell/hass-psn/issues",
-  "requirements": ["PSNAWP-HA==2.1.2"],
+  "requirements": ["PSNAWP-HA==2.2.0"],
   "ssdp": [],
   "version": "0.6.0"
 }
diff --git a/custom_components/playstation_network/sensor.py b/custom_components/playstation_network/sensor.py
@@ -300,7 +300,7 @@ def get_trophy_attr(coordinator_data: any) -> dict[str, str]:
         entity_registry_enabled_default=True,
         has_entity_name=True,
         unique_id="psn_trophy_platinum_earned_attr",
-        value_fn=lambda data: data.get("earned_trophies").get("bronze"),
+        value_fn=lambda data: data.get("earned_trophies").get("platinum"),
     ),
     PsnSensorEntityDescription(
         key="trophy_gold_earned",
@@ -310,7 +310,7 @@ def get_trophy_attr(coordinator_data: any) -> dict[str, str]:
         entity_registry_enabled_default=True,
         has_entity_name=True,
         unique_id="psn_trophy_gold_earned_attr",
-        value_fn=lambda data: data.get("earned_trophies").get("bronze"),
+        value_fn=lambda data: data.get("earned_trophies").get("gold"),
     ),
     PsnSensorEntityDescription(
         key="trophy_silver_earned",
@@ -320,7 +320,7 @@ def get_trophy_attr(coordinator_data: any) -> dict[str, str]:
         entity_registry_enabled_default=True,
         has_entity_name=True,
         unique_id="psn_trophy_silver_earned_attr",
-        value_fn=lambda data: data.get("earned_trophies").get("bronze"),
+        value_fn=lambda data: data.get("earned_trophies").get("silver"),
     ),
     PsnSensorEntityDescription(
         key="trophy_bronze_earned",