Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3744 from JohniFi/fix-format-string-for-i18n

Browse source 
fix format strings for i18n
This commit is contained in:
Griatch 2025-03-21 22:25:17 +01:00 • committed by GitHub
commit 595cd56ec2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
evennia/accounts/accounts.py
View file

@ -475,7 +475,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
return return
if not obj.access(self, "puppet"): if not obj.access(self, "puppet"):
# no access # no access
self.msg(_("You don't have permission to puppet '{key}'.".format(key=obj.key))) self.msg(_("You don't have permission to puppet '{key}'.").format(key=obj.key))
return return
if obj.account: if obj.account:
# object already puppeted # object already puppeted
@ -484,27 +484,21 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
# we may take over another of our sessions # we may take over another of our sessions
# output messages to the affected sessions # output messages to the affected sessions
if _MULTISESSION_MODE in (1, 3): if _MULTISESSION_MODE in (1, 3):
txt1 = _( txt1 = _("Sharing |c{name}|n with another of your sessions.").format(
"Sharing |c{name}|n with another of your sessions.".format(
name=obj.name
)
)
txt2 = "|c{name}|n|G is now shared from another of your sessions.|n".format(
name=obj.name name=obj.name
) )
txt2 = _(
"|c{name}|n|G is now shared from another of your sessions.|n"
).format(name=obj.name)
self.msg(txt1, session=session) self.msg(txt1, session=session)
self.msg(txt2, session=obj.sessions.all()) self.msg(txt2, session=obj.sessions.all())
else: else:
txt1 = _( txt1 = _("Taking over |c{name}|n from another of your sessions.").format(
"Taking over |c{name}|n from another of your sessions.".format(
name=obj.name name=obj.name
) )
)
txt2 = _( txt2 = _(
"|c{name}|n|R is now acted from another of your sessions.|n".format( "|c{name}|n|R is now acted from another of your sessions.|n"
name=obj.name ).format(name=obj.name)
)
)
self.msg(txt1, session=session) self.msg(txt1, session=session)
self.msg(txt2, session=obj.sessions.all()) self.msg(txt2, session=obj.sessions.all())
self.unpuppet_object(obj.sessions.get()) self.unpuppet_object(obj.sessions.get())
@ -530,12 +524,10 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
and len(self.get_all_puppets()) >= _MAX_NR_SIMULTANEOUS_PUPPETS and len(self.get_all_puppets()) >= _MAX_NR_SIMULTANEOUS_PUPPETS
): ):
self.msg( self.msg(
_( _("You cannot control any more puppets (max {max_puppets})").format(
"You cannot control any more puppets (max {max_puppets})".format(
max_puppets=_MAX_NR_SIMULTANEOUS_PUPPETS max_puppets=_MAX_NR_SIMULTANEOUS_PUPPETS
) )
) )
)
return return
# do the puppeting # do the puppeting