cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import export cleanup + features

Browse Source
This commit is contained in:
vabene1111 2020-04-25 23:32:15 +02:00
parent 85a4d5d432
commit 379d5a5177
9 changed files with 297 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cookbook/forms.py
View File

@ -104,10 +104,18 @@ class ExportForm(forms.Form):
queryset=Recipe.objects.filter(internal=True).all(), queryset=Recipe.objects.filter(internal=True).all(),
widget=SelectWidget 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): 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): class UnitMergeForm(forms.Form):

BIN
cookbook/locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

381
cookbook/locale/de/LC_MESSAGES/django.po
View File

@ -7,25 +7,25 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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: 2020-03-18 12:19+0100\n" "PO-Revision-Date: 2020-04-25 23:31+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Last-Translator: \n"
"Language-Team: \n"
"X-Generator: Poedit 2.3\n" "X-Generator: Poedit 2.3\n"
#: .\cookbook\filters.py:15 .\cookbook\templates\base.html:98 #: .\cookbook\filters.py:15 .\cookbook\templates\base.html:99
#: .\cookbook\templates\forms\edit_internal_recipe.html:28 #: .\cookbook\templates\forms\edit_internal_recipe.html:28
#: .\cookbook\templates\forms\ingredients.html:34 #: .\cookbook\templates\forms\ingredients.html:34
#: .\cookbook\templates\recipe_view.html:104 .\cookbook\views\lists.py:45 #: .\cookbook\templates\recipe_view.html:110 .\cookbook\views\lists.py:45
msgid "Ingredients" msgid "Ingredients"
msgstr "Zutaten" msgstr "Zutaten"
#: .\cookbook\forms.py:35 #: .\cookbook\forms.py:36
msgid "" msgid ""
"Color of the top navigation bar. Not all colors work with all themes, just " "Color of the top navigation bar. Not all colors work with all themes, just "
"try them out!" "try them out!"
@ -33,36 +33,48 @@ msgstr ""
"Farbe der oberen Navigationsleiste. Nicht alle Farben passen, daher einfach " "Farbe der oberen Navigationsleiste. Nicht alle Farben passen, daher einfach "
"mal ausprobieren!" "mal ausprobieren!"
#: .\cookbook\forms.py:49 .\cookbook\forms.py:67 .\cookbook\forms.py:196 #: .\cookbook\forms.py:37
msgid "Default Unit to be used when inserting a new ingredient into a recipe."
msgstr "Standard Einheit für neue Zutaten."
#: .\cookbook\forms.py:49
msgid ""
"Both fields are optional. If none are given the username will be displayed "
"instead"
msgstr ""
"Beide Felder sind optional, wenn keins von beiden gegeben ist wird der "
"Nutzername angezeigt"
#: .\cookbook\forms.py:63 .\cookbook\forms.py:81 .\cookbook\forms.py:229
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
#: .\cookbook\forms.py:50 .\cookbook\forms.py:68 .\cookbook\forms.py:197 #: .\cookbook\forms.py:64 .\cookbook\forms.py:82 .\cookbook\forms.py:230
#: .\cookbook\templates\stats.html:22 #: .\cookbook\templates\stats.html:22
msgid "Keywords" msgid "Keywords"
msgstr "Schlagwörter" msgstr "Schlagwörter"
#: .\cookbook\forms.py:51 .\cookbook\forms.py:70 #: .\cookbook\forms.py:65 .\cookbook\forms.py:84
msgid "Preparation time in minutes" msgid "Preparation time in minutes"
msgstr "Zubereitungszeit in Minuten" msgstr "Zubereitungszeit in Minuten"
#: .\cookbook\forms.py:52 .\cookbook\forms.py:71 #: .\cookbook\forms.py:66 .\cookbook\forms.py:85
msgid "Waiting time (cooking/baking) in minutes" msgid "Waiting time (cooking/baking) in minutes"
msgstr "Wartezeit (kochen/backen) in Minuten" msgstr "Wartezeit (kochen/backen) in Minuten"
#: .\cookbook\forms.py:53 .\cookbook\forms.py:198 #: .\cookbook\forms.py:67 .\cookbook\forms.py:231
msgid "Path" msgid "Path"
msgstr "Pfad" msgstr "Pfad"
#: .\cookbook\forms.py:54 #: .\cookbook\forms.py:68
msgid "Storage UID" msgid "Storage UID"
msgstr "Speicher ID" msgstr "Speicher ID"
#: .\cookbook\forms.py:69 #: .\cookbook\forms.py:83
msgid "Instructions" msgid "Instructions"
msgstr "Anleitung" msgstr "Anleitung"
#: .\cookbook\forms.py:82 #: .\cookbook\forms.py:96
msgid "" msgid ""
"Include <code>- [ ]</code> in list for easier usage in markdown based " "Include <code>- [ ]</code> in list for easier usage in markdown based "
"documents." "documents."
@ -70,51 +82,63 @@ msgstr ""
"Füge <code>- [ ]</code> vor den Zutaten ein um sie besser in einem Markdown " "Füge <code>- [ ]</code> vor den Zutaten ein um sie besser in einem Markdown "
"Dokument zu verwenden." "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" msgid "New Unit"
msgstr "Neue Einheit" msgstr "Neue Einheit"
#: .\cookbook\forms.py:95 #: .\cookbook\forms.py:128
msgid "New unit that other gets replaced by." msgid "New unit that other gets replaced by."
msgstr "Neue Einheit die die alte ersetzt." msgstr "Neue Einheit die die alte ersetzt."
#: .\cookbook\forms.py:100 #: .\cookbook\forms.py:133
msgid "Old Unit" msgid "Old Unit"
msgstr "Alte Einheit" msgstr "Alte Einheit"
#: .\cookbook\forms.py:101 #: .\cookbook\forms.py:134
msgid "Unit that should be replaced." msgid "Unit that should be replaced."
msgstr "Einheit die ersetzt werden soll." msgstr "Einheit die ersetzt werden soll."
#: .\cookbook\forms.py:111 #: .\cookbook\forms.py:144
msgid "New Ingredient" msgid "New Ingredient"
msgstr "Neue Zutat" msgstr "Neue Zutat"
#: .\cookbook\forms.py:112 #: .\cookbook\forms.py:145
msgid "New ingredient that other gets replaced by." msgid "New ingredient that other gets replaced by."
msgstr "Neue Zutat die die alte ersetzt." msgstr "Neue Zutat die die alte ersetzt."
#: .\cookbook\forms.py:117 #: .\cookbook\forms.py:150
msgid "Old Ingredient" msgid "Old Ingredient"
msgstr "Alte Zutat" msgstr "Alte Zutat"
#: .\cookbook\forms.py:118 #: .\cookbook\forms.py:151
msgid "Ingredient that should be replaced." msgid "Ingredient that should be replaced."
msgstr "Zutat die ersetzt werden soll." msgstr "Zutat die ersetzt werden soll."
#: .\cookbook\forms.py:130 #: .\cookbook\forms.py:163
msgid "Add your comment: " 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." msgid "Leave empty for dropbox and enter app password for nextcloud."
msgstr "Für Dropbox leer lassen, bei Nextcloud App-Passwort eingeben." 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." msgid "Leave empty for nextcloud and enter api token for dropbox."
msgstr "Bei Nextcloud leer lassen, bei Dropbox API Token eingeben." msgstr "Bei Nextcloud leer lassen, bei Dropbox API Token eingeben."
#: .\cookbook\forms.py:166 #: .\cookbook\forms.py:199
msgid "" msgid ""
"Leave empty for dropbox and enter only base url for nextcloud (<code>/remote." "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
"php/webdav/</code> is added automatically)" "php/webdav/</code> is added automatically)"
@ -122,119 +146,128 @@ msgstr ""
"Bei Dropbox leer lassen, bei Nextcloud Server URL angeben (<code>/remote.php/" "Bei Dropbox leer lassen, bei Nextcloud Server URL angeben (<code>/remote.php/"
"webdav/</code> wird automatisch hinzugefügt)" "webdav/</code> wird automatisch hinzugefügt)"
#: .\cookbook\forms.py:185 #: .\cookbook\forms.py:218
msgid "Search String" msgid "Search String"
msgstr "Such Wort" msgstr "Such Wort"
#: .\cookbook\forms.py:199 #: .\cookbook\forms.py:232
msgid "File ID" msgid "File ID"
msgstr "Datei 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" msgid "Breakfast"
msgstr "Frühstück" msgstr "Frühstück"
#: .\cookbook\models.py:190 #: .\cookbook\models.py:210
msgid "Lunch" msgid "Lunch"
msgstr "Mittagessen" msgstr "Mittagessen"
#: .\cookbook\models.py:190 #: .\cookbook\models.py:210
msgid "Dinner" msgid "Dinner"
msgstr "Abendessen" msgstr "Abendessen"
#: .\cookbook\models.py:190 #: .\cookbook\models.py:210
msgid "Other" msgid "Other"
msgstr "Andere" msgstr "Andere"
#: .\cookbook\tables.py:83 #: .\cookbook\tables.py:83
#: .\cookbook\templates\forms\edit_internal_recipe.html:49 #: .\cookbook\templates\forms\edit_internal_recipe.html:50
#: .\cookbook\templates\forms\edit_internal_recipe.html:160 #: .\cookbook\templates\forms\edit_internal_recipe.html:161
#: .\cookbook\templates\generic\delete_template.html:5 #: .\cookbook\templates\generic\delete_template.html:5
#: .\cookbook\templates\generic\delete_template.html:13 #: .\cookbook\templates\generic\delete_template.html:13
#: .\cookbook\templates\generic\edit_template.html:25 #: .\cookbook\templates\generic\edit_template.html:25
msgid "Delete" msgid "Delete"
msgstr "Löschen" 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\forms\ingredients.html:7
#: .\cookbook\templates\index.html:7 .\cookbook\templates\shopping_list.html:7 #: .\cookbook\templates\index.html:7 .\cookbook\templates\shopping_list.html:7
msgid "Cookbook" msgid "Cookbook"
msgstr "Kochbuch" msgstr "Kochbuch"
#: .\cookbook\templates\base.html:85 #: .\cookbook\templates\base.html:86
msgid "Utensils" msgid "Utensils"
msgstr "Utensilien" msgstr "Utensilien"
#: .\cookbook\templates\base.html:89 #: .\cookbook\templates\base.html:96
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
msgid "Shopping" msgid "Shopping"
msgstr "Einkaufsliste" msgstr "Einkaufsliste"
#: .\cookbook\templates\base.html:105 #: .\cookbook\templates\base.html:106
msgid "Tags" msgid "Tags"
msgstr "Schlagwörter" msgstr "Schlagwörter"
#: .\cookbook\templates\base.html:109 .\cookbook\views\delete.py:70 #: .\cookbook\templates\base.html:110 .\cookbook\views\delete.py:70
#: .\cookbook\views\edit.py:159 .\cookbook\views\lists.py:18 #: .\cookbook\views\edit.py:162 .\cookbook\views\lists.py:18
#: .\cookbook\views\new.py:46 #: .\cookbook\views\new.py:47
msgid "Keyword" msgid "Keyword"
msgstr "Schlagwort" msgstr "Schlagwort"
#: .\cookbook\templates\base.html:111 #: .\cookbook\templates\base.html:112
msgid "Batch Edit" msgid "Batch Edit"
msgstr "Massenbearbeitung" msgstr "Massenbearbeitung"
#: .\cookbook\templates\base.html:116 #: .\cookbook\templates\base.html:117
msgid "Storage Data" msgid "Storage Data"
msgstr "Datenquellen" msgstr "Datenquellen"
#: .\cookbook\templates\base.html:120 #: .\cookbook\templates\base.html:121
msgid "Storage Backends" msgid "Storage Backends"
msgstr "Speicher Quellen" msgstr "Speicher Quellen"
#: .\cookbook\templates\base.html:122 #: .\cookbook\templates\base.html:123
msgid "Configure Sync" msgid "Configure Sync"
msgstr "Sync Einstellen" msgstr "Sync Einstellen"
#: .\cookbook\templates\base.html:124 #: .\cookbook\templates\base.html:125
msgid "Import Recipes" msgid "Discovered Recipes"
msgstr "Importierte Rezepte" msgstr "Entdeckte Rezepte"
#: .\cookbook\templates\base.html:126 .\cookbook\views\lists.py:26 #: .\cookbook\templates\base.html:127
msgid "Import Log" msgid "Discovery Log"
msgstr "Import 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" msgid "Statistics"
msgstr "Statistiken" msgstr "Statistiken"
#: .\cookbook\templates\base.html:130 #: .\cookbook\templates\base.html:131
msgid "Units & Ingredients" msgid "Units & Ingredients"
msgstr "Einheiten & Zutaten" 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 #: .\cookbook\templates\settings.html:11
msgid "Settings" msgid "Settings"
msgstr "Einstellungen" msgstr "Einstellungen"
#: .\cookbook\templates\base.html:148 #: .\cookbook\templates\base.html:152
msgid "Admin" msgid "Admin"
msgstr "Admin" msgstr "Admin"
#: .\cookbook\templates\base.html:152 #: .\cookbook\templates\base.html:156
msgid "Logout" msgid "Logout"
msgstr "Ausloggen" msgstr "Ausloggen"
#: .\cookbook\templates\base.html:157 #: .\cookbook\templates\base.html:161
#: .\cookbook\templates\registration\login.html:44 #: .\cookbook\templates\registration\login.html:44
msgid "Login" msgid "Login"
msgstr "Einloggen" msgstr "Einloggen"
@ -253,7 +286,7 @@ msgstr ""
"Ausgewählte Schlagwörter zu allen Rezepten die das Suchwort enthalten " "Ausgewählte Schlagwörter zu allen Rezepten die das Suchwort enthalten "
"hinzufügen" "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" msgid "Sync"
msgstr "Synchronisieren" msgstr "Synchronisieren"
@ -302,17 +335,45 @@ msgstr "Neues Buch"
msgid "There are no recipes in this book yet." msgid "There are no recipes in this book yet."
msgstr "In diesem Buch sind bisher keine Rezepte." 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:5
#: .\cookbook\templates\forms\edit_import_recipe.html:9 #: .\cookbook\templates\forms\edit_import_recipe.html:9
msgid "Import new Recipe" msgid "Import new Recipe"
msgstr "Rezept Importieren" msgstr "Rezept Importieren"
#: .\cookbook\templates\forms\edit_import_recipe.html:14 #: .\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\edit_template.html:23
#: .\cookbook\templates\generic\new_template.html:23 #: .\cookbook\templates\generic\new_template.html:23
#: .\cookbook\templates\recipe_view.html:340 #: .\cookbook\templates\recipe_view.html:357
#: .\cookbook\templates\settings.html:33 .\cookbook\templates\settings.html:47 #: .\cookbook\templates\settings.html:22 .\cookbook\templates\settings.html:28
#: .\cookbook\templates\settings.html:50 .\cookbook\templates\settings.html:64
msgid "Save" msgid "Save"
msgstr "Speichern" msgstr "Speichern"
@ -321,7 +382,7 @@ msgstr "Speichern"
msgid "Edit Recipe" msgid "Edit Recipe"
msgstr "Rezept bearbeiten" msgstr "Rezept bearbeiten"
#: .\cookbook\templates\forms\edit_internal_recipe.html:37 #: .\cookbook\templates\forms\edit_internal_recipe.html:38
msgid "" msgid ""
"Use <b>Ctrl</b>+<b>Space</b> to insert new Ingredient!<br/>You can also save " "Use <b>Ctrl</b>+<b>Space</b> to insert new Ingredient!<br/>You can also save "
"the recipe using <b>Ctrl</b>+<b>Shift</b>+<b>S</b>." "the recipe using <b>Ctrl</b>+<b>Shift</b>+<b>S</b>."
@ -329,36 +390,35 @@ msgstr ""
"Benutze <b>Strg</b>+<b>Leertaste</b> um eine neue Zutat einzufügen!<br/" "Benutze <b>Strg</b>+<b>Leertaste</b> um eine neue Zutat einzufügen!<br/"
">Rezepte können mit<b>Strg</b>+<b>Shift</b>+<b>S</b> gespeichert werden." ">Rezepte können mit<b>Strg</b>+<b>Shift</b>+<b>S</b> 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\generic\edit_template.html:27
#: .\cookbook\templates\recipe_view.html:7
msgid "View" msgid "View"
msgstr "Angucken" 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 #: .\cookbook\templates\generic\edit_template.html:30
msgid "Delete original file" msgid "Delete original file"
msgstr "Original löschen" msgstr "Original löschen"
#: .\cookbook\templates\forms\edit_internal_recipe.html:142 #: .\cookbook\templates\forms\edit_internal_recipe.html:143
#: .\cookbook\templates\forms\edit_internal_recipe.html:189 #: .\cookbook\templates\forms\edit_internal_recipe.html:190
#: .\cookbook\views\delete.py:81 .\cookbook\views\edit.py:175 #: .\cookbook\views\delete.py:81 .\cookbook\views\edit.py:178
msgid "Ingredient" msgid "Ingredient"
msgstr "Zutat" msgstr "Zutat"
#: .\cookbook\templates\forms\edit_internal_recipe.html:147 #: .\cookbook\templates\forms\edit_internal_recipe.html:148
msgid "Amount" msgid "Amount"
msgstr "Menge" msgstr "Menge"
#: .\cookbook\templates\forms\edit_internal_recipe.html:149 #: .\cookbook\templates\forms\edit_internal_recipe.html:150
msgid "Unit" msgid "Unit"
msgstr "Einheit" msgstr "Einheit"
#: .\cookbook\templates\forms\edit_internal_recipe.html:154 #: .\cookbook\templates\forms\edit_internal_recipe.html:155
msgid "Note" 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?" msgid "Are you sure that you want to delete this ingredient?"
msgstr "Bist du sicher das du diese Zutat löschen willst?" 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 #: .\cookbook\templates\generic\delete_template.html:18
#, python-format #, python-format
msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> " msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
msgstr "Bist du sicher das %(title)s: <b>%(object)s</b> gelöscht werden soll" msgstr "Bist du sicher das %(title)s: <b>%(object)s</b> gelöscht werden soll "
#: .\cookbook\templates\generic\delete_template.html:21 #: .\cookbook\templates\generic\delete_template.html:21
msgid "Confirm" msgid "Confirm"
@ -441,9 +501,18 @@ msgstr "vorherige"
msgid "next" msgid "next"
msgstr "nächste" 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\templates\include\recipe_open_modal.html:28
#: .\cookbook\views\delete.py:21 .\cookbook\views\edit.py:315 #: .\cookbook\views\delete.py:21 .\cookbook\views\edit.py:318
#: .\cookbook\views\new.py:34 #: .\cookbook\views\new.py:35
msgid "Recipe" msgid "Recipe"
msgstr "Rezept" msgstr "Rezept"
@ -501,47 +570,47 @@ msgstr "Suche zurücksetzen"
msgid "Log in to view Recipies" msgid "Log in to view Recipies"
msgstr "Bitte einloggen um Rezepte zu sehen" msgstr "Bitte einloggen um Rezepte zu sehen"
#: .\cookbook\templates\meal_plan.html:20 #: .\cookbook\templates\meal_plan.html:39
msgid "Week" msgid "Week"
msgstr "Woche" msgstr "Woche"
#: .\cookbook\templates\recipe_view.html:67 #: .\cookbook\templates\recipe_view.html:71
msgid "in" msgid "in"
msgstr "in" msgstr "in"
#: .\cookbook\templates\recipe_view.html:72 #: .\cookbook\templates\recipe_view.html:76
#: .\cookbook\templates\recipe_view.html:293 #: .\cookbook\templates\recipe_view.html:310
msgid "by" msgid "by"
msgstr "von" msgstr "von"
#: .\cookbook\templates\recipe_view.html:84 #: .\cookbook\templates\recipe_view.html:89
msgid "Preparation time ca." msgid "Preparation time ca."
msgstr "Zubereitungszeit ca." msgstr "Zubereitungszeit ca."
#: .\cookbook\templates\recipe_view.html:89 #: .\cookbook\templates\recipe_view.html:95
msgid "Waiting time ca." msgid "Waiting time ca."
msgstr "Wartezeit ca." msgstr "Wartezeit ca."
#: .\cookbook\templates\recipe_view.html:170 #: .\cookbook\templates\recipe_view.html:186
msgid "Recipe Image" msgid "Recipe Image"
msgstr "Rezept Bild" msgstr "Rezept Bild"
#: .\cookbook\templates\recipe_view.html:193 #: .\cookbook\templates\recipe_view.html:209
#: .\cookbook\templates\recipe_view.html:227 #: .\cookbook\templates\recipe_view.html:243
msgid "View external recipe" msgid "View external recipe"
msgstr "Externes Rezept ansehen" 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 ?" msgid "Cloud not show a file preview. Maybe its not a PDF ?"
msgstr "" msgstr ""
"Datei konnte nicht angezeigt werden. Direkte anzeige funktioniert nur mit " "Datei konnte nicht angezeigt werden. Direkte anzeige funktioniert nur mit "
"PDF Dateien." "PDF Dateien."
#: .\cookbook\templates\recipe_view.html:212 #: .\cookbook\templates\recipe_view.html:228
msgid "External recipe" msgid "External recipe"
msgstr "Externes Rezept" msgstr "Externes Rezept"
#: .\cookbook\templates\recipe_view.html:214 #: .\cookbook\templates\recipe_view.html:230
msgid "" msgid ""
"\n" "\n"
" This is an external recipe, which means " " This is an external recipe, which means "
@ -562,16 +631,16 @@ msgstr ""
"bleibt weiterhin verfügbar.\n" "bleibt weiterhin verfügbar.\n"
" " " "
#: .\cookbook\templates\recipe_view.html:225 #: .\cookbook\templates\recipe_view.html:241
msgid "Convert now!" msgid "Convert now!"
msgstr "Jetzt umwandeln!" msgstr "Jetzt umwandeln!"
#: .\cookbook\templates\recipe_view.html:289 #: .\cookbook\templates\recipe_view.html:305
msgid "Comments" msgid "Comments"
msgstr "Kommentare" msgstr "Kommentare"
#: .\cookbook\templates\recipe_view.html:309 .\cookbook\views\delete.py:103 #: .\cookbook\templates\recipe_view.html:326 .\cookbook\views\delete.py:103
#: .\cookbook\views\edit.py:234 #: .\cookbook\views\edit.py:237
msgid "Comment" msgid "Comment"
msgstr "Kommentar" 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." msgstr "Nutzername oder Passwort falsch. Bitte versuch es erneut."
#: .\cookbook\templates\settings.html:17 #: .\cookbook\templates\settings.html:17
msgid "Account"
msgstr "Account"
#: .\cookbook\templates\settings.html:34
msgid "Language" msgid "Language"
msgstr "Sprache" msgstr "Sprache"
#: .\cookbook\templates\settings.html:42 #: .\cookbook\templates\settings.html:59
msgid "Style" msgid "Style"
msgstr "Stil" msgstr "Stil"
@ -595,15 +668,6 @@ msgstr "Einkaufsliste"
msgid "Load" msgid "Load"
msgstr "Laden" 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 #: .\cookbook\templates\stats.html:4
msgid "Stats" msgid "Stats"
msgstr "Statistiken" msgstr "Statistiken"
@ -644,22 +708,17 @@ msgstr[0] "Massenbearbeitung erfolgreich. %(count)d Rezept wurde aktualisiert."
msgstr[1] "" msgstr[1] ""
"Massenbearbeitung erfolgreich. %(count)d Rezepte wurden aktualisiert." "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 #: .\cookbook\views\delete.py:59
msgid "Monitor" msgid "Monitor"
msgstr "Monitor" msgstr "Monitor"
#: .\cookbook\views\delete.py:92 .\cookbook\views\lists.py:53 #: .\cookbook\views\delete.py:92 .\cookbook\views\lists.py:53
#: .\cookbook\views\new.py:64 #: .\cookbook\views\new.py:65
msgid "Storage Backend" msgid "Storage Backend"
msgstr "Speicher Quelle" msgstr "Speicher Quelle"
#: .\cookbook\views\delete.py:114 .\cookbook\views\edit.py:267 #: .\cookbook\views\delete.py:114 .\cookbook\views\edit.py:270
#: .\cookbook\views\new.py:112 #: .\cookbook\views\new.py:114
msgid "Recipe Book" msgid "Recipe Book"
msgstr "Rezeptbuch" msgstr "Rezeptbuch"
@ -667,58 +726,82 @@ msgstr "Rezeptbuch"
msgid "Bookmarks" msgid "Bookmarks"
msgstr "Lesezeichen" 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!" 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!" 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!" msgid "You cannot edit this storage!"
msgstr "Du kannst diese Speicherquelle nicht bearbeiten!" msgstr "Du kannst diese Speicherquelle nicht bearbeiten!"
#: .\cookbook\views\edit.py:203 #: .\cookbook\views\edit.py:206
msgid "Storage saved!" msgid "Storage saved!"
msgstr "Speicherquelle gespeichert" msgstr "Speicherquelle gespeichert!"
#: .\cookbook\views\edit.py:205 #: .\cookbook\views\edit.py:208
msgid "There was an error updating this storage backend.!" msgid "There was an error updating this storage backend!"
msgstr "Es gab einen Fehler beim aktualisierung dieser Speicher Quelle" 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!" msgid "You cannot edit this comment!"
msgstr "Du kannst diesen Kommentar nicht bearbeiten!" msgstr "Du kannst diesen Kommentar nicht bearbeiten!"
#: .\cookbook\views\edit.py:303 #: .\cookbook\views\edit.py:306
msgid "Changes saved!" msgid "Changes saved!"
msgstr "Änderungen gespeichert" msgstr "Änderungen gespeichert!"
#: .\cookbook\views\edit.py:307 #: .\cookbook\views\edit.py:310
msgid "Error saving changes!" 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!" msgid "Units merged!"
msgstr "Einheiten zusammengeführt" msgstr "Einheiten zusammengeführt!"
#: .\cookbook\views\edit.py:350 #: .\cookbook\views\edit.py:353
msgid "Ingredients merged!" 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!" 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!" 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!" msgid "Comment saved!"
msgstr "Kommentar gespeichert" msgstr "Kommentar gespeichert!"
#: .\cookbook\views\views.py:54 #: .\cookbook\views\views.py:73
msgid "Bookmark saved!" msgid "Bookmark saved!"
msgstr "Lesezeichen gespeichert" msgstr "Lesezeichen gespeichert!"

