From fc38a495aab3383b31af9bfbd5eccc4ffe9ca521 Mon Sep 17 00:00:00 2001 From: malnvenshorn Date: Thu, 1 Feb 2018 14:48:23 +0100 Subject: [PATCH 1/3] Fixed import regression error (#77) --- octoprint_filamentmanager/data/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octoprint_filamentmanager/data/__init__.py b/octoprint_filamentmanager/data/__init__.py index ca434b3..ea5d2b5 100644 --- a/octoprint_filamentmanager/data/__init__.py +++ b/octoprint_filamentmanager/data/__init__.py @@ -343,7 +343,7 @@ def from_csv(table): values = dict(zip(header, row)) if self.engine_dialect_is(self.DIALECT_SQLITE): - identifier = values[table.c.id] + identifier = values[table.c.id.name] # try to update entry stmt = update(table).values(values).where(table.c.id == identifier) if self.conn.execute(stmt).rowcount == 0: From 3071693b988381437f58cae0684b2a9f4599ba82 Mon Sep 17 00:00:00 2001 From: malnvenshorn Date: Sun, 4 Feb 2018 15:27:19 +0100 Subject: [PATCH 2/3] Added some information to the confirmation dialog if no selection is available (#73) --- .../templates/spool_confirmation.jinja2 | 22 +++++++++------ .../translations/de/LC_MESSAGES/messages.mo | Bin 7566 -> 7903 bytes .../translations/de/LC_MESSAGES/messages.po | 25 ++++++++++++------ translations/de/LC_MESSAGES/messages.mo | Bin 7566 -> 7903 bytes translations/de/LC_MESSAGES/messages.po | 25 ++++++++++++------ translations/messages.pot | 17 ++++++++---- 6 files changed, 60 insertions(+), 29 deletions(-) diff --git a/octoprint_filamentmanager/templates/spool_confirmation.jinja2 b/octoprint_filamentmanager/templates/spool_confirmation.jinja2 index d77ca07..98232b1 100644 --- a/octoprint_filamentmanager/templates/spool_confirmation.jinja2 +++ b/octoprint_filamentmanager/templates/spool_confirmation.jinja2 @@ -6,14 +6,20 @@
-

{{ _("Please confirm your selected spools for all active tools. This dialog is meant to protect you from accidentically selecting wrong spools for the print.") }}

- -
-
-   - -
-
+ +

{{ _("There are no information available about the active tools for the print job. Make sure the analysing process of the file has finished and that it's loaded correctly.") }}

+ + + +

{{ _("Please confirm your selected spools for all active tools. This dialog is meant to protect you from accidentically selecting wrong spools for the print.") }}

+ +
+
+   + +
+
+
diff --git a/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.mo b/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.mo index ffce34cc598cca641b6037f2b9950ab4fe4e6757..9f3867ba8ff308ccf2801713f0ca7d032da9892d 100644 GIT binary patch delta 2037 zcmZA1TWl0n9LMp~+KV8U(sCb3IU`VB&HB(X~7Cbu;LA--Pv~Bb*9YDmNZc| z)dx$$MYA9eT)d$4!89hWmqYIT0}tOYmEx1A zNKYeknKw}xeHWFP&rlP8AJ@mRgZginTSj3uy)-}{^33$3QvEb);=|a9FXJ2d7e0!| z$n#E|jO`!|I!7a@{{Nx+bux(hjiM&5Bz!GsM-};3oAQs;V?Gf8MOE*DuchG`u&RP+KvAe9T$Cw1r=yhhL-KZ(hJJ3)@ir2JjRfM9tU8e(?X0 zGixbmWv!@4JCKjr$(JGxQ7L;at{+67`YCL}nYB|9u17_@4fWn`RHS=wHxA)(yo{Z= zkEpij_kWSXHXc|uXe(y09Y4Z{a26ZA9bHV~SyUz(*lVMnRCySh^M;_J^Jy*(ZbUWwygfxi*t!uwrlDNe^Z`zt{GML64is z*dSSKNP3Lg=P-oldzn5rQEweTL6Z|%FS<2j(}9z46SgM^L$@bN4;Ch794(u^a_RC_ zc16>@D_7+A%~^c4x~gzyjx8yqQyDET+T_>mr-g?20fI*citB4n;3cHPCR6| zDo6uJv3O%5xFd-hS6#9(9^8f*xEEb`0(;;&?1@pQe8Z`~kLuzPs^4eW55J=NOGz=N zzlIt>CX)wwj8FWGvH({7e@&)yFey zP1ubgEp;Fnbu<^%umbyHC8ps<)Qh`N?G8BQM%0SVpxU)M&ts^5UZW!R(eWoHQch>| zKA0gD>S1IOa2&3|d{hUg(T^8V6KKaqe240|u2*-6_o7y6kugjYDx#-Qk-3foQ$L(IHc$>=A>PD0adgi9DMD?$ z%po&xQ2qTts?0CcIDI_CpUD|7M^d31fkfBjpiXT84#uT82)8@Wk773ED>x9J;1K+R zesnWBb2PcAc7>?^D^UZ7QRCJ`$mlTaM!j$lHPaKQtvH98@nuxIdpH$epxXHepC&v6 z_5NsN7tAEo0HvsQOPu;D^ike`%+*Bd$!LIP)XXlS4$oCo!^fyS`;0`*bUO8kG}0bs zV;Bdc-rs`(Jc#_vEpE;D95vw9tnNcwk4!9L8pvp+M^Jm!f?8=SDr66x@(Wx?xdZcX zF^#pteW(>5L%nwa6^ZLug)uD0fR|4kBRCHqVVS=Fp)9k62env%t+)U)*tpdgMn#|< zwc=-}$h<^_{u}Z^nBS-g_vYX*N0W&>GGlNimZHA0!`Onyu~aV>a)LOtX0~le@_46{ z`~T8#(`;)}aiENxPWnQUwqp)SozEv}Fs)n%mc^MO8*+L6{*BMDC9d4OVxH-+>QW>W z6^*aO>(VYL06NH%NxEj)ORmXrrMAmhwppB EA3}!0k^lez diff --git a/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po b/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po index 99ee425..ca7b099 100644 --- a/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po +++ b/octoprint_filamentmanager/translations/de/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-01-11 13:47+0100\n" -"PO-Revision-Date: 2018-01-11 13:48+0100\n" +"POT-Creation-Date: 2018-02-04 15:21+0100\n" +"PO-Revision-Date: 2018-02-04 15:24+0100\n" "Last-Translator: Sven Lohrmann \n" "Language: de\n" "Language-Team: de \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.4.0\n" -"X-Generator: Poedit 2.0.5\n" +"X-Generator: Poedit 2.0.6\n" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 msgid "Start Print" @@ -331,7 +331,7 @@ msgstr "Währungssymbol" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:21 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 msgid "Cancel" msgstr "Abbrechen" @@ -398,12 +398,12 @@ msgid "Temperature offset" msgstr "Temperaturoffset" #: octoprint_filamentmanager/templates/sidebar.jinja2:4 -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:13 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 msgid "Tool" msgstr "Tool" #: octoprint_filamentmanager/templates/sidebar.jinja2:5 -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" msgstr "--- Spule auswählen ---" @@ -411,12 +411,21 @@ msgstr "--- Spule auswählen ---" msgid "Confirm your selected spools" msgstr "Bestätige deine Spulauswahl" -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:9 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 +msgid "" +"There are no information available about the active tools for the print job. " +"Make sure the analysing process of the file has finished and that it's loaded " +"correctly." +msgstr "" +"Es sind keine Informationen über die aktiven Tools für den Druckauftrag " +"vorhanden. Überprüfe ob die Datei bereits analysiert und korrekt geladen wurde." + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 msgid "" "Please confirm your selected spools for all active tools. This dialog is meant " "to protect you from accidentically selecting wrong spools for the print." msgstr "" -"Bitte bestätige deine Spulauswahl für alle aktiven Extruder. Dieser Dialog soll " +"Bitte bestätige deine Spulenauswahl für alle aktiven Tools. Dieser Dialog soll " "verhindern, dass du aus Versehen falsche Spulen für deinen Druck auswählst." #~ msgid "Profile (ascending)" diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo index ffce34cc598cca641b6037f2b9950ab4fe4e6757..9f3867ba8ff308ccf2801713f0ca7d032da9892d 100644 GIT binary patch delta 2037 zcmZA1TWl0n9LMp~+KV8U(sCb3IU`VB&HB(X~7Cbu;LA--Pv~Bb*9YDmNZc| z)dx$$MYA9eT)d$4!89hWmqYIT0}tOYmEx1A zNKYeknKw}xeHWFP&rlP8AJ@mRgZginTSj3uy)-}{^33$3QvEb);=|a9FXJ2d7e0!| z$n#E|jO`!|I!7a@{{Nx+bux(hjiM&5Bz!GsM-};3oAQs;V?Gf8MOE*DuchG`u&RP+KvAe9T$Cw1r=yhhL-KZ(hJJ3)@ir2JjRfM9tU8e(?X0 zGixbmWv!@4JCKjr$(JGxQ7L;at{+67`YCL}nYB|9u17_@4fWn`RHS=wHxA)(yo{Z= zkEpij_kWSXHXc|uXe(y09Y4Z{a26ZA9bHV~SyUz(*lVMnRCySh^M;_J^Jy*(ZbUWwygfxi*t!uwrlDNe^Z`zt{GML64is z*dSSKNP3Lg=P-oldzn5rQEweTL6Z|%FS<2j(}9z46SgM^L$@bN4;Ch794(u^a_RC_ zc16>@D_7+A%~^c4x~gzyjx8yqQyDET+T_>mr-g?20fI*citB4n;3cHPCR6| zDo6uJv3O%5xFd-hS6#9(9^8f*xEEb`0(;;&?1@pQe8Z`~kLuzPs^4eW55J=NOGz=N zzlIt>CX)wwj8FWGvH({7e@&)yFey zP1ubgEp;Fnbu<^%umbyHC8ps<)Qh`N?G8BQM%0SVpxU)M&ts^5UZW!R(eWoHQch>| zKA0gD>S1IOa2&3|d{hUg(T^8V6KKaqe240|u2*-6_o7y6kugjYDx#-Qk-3foQ$L(IHc$>=A>PD0adgi9DMD?$ z%po&xQ2qTts?0CcIDI_CpUD|7M^d31fkfBjpiXT84#uT82)8@Wk773ED>x9J;1K+R zesnWBb2PcAc7>?^D^UZ7QRCJ`$mlTaM!j$lHPaKQtvH98@nuxIdpH$epxXHepC&v6 z_5NsN7tAEo0HvsQOPu;D^ike`%+*Bd$!LIP)XXlS4$oCo!^fyS`;0`*bUO8kG}0bs zV;Bdc-rs`(Jc#_vEpE;D95vw9tnNcwk4!9L8pvp+M^Jm!f?8=SDr66x@(Wx?xdZcX zF^#pteW(>5L%nwa6^ZLug)uD0fR|4kBRCHqVVS=Fp)9k62env%t+)U)*tpdgMn#|< zwc=-}$h<^_{u}Z^nBS-g_vYX*N0W&>GGlNimZHA0!`Onyu~aV>a)LOtX0~le@_46{ z`~T8#(`;)}aiENxPWnQUwqp)SozEv}Fs)n%mc^MO8*+L6{*BMDC9d4OVxH-+>QW>W z6^*aO>(VYL06NH%NxEj)ORmXrrMAmhwppB EA3}!0k^lez diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po index 99ee425..ca7b099 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.1.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-01-11 13:47+0100\n" -"PO-Revision-Date: 2018-01-11 13:48+0100\n" +"POT-Creation-Date: 2018-02-04 15:21+0100\n" +"PO-Revision-Date: 2018-02-04 15:24+0100\n" "Last-Translator: Sven Lohrmann \n" "Language: de\n" "Language-Team: de \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.4.0\n" -"X-Generator: Poedit 2.0.5\n" +"X-Generator: Poedit 2.0.6\n" #: octoprint_filamentmanager/static/js/filamentmanager.bundled.js:334 msgid "Start Print" @@ -331,7 +331,7 @@ msgstr "Währungssymbol" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:21 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 msgid "Cancel" msgstr "Abbrechen" @@ -398,12 +398,12 @@ msgid "Temperature offset" msgstr "Temperaturoffset" #: octoprint_filamentmanager/templates/sidebar.jinja2:4 -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:13 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 msgid "Tool" msgstr "Tool" #: octoprint_filamentmanager/templates/sidebar.jinja2:5 -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" msgstr "--- Spule auswählen ---" @@ -411,12 +411,21 @@ msgstr "--- Spule auswählen ---" msgid "Confirm your selected spools" msgstr "Bestätige deine Spulauswahl" -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:9 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 +msgid "" +"There are no information available about the active tools for the print job. " +"Make sure the analysing process of the file has finished and that it's loaded " +"correctly." +msgstr "" +"Es sind keine Informationen über die aktiven Tools für den Druckauftrag " +"vorhanden. Überprüfe ob die Datei bereits analysiert und korrekt geladen wurde." + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 msgid "" "Please confirm your selected spools for all active tools. This dialog is meant " "to protect you from accidentically selecting wrong spools for the print." msgstr "" -"Bitte bestätige deine Spulauswahl für alle aktiven Extruder. Dieser Dialog soll " +"Bitte bestätige deine Spulenauswahl für alle aktiven Tools. Dieser Dialog soll " "verhindern, dass du aus Versehen falsche Spulen für deinen Druck auswählst." #~ msgid "Profile (ascending)" diff --git a/translations/messages.pot b/translations/messages.pot index c67c5bc..b35a733 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint-FilamentManager 0.5.2\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2018-01-11 13:47+0100\n" +"POT-Creation-Date: 2018-02-04 15:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -313,7 +313,7 @@ msgstr "" #: octoprint_filamentmanager/templates/settings_configdialog.jinja2:149 #: octoprint_filamentmanager/templates/settings_spooldialog.jinja2:87 -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:21 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:27 msgid "Cancel" msgstr "" @@ -380,12 +380,12 @@ msgid "Temperature offset" msgstr "" #: octoprint_filamentmanager/templates/sidebar.jinja2:4 -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:13 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:18 msgid "Tool" msgstr "" #: octoprint_filamentmanager/templates/sidebar.jinja2:5 -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:19 msgid "--- Select Spool ---" msgstr "" @@ -393,7 +393,14 @@ msgstr "" msgid "Confirm your selected spools" msgstr "" -#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:9 +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:10 +msgid "" +"There are no information available about the active tools for the print " +"job. Make sure the analysing process of the file has finished and that " +"it's loaded correctly." +msgstr "" + +#: octoprint_filamentmanager/templates/spool_confirmation.jinja2:14 msgid "" "Please confirm your selected spools for all active tools. This dialog is " "meant to protect you from accidentically selecting wrong spools for the " From 63ffe09ef7b6b8956db98f51095a33afe903c595 Mon Sep 17 00:00:00 2001 From: malnvenshorn Date: Sun, 4 Feb 2018 15:32:15 +0100 Subject: [PATCH 3/3] Prepare release of 0.5.3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index eac3052..5075e2e 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plugin_identifier = "filamentmanager" plugin_package = "octoprint_filamentmanager" plugin_name = "OctoPrint-FilamentManager" -plugin_version = "0.5.2" +plugin_version = "0.5.3" plugin_description = "Manage your spools and keep track of remaining filament on them" plugin_author = "Sven Lohrmann" plugin_author_email = "malnvenshorn@gmail.com"