From 89449d6d30a386225e1a0a323fd533a4c7ea94fc Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Sat, 14 Apr 2018 02:15:58 -0500
Subject: [PATCH] Correct type issues with translations and expected
 translation filename

---
 src/CMakeLists.txt                      |  2 +-
 src/pyCfg.py                            | 12 ++++++------
 src/pyCfgDialog.ui                      |  4 ++--
 src/{configurator_en.ts => pyCfg_en.ts} | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 9 deletions(-)
 rename src/{configurator_en.ts => pyCfg_en.ts} (89%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b3614e5..60357b9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
 FIND_PACKAGE(Qt5Widgets REQUIRED)
 FIND_PACKAGE(Qt5LinguistTools)
 INCLUDE(PyQt5TranslationMacros.cmake)
-PYQT5_CREATE_TRANSLATION(configurator_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/configurator_en.ts)
+PYQT5_CREATE_TRANSLATION(configurator_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/pyCfg_en.ts)
 
 SET(default_project_path "${CMAKE_SOURCE_DIR}/..")
 GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
diff --git a/src/pyCfg.py b/src/pyCfg.py
index 411fc70..8a682d6 100644
--- a/src/pyCfg.py
+++ b/src/pyCfg.py
@@ -349,9 +349,9 @@ class MainWindow(QDialog):
             newItem = self.__addSetting(settingKey,  setting)
             self.__updateIcon(newItem)
             if "description" in setting:
-                newItem.setToolTip(0, str(setting["description"]))
+                newItem.setToolTip(0, str(this.__tr(setting["description"])))
             if "default" in setting:
-                newItem.setToolTip(1, "Default: " + str(setting["default"]))
+                newItem.setToolTip(1, this.__tr("Default: ") + str(setting["default"]))
             self.__ui.settingsTree.addTopLevelItem(newItem)
 
         self.__ui.settingsTree.resizeColumnToContents(0)
@@ -490,7 +490,7 @@ class IniEdit(mobase.IPluginTool):
         parser.readfp(cfgFile)
         for section in parser.sections():
             if section not in settings:
-                QtCore.qDebug(self.__tr("unexpected section {0} in {1}").format(section, fileName))
+                QtCore.qDebug(self.__tr("unexpected section {0} in {1}").format(section, fileName).encode('ascii','ignore'))
                 continue
             else:
                 settings.updateKey(section)
@@ -498,13 +498,13 @@ class IniEdit(mobase.IPluginTool):
             for setting in parser.items(section, True):
                 # test if the setting is allowed in this file
                 if setting[0].lower() not in settings[section]:
-                    QtCore.qDebug(self.__tr("unknown ini setting {0}").format(str(setting[0])))
+                    QtCore.qDebug(self.__tr("unknown ini setting {0}").format(setting[0]).encode('ascii','ignore'))
                     continue
 
                 if "both" not in settings[section][setting[0]].get("flags", [])\
                         and fileName.lower() != settings[section][setting[0]]["file"].lower():
                     QtCore.qDebug(self.__tr("{0} in wrong ini file ({1}, should be {2})").format(
-                        str(setting[0]), fileName, settings[section][setting[0]]["file"]))
+                        setting[0], fileName, settings[section][setting[0]]["file"]).encode('ascii','ignore'))
                     continue
 
                 newData = settings[section].get(setting[0],  {})
@@ -521,7 +521,7 @@ class IniEdit(mobase.IPluginTool):
                             value = float(int(value))
                 except ValueError, e:
                     QMessageBox.warning(self.__window,  self.__tr("Invalid configuration file"),
-                                    self.__tr("Your configuration files contains an invalid value: {0}={1} (in section {2}).\n").format(str(setting[0]), str(setting[1]), section)
+                                    self.__tr("Your configuration files contains an invalid value: {0}={1} (in section {2}).\n").format(QString(setting[0]), QString(setting[1]), section)
                                     + self.__tr("Please note that the game probably won't report an error, it will just ignore this setting.\n")
                                     + self.__tr("Please note that even if someone told you to use this setting, that doesn't mean they know what they're talking about.\n")
                                     + self.__tr("BUT, if you know for a fact this is a valid setting, then please contact me at sherb@gmx.net."))
diff --git a/src/pyCfgDialog.ui b/src/pyCfgDialog.ui
index e21ba74..f1f944d 100644
--- a/src/pyCfgDialog.ui
+++ b/src/pyCfgDialog.ui
@@ -79,12 +79,12 @@
      </attribute>
      <column>
       <property name="text">
-       <string notr="true">Key</string>
+       <string>Key</string>
       </property>
      </column>
      <column>
       <property name="text">
-       <string notr="true">Value</string>
+       <string>Value</string>
       </property>
      </column>
     </widget>
diff --git a/src/configurator_en.ts b/src/pyCfg_en.ts
similarity index 89%
rename from src/configurator_en.ts
rename to src/pyCfg_en.ts
index e7b2f17..4d9bafd 100644
--- a/src/configurator_en.ts
+++ b/src/pyCfg_en.ts
@@ -111,6 +111,16 @@
         <source>Basic</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="pyCfgDialog.ui" line="82"/>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pyCfgDialog.ui" line="87"/>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="pyCfgDialog.ui" line="113"/>
         <source>Save</source>
@@ -122,4 +132,12 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>this</name>
+    <message>
+        <location filename="pyCfg.py" line="355"/>
+        <source>Default: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>