Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Mon Jun 08 08:17:14 2020 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Mon Jun 08 20:08:27 2020 +0200
@@ -7,12 +7,15 @@
 Module implementing a dialog to select code style message codes.
 """
 
+import textwrap
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
 
 from .Ui_CodeStyleCodeSelectionDialog import Ui_CodeStyleCodeSelectionDialog
 
+from .translations import getMessageCodes, getTranslatedMessage
+
 import UI.PixmapCache
 
 
@@ -37,40 +40,30 @@
         super(CodeStyleCodeSelectionDialog, self).__init__(parent)
         self.setupUi(self)
         
+        textWrapper = textwrap.TextWrapper(width=60)
+        
         self.codeTable.headerItem().setText(self.codeTable.columnCount(), "")
         codeList = [code.strip() for code in codes.split(",") if code.strip()]
         if categories:
             codeList = [code for code in codeList if not code[0] in categories]
         
-        from .translations import _messages, _messages_sample_args
-        from .Security import translations as s_translations
-        
         if showFixCodes:
             from .CodeStyleFixer import FixableCodeStyleIssues
             selectableCodes = FixableCodeStyleIssues
         else:
             selectableCodes = (
-                [x for x in list(_messages.keys())
-                 if not x.startswith('FIX')] +
-                [x for x in list(s_translations._messages.keys())]
+                [x for x in getMessageCodes() if not x.startswith('FIX')]
             )
             if categories:
                 # filter by category
                 selectableCodes = [x for x in selectableCodes
                                    if not x[0] in categories]
         for code in sorted(selectableCodes):
-            if code in _messages_sample_args:
-                message = _messages[code].format(*_messages_sample_args[code])
-            elif code in _messages:
-                message = _messages[code]
-            elif code in s_translations._messages_sample_args:
-                message = s_translations._messages[code].format(
-                    *s_translations._messages_sample_args)
-            elif code in s_translations._messages:
-                message = s_translations._messages[code]
-            else:
+            message = getTranslatedMessage(code, [], example=True)
+            if message is None:
                 continue
-            itm = QTreeWidgetItem(self.codeTable, [code, message])
+            itm = QTreeWidgetItem(self.codeTable, [
+                code, "\n".join(textWrapper.wrap(message))])
             if code.startswith(("W", "C", "M")):
                 itm.setIcon(0, UI.PixmapCache.getIcon("warning"))
             elif code.startswith("E"):