From 3d9b4c11d4fdac36541646b2e5f4c9c880bf1c7b Mon Sep 17 00:00:00 2001
From: zhaoweny <zhaoweny@users.noreply.github.com>
Date: Fri, 19 Jun 2020 22:17:49 -0400
Subject: [PATCH] i18n/zh_CN: reformat code and ignore `_`

1. update `Pyfa_Inspections.xml` to ignore `_`

i18n module `gettext` will do a `gettext.install(...)` to put `_` function into `builtin` module. Currently PyCharm does not recognize this as a function and report as unresolved reference.

2. reformat code to remove padding for vertical dicts

3. update `Pyfa_CodeStyle.xml` to not pad vertical dicts

(cherry picked from commit e5a570a0078f05fe34c473841af6b7746e06bfca)
---
 _development/Pyfa_CodeStyle.xml              |   1 -
 _development/Pyfa_Inspections.xml            | 111 ++++++++++---------
 gui/builtinStatsViews/resistancesViewFull.py |  12 +-
 gui/builtinStatsViews/resourcesViewFull.py   |  20 ++--
 4 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/_development/Pyfa_CodeStyle.xml b/_development/Pyfa_CodeStyle.xml
index a7980e4df3..121e2b455a 100644
--- a/_development/Pyfa_CodeStyle.xml
+++ b/_development/Pyfa_CodeStyle.xml
@@ -3,7 +3,6 @@
   <option name="RIGHT_MARGIN" value="165" />
   <Python>
     <option name="NEW_LINE_AFTER_COLON" value="true" />
-    <option name="DICT_ALIGNMENT" value="2" />
     <option name="DICT_NEW_LINE_AFTER_LEFT_BRACE" value="true" />
     <option name="DICT_NEW_LINE_BEFORE_RIGHT_BRACE" value="true" />
     <option name="USE_CONTINUATION_INDENT_FOR_ARGUMENTS" value="true" />
diff --git a/_development/Pyfa_Inspections.xml b/_development/Pyfa_Inspections.xml
index 0a0da06d47..c724a83fc0 100644
--- a/_development/Pyfa_Inspections.xml
+++ b/_development/Pyfa_Inspections.xml
@@ -1,54 +1,61 @@
-<profile version="1.0">
-  <option name="myName" value="Pyfa" />
-  <inspection_tool class="IgnoreUnusedEntry" enabled="false" level="UNUSED ENTRY" enabled_by_default="false" />
-  <inspection_tool class="InconsistentLineSeparators" enabled="true" level="ERROR" enabled_by_default="true" />
-  <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="PyBehaveInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="PyClassicStyleClassInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
-    <option name="ourVersions">
-      <value>
-        <list size="1">
-          <item index="0" class="java.lang.String" itemvalue="2.7" />
+  <profile version="1.0">
+    <option name="myName" value="Pyfa" />
+    <inspection_tool class="IgnoreUnusedEntry" enabled="false" level="UNUSED ENTRY" enabled_by_default="false" />
+    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyBehaveInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyClassicStyleClassInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ourVersions">
+        <value>
+          <list size="1">
+            <item index="0" class="java.lang.String" itemvalue="2.7" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyMissingTypeHintsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="1">
+            <item index="0" class="java.lang.String" itemvalue="wxPython" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8Inspection" enabled="true" level="TYPO" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="E203" />
+          <option value="E127" />
+          <option value="E128" />
+          <option value="E126" />
         </list>
-      </value>
-    </option>
-  </inspection_tool>
-  <inspection_tool class="PyMissingTypeHintsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-  <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
-    <option name="ignoredPackages">
-      <value>
-        <list size="1">
-          <item index="0" class="java.lang.String" itemvalue="wxPython" />
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="TYPO" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N802" />
+          <option value="N806" />
+          <option value="N803" />
+          <option value="N814" />
         </list>
-      </value>
-    </option>
-  </inspection_tool>
-  <inspection_tool class="PyPep8Inspection" enabled="true" level="TYPO" enabled_by_default="true">
-    <option name="ignoredErrors">
-      <list>
-        <option value="E203" />
-        <option value="E127" />
-        <option value="E128" />
-        <option value="E126" />
-      </list>
-    </option>
-  </inspection_tool>
-  <inspection_tool class="PyPep8NamingInspection" enabled="true" level="TYPO" enabled_by_default="true">
-    <option name="ignoredErrors">
-      <list>
-        <option value="N802" />
-        <option value="N806" />
-        <option value="N803" />
-        <option value="N814" />
-      </list>
-    </option>
-  </inspection_tool>
-  <inspection_tool class="PyShadowingBuiltinsInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="PyShadowingNamesInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-    <option name="processCode" value="true" />
-    <option name="processLiterals" value="true" />
-    <option name="processComments" value="true" />
-  </inspection_tool>
-</profile>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyShadowingBuiltinsInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyShadowingNamesInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="_" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+  </profile>
diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py
index 4142bda657..e43a655e8c 100644
--- a/gui/builtinStatsViews/resistancesViewFull.py
+++ b/gui/builtinStatsViews/resistancesViewFull.py
@@ -80,9 +80,9 @@ def populatePanel(self, contentPanel, headerPanel):
         sizerResistances.Add(wx.StaticText(contentPanel, wx.ID_ANY), wx.GBPosition(row, col), wx.GBSpan(1, 1))
         col += 1
         toolTipText = {
-            "em"       : _("Electromagnetic resistance"),
-            "thermal"  : _("Thermal resistance"),
-            "kinetic"  : _("Kinetic resistance"),
+            "em": _("Electromagnetic resistance"),
+            "thermal": _("Thermal resistance"),
+            "kinetic": _("Kinetic resistance"),
             "explosive": _("Explosive resistance")
         }
         for damageType in ("em", "thermal", "kinetic", "explosive"):
@@ -107,9 +107,9 @@ def populatePanel(self, contentPanel, headerPanel):
                         ((198, 133, 38), (81, 83, 67)))
 
         toolTipText = {
-            "shield"       : _("Shield resistance"),
-            "armor"        : _("Armor resistance"),
-            "hull"         : _("Hull resistance"),
+            "shield": _("Shield resistance"),
+            "armor": _("Armor resistance"),
+            "hull": _("Hull resistance"),
             "damagePattern": _("Incoming damage pattern")
         }
         for tankType in ("shield", "armor", "hull", "separator", "damagePattern"):
diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py
index c9308f7d18..ec6d042e00 100644
--- a/gui/builtinStatsViews/resourcesViewFull.py
+++ b/gui/builtinStatsViews/resourcesViewFull.py
@@ -106,10 +106,10 @@ def populatePanel(self, contentPanel, headerPanel):
         sizer.AddStretchSpacer()
         # Turrets & launcher hardslots display
         tooltipText = {
-            "turret"     : _("Turret hardpoints"),
-            "launcher"   : _("Launcher hardpoints"),
-            "drones"     : _("Drones active"),
-            "fighter"    : _("Fighter squadrons active"),
+            "turret": _("Turret hardpoints"),
+            "launcher": _("Launcher hardpoints"),
+            "drones": _("Drones active"),
+            "fighter": _("Fighter squadrons active"),
             "calibration": _("Calibration")
         }
         for type_ in ("turret", "launcher", "drones", "fighter", "calibration"):
@@ -124,7 +124,7 @@ def populatePanel(self, contentPanel, headerPanel):
             sizer.Add(box, 0, wx.ALIGN_CENTER)
 
             suffix = {
-                'turret'     : 'Hardpoints', 'launcher': 'Hardpoints', 'drones': 'Active', 'fighter': 'Tubes',
+                'turret': 'Hardpoints', 'launcher': 'Hardpoints', 'drones': 'Active', 'fighter': 'Tubes',
                 'calibration': 'Points'
             }
             lbl = wx.StaticText(parent, wx.ID_ANY, "0")
@@ -148,12 +148,12 @@ def populatePanel(self, contentPanel, headerPanel):
 
         # PG, Cpu & drone stuff
         tooltipText = {
-            "cpu"           : _("CPU"),
-            "pg"            : _("PowerGrid"),
-            "droneBay"      : _("Drone bay"),
-            "fighterBay"    : _("Fighter bay"),
+            "cpu": _("CPU"),
+            "pg": _("PowerGrid"),
+            "droneBay": _("Drone bay"),
+            "fighterBay": _("Fighter bay"),
             "droneBandwidth": _("Drone bandwidth"),
-            "cargoBay"      : _("Cargo bay")
+            "cargoBay": _("Cargo bay")
         }
         for i, group in enumerate((("cpu", "pg"), ("cargoBay", "droneBay", "fighterBay", "droneBandwidth"))):
             main = wx.BoxSizer(wx.VERTICAL)