aa-structures 2.6.0__py3-none-any.whl → 2.6.2__py3-none-any.whl

structures/core/notification_embeds/structures_embeds.py

@@ -6,11 +6,12 @@ from collections import namedtuple
 
 import dhooks_lite
 
-from django.utils.translation import gettext as __
+from django.utils.translation import gettext as _
 from eveuniverse.models import EveEntity, EveType
 
 from app_utils.datetime import ldap_time_2_datetime, ldap_timedelta_2_timedelta
 
+from structures.helpers import get_or_create_esi_obj
 from structures.models import Notification, Structure, Webhook
 
 from .helpers import (
@@ -34,7 +35,7 @@ class NotificationStructureEmbed(NotificationBaseEmbed):
             )
         except Structure.DoesNotExist:
             structure = None
-            structure_name = __("(unknown)")
+            structure_name = _("(unknown)")
             structure_type = self._notification.eve_structure_type()
             structure_solar_system = self._notification.eve_solar_system(
                 "solarsystemID"
@@ -46,19 +47,24 @@ class NotificationStructureEmbed(NotificationBaseEmbed):
             structure_type = structure.eve_type
             structure_solar_system = structure.eve_solar_system
             owner_link = gen_corporation_link(str(structure.owner))
-            location = f" at {structure.eve_moon} " if structure.eve_moon else ""
+            # Translators: Context is a location, e.g. a moon
+            location = _(" at %s ") % structure.eve_moon if structure.eve_moon else ""
 
         self._structure = structure
-        self._description = __(
-            "The %(structure_type)s %(structure_name)s%(location)s in %(solar_system)s "
-            "belonging to %(owner_link)s "
-        ) % {
-            "structure_type": structure_type.name,
-            "structure_name": Webhook.text_bold(structure_name),
-            "location": location,
-            "solar_system": gen_solar_system_text(structure_solar_system),
-            "owner_link": owner_link,
-        }
+        self._description = (
+            _(
+                "The %(structure_type)s %(structure_name)s%(location)s "
+                "in %(solar_system)s belonging to %(owner_link)s"
+            )
+            % {
+                "structure_type": structure_type.name,
+                "structure_name": Webhook.text_bold(structure_name),
+                "location": location,
+                "solar_system": gen_solar_system_text(structure_solar_system),
+                "owner_link": owner_link,
+            }
+            + " "
+        )
         self._thumbnail = dhooks_lite.Thumbnail(
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
@@ -67,8 +73,8 @@ class NotificationStructureEmbed(NotificationBaseEmbed):
 class NotificationStructureOnline(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Structure online")
-        self._description += __("is now online.")
+        self._title = _("Structure online")
+        self._description += _("is now online.")
         self._color = Webhook.Color.SUCCESS
 
 
@@ -79,8 +85,8 @@ class NotificationStructureFuelAlert(NotificationStructureEmbed):
             hours_left = timeuntil(self._structure.fuel_expires_at)
         else:
             hours_left = "?"
-        self._title = __("Structure fuel alert")
-        self._description += __("is running out of fuel in %s.") % Webhook.text_bold(
+        self._title = _("Structure fuel alert")
+        self._description += _("is running out of fuel in %s.") % Webhook.text_bold(
             hours_left
         )
 
@@ -90,17 +96,16 @@ class NotificationStructureFuelAlert(NotificationStructureEmbed):
 class NotificationStructureJumpFuelAlert(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Jump gate low on Liquid Ozone")
+        self._title = _("Jump gate low on Liquid Ozone")
         threshold_str = f"{self._parsed_text['threshold']:,}"
         quantity_str = f"{self._structure.jump_fuel_quantity():,}"
-        self._description += __(
+        self._description += _(
             "is below %(threshold)s units on Liquid Ozone.\n"
             "Remaining units: %(remaining)s."
-            % {
-                "threshold": f"{Webhook.text_bold(threshold_str)}",
-                "remaining": f"{Webhook.text_bold(quantity_str)}",
-            }
-        )
+        ) % {
+            "threshold": f"{Webhook.text_bold(threshold_str)}",
+            "remaining": f"{Webhook.text_bold(quantity_str)}",
+        }
         self._color = Webhook.Color.WARNING
 
 
@@ -108,9 +113,9 @@ class NotificationStructureRefueledExtra(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         target_date = self.fuel_expires_target_date()
-        self._title = __("Structure refueled")
+        self._title = _("Structure refueled")
         self._description += (
-            __("has been refueled. Fuel will last until %s.") % target_date
+            _("has been refueled. Fuel will last until %s.") % target_date
         )
         self._color = Webhook.Color.INFO
 
@@ -118,8 +123,8 @@ class NotificationStructureRefueledExtra(NotificationStructureEmbed):
 class NotificationStructureServicesOffline(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Structure services off-line")
-        self._description += __("has all services off-lined.")
+        self._title = _("Structure services off-line")
+        self._description += _("has all services off-lined.")
         if self._structure and self._structure.services.count() > 0:
             qs = self._structure.services.all().order_by("name")
             services_list = "\n".join([x.name for x in qs])
@@ -130,27 +135,27 @@ class NotificationStructureServicesOffline(NotificationStructureEmbed):
 class NotificationStructureWentLowPower(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Structure low power")
-        self._description += __("went to low power mode.")
+        self._title = _("Structure low power")
+        self._description += _("went to low power mode.")
         self._color = Webhook.Color.WARNING
 
 
 class NotificationStructureWentHighPower(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Structure full power")
-        self._description += __("went to full power mode.")
+        self._title = _("Structure full power")
+        self._description += _("went to full power mode.")
         self._color = Webhook.Color.SUCCESS
 
 
 class NotificationStructureUnanchoring(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Structure un-anchoring")
+        self._title = _("Structure un-anchoring")
         unanchored_at = notification.timestamp + ldap_timedelta_2_timedelta(
             self._parsed_text["timeLeft"]
         )
-        self._description += __(
+        self._description += _(
             "has started un-anchoring. It will be fully un-anchored at: %s"
         ) % target_datetime_formatted(unanchored_at)
         self._color = Webhook.Color.INFO
@@ -159,11 +164,11 @@ class NotificationStructureUnanchoring(NotificationStructureEmbed):
 class NotificationStructureUnderAttack(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Structure under attack")
-        self._description += __("is under attack by %s.\n%s") % (
-            self._get_attacker_link(),
-            self.compile_damage_text("Percentage"),
-        )
+        self._title = _("Structure under attack")
+        self._description += _("is under attack by %(attacker)s.\n%(damage_text)s") % {
+            "attacker": self._get_attacker_link(),
+            "damage_text": self.compile_damage_text("Percentage"),
+        }
         self._color = Webhook.Color.DANGER
 
     def _get_attacker_link(self) -> str:
@@ -174,17 +179,17 @@ class NotificationStructureUnderAttack(NotificationStructureEmbed):
         if self._parsed_text.get("corpName"):
             return gen_corporation_link(self._parsed_text["corpName"])
 
-        return "(unknown)"
+        return _("(unknown)")
 
 
 class NotificationStructureLostShield(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Structure lost shield")
+        self._title = _("Structure lost shield")
         timer_ends_at = notification.timestamp + ldap_timedelta_2_timedelta(
             self._parsed_text["timeLeft"]
         )
-        self._description += __(
+        self._description += _(
             "has lost its shields. Armor timer end at: %s"
         ) % target_datetime_formatted(timer_ends_at)
         self._color = Webhook.Color.DANGER
@@ -193,11 +198,11 @@ class NotificationStructureLostShield(NotificationStructureEmbed):
 class NotificationStructureLostArmor(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Structure lost armor")
+        self._title = _("Structure lost armor")
         timer_ends_at = notification.timestamp + ldap_timedelta_2_timedelta(
             self._parsed_text["timeLeft"]
         )
-        self._description += __(
+        self._description += _(
             "has lost its armor. Hull timer end at: %s"
         ) % target_datetime_formatted(timer_ends_at)
         self._color = Webhook.Color.DANGER
@@ -206,8 +211,8 @@ class NotificationStructureLostArmor(NotificationStructureEmbed):
 class NotificationStructureDestroyed(NotificationStructureEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Structure destroyed")
-        self._description += __("has been destroyed.")
+        self._title = _("Structure destroyed")
+        self._description += _("has been destroyed.")
         self._color = Webhook.Color.DANGER
 
 
@@ -215,7 +220,7 @@ class NotificationStructureOwnershipTransferred(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         structure_type = self._notification.eve_structure_type()
-        self._description = __(
+        self._description = _(
             "The %(structure_type)s %(structure_name)s in %(solar_system)s "
         ) % {
             "structure_type": structure_type.name,
@@ -224,16 +229,14 @@ class NotificationStructureOwnershipTransferred(NotificationBaseEmbed):
                 self._notification.eve_solar_system()
             ),
         }
-        from_corporation, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["oldOwnerCorpID"]
-        )
-        to_corporation, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["newOwnerCorpID"]
+        from_corporation = get_or_create_esi_obj(
+            EveEntity, id=self._parsed_text["oldOwnerCorpID"]
         )
-        character, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["charID"]
+        to_corporation = get_or_create_esi_obj(
+            EveEntity, id=self._parsed_text["newOwnerCorpID"]
         )
-        self._description += __(
+        character = get_or_create_esi_obj(EveEntity, id=self._parsed_text["charID"])
+        self._description += _(
             "has been transferred from %(from_corporation)s "
             "to %(to_corporation)s by %(character)s."
         ) % {
@@ -241,7 +244,7 @@ class NotificationStructureOwnershipTransferred(NotificationBaseEmbed):
             "to_corporation": gen_corporation_link(to_corporation.name),
             "character": character.name,
         }
-        self._title = __("Ownership transferred")
+        self._title = _("Ownership transferred")
         self._color = Webhook.Color.INFO
         self._thumbnail = dhooks_lite.Thumbnail(
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
@@ -256,7 +259,7 @@ class NotificationStructureAnchoring(NotificationBaseEmbed):
         owner_link = gen_corporation_link(
             self._parsed_text.get("ownerCorpName", "(unknown)")
         )
-        self._description = __(
+        self._description = _(
             "A %(structure_type)s belonging to %(owner_link)s "
             "has started anchoring in %(solar_system)s. "
         ) % {
@@ -264,7 +267,7 @@ class NotificationStructureAnchoring(NotificationBaseEmbed):
             "owner_link": owner_link,
             "solar_system": gen_solar_system_text(solar_system),
         }
-        self._title = __("Structure anchoring")
+        self._title = _("Structure anchoring")
         self._color = Webhook.Color.INFO
         self._thumbnail = dhooks_lite.Thumbnail(
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
@@ -292,7 +295,7 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
                             id=structure_info[2]
                         ),
                         eve_solar_system=None,
-                        owner_link="(unknown)",
+                        owner_link=_("(unknown)"),
                     )
                 )
             else:
@@ -305,14 +308,14 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
                     )
                 )
 
-        self._title = __("Structure reinforcement time changed")
+        self._title = _("Structure reinforcement time changed")
         change_effective = ldap_time_2_datetime(self._parsed_text["timestamp"])
-        self._description = __(
+        self._description = _(
             "Reinforcement hour has been changed to %s "
             "for the following structures:\n"
         ) % Webhook.text_bold(self._parsed_text["hour"])
         for structure_info in all_structure_info:
-            self._description += __(
+            self._description += _(
                 "- %(structure_type)s %(structure_name)s in %(solar_system)s "
                 "belonging to %(owner_link)s"
             ) % {
@@ -322,7 +325,7 @@ class NotificationStructureReinforceChange(NotificationBaseEmbed):
                 "owner_link": structure_info.owner_link,
             }
 
-        self._description += __(
-            "\n\nChange becomes effective at %s."
+        self._description += _(
+            _("\n\nChange becomes effective at %s.")
         ) % target_datetime_formatted(change_effective)
         self._color = Webhook.Color.INFO

structures/core/notification_embeds/tower_embeds.py

@@ -6,7 +6,7 @@ import datetime as dt
 
 import dhooks_lite
 
-from django.utils.translation import gettext as __
+from django.utils.translation import gettext as _
 
 from structures.core import starbases
 from structures.models import GeneratedNotification, Notification, Structure, Webhook
@@ -36,15 +36,21 @@ class NotificationTowerEmbed(NotificationBaseEmbed):
         self._thumbnail = dhooks_lite.Thumbnail(
             structure_type.icon_url(size=self.ICON_DEFAULT_SIZE)
         )
-        self._description = __(
-            "The starbase %(structure_name)s at %(moon)s "
-            "in %(solar_system)s belonging to %(owner_link)s "
-        ) % {
-            "structure_name": Webhook.text_bold(structure_name),
-            "moon": eve_moon.name,
-            "solar_system": gen_solar_system_text(eve_moon.eve_planet.eve_solar_system),
-            "owner_link": gen_corporation_link(str(notification.owner)),
-        }
+        self._description = (
+            _(
+                "The starbase %(structure_name)s at %(moon)s "
+                "in %(solar_system)s belonging to %(owner_link)s"
+            )
+            % {
+                "structure_name": Webhook.text_bold(structure_name),
+                "moon": eve_moon.name,
+                "solar_system": gen_solar_system_text(
+                    eve_moon.eve_planet.eve_solar_system
+                ),
+                "owner_link": gen_corporation_link(str(notification.owner)),
+            }
+            + " "
+        )
 
 
 class NotificationTowerAlertMsg(NotificationTowerEmbed):
@@ -52,10 +58,11 @@ class NotificationTowerAlertMsg(NotificationTowerEmbed):
         super().__init__(notification)
         aggressor_link = self.get_aggressor_link()
         damage_text = self.compile_damage_text("Value", 100)
-        self._title = __("Starbase under attack")
-        self._description += __(
-            "is under attack by %(aggressor)s.\n%(damage_text)s"
-        ) % {"aggressor": aggressor_link, "damage_text": damage_text}
+        self._title = _("Starbase under attack")
+        self._description += _("is under attack by %(aggressor)s.\n%(damage_text)s") % {
+            "aggressor": aggressor_link,
+            "damage_text": damage_text,
+        }
         self._color = Webhook.Color.WARNING
 
 
@@ -79,8 +86,8 @@ class NotificationTowerResourceAlertMsg(NotificationTowerEmbed):
             hours_left = timeuntil(self._structure.fuel_expires_at)
         else:
             hours_left = "?"
-        self._title = __("Starbase fuel alert")
-        self._description += __("is running out of fuel in %s.") % Webhook.text_bold(
+        self._title = _("Starbase fuel alert")
+        self._description += _("is running out of fuel in %s.") % Webhook.text_bold(
             hours_left
         )
         self._color = Webhook.Color.WARNING
@@ -90,9 +97,9 @@ class NotificationTowerRefueledExtra(NotificationTowerEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         target_date = self.fuel_expires_target_date()
-        self._title = __("Starbase refueled")
+        self._title = _("Starbase refueled")
         self._description += (
-            __("has been refueled. Fuel will last until %s.") % target_date
+            _("has been refueled. Fuel will last until %s.") % target_date
         )
         self._color = Webhook.Color.INFO
 
@@ -117,7 +124,7 @@ class GeneratedNotificationTowerEmbed(GeneratedNotificationBaseEmbed):
 
     def __init__(self, notification: GeneratedNotification) -> None:
         super().__init__(notification)
-        self._description = __(
+        self._description = _(
             "The starbase %(structure_name)s at %(moon)s "
             "in %(solar_system)s belonging to %(owner_link)s "
         ) % {
@@ -131,16 +138,16 @@ class GeneratedNotificationTowerEmbed(GeneratedNotificationBaseEmbed):
 class NotificationTowerReinforcedExtra(GeneratedNotificationTowerEmbed):
     def __init__(self, notification: GeneratedNotification) -> None:
         super().__init__(notification)
-        self._title = __("Starbase reinforced")
+        self._title = _("Starbase reinforced")
         try:
             reinforced_until = target_datetime_formatted(
                 dt.datetime.fromisoformat(notification.details["reinforced_until"])
             )
         except (KeyError, ValueError):
-            reinforced_until = "(unknown)"
+            reinforced_until = _("(unknown)")
 
         self._description += (
-            __("has been reinforced and will come out at: %s.") % reinforced_until
+            _("has been reinforced and will come out at: %s.") % reinforced_until
         )
 
         self._color = Webhook.Color.DANGER

structures/core/notification_embeds/war_embeds.py

@@ -6,11 +6,12 @@
 import dhooks_lite
 
 from django.utils.html import strip_tags
-from django.utils.translation import gettext as __
+from django.utils.translation import gettext as _
 from eveuniverse.models import EveEntity
 
 from app_utils.datetime import ldap_time_2_datetime
 
+from structures.helpers import get_or_create_esi_obj
 from structures.models import Notification, Webhook
 
 from .helpers import (
@@ -24,11 +25,11 @@ from .main import NotificationBaseEmbed
 class NotificationWarEmbed(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._declared_by, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["declaredByID"]
+        self._declared_by = get_or_create_esi_obj(
+            EveEntity, id=self._parsed_text["declaredByID"]
         )
-        self._against, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["againstID"]
+        self._against = get_or_create_esi_obj(
+            EveEntity, id=self._parsed_text["againstID"]
         )
         self._thumbnail = dhooks_lite.Thumbnail(
             self._declared_by.icon_url(size=self.ICON_DEFAULT_SIZE)
@@ -38,8 +39,8 @@ class NotificationWarEmbed(NotificationBaseEmbed):
 class NotificationCorpWarSurrenderMsg(NotificationWarEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("One party has surrendered")
-        self._description = __(
+        self._title = _("One party has surrendered")
+        self._description = _(
             "The war between %(against)s and %(declared_by)s is coming to an end "
             "as one party has surrendered. "
             "The war will be declared as being over after approximately 24 hours."
@@ -53,14 +54,12 @@ class NotificationCorpWarSurrenderMsg(NotificationWarEmbed):
 class NotificationWarAdopted(NotificationWarEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        alliance, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["allianceID"]
-        )
-        self._title = __("War update: %(against)s has left %(alliance)s") % {
+        alliance = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allianceID"])
+        self._title = _("War update: %(against)s has left %(alliance)s") % {
             "against": self._against.name,
             "alliance": alliance.name,
         }
-        self._description = __(
+        self._description = _(
             "There has been a development in the war between %(declared_by)s "
             "and %(alliance)s.\n"
             "%(against)s is no longer a member of %(alliance)s, "
@@ -76,11 +75,11 @@ class NotificationWarAdopted(NotificationWarEmbed):
 class NotificationWarDeclared(NotificationWarEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("%(declared_by)s Declares War Against %(against)s") % {
+        self._title = _("%(declared_by)s Declares War Against %(against)s") % {
             "declared_by": self._declared_by.name,
             "against": self._against.name,
         }
-        self._description = __(
+        self._description = _(
             "%(declared_by)s has declared war on %(against)s with %(war_hq)s "
             "as the designated war headquarters.\n"
             "Within %(delay_hours)s hours fighting can legally occur "
@@ -97,20 +96,14 @@ class NotificationWarDeclared(NotificationWarEmbed):
 class NotificationWarInherited(NotificationWarEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        alliance, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["allianceID"]
-        )
-        opponent, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["opponentID"]
-        )
-        quitter, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["quitterID"]
-        )
-        self._title = __("%(alliance)s inherits war against %(opponent)s") % {
+        alliance = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allianceID"])
+        opponent = get_or_create_esi_obj(EveEntity, id=self._parsed_text["opponentID"])
+        quitter = get_or_create_esi_obj(EveEntity, id=self._parsed_text["quitterID"])
+        self._title = _("%(alliance)s inherits war against %(opponent)s") % {
             "alliance": alliance.name,
             "opponent": opponent.name,
         }
-        self._description = __(
+        self._description = _(
             "%(alliance)s has inherited the war between %(declared_by)s and "
             "%(against)s from newly joined %(quitter)s. "
             "Within **24** hours fighting can legally occur with %(alliance)s."
@@ -126,9 +119,9 @@ class NotificationWarInherited(NotificationWarEmbed):
 class NotificationWarRetractedByConcord(NotificationWarEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("CONCORD invalidates war")
+        self._title = _("CONCORD invalidates war")
         war_ends = ldap_time_2_datetime(self._parsed_text["endDate"])
-        self._description = __(
+        self._description = _(
             "The war between %(declared_by)s and %(against)s "
             "has been retracted by CONCORD.\n"
             "After %(end_date)s CONCORD will again respond to any hostilities "
@@ -144,10 +137,10 @@ class NotificationWarRetractedByConcord(NotificationWarEmbed):
 class NotificationWarCorporationBecameEligible(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __(
+        self._title = _(
             "Corporation or alliance is now eligible for formal war declarations"
         )
-        self._description = __(
+        self._description = _(
             "Your corporation or alliance is **now eligible** to participate in "
             "formal war declarations. This could be because your corporation "
             "and/or one of the corporations in your alliance owns a structure "
@@ -159,10 +152,10 @@ class NotificationWarCorporationBecameEligible(NotificationBaseEmbed):
 class NotificationWarCorporationNoLongerEligible(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __(
+        self._title = _(
             "Corporation or alliance is no longer eligible for formal war declarations"
         )
-        self._description = __(
+        self._description = _(
             "Your corporation or alliance is **no longer eligible** to participate "
             "in formal war declarations.\n"
             "Neither your corporation nor any of the corporations "
@@ -177,13 +170,11 @@ class NotificationWarSurrenderOfferMsg(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
         isk_value = self._parsed_text.get("iskValue", 0)
-        owner_1, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text.get("ownerID1")
-        )
+        owner_1 = get_or_create_esi_obj(EveEntity, id=self._parsed_text.get("ownerID1"))
         owner_1_link = gen_eve_entity_link(owner_1)
         owner_2_link = gen_eve_entity_link_from_id(self._parsed_text.get("ownerID2"))
-        self._title = __("%s has offered a surrender") % (owner_1,)
-        self._description = __(
+        self._title = _("%s has offered a surrender") % (owner_1,)
+        self._description = _(
             "%s has offered to end the war with %s in the exchange for %s ISK. "
             "If accepted, the war will end in 24 hours and your organizations will "
             "be unable to declare new wars against each other for the next 2 weeks."
@@ -194,16 +185,14 @@ class NotificationWarSurrenderOfferMsg(NotificationBaseEmbed):
 class NotificationAllyJoinedWarMsg(NotificationBaseEmbed):
     def __init__(self, notification: Notification) -> None:
         super().__init__(notification)
-        self._title = __("Ally Has Joined a War")
-        aggressor, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["aggressorID"]
-        )
-        ally, _ = EveEntity.objects.get_or_create_esi(id=self._parsed_text["allyID"])
-        defender, _ = EveEntity.objects.get_or_create_esi(
-            id=self._parsed_text["defenderID"]
+        self._title = _("Ally Has Joined a War")
+        aggressor = get_or_create_esi_obj(
+            EveEntity, id=self._parsed_text["aggressorID"]
         )
+        ally = get_or_create_esi_obj(EveEntity, id=self._parsed_text["allyID"])
+        defender = get_or_create_esi_obj(EveEntity, id=self._parsed_text["defenderID"])
         start_time = ldap_time_2_datetime(self._parsed_text["startTime"])
-        self._description = __(
+        self._description = _(
             "%(ally)s has joined %(defender)s in a war against %(aggressor)s. "
             "Their participation in the war will start at %(start_time)s."
         ) % {

structures/core/serializers.py

@@ -12,7 +12,7 @@ from django.urls import reverse
 from django.utils.html import escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from eveuniverse.models import EvePlanet
 
 from allianceauth.eveonline.evelinks import dotlan

structures/helpers.py

@@ -1,7 +1,7 @@
 """Helpers for Structures."""
 
 import datetime as dt
-from typing import Optional
+from typing import Any, Optional
 from urllib.parse import urlparse
 
 from django.utils.timezone import now
@@ -33,3 +33,9 @@ def datetime_almost_equal(
 def is_absolute_url(url: str) -> bool:
     """Return True if URL is absolute else False."""
     return bool(urlparse(url).netloc)
+
+
+def get_or_create_esi_obj(model_class: type, *args, **kwargs) -> Any:
+    """Get or create an object from ESI and return it."""
+    obj, _ = model_class.objects.get_or_create_esi(*args, **kwargs)
+    return obj