Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Thu Jun 04 17:57:20 2020 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Sat Jun 06 19:42:15 2020 +0200
@@ -1078,38 +1078,29 @@
 }
 
 
-def getTranslatedMessage(message):
+def getTranslatedMessage(messageCode, messageArgs):
     """
     Module function to get a translated and formatted message for a
     given message ID.
     
-    @param message the message ID
+    @param messageCode the message code
     @type str
+    @param messageArgs list of arguments or a single integer value to format
+        the message
+    @type list or int
     @return translated and formatted message
     @rtype str
     """
-    if isinstance(message, list):
-        message, args = message
-    else:
-        args = []
-
-    if message in _messages:
-        if isinstance(args, int):
+    if messageCode in _messages:
+        if isinstance(messageArgs, int):
             # Retranslate with correct plural form
-            return _messages[message](args)
+            return _messages[messageCode](messageArgs)
         else:
-            if message.startswith(('FIXD', 'FIXE', 'FIXN', 'FIXW')):
-                prefix = ''
-            else:
-                prefix = message + ' '
-            return prefix + _messages[message].format(*args)
-    elif ' ' in message:
-        # already translated
-        return message
+            return _messages[messageCode].format(*messageArgs)
     else:
         return QCoreApplication.translate(
             "CodeStyleFixer", " no message defined for code '{0}'"
-        ).format(message)
+        ).format(messageCode)
 
 #
 # eflag: noqa = M201