12
cookbook/templates/base.html
View File

@ -75,7 +75,8 @@
<div class="collapse navbar-collapse" id="navbarText"> <div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<li class="nav-item {% if request.resolver_match.url_name in 'view_search,edit_recipe,edit_internal_recipe,edit_external_recipe,view_recipe' %}active{% endif %}"> <li class="nav-item {% if request.resolver_match.url_name in 'view_search,edit_recipe,edit_internal_recipe,edit_external_recipe,view_recipe' %}active{% endif %}">
<a class="nav-link" href="{% url 'view_search' %}"><i class="fas fa-book"></i> {% trans 'Cookbook' %}<span <a class="nav-link" href="{% url 'view_search' %}"><i
class="fas fa-book"></i> {% trans 'Cookbook' %}<span
class="sr-only">(current)</span></a> class="sr-only">(current)</span></a>
</li> </li>
@ -121,13 +122,15 @@
<a class="dropdown-item" href="{% url 'data_sync' %}"><i <a class="dropdown-item" href="{% url 'data_sync' %}"><i
class="fas fa-sync-alt fa-fw"></i> {% trans 'Configure Sync' %}</a> class="fas fa-sync-alt fa-fw"></i> {% trans 'Configure Sync' %}</a>
<a class="dropdown-item" href="{% url 'list_recipe_import' %}"><i <a class="dropdown-item" href="{% url 'list_recipe_import' %}"><i
class="far fa-file-alt fa-fw"></i> {% trans 'Import Recipes' %}</a> class="far fa-file-alt fa-fw"></i> {% trans 'Discovered Recipes' %}</a>
<a class="dropdown-item" href="{% url 'list_sync_log' %}"><i <a class="dropdown-item" href="{% url 'list_sync_log' %}"><i
class="fas fa-history fa-fw"></i> {% trans 'Import Log' %}</a> class="fas fa-history fa-fw"></i> {% trans 'Discovery Log' %}</a>
<a class="dropdown-item" href="{% url 'data_stats' %}"><i <a class="dropdown-item" href="{% url 'data_stats' %}"><i
class="fas fa-chart-line fa-fw"></i> {% trans 'Statistics' %}</a> class="fas fa-chart-line fa-fw"></i> {% trans 'Statistics' %}</a>
<a class="dropdown-item" href="{% url 'edit_ingredient' %}"><i <a class="dropdown-item" href="{% url 'edit_ingredient' %}"><i
class="fas fa-balance-scale fa-fw"></i> {% trans 'Units & Ingredients' %}</a> class="fas fa-balance-scale fa-fw"></i> {% trans 'Units & Ingredients' %}</a>
<a class="dropdown-item" href="{% url 'view_import' %}"><i
class="fas fa-file-import"></i> {% trans 'Import Recipe' %}</a>
</div> </div>
</li> </li>
@ -137,7 +140,8 @@
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li class="nav-item dropdown {% if request.resolver_match.url_name in 'view_settings' %}active{% endif %}"> <li class="nav-item dropdown {% if request.resolver_match.url_name in 'view_settings' %}active{% endif %}">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"><i class="fas fa-user-alt"></i> {{ user.get_user_name }} aria-haspopup="true" aria-expanded="false"><i
class="fas fa-user-alt"></i> {{ user.get_user_name }}
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">

