From 379d5a5177f066fce3514a51fe79de23812358cf Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sat, 25 Apr 2020 23:32:15 +0200 Subject: [PATCH] import export cleanup + features --- cookbook/forms.py | 10 +- cookbook/locale/de/LC_MESSAGES/django.mo | Bin 12095 -> 13691 bytes cookbook/locale/de/LC_MESSAGES/django.po | 381 ++++++++++++++--------- cookbook/templates/base.html | 12 +- cookbook/templates/recipe_view.html | 4 +- cookbook/views/edit.py | 2 +- cookbook/views/import_export.py | 43 ++- cookbook/views/lists.py | 2 +- recipes/locale/de/LC_MESSAGES/django.po | 6 +- 9 files changed, 297 insertions(+), 163 deletions(-) diff --git a/cookbook/forms.py b/cookbook/forms.py index e716c855a..84c14ae1a 100644 --- a/cookbook/forms.py +++ b/cookbook/forms.py @@ -104,10 +104,18 @@ class ExportForm(forms.Form): queryset=Recipe.objects.filter(internal=True).all(), widget=SelectWidget ) + image = forms.BooleanField( + help_text=_('Export Base64 encoded image?'), + required=False + ) + download = forms.BooleanField( + help_text=_('Download export directly or show on page?'), + required=False + ) class ImportForm(forms.Form): - recipe = forms.CharField(widget=forms.Textarea) + recipe = forms.CharField(widget=forms.Textarea, help_text=_('Simply paste a JSON export into this textarea and click import.')) class UnitMergeForm(forms.Form): diff --git a/cookbook/locale/de/LC_MESSAGES/django.mo b/cookbook/locale/de/LC_MESSAGES/django.mo index 07f72e42ab79bacb52eed164e73634e980a383c3..0552499b3fb5e92b1273b19043c34d3b871641fd 100644 GIT binary patch delta 5043 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 BN;Cif delta 3501 zcmYk-X>6259LMq5wp<0uO<95R06i(&Zg)YTR0?e=h(&=G6r@~rZMQB<*;Wxy7ZIT- zi1469V}dU}Sk0W8!8BiA-)hjsx%+RE39e8GeSUFi4^LRE=tAw$0ZgeKL)< zJc8rM$M6Px3cH~y*K^&mJ7y>Iabp}3dY}{;q?uqJsIldtv1-KbSFk%j81*X9e6Niad=&rG-ZML36i z1ohsVI2zwab>IxrhB=2CSTA~`hP|j67>RKu#*nxQgSZA)V>zBijVzbp%OcFi64VmZ zqB>q@^YzG|S;&u;s?Ciu!3_o{I*)}dx%KdQqoqTYWUnG|y*oB1C~;&Tc#lC!86&Y`9(V@S$= zs0MOS4f;?cnvDFJYJT+mVpIcR)N@f(NAE!GjR#O2+-uzzC!q%qqDFog)zc4Ao8>s_ z#gnK8&Z0W_52{0%-qiD6RKp`sQ=f}^uf&#DVj=k&%*T~jgz??B;4KVLa0=(+kSkIZ zMsYa#c2vi9qBhkYRL7se4frZ*WaUh!I#P|A;+d$18&MtFZ13+u>W!PnQVH`Kmh-@u zn1%!R8p*+^3caWXa`0+CLNWAAH@Le zn-56TaN{qm#c88BV%UjVyN{7RnUlz@o4;@?4&tn_P0U`@lDv%C6Gv_Sn7#i6YH5GP z1$Z7Cac(Y4rSpG)1SieBihA%9)Y^ZAs`w{V&;LZtK)1YcttTku9+K z6{v<+qXx7IwK=z;mh1`afv;HKMlE6dBNBS?Th!G5X8p(7t2our71n&z)CEu#RG~&z zZ|^TdJ_RO%8qgNh^V?8+cDvP;2h!sg3n2^LmjC1XAnA`m#*m~7VG?LT6Af;t|D|KRq<+K zDbY$~5&A}GFU%(HBhw{mbc*;;#T4gLdUj+s3dfy6EPx38LmFWIwF^d61ws=|Jv<^ z#3Djh5pi8I_5V)|No~rt{}-7Go4)(9G9{~s&9>}H+-1|f@Oqo(P$d65wrb}$6SvzN z{jCeE4Y<;#*WjfMGnI5bQA(5%#l%eFT4FMxtCrANUq+Zr_iWba#NWM7q$j@a*CQ=4 zVc-ytyKm5F*BN|c?~YI`x;)~=xfAdQ{62rsS2ocp3zU}yi~VJOzdOb8_W7@DQmU-e zaouKTRAT7JAJW~-yhvhA-YAdzX#VMerY_VTS{Dj8wS=Ok>gXF7bN?vFb-jfr-SdUF zxK9-2yQ9Wj=PNO_p_WJ}=Bx;XS331;qfITbRnc&JI27Z}>9=bvp>}5;m9=%aON%GE z`--Q#zZ4%$92)CO^Eip`OG-UGn?vnw$;M(G?j(P;yV2j^4l0Yd8_V{)&4G#T- [ ] in list for easier usage in markdown based " "documents." @@ -70,51 +82,63 @@ msgstr "" "Füge - [ ] vor den Zutaten ein um sie besser in einem Markdown " "Dokument zu verwenden." -#: .\cookbook\forms.py:94 +#: .\cookbook\forms.py:108 +msgid "Export Base64 encoded image?" +msgstr "Base64 kodiertes Bild exportieren ?" + +#: .\cookbook\forms.py:112 +msgid "Download export directly or show on page?" +msgstr "Direkter Download oder anzeige auf Seite ?" + +#: .\cookbook\forms.py:118 +msgid "Simply paste a JSON export into this textarea and click import." +msgstr "Einfach JSON in die Textbox einfügen und importieren klicken." + +#: .\cookbook\forms.py:127 msgid "New Unit" msgstr "Neue Einheit" -#: .\cookbook\forms.py:95 +#: .\cookbook\forms.py:128 msgid "New unit that other gets replaced by." msgstr "Neue Einheit die die alte ersetzt." -#: .\cookbook\forms.py:100 +#: .\cookbook\forms.py:133 msgid "Old Unit" msgstr "Alte Einheit" -#: .\cookbook\forms.py:101 +#: .\cookbook\forms.py:134 msgid "Unit that should be replaced." msgstr "Einheit die ersetzt werden soll." -#: .\cookbook\forms.py:111 +#: .\cookbook\forms.py:144 msgid "New Ingredient" msgstr "Neue Zutat" -#: .\cookbook\forms.py:112 +#: .\cookbook\forms.py:145 msgid "New ingredient that other gets replaced by." msgstr "Neue Zutat die die alte ersetzt." -#: .\cookbook\forms.py:117 +#: .\cookbook\forms.py:150 msgid "Old Ingredient" msgstr "Alte Zutat" -#: .\cookbook\forms.py:118 +#: .\cookbook\forms.py:151 msgid "Ingredient that should be replaced." msgstr "Zutat die ersetzt werden soll." -#: .\cookbook\forms.py:130 +#: .\cookbook\forms.py:163 msgid "Add your comment: " -msgstr "Schreibe einen Kommentar:" +msgstr "Schreibe einen Kommentar: " -#: .\cookbook\forms.py:155 +#: .\cookbook\forms.py:188 msgid "Leave empty for dropbox and enter app password for nextcloud." msgstr "Für Dropbox leer lassen, bei Nextcloud App-Passwort eingeben." -#: .\cookbook\forms.py:158 +#: .\cookbook\forms.py:191 msgid "Leave empty for nextcloud and enter api token for dropbox." msgstr "Bei Nextcloud leer lassen, bei Dropbox API Token eingeben." -#: .\cookbook\forms.py:166 +#: .\cookbook\forms.py:199 msgid "" "Leave empty for dropbox and enter only base url for nextcloud (/remote." "php/webdav/ is added automatically)" @@ -122,119 +146,128 @@ msgstr "" "Bei Dropbox leer lassen, bei Nextcloud Server URL angeben (/remote.php/" "webdav/ wird automatisch hinzugefügt)" -#: .\cookbook\forms.py:185 +#: .\cookbook\forms.py:218 msgid "Search String" msgstr "Such Wort" -#: .\cookbook\forms.py:199 +#: .\cookbook\forms.py:232 msgid "File ID" msgstr "Datei ID" -#: .\cookbook\models.py:190 +#: .\cookbook\models.py:49 +msgid "Search" +msgstr "Suche" + +#: .\cookbook\models.py:49 .\cookbook\templates\base.html:93 +#: .\cookbook\templates\meal_plan.html:4 .\cookbook\templates\meal_plan.html:32 +#: .\cookbook\views\delete.py:136 .\cookbook\views\edit.py:286 +#: .\cookbook\views\new.py:138 +msgid "Meal-Plan" +msgstr "Plan" + +#: .\cookbook\models.py:49 .\cookbook\templates\base.html:90 +msgid "Books" +msgstr "Bücher" + +#: .\cookbook\models.py:210 msgid "Breakfast" msgstr "Frühstück" -#: .\cookbook\models.py:190 +#: .\cookbook\models.py:210 msgid "Lunch" msgstr "Mittagessen" -#: .\cookbook\models.py:190 +#: .\cookbook\models.py:210 msgid "Dinner" msgstr "Abendessen" -#: .\cookbook\models.py:190 +#: .\cookbook\models.py:210 msgid "Other" msgstr "Andere" #: .\cookbook\tables.py:83 -#: .\cookbook\templates\forms\edit_internal_recipe.html:49 -#: .\cookbook\templates\forms\edit_internal_recipe.html:160 +#: .\cookbook\templates\forms\edit_internal_recipe.html:50 +#: .\cookbook\templates\forms\edit_internal_recipe.html:161 #: .\cookbook\templates\generic\delete_template.html:5 #: .\cookbook\templates\generic\delete_template.html:13 #: .\cookbook\templates\generic\edit_template.html:25 msgid "Delete" msgstr "Löschen" -#: .\cookbook\templates\base.html:70 .\cookbook\templates\base.html:78 +#: .\cookbook\templates\base.html:70 .\cookbook\templates\base.html:79 #: .\cookbook\templates\forms\ingredients.html:7 #: .\cookbook\templates\index.html:7 .\cookbook\templates\shopping_list.html:7 msgid "Cookbook" msgstr "Kochbuch" -#: .\cookbook\templates\base.html:85 +#: .\cookbook\templates\base.html:86 msgid "Utensils" msgstr "Utensilien" -#: .\cookbook\templates\base.html:89 -msgid "Books" -msgstr "Bücher" - -#: .\cookbook\templates\base.html:92 .\cookbook\templates\meal_plan.html:4 -#: .\cookbook\templates\meal_plan.html:13 .\cookbook\views\delete.py:136 -#: .\cookbook\views\edit.py:283 .\cookbook\views\new.py:130 -msgid "Meal-Plan" -msgstr "Plan" - -#: .\cookbook\templates\base.html:95 +#: .\cookbook\templates\base.html:96 msgid "Shopping" msgstr "Einkaufsliste" -#: .\cookbook\templates\base.html:105 +#: .\cookbook\templates\base.html:106 msgid "Tags" msgstr "Schlagwörter" -#: .\cookbook\templates\base.html:109 .\cookbook\views\delete.py:70 -#: .\cookbook\views\edit.py:159 .\cookbook\views\lists.py:18 -#: .\cookbook\views\new.py:46 +#: .\cookbook\templates\base.html:110 .\cookbook\views\delete.py:70 +#: .\cookbook\views\edit.py:162 .\cookbook\views\lists.py:18 +#: .\cookbook\views\new.py:47 msgid "Keyword" msgstr "Schlagwort" -#: .\cookbook\templates\base.html:111 +#: .\cookbook\templates\base.html:112 msgid "Batch Edit" msgstr "Massenbearbeitung" -#: .\cookbook\templates\base.html:116 +#: .\cookbook\templates\base.html:117 msgid "Storage Data" msgstr "Datenquellen" -#: .\cookbook\templates\base.html:120 +#: .\cookbook\templates\base.html:121 msgid "Storage Backends" msgstr "Speicher Quellen" -#: .\cookbook\templates\base.html:122 +#: .\cookbook\templates\base.html:123 msgid "Configure Sync" msgstr "Sync Einstellen" -#: .\cookbook\templates\base.html:124 -msgid "Import Recipes" -msgstr "Importierte Rezepte" +#: .\cookbook\templates\base.html:125 +msgid "Discovered Recipes" +msgstr "Entdeckte Rezepte" -#: .\cookbook\templates\base.html:126 .\cookbook\views\lists.py:26 -msgid "Import Log" -msgstr "Import Log" +#: .\cookbook\templates\base.html:127 +msgid "Discovery Log" +msgstr "Entdeckungs Log" -#: .\cookbook\templates\base.html:128 .\cookbook\templates\stats.html:10 +#: .\cookbook\templates\base.html:129 .\cookbook\templates\stats.html:10 msgid "Statistics" msgstr "Statistiken" -#: .\cookbook\templates\base.html:130 +#: .\cookbook\templates\base.html:131 msgid "Units & Ingredients" msgstr "Einheiten & Zutaten" -#: .\cookbook\templates\base.html:145 .\cookbook\templates\settings.html:6 +#: .\cookbook\templates\base.html:133 +msgid "Import Recipe" +msgstr "Importier Rezept" + +#: .\cookbook\templates\base.html:149 .\cookbook\templates\settings.html:6 #: .\cookbook\templates\settings.html:11 msgid "Settings" msgstr "Einstellungen" -#: .\cookbook\templates\base.html:148 +#: .\cookbook\templates\base.html:152 msgid "Admin" msgstr "Admin" -#: .\cookbook\templates\base.html:152 +#: .\cookbook\templates\base.html:156 msgid "Logout" msgstr "Ausloggen" -#: .\cookbook\templates\base.html:157 +#: .\cookbook\templates\base.html:161 #: .\cookbook\templates\registration\login.html:44 msgid "Login" msgstr "Einloggen" @@ -253,7 +286,7 @@ msgstr "" "Ausgewählte Schlagwörter zu allen Rezepten die das Suchwort enthalten " "hinzufügen" -#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:143 +#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:146 msgid "Sync" msgstr "Synchronisieren" @@ -302,17 +335,45 @@ msgstr "Neues Buch" msgid "There are no recipes in this book yet." msgstr "In diesem Buch sind bisher keine Rezepte." +#: .\cookbook\templates\export.html:6 +msgid "Export Recipes" +msgstr "Exportier Rezepte" + +#: .\cookbook\templates\export.html:19 +msgid "Export" +msgstr "Export" + +#: .\cookbook\templates\export.html:31 +msgid "Exported Recipe" +msgstr "Exportierte Rezepte" + +#: .\cookbook\templates\export.html:42 +msgid "Copy to clipboard" +msgstr "In Zwischenablage kopieren" + +#: .\cookbook\templates\export.html:54 +#: .\cookbook\templates\shopping_list.html:48 +msgid "Copied!" +msgstr "Kopiert!" + +#: .\cookbook\templates\export.html:61 +#: .\cookbook\templates\shopping_list.html:37 +#: .\cookbook\templates\shopping_list.html:55 +msgid "Copy list to clipboard" +msgstr "Kopiere Liste in Zwischenablage" + #: .\cookbook\templates\forms\edit_import_recipe.html:5 #: .\cookbook\templates\forms\edit_import_recipe.html:9 msgid "Import new Recipe" msgstr "Rezept Importieren" #: .\cookbook\templates\forms\edit_import_recipe.html:14 -#: .\cookbook\templates\forms\edit_internal_recipe.html:47 +#: .\cookbook\templates\forms\edit_internal_recipe.html:48 #: .\cookbook\templates\generic\edit_template.html:23 #: .\cookbook\templates\generic\new_template.html:23 -#: .\cookbook\templates\recipe_view.html:340 -#: .\cookbook\templates\settings.html:33 .\cookbook\templates\settings.html:47 +#: .\cookbook\templates\recipe_view.html:357 +#: .\cookbook\templates\settings.html:22 .\cookbook\templates\settings.html:28 +#: .\cookbook\templates\settings.html:50 .\cookbook\templates\settings.html:64 msgid "Save" msgstr "Speichern" @@ -321,7 +382,7 @@ msgstr "Speichern" msgid "Edit Recipe" msgstr "Rezept bearbeiten" -#: .\cookbook\templates\forms\edit_internal_recipe.html:37 +#: .\cookbook\templates\forms\edit_internal_recipe.html:38 msgid "" "Use Ctrl+Space to insert new Ingredient!
You can also save " "the recipe using Ctrl+Shift+S." @@ -329,36 +390,35 @@ msgstr "" "Benutze Strg+Leertaste um eine neue Zutat einzufügen!
Rezepte können mitStrg+Shift+S gespeichert werden." -#: .\cookbook\templates\forms\edit_internal_recipe.html:51 +#: .\cookbook\templates\forms\edit_internal_recipe.html:52 #: .\cookbook\templates\generic\edit_template.html:27 -#: .\cookbook\templates\recipe_view.html:7 msgid "View" msgstr "Angucken" -#: .\cookbook\templates\forms\edit_internal_recipe.html:55 +#: .\cookbook\templates\forms\edit_internal_recipe.html:56 #: .\cookbook\templates\generic\edit_template.html:30 msgid "Delete original file" msgstr "Original löschen" -#: .\cookbook\templates\forms\edit_internal_recipe.html:142 -#: .\cookbook\templates\forms\edit_internal_recipe.html:189 -#: .\cookbook\views\delete.py:81 .\cookbook\views\edit.py:175 +#: .\cookbook\templates\forms\edit_internal_recipe.html:143 +#: .\cookbook\templates\forms\edit_internal_recipe.html:190 +#: .\cookbook\views\delete.py:81 .\cookbook\views\edit.py:178 msgid "Ingredient" msgstr "Zutat" -#: .\cookbook\templates\forms\edit_internal_recipe.html:147 +#: .\cookbook\templates\forms\edit_internal_recipe.html:148 msgid "Amount" msgstr "Menge" -#: .\cookbook\templates\forms\edit_internal_recipe.html:149 +#: .\cookbook\templates\forms\edit_internal_recipe.html:150 msgid "Unit" msgstr "Einheit" -#: .\cookbook\templates\forms\edit_internal_recipe.html:154 +#: .\cookbook\templates\forms\edit_internal_recipe.html:155 msgid "Note" -msgstr "Notiz " +msgstr "Notiz" -#: .\cookbook\templates\forms\edit_internal_recipe.html:163 +#: .\cookbook\templates\forms\edit_internal_recipe.html:164 msgid "Are you sure that you want to delete this ingredient?" msgstr "Bist du sicher das du diese Zutat löschen willst?" @@ -404,7 +464,7 @@ msgstr "Bist du sicher diese beiden Zutaten zusammengeführt werden sollen ?" #: .\cookbook\templates\generic\delete_template.html:18 #, python-format msgid "Are you sure you want to delete the %(title)s: %(object)s " -msgstr "Bist du sicher das %(title)s: %(object)s gelöscht werden soll" +msgstr "Bist du sicher das %(title)s: %(object)s gelöscht werden soll " #: .\cookbook\templates\generic\delete_template.html:21 msgid "Confirm" @@ -441,9 +501,18 @@ msgstr "vorherige" msgid "next" msgstr "nächste" +#: .\cookbook\templates\import.html:6 +msgid "Import Recipes" +msgstr "Importierte Rezepte" + +#: .\cookbook\templates\import.html:14 .\cookbook\views\delete.py:48 +#: .\cookbook\views\edit.py:254 +msgid "Import" +msgstr "Rezept Importieren" + #: .\cookbook\templates\include\recipe_open_modal.html:28 -#: .\cookbook\views\delete.py:21 .\cookbook\views\edit.py:315 -#: .\cookbook\views\new.py:34 +#: .\cookbook\views\delete.py:21 .\cookbook\views\edit.py:318 +#: .\cookbook\views\new.py:35 msgid "Recipe" msgstr "Rezept" @@ -501,47 +570,47 @@ msgstr "Suche zurücksetzen" msgid "Log in to view Recipies" msgstr "Bitte einloggen um Rezepte zu sehen" -#: .\cookbook\templates\meal_plan.html:20 +#: .\cookbook\templates\meal_plan.html:39 msgid "Week" msgstr "Woche" -#: .\cookbook\templates\recipe_view.html:67 +#: .\cookbook\templates\recipe_view.html:71 msgid "in" msgstr "in" -#: .\cookbook\templates\recipe_view.html:72 -#: .\cookbook\templates\recipe_view.html:293 +#: .\cookbook\templates\recipe_view.html:76 +#: .\cookbook\templates\recipe_view.html:310 msgid "by" msgstr "von" -#: .\cookbook\templates\recipe_view.html:84 +#: .\cookbook\templates\recipe_view.html:89 msgid "Preparation time ca." msgstr "Zubereitungszeit ca." -#: .\cookbook\templates\recipe_view.html:89 +#: .\cookbook\templates\recipe_view.html:95 msgid "Waiting time ca." msgstr "Wartezeit ca." -#: .\cookbook\templates\recipe_view.html:170 +#: .\cookbook\templates\recipe_view.html:186 msgid "Recipe Image" msgstr "Rezept Bild" -#: .\cookbook\templates\recipe_view.html:193 -#: .\cookbook\templates\recipe_view.html:227 +#: .\cookbook\templates\recipe_view.html:209 +#: .\cookbook\templates\recipe_view.html:243 msgid "View external recipe" msgstr "Externes Rezept ansehen" -#: .\cookbook\templates\recipe_view.html:205 +#: .\cookbook\templates\recipe_view.html:221 msgid "Cloud not show a file preview. Maybe its not a PDF ?" msgstr "" "Datei konnte nicht angezeigt werden. Direkte anzeige funktioniert nur mit " "PDF Dateien." -#: .\cookbook\templates\recipe_view.html:212 +#: .\cookbook\templates\recipe_view.html:228 msgid "External recipe" msgstr "Externes Rezept" -#: .\cookbook\templates\recipe_view.html:214 +#: .\cookbook\templates\recipe_view.html:230 msgid "" "\n" " This is an external recipe, which means " @@ -562,16 +631,16 @@ msgstr "" "bleibt weiterhin verfügbar.\n" " " -#: .\cookbook\templates\recipe_view.html:225 +#: .\cookbook\templates\recipe_view.html:241 msgid "Convert now!" msgstr "Jetzt umwandeln!" -#: .\cookbook\templates\recipe_view.html:289 +#: .\cookbook\templates\recipe_view.html:305 msgid "Comments" msgstr "Kommentare" -#: .\cookbook\templates\recipe_view.html:309 .\cookbook\views\delete.py:103 -#: .\cookbook\views\edit.py:234 +#: .\cookbook\templates\recipe_view.html:326 .\cookbook\views\delete.py:103 +#: .\cookbook\views\edit.py:237 msgid "Comment" msgstr "Kommentar" @@ -580,10 +649,14 @@ msgid "Your username and password didn't match. Please try again." msgstr "Nutzername oder Passwort falsch. Bitte versuch es erneut." #: .\cookbook\templates\settings.html:17 +msgid "Account" +msgstr "Account" + +#: .\cookbook\templates\settings.html:34 msgid "Language" msgstr "Sprache" -#: .\cookbook\templates\settings.html:42 +#: .\cookbook\templates\settings.html:59 msgid "Style" msgstr "Stil" @@ -595,15 +668,6 @@ msgstr "Einkaufsliste" msgid "Load" msgstr "Laden" -#: .\cookbook\templates\shopping_list.html:37 -#: .\cookbook\templates\shopping_list.html:55 -msgid "Copy list to clipboard" -msgstr "Kopiere Liste in Zwischenablage" - -#: .\cookbook\templates\shopping_list.html:48 -msgid "Copied!" -msgstr "Kopiert!" - #: .\cookbook\templates\stats.html:4 msgid "Stats" msgstr "Statistiken" @@ -644,22 +708,17 @@ msgstr[0] "Massenbearbeitung erfolgreich. %(count)d Rezept wurde aktualisiert." msgstr[1] "" "Massenbearbeitung erfolgreich. %(count)d Rezepte wurden aktualisiert." -#: .\cookbook\views\delete.py:48 .\cookbook\views\edit.py:251 -#: .\cookbook\views\lists.py:35 -msgid "Import" -msgstr "Rezept Importieren" - #: .\cookbook\views\delete.py:59 msgid "Monitor" msgstr "Monitor" #: .\cookbook\views\delete.py:92 .\cookbook\views\lists.py:53 -#: .\cookbook\views\new.py:64 +#: .\cookbook\views\new.py:65 msgid "Storage Backend" msgstr "Speicher Quelle" -#: .\cookbook\views\delete.py:114 .\cookbook\views\edit.py:267 -#: .\cookbook\views\new.py:112 +#: .\cookbook\views\delete.py:114 .\cookbook\views\edit.py:270 +#: .\cookbook\views\new.py:114 msgid "Recipe Book" msgstr "Rezeptbuch" @@ -667,58 +726,82 @@ msgstr "Rezeptbuch" msgid "Bookmarks" msgstr "Lesezeichen" -#: .\cookbook\views\edit.py:117 +#: .\cookbook\views\edit.py:104 +msgid "There was an error converting your ingredients amount to a number: " +msgstr "Es gab einen Fehler beim umwandeln der Menge in eine Zahl: " + +#: .\cookbook\views\edit.py:120 msgid "Recipe saved!" -msgstr "Rezept gespeichert" +msgstr "Rezept gespeichert!" -#: .\cookbook\views\edit.py:119 +#: .\cookbook\views\edit.py:122 msgid "There was an error saving this recipe!" -msgstr "Es gab einen Fehler beim Speichern des Rezepts" +msgstr "Es gab einen Fehler beim Speichern des Rezepts!" -#: .\cookbook\views\edit.py:184 +#: .\cookbook\views\edit.py:187 msgid "You cannot edit this storage!" msgstr "Du kannst diese Speicherquelle nicht bearbeiten!" -#: .\cookbook\views\edit.py:203 +#: .\cookbook\views\edit.py:206 msgid "Storage saved!" -msgstr "Speicherquelle gespeichert" +msgstr "Speicherquelle gespeichert!" -#: .\cookbook\views\edit.py:205 -msgid "There was an error updating this storage backend.!" -msgstr "Es gab einen Fehler beim aktualisierung dieser Speicher Quelle" +#: .\cookbook\views\edit.py:208 +msgid "There was an error updating this storage backend!" +msgstr "Es gab einen Fehler beim aktualisierung dieser Speicher Quelle!" -#: .\cookbook\views\edit.py:225 +#: .\cookbook\views\edit.py:228 msgid "You cannot edit this comment!" msgstr "Du kannst diesen Kommentar nicht bearbeiten!" -#: .\cookbook\views\edit.py:303 +#: .\cookbook\views\edit.py:306 msgid "Changes saved!" -msgstr "Änderungen gespeichert" +msgstr "Änderungen gespeichert!" -#: .\cookbook\views\edit.py:307 +#: .\cookbook\views\edit.py:310 msgid "Error saving changes!" -msgstr "Fehler beim Speichern der Daten." +msgstr "Fehler beim Speichern der Daten!" -#: .\cookbook\views\edit.py:337 +#: .\cookbook\views\edit.py:340 msgid "Units merged!" -msgstr "Einheiten zusammengeführt" +msgstr "Einheiten zusammengeführt!" -#: .\cookbook\views\edit.py:350 +#: .\cookbook\views\edit.py:353 msgid "Ingredients merged!" -msgstr "Zutaten zusammengeführt" +msgstr "Zutaten zusammengeführt!" -#: .\cookbook\views\new.py:86 +#: .\cookbook\views\import_export.py:57 +msgid "Recipe imported successfully!" +msgstr "Rezept erfolgreich importiert!" + +#: .\cookbook\views\import_export.py:103 +msgid "" +"External recipes cannot be exported, please share the file directly or " +"select an internal recipe." +msgstr "" +"Externe Rezepte können nicht exportiert werden, bitte Datei direkt teilen " +"oder ein Internes Rezept auswählen." + +#: .\cookbook\views\lists.py:26 +msgid "Import Log" +msgstr "Import Log" + +#: .\cookbook\views\lists.py:35 +msgid "Discovery" +msgstr "Entdeckung" + +#: .\cookbook\views\new.py:88 msgid "Imported new recipe!" -msgstr "Importier neue Rezepte" +msgstr "Importier neue Rezepte!" -#: .\cookbook\views\new.py:89 +#: .\cookbook\views\new.py:91 msgid "There was an error importing this recipe!" -msgstr "Beim importieren des Rezeptes ist ein Fehler aufgetreten" +msgstr "Beim importieren des Rezeptes ist ein Fehler aufgetreten!" -#: .\cookbook\views\views.py:44 +#: .\cookbook\views\views.py:63 msgid "Comment saved!" -msgstr "Kommentar gespeichert" +msgstr "Kommentar gespeichert!" -#: .\cookbook\views\views.py:54 +#: .\cookbook\views\views.py:73 msgid "Bookmark saved!" -msgstr "Lesezeichen gespeichert" +msgstr "Lesezeichen gespeichert!" diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index 0121ca4ca..6a607063a 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -75,7 +75,8 @@ @@ -137,7 +140,8 @@ {% if user.is_authenticated %}
  • diff --git a/cookbook/templates/recipe_view.html b/cookbook/templates/recipe_view.html index 471cf0f0b..71381f890 100644 --- a/cookbook/templates/recipe_view.html +++ b/cookbook/templates/recipe_view.html @@ -62,6 +62,8 @@ class="fas fa-calendar"> +
    @@ -194,7 +196,7 @@
    {% if recipe.instructions %} - {{ recipe.instructions | urlize | markdown | safe }} + {{ recipe.instructions | urlize | markdown | safe }} {% endif %}
    diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py index b28b5a448..d9b72f527 100644 --- a/cookbook/views/edit.py +++ b/cookbook/views/edit.py @@ -205,7 +205,7 @@ def edit_storage(request, pk): messages.add_message(request, messages.SUCCESS, _('Storage saved!')) else: - messages.add_message(request, messages.ERROR, _('There was an error updating this storage backend.!')) + messages.add_message(request, messages.ERROR, _('There was an error updating this storage backend!')) else: pseudo_instance = instance pseudo_instance.password = '__NO__CHANGE__' diff --git a/cookbook/views/import_export.py b/cookbook/views/import_export.py index 1541b29a8..b2a7a7a2a 100644 --- a/cookbook/views/import_export.py +++ b/cookbook/views/import_export.py @@ -1,13 +1,17 @@ +import base64 import json +import re from django.contrib import messages +from django.core.files.base import ContentFile from django.db import IntegrityError -from django.http import HttpResponseRedirect +from django.http import HttpResponseRedirect, JsonResponse, HttpResponse from django.shortcuts import render from django.urls import reverse_lazy + from django.utils.translation import gettext as _ from cookbook.forms import ExportForm, ImportForm -from cookbook.models import RecipeIngredient, Recipe, Unit, Ingredient +from cookbook.models import RecipeIngredient, Recipe, Unit, Ingredient, Keyword def import_recipe(request): @@ -20,6 +24,14 @@ def import_recipe(request): working_time=data['recipe']['working_time'], waiting_time=data['recipe']['waiting_time'], created_by=request.user, internal=True) + for k in data['keywords']: + try: + Keyword.objects.create(name=k['name'], icon=k['icon'], description=k['description']).save() + except IntegrityError: + pass + + recipe.keywords.add(Keyword.objects.get(name=k['name'])) + for u in data['units']: try: Unit.objects.create(name=u['name'], description=u['description']).save() @@ -36,6 +48,12 @@ def import_recipe(request): RecipeIngredient.objects.create(recipe=recipe, ingredient=Ingredient.objects.get(name=ri['ingredient']), unit=Unit.objects.get(name=ri['unit']), amount=ri['amount'], note=ri['note']) + if data['image']: + fmt, img = data['image'].split(';base64,') + ext = fmt.split('/')[-1] + recipe.image = ContentFile(base64.b64decode(img), name=f'{recipe.pk}.{ext}') + recipe.save() + messages.add_message(request, messages.SUCCESS, _('Recipe imported successfully!')) return HttpResponseRedirect(reverse_lazy('view_recipe', args=[recipe.pk])) else: @@ -55,9 +73,14 @@ def export_recipe(request): 'recipe': {'name': recipe.name, 'instructions': recipe.instructions, 'working_time': recipe.working_time, 'waiting_time': recipe.working_time}, 'units': [], 'ingredients': [], - 'recipe_ingredients': [] + 'recipe_ingredients': [], + 'keywords': [], + 'image': None } + for k in recipe.keywords.all(): + export['keywords'].append({'name': k.name, 'icon': k.icon, 'description': k.description}) + for ri in RecipeIngredient.objects.filter(recipe=recipe).all(): if ri.unit not in export['units']: export['units'].append({'name': ri.unit.name, 'description': ri.unit.description}) @@ -66,11 +89,25 @@ def export_recipe(request): export['recipe_ingredients'].append({'ingredient': ri.ingredient.name, 'unit': ri.unit.name, 'amount': float(ri.amount), 'note': ri.note}) + if recipe.image and form.cleaned_data['image']: + with open(recipe.image.path, 'rb') as img_f: + export['image'] = f'data:image/png;base64,{base64.b64encode(img_f.read()).decode("utf-8")}' + + if form.cleaned_data['download']: + response = HttpResponse(json.dumps(export), content_type='text/plain') + response['Content-Disposition'] = f'attachment; filename={recipe.name}.json' + return response + context['export'] = json.dumps(export, indent=4) else: form.add_error('recipe', _('External recipes cannot be exported, please share the file directly or select an internal recipe.')) else: form = ExportForm() + recipe = request.GET.get('r') + if recipe: + if re.match(r'^([0-9])+$', recipe): + if recipe := Recipe.objects.filter(pk=int(recipe)).first(): + form = ExportForm(initial={'recipe': recipe}) context['form'] = form diff --git a/cookbook/views/lists.py b/cookbook/views/lists.py index 38e094b77..348860cf2 100644 --- a/cookbook/views/lists.py +++ b/cookbook/views/lists.py @@ -32,7 +32,7 @@ def recipe_import(request): RequestConfig(request, paginate={'per_page': 25}).configure(table) - return render(request, 'generic/list_template.html', {'title': _("Import"), 'table': table, 'import_btn': True}) + return render(request, 'generic/list_template.html', {'title': _("Discovery"), 'table': table, 'import_btn': True}) @login_required diff --git a/recipes/locale/de/LC_MESSAGES/django.po b/recipes/locale/de/LC_MESSAGES/django.po index afe53cdde..16c69214b 100644 --- a/recipes/locale/de/LC_MESSAGES/django.po +++ b/recipes/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-18 12:13+0100\n" +"POT-Creation-Date: 2020-04-25 23:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,10 +18,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: .\recipes\settings.py:136 +#: .\recipes\settings.py:137 msgid "German" msgstr "Deutsch" -#: .\recipes\settings.py:137 +#: .\recipes\settings.py:138 msgid "English" msgstr "Englisch"