kopia lustrzana https://github.com/wagtail/wagtail
Convert remaining gettext .format strings to old-style string formatting
As per #5548 / #6238. Fixes #6343pull/6350/head
rodzic
b111e100a6
commit
a1f882b7c9
|
@ -1197,7 +1197,7 @@ Audit log
|
|||
actions.register_action('wagtail_package.echo', _('Echo'), _('Sent an echo'))
|
||||
|
||||
def callback_message(data):
|
||||
return _('Hello {audience}') % {
|
||||
return _('Hello %(audience)s') % {
|
||||
'audience': data['audience'],
|
||||
}
|
||||
actions.register_action('wagtail_package.with_callback', _('Callback'), callback_message)
|
||||
|
|
|
@ -47,7 +47,7 @@ class LogActionRegistry:
|
|||
return self.messages
|
||||
|
||||
def format_message(self, log_entry):
|
||||
message = self.get_messages().get(log_entry.action, _('Unknown {action}').format(action=log_entry.action))
|
||||
message = self.get_messages().get(log_entry.action, _('Unknown %(action)s') % {'action': log_entry.action})
|
||||
if callable(message):
|
||||
message = message(log_entry.data)
|
||||
|
||||
|
|
|
@ -3756,7 +3756,7 @@ class BaseLogEntry(models.Model):
|
|||
return self.user.get_username()
|
||||
except self._meta.get_field('user').related_model.DoesNotExist:
|
||||
# User has been deleted
|
||||
return _('user {id} (deleted)').format(id=self.user_id)
|
||||
return _('user %(id)d (deleted)') % {'id': self.user_id}
|
||||
else:
|
||||
return _('system')
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue