From 8ce35dde0b13cf19477d1e907d51539cfcdc3eff Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 21 Nov 2019 15:01:48 +0100
Subject: [PATCH] translations in vcs + storage security

---
 .gitignore                                       |   4 ----
 cookbook/locale/de/LC_MESSAGES/django.mo         | Bin 0 -> 5702 bytes
 .../include/storage_backend_warning.html         |   2 +-
 cookbook/urls.py                                 |   2 +-
 cookbook/views/edit.py                           |   4 ++--
 recipes/locale/de/LC_MESSAGES/django.mo          | Bin 0 -> 452 bytes
 6 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 cookbook/locale/de/LC_MESSAGES/django.mo
 create mode 100644 recipes/locale/de/LC_MESSAGES/django.mo

diff --git a/.gitignore b/.gitignore
index 4002e45e5..6bfc03c06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,10 +44,6 @@ nosetests.xml
 coverage.xml
 *,cover
 
-# Translations
-*.mo
-*.pot
-
 # Django stuff:
 *.log
 
diff --git a/cookbook/locale/de/LC_MESSAGES/django.mo b/cookbook/locale/de/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..2640e2a90f9c5dbed154059461c1b84a36a19c64
GIT binary patch
literal 5702
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

literal 0
HcmV?d00001

diff --git a/cookbook/templates/include/storage_backend_warning.html b/cookbook/templates/include/storage_backend_warning.html
index 817a5840c..356b001e7 100644
--- a/cookbook/templates/include/storage_backend_warning.html
+++ b/cookbook/templates/include/storage_backend_warning.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <div class="alert alert-danger" role="alert">
-    <h4 class="alert-heading"><i class="far fa-exclamation-triangle"></i> {% trans 'Security Warning' %}</h4>
+    <h4 class="alert-heading"><i class="fas fa-exclamation-triangle"></i> {% trans 'Security Warning' %}</h4>
     <p>{% blocktrans %}
         The <b>Password and Token</b> field are stored as <b>plain text</b> inside the database.
         This is necessary because they are needed to make API requests, but it also increases the risk of
diff --git a/cookbook/urls.py b/cookbook/urls.py
index d1ac1a6ea..933ee6222 100644
--- a/cookbook/urls.py
+++ b/cookbook/urls.py
@@ -28,7 +28,7 @@ urlpatterns = [
     path('edit/keyword/<int:pk>/', edit.KeywordUpdate.as_view(), name='edit_keyword'),
     path('edit/sync/<int:pk>/', edit.SyncUpdate.as_view(), name='edit_sync'),
     path('edit/import/<int:pk>/', edit.ImportUpdate.as_view(), name='edit_import'),
-    path('edit/storage/<int:pk>/', edit.StorageUpdate.as_view(), name='edit_storage'),
+    path('edit/storage/<int:pk>/', edit.edit_storage, name='edit_storage'),
     path('edit/comment/<int:pk>/', edit.CommentUpdate.as_view(), name='edit_comment'),
 
     path('redirect/delete/<slug:name>/<int:pk>/', edit.delete_redirect, name='redirect_delete'),
diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py
index fd6968cf4..a11e2f96f 100644
--- a/cookbook/views/edit.py
+++ b/cookbook/views/edit.py
@@ -147,9 +147,9 @@ def edit_storage(request, pk):
         pseudo_instance = instance
         pseudo_instance.password = '__NO__CHANGE__'
         pseudo_instance.token = '__NO__CHANGE__'
-        form = InternalRecipeForm(instance=pseudo_instance)
+        form = StorageForm(instance=pseudo_instance)
 
-    return render(request, 'forms/edit_internal_recipe.html',
+    return render(request, 'generic/edit_template.html',
                   {'form': form, 'view_url': reverse('view_recipe', args=[pk])})
 
 
diff --git a/recipes/locale/de/LC_MESSAGES/django.mo b/recipes/locale/de/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..24682470f68657f27807f1ee2d3cce7c520e2390
GIT binary patch
literal 452
zcmYL_OHRWu6h*@yWyqL;nSqcCMGUI6L8OgaBJxw3R)P^GHK|c*N4A4tA*_TcYhf+C
z6r^7H_&v+l_LYB*c0Vo94sZ-y1A9OSw0Z&#01E5_92jm{Rt@zK_=3LO|Aq=<t@f@~
z+wDX|S#iCzCQPlUuu>&oSz&Onz;mWFm%>4*H@f#G1kFh{4U*W-SS^*okuLcH51Ufs
zTsp{36P&R(-k!leHOxT|#LIA$VBbS`i4z6qk4a4IkZOZ-MTM@Yk;*~iSs0?&iwGK!
z$P2<-&-XJjo!)>|lnpHz&KX@fDD>jVtW7cq!`q5?q$)QaNDu`P*~IR4F71&Nh6#A?
zqlP?&y_<`=qFnS*v7|~f<IeIi?rnT+tQV#*5rtfEQ97vi%#EE^jiMDEOSRGt67_ni
c-K#$OYu!_UPF&PI>)Zc7S}ZM}HAX}I1rIcL%K!iX

literal 0
HcmV?d00001