Merge branch 'translation-fixes' into 'master'

[FIX] Django `makemessages` is ignoring f-strings for translations now

See merge request allianceauth/allianceauth!1772
This commit is contained in:
Ariel Rin 2025-10-29 00:23:39 +00:00
commit 5291bf6896
2 changed files with 6 additions and 3 deletions

View File

@ -320,8 +320,8 @@ def click_fatlink_view(request, token, fat_hash=None):
messages.warning( messages.warning(
request, request,
_( _(
f"Cannot register the fleet participation for {character.character_name}. The character needs to be online." "Cannot register the fleet participation for {character_name}. The character needs to be online."
), ).format(character_name=character.character_name)
) )
return redirect('fatlink:view') return redirect('fatlink:view')

View File

@ -100,7 +100,10 @@ class BaseSetPasswordServiceAccountView(ServicesCRUDMixin, BaseServiceView, Upda
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
result = super().post(request, *args, **kwargs) result = super().post(request, *args, **kwargs)
if self.get_form().is_valid(): if self.get_form().is_valid():
messages.success(request, _(f"Successfully set your {self.service_name} password")) messages.success(
request,
_("Successfully set your {service_name} password").format(service_name=self.service_name)
)
return result return result