4
cookbook/templates/recipe_view.html
View File

@ -62,6 +62,8 @@
class="fas fa-calendar"></i></a> class="fas fa-calendar"></i></a>
<a class="btn btn-light" onclick="window.print()"><i <a class="btn btn-light" onclick="window.print()"><i
class="fas fa-print"></i></a> class="fas fa-print"></i></a>
<a class="btn btn-primary" href="{% url 'view_export' %}?r={{ recipe.pk }}" target="_blank"><i
class="fas fa-file-export"></i></a>
</div> </div>
</div> </div>
@ -194,7 +196,7 @@
<div style="font-size: large"> <div style="font-size: large">
{% if recipe.instructions %} {% if recipe.instructions %}
{{ recipe.instructions | urlize | markdown | safe }} {{ recipe.instructions | urlize | markdown | safe }}
{% endif %} {% endif %}
</div> </div>

2
cookbook/views/edit.py
View File

@ -205,7 +205,7 @@ def edit_storage(request, pk):
messages.add_message(request, messages.SUCCESS, _('Storage saved!')) messages.add_message(request, messages.SUCCESS, _('Storage saved!'))
else: 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: else:
pseudo_instance = instance pseudo_instance = instance
pseudo_instance.password = '__NO__CHANGE__' pseudo_instance.password = '__NO__CHANGE__'

43
cookbook/views/import_export.py
View File

@ -1,13 +1,17 @@
import base64
import json import json
import re
from django.contrib import messages from django.contrib import messages
from django.core.files.base import ContentFile
from django.db import IntegrityError from django.db import IntegrityError
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect, JsonResponse, HttpResponse
from django.shortcuts import render from django.shortcuts import render
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from cookbook.forms import ExportForm, ImportForm 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): def import_recipe(request):
@ -20,6 +24,14 @@ def import_recipe(request):
working_time=data['recipe']['working_time'], waiting_time=data['recipe']['waiting_time'], working_time=data['recipe']['working_time'], waiting_time=data['recipe']['waiting_time'],
created_by=request.user, internal=True) 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']: for u in data['units']:
try: try:
Unit.objects.create(name=u['name'], description=u['description']).save() 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']), 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']) 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!')) messages.add_message(request, messages.SUCCESS, _('Recipe imported successfully!'))
return HttpResponseRedirect(reverse_lazy('view_recipe', args=[recipe.pk])) return HttpResponseRedirect(reverse_lazy('view_recipe', args=[recipe.pk]))
else: 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}, 'recipe': {'name': recipe.name, 'instructions': recipe.instructions, 'working_time': recipe.working_time, 'waiting_time': recipe.working_time},
'units': [], 'units': [],
'ingredients': [], '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(): for ri in RecipeIngredient.objects.filter(recipe=recipe).all():
if ri.unit not in export['units']: if ri.unit not in export['units']:
export['units'].append({'name': ri.unit.name, 'description': ri.unit.description}) 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}) 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) context['export'] = json.dumps(export, indent=4)
else: else:
form.add_error('recipe', _('External recipes cannot be exported, please share the file directly or select an internal recipe.')) form.add_error('recipe', _('External recipes cannot be exported, please share the file directly or select an internal recipe.'))
else: else:
form = ExportForm() 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 context['form'] = form

2
cookbook/views/lists.py
View File

@ -32,7 +32,7 @@ def recipe_import(request):
RequestConfig(request, paginate={'per_page': 25}).configure(table) 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 @login_required

6
recipes/locale/de/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,10 +18,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: .\recipes\settings.py:136 #: .\recipes\settings.py:137
msgid "German" msgid "German"
msgstr "Deutsch" msgstr "Deutsch"
#: .\recipes\settings.py:137 #: .\recipes\settings.py:138
msgid "English" msgid "English"
msgstr "Englisch" msgstr "Englisch"