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

Fixed conflicts against master.

Browse source
This commit is contained in:
Griatch 2015-10-18 12:43:43 +02:00
commit b952a290b5
18 changed files with 307 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/utils/utils.py
View file

@ -1537,7 +1537,7 @@ def at_search_result(matches, caller, query="", quiet=False, **kwargs):
error = ""
if not matches:
# no results.
error = kwargs.get("nofound_string", _("Could not find '%s'." % query))
error = kwargs.get("nofound_string") or _("Could not find '%s'." % query)
matches = None
elif len(matches) > 1:
error = kwargs.get("multimatch_string", None)