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

fixing fstring

Browse source
This commit is contained in:
trhr 2020-04-16 05:53:51 -05:00
parent e3426d2124
commit 0f8c0ad9bf
9 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/accounts/accounts.py
View file

@ -279,7 +279,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
return
if not obj.access(self, "puppet"):
# no access
self.msg(_(f"You don't have permission to puppet '{obj.key}'."))
self.msg(_("You don't have permission to puppet '{key}'.".format(key=obj.key)))
return
if obj.account:
# object already puppeted
@ -300,7 +300,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
self.unpuppet_object(obj.sessions.get())
elif obj.account.is_connected:
# controlled by another account
self.msg(_(f"|c{obj.key}|R is already puppeted by another Account."))
self.msg(_("|c{key}|R is already puppeted by another Account.".format(key=obj.key)))
return
# do the puppeting
@ -1305,7 +1305,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
"""
reason = f" ({reason if reason else ''})"
self._send_to_connect_channel(_(f"|R{self.key} disconnected{reason}|n"))
self._send_to_connect_channel(_("|R{key} disconnected{reason}|n".format(key=self.key)))
def at_post_disconnect(self, **kwargs):
"""
@ -1411,7 +1411,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
if hasattr(target, "return_appearance"):
return target.return_appearance(self)
else:
return _(f"{target} has no in-game appearance.")
return _("{target} has no in-game appearance.".format(target=target))
else:
# list of targets - make list to disconnect from db
characters = list(tar for tar in target if tar) if target else []
@ -1589,7 +1589,7 @@ class DefaultGuest(DefaultAccount):
overriding the call (unused by default).
"""
self._send_to_connect_channel(_(f"|G{self.key} connected|n"))
self._send_to_connect_channel(_("|G{key} connected|n".format(key=self.key)))
self.puppet_object(session, self.db._last_puppet)
def at_server_shutdown(self):

4
evennia/accounts/bots.py
View file

@ -329,7 +329,7 @@ class IRCBot(Bot):
chstr = f"{self.db.irc_channel} ({self.db.irc_network}:{self.db.irc_port})"
nicklist = ", ".join(sorted(kwargs["nicklist"], key=lambda n: n.lower()))
for obj in self._nicklist_callers:
obj.msg(_(f"Nicks at {chstr}:\n {nicklist}"))
obj.msg(_("Nicks at {chstr}:\n {nicklist}".format(chstr=chstr, nicklist=nicklist)))
self._nicklist_callers = []
return
@ -338,7 +338,7 @@ class IRCBot(Bot):
if hasattr(self, "_ping_callers") and self._ping_callers:
chstr = f"{self.db.irc_channel} ({self.db.irc_network}:{self.db.irc_port})"
for obj in self._ping_callers:
obj.msg(_(f"IRC ping return from {chstr} took {kwargs['timing']}s."))
obj.msg(_("IRC ping return from {chstr} took {time}s.".format(chstr=chstr, time=kwargs['timing'])))
self._ping_callers = []
return