django.utils.translation.ugettext(), ugettext_lazy(), ugettext_noop(), ungettext(), and ungettext_lazy() are deprecated in favor of the functions that they’re aliases for: django.utils.translation.gettext(), gettext_lazy(), gettext_noop(), ngettext(), and ngettext_lazy().

evennia/accounts/accounts.py

@@ -37,7 +37,7 @@ from evennia.scripts.scripthandler import ScriptHandler
 from evennia.commands.cmdsethandler import CmdSetHandler
 from evennia.utils.optionhandler import OptionHandler
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from random import getrandbits
 
 __all__ = ("DefaultAccount",)

evennia/commands/cmdhandler.py

@@ -48,7 +48,7 @@ from evennia.comms.channelhandler import CHANNELHANDLER
 from evennia.utils import logger, utils
 from evennia.utils.utils import string_suggestions
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 _IN_GAME_ERRORS = settings.IN_GAME_ERRORS
 

evennia/commands/cmdset.py

@@ -27,7 +27,7 @@ Set theory.
 
 """
 from weakref import WeakKeyDictionary
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from evennia.utils.utils import inherits_from, is_iter
 
 __all__ = ("CmdSet",)

evennia/commands/cmdsethandler.py

@@ -72,7 +72,7 @@ from evennia.utils import logger, utils
 from evennia.commands.cmdset import CmdSet
 from evennia.server.models import ServerConfig
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 __all__ = ("import_cmdset", "CmdSetHandler")
 

evennia/comms/channelhandler.py

@@ -27,7 +27,7 @@ from django.conf import settings
 from evennia.commands import cmdset, command
 from evennia.utils.logger import tail_log_file
 from evennia.utils.utils import class_from_module
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 # we must late-import these since any overloads are likely to
 # themselves be using these classes leading to a circular import.

evennia/locks/lockhandler.py

@@ -107,7 +107,7 @@ to any other identifier you can use.
 import re
 from django.conf import settings
 from evennia.utils import logger, utils
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 __all__ = ("LockHandler", "LockException")
 

evennia/objects/objects.py

@@ -31,7 +31,7 @@ from evennia.utils.utils import (
     list_to_string,
     to_str,
 )
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 _INFLECT = inflect.engine()
 _MULTISESSION_MODE = settings.MULTISESSION_MODE

evennia/scripts/scripthandler.py

@@ -9,7 +9,7 @@ from evennia.scripts.models import ScriptDB
 from evennia.utils import create
 from evennia.utils import logger
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 
 class ScriptHandler(object):

evennia/scripts/scripts.py

@@ -8,7 +8,7 @@ ability to run timers.
 from twisted.internet.defer import Deferred, maybeDeferred
 from twisted.internet.task import LoopingCall
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from evennia.typeclasses.models import TypeclassBase
 from evennia.scripts.models import ScriptDB
 from evennia.scripts.manager import ScriptManager

evennia/server/initial_setup.py

@@ -9,7 +9,7 @@ Everything starts at handle_setup()
 
 import time
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from evennia.accounts.models import AccountDB
 from evennia.server.models import ServerConfig
 from evennia.utils import create, logger

evennia/server/server.py

@@ -38,7 +38,7 @@ from evennia.utils import logger
 from evennia.comms import channelhandler
 from evennia.server.sessionhandler import SESSIONS
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 _SA = object.__setattr__
 

evennia/server/serversession.py

@@ -23,7 +23,7 @@ _ObjectDB = None
 _ANSI = None
 
 # i18n
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 # Handlers for Session.db/ndb operation
 

evennia/server/sessionhandler.py

@@ -67,7 +67,7 @@ PSTATUS = chr(18)  # ping server or portal status
 SRESET = chr(19)  # server shutdown in reset mode
 
 # i18n
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 _SERVERNAME = settings.SERVERNAME
 _MULTISESSION_MODE = settings.MULTISESSION_MODE

evennia/utils/evmenu.py

@@ -187,7 +187,7 @@ _CMD_NOINPUT = cmdhandler.CMD_NOINPUT
 # Return messages
 
 # i18n
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 _ERR_NOT_IMPLEMENTED = _(
     "Menu node '{nodename}' is either not implemented or " "caused an error. Make another choice."

evennia/utils/utils.py

@@ -27,7 +27,7 @@ from collections import defaultdict, OrderedDict
 from twisted.internet import threads, reactor
 from django.conf import settings
 from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.apps import apps
 from evennia.utils import logger