From c5d8bbd863a4c6c9009ba1ea4c4c70ce00614f8b Mon Sep 17 00:00:00 2001
From: David Zingg <mail@davidzingg.ch>
Date: Sat, 25 Jul 2020 16:48:24 +0200
Subject: [PATCH 1/2] #25 Python 3 Compatibility

---
 .idea/workspace.xml | 35 +++++++++++++++++------------------
 setup.py            |  2 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 934bf8e..183db3a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="7e2e0eec-b22e-4d48-8f24-196d1ed9b51a" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/octoprint_mystromswitch/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/octoprint_mystromswitch/__init__.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -48,20 +47,6 @@
       <option name="presentableId" value="Default" />
       <updated>1574193087583</updated>
     </task>
-    <task id="LOCAL-00054" summary="#17 Logging zur Fehleranalyse eingebaut">
-      <created>1578939868815</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1578939868816</updated>
-    </task>
-    <task id="LOCAL-00055" summary="#17 Logging zur Fehleranalyse eingebaut">
-      <created>1578940345174</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1578940345174</updated>
-    </task>
     <task id="LOCAL-00056" summary="#17 Logging zur Fehleranalyse eingebaut">
       <created>1578941071143</created>
       <option name="number" value="00056" />
@@ -391,7 +376,21 @@
       <option name="project" value="LOCAL" />
       <updated>1593632006106</updated>
     </task>
-    <option name="localTasksCounter" value="103" />
+    <task id="LOCAL-00103" summary="#25 Python 3 Compatibility">
+      <created>1593633576198</created>
+      <option name="number" value="00103" />
+      <option name="presentableId" value="LOCAL-00103" />
+      <option name="project" value="LOCAL" />
+      <updated>1593633576198</updated>
+    </task>
+    <task id="LOCAL-00104" summary="#25 Python 3 Compatibility">
+      <created>1593633696895</created>
+      <option name="number" value="00104" />
+      <option name="presentableId" value="LOCAL-00104" />
+      <option name="project" value="LOCAL" />
+      <updated>1593633696895</updated>
+    </task>
+    <option name="localTasksCounter" value="105" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -421,7 +420,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="#5 Rest Api integration&#10;&#10;- Nullpointer fix" />
     <MESSAGE value="#6 UI Updates senden und anzeigen&#10;&#10;- unnötigen Code entfernen, erster Versuch" />
     <MESSAGE value="Revert &quot;#6 UI Updates senden und anzeigen&quot;&#10;&#10;This reverts commit f83d4259" />
     <MESSAGE value="#6 UI Updates senden und anzeigen" />
@@ -446,6 +444,7 @@
     <MESSAGE value="#22 Button taucht nicht auf&#10;&#10;Fehler anzeigen wenn Verbindung zu switch nicht klappt" />
     <MESSAGE value="#21 Add PowerOFF when print is finished" />
     <MESSAGE value="#24 API Token Support" />
-    <option name="LAST_COMMIT_MESSAGE" value="#24 API Token Support" />
+    <MESSAGE value="#25 Python 3 Compatibility" />
+    <option name="LAST_COMMIT_MESSAGE" value="#25 Python 3 Compatibility" />
   </component>
 </project>
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 0372894..0438785 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ plugin_package = "octoprint_mystromswitch"
 plugin_name = "OctoPrint-MyStromSwitch"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.1.1"
+plugin_version = "1.2.0"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module

From 96fdafb2dcbd1af4885f9fc9cd63dc577448aaaf Mon Sep 17 00:00:00 2001
From: David Zingg <mail@davidzingg.ch>
Date: Sat, 25 Jul 2020 16:48:56 +0200
Subject: [PATCH 2/2] #25 Python 3 Compatibility

---
 .../templates/mystromswitch_sidebar.jinja2                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2 b/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
index a5382b9..3769171 100644
--- a/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
+++ b/octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
@@ -4,11 +4,11 @@
     <button class="btn btn-primary" data-bind="click: onToggleRelayEvent, visible : onOffButtonEnabled">{{ _('Toggle Relais') }}</button>
     <label class="checkbox" data-bind="visible :showShutdownOctopiOption">
 		<input type="checkbox" data-bind="enable: loginState.isUser(), checked: automaticShutdownEnabled, visible :showShutdownOctopiOption">
-		{{ _('Shutdown Octoprint after print finishes') }}
+		{{ _('Shutdown Octoprint after print finished') }}
 	</label>
 
 	<label class="checkbox" data-bind="visible: showPowerOffPrintFinishOption">
 		<input type="checkbox" data-bind="enable: loginState.isUser(), checked: automaticPowerOffEnabled, visible: showPowerOffPrintFinishOption">
-		{{ _('Power Off Relais after print finishes') }}
+		{{ _('Power Off Relais after print finished') }}
 	</label>
 </div>