Merge 47d0b73 into d0c79a9

watchdogpolska · Nov 19, 2020 · 31275b4 · 31275b4
2 parents d0c79a9 + 47d0b73
commit 31275b4
Show file tree

Hide file tree

Showing 15 changed files with 959 additions and 8,545 deletions.
diff --git a/feder/assets/scss/style.scss b/feder/assets/scss/style.scss
@@ -163,3 +163,21 @@ $gray: #F0F0F0;
     margin-left: 10px;
   }
 }
+
+/* Letters app */
+
+.letter-body {
+  margin-bottom: 20px;
+
+  iframe {
+    width: 100%;
+    height: 400px;
+    border: 0;
+  }
+}
+
+iframe.letter-quote {
+  width: 100%;
+  height: 200px;
+  border: 0;
+}
diff --git a/feder/letters/locale/pl/LC_MESSAGES/django.mo b/feder/letters/locale/pl/LC_MESSAGES/django.mo
diff --git a/feder/letters/locale/pl/LC_MESSAGES/django.po b/feder/letters/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: letters 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-11 21:53+0000\n"
-"PO-Revision-Date: 2020-07-11 23:54+0200\n"
+"POT-Creation-Date: 2020-11-18 14:43+0000\n"
+"PO-Revision-Date: 2020-11-18 15:43+0100\n"
 "Last-Translator: Adam Dobrawy <naczelnik@jawnosc.tk>\n"
 "Language-Team: Adam Dobrawy <naczelnik@jawnosc.tk>\n"
 "Language: pl_PL\n"
@@ -17,9 +17,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.0.6\n"
 
-#: apps.py:7 models.py:138
+#: apps.py:7 models.py:144
 msgid "Letter"
 msgstr "List"
 
@@ -31,7 +31,7 @@ msgstr "Data utworzenia"
 msgid "Has eml?"
 msgstr "Ma plik .eml?"
 
-#: filters.py:20 models.py:101
+#: filters.py:20 models.py:100
 msgid "Title"
 msgstr "Tytuł"
 
@@ -77,88 +77,100 @@ msgstr "Numer sprawy"
 msgid "Reassign"
 msgstr "Przepisz"
 
-#: models.py:83
+#: models.py:82
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: models.py:84
+#: models.py:83
 msgid "Spam"
 msgstr "Spam"
 
-#: models.py:85
+#: models.py:84
 msgid "Non-spam"
 msgstr "Nie-spam"
 
-#: models.py:90
+#: models.py:89
 msgid "Author (if user)"
 msgstr "Autor (jeżeli użytkownik)"
 
-#: models.py:97
+#: models.py:96
 msgid "Author (if institution)"
 msgstr "Autor (jeżeli instytucja)"
 
-#: models.py:102 templates/letters/messages/_message.html:13
+#: models.py:101 templates/letters/messages/_message.html:13
 msgid "Text"
 msgstr "Treść"
 
+#: models.py:102
+msgid "Text in HTML"
+msgstr "Treść w formacie HTML"
+
 #: models.py:103
 msgid "Quote"
 msgstr "Cytat"
 
 #: models.py:104
+msgid "Quote in HTML"
+msgstr "Cytat w formacie HTML"
+
+#: models.py:105
 msgid "E-mail"
 msgstr "E-mail"
 
-#: models.py:105
+#: models.py:106
 msgid "Comments from editor"
 msgstr "Komentarz od redakcji"
 
-#: models.py:107
+#: models.py:108
+msgid "Is SPAM?"
+msgstr "Oznaczony jako SPAM?"
+
+#: models.py:113
 msgid "Is draft?"
 msgstr "Czy szkic?"
 
-#: models.py:113
+#: models.py:119
 msgid "Spam marker"
 msgstr "Oznacz spam"
 
-#: models.py:114
+#: models.py:120
 msgid "The person who marked it as spam"
 msgstr "Osoba, która oznaczyła jako spam"
 
-#: models.py:120
+#: models.py:126
 msgid "Time of mark as spam"
 msgstr "Czas oznaczenia jako spam"
 
-#: models.py:121
+#: models.py:127
 msgid "Time when letter was marked as spam"
 msgstr "Czas kiedy list został oznaczony jako spam"
 
-#: models.py:125
+#: models.py:131
 msgid "ID of sent email message \"Message-ID\""
 msgstr "ID wysłanej wiadomości e-mail \"Message-ID\""
 
-#: models.py:129
+#: models.py:135
 msgid "File"
 msgstr "Plik"
 
-#: models.py:139 templates/letters/base.html:5
+#: models.py:145 templates/letters/base.html:5
 #: templates/letters/letter_detail.html:3
 msgid "Letters"
 msgstr "Listy"
 
-#: models.py:142
+#: models.py:148
 msgid "Can filter eml"
 msgstr "Może filtrować po eml"
 
-#: models.py:143
+#: models.py:149
 msgid "Can recognize letter"
 msgstr "Może rozpoznawać listy"
 
-#: models.py:157
+#: models.py:163
 msgid "(no subject)"
 msgstr "(bez tematu)"
 
-#: models.py:276
+#: models.py:282
 msgid "Virus scan request"
 msgstr "Żądanie skanowania antywirusowego"
 
@@ -220,7 +232,7 @@ msgid "E-mail of case"
 msgstr "Adres e-mail sprawy"
 
 #: templates/letters/_letter_reply_body.html:5
-#: templates/letters/_letter_reply_body.txt:4 templates/letters/_object.html:21
+#: templates/letters/_letter_reply_body.txt:4 templates/letters/_object.html:31
 #: templates/letters/messages/_message.html:26
 msgid "Attachments"
 msgstr "Załączniki"
@@ -247,18 +259,18 @@ msgstr ""
 msgid "Download letter"
 msgstr "Pobierz list"
 
-#: templates/letters/_object.html:15
+#: templates/letters/_object.html:25
 msgid ""
 "This is just a draft message. The message was not sent to the institution."
 msgstr ""
 "To jest tylko szablon wiadomości. Wiadomość nie została wysłana do "
 "instytucji."
 
-#: templates/letters/_object.html:32
+#: templates/letters/_object.html:42
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/letters/_object.html:39
+#: templates/letters/_object.html:49
 msgid "Scan"
 msgstr "Skanuj"
 
@@ -596,7 +608,7 @@ msgstr "List {object} został oznaczony jako spam i ukryty."
 msgid "Assigned letter to case '%(case)s'"
 msgstr "Przypisano list do sprawy '%(case)s'"
 
-#: views.py:520
+#: views.py:521
 msgid "The file {} has been queued for scanning"
 msgstr "Plik {} został zakolejkowany do skanowania."
 

diff --git a/feder/letters/logs/locale/pl/LC_MESSAGES/django.po b/feder/letters/logs/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-11 21:54+0000\n"
+"POT-Creation-Date: 2020-11-18 14:43+0000\n"
 "PO-Revision-Date: 2017-09-20 20:27+0200\n"
 "Last-Translator: Adam Dobrawy <naczelnik@jawnosc.tk>\n"
 "Language-Team: \n"
@@ -19,107 +19,107 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: apps.py:7
+#: logs/apps.py:7
 msgid "Logs of letter"
 msgstr "Dziennik listów"
 
-#: models.py:16
+#: logs/models.py:16
 msgid "Open"
 msgstr "Otwarty"
 
-#: models.py:17
+#: logs/models.py:17
 msgid "Delivered"
 msgstr "Dostarczony"
 
-#: models.py:18
+#: logs/models.py:18
 msgid "Spam-bounce"
 msgstr "Odrzucony z powodu spamu"
 
-#: models.py:19
+#: logs/models.py:19
 msgid "Soft-bounce"
 msgstr "Miękko odrzucony"
 
-#: models.py:20
+#: logs/models.py:20
 msgid "Hard-bounce"
 msgstr "Twardo odrzucony"
 
-#: models.py:21
+#: logs/models.py:21
 msgid "Dropped"
 msgstr "Porzucone"
 
-#: models.py:22
+#: logs/models.py:22
 msgid "Deferred"
 msgstr "Odroczone"
 
-#: models.py:23
+#: logs/models.py:23
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: models.py:34 templates/logs/_list.html:7
+#: logs/models.py:34 logs/templates/logs/_list.html:7
 msgid "Case"
 msgstr "Sprawa"
 
-#: models.py:36 templates/logs/_list.html:9
+#: logs/models.py:36 logs/templates/logs/_list.html:9
 msgid "Letter"
 msgstr "List"
 
-#: models.py:38
+#: logs/models.py:38
 msgid "Message-ID"
 msgstr "Message-ID"
 
-#: models.py:39
+#: logs/models.py:39
 msgid "To"
 msgstr "Do"
 
-#: models.py:49 models.py:90
+#: logs/models.py:49 logs/models.py:90
 msgid "Email"
 msgstr "E-mail"
 
-#: models.py:50
+#: logs/models.py:50
 msgid "Emails"
 msgstr "E-maile"
 
-#: models.py:108
+#: logs/models.py:108
 msgid "Log record"
 msgstr "Rekord dziennika"
 
-#: models.py:109
+#: logs/models.py:109
 msgid "Log records"
 msgstr "Rekordy dziennika"
 
-#: templates/logs/_list.html:6
+#: logs/templates/logs/_list.html:6
 msgid "ID"
 msgstr "ID"
 
-#: templates/logs/_list.html:8
+#: logs/templates/logs/_list.html:8
 msgid "Status"
 msgstr "Status"
 
-#: templates/logs/_list.html:10
+#: logs/templates/logs/_list.html:10
 msgid "Records count"
 msgstr "Liczba wpisów"
 
-#: templates/logs/emaillog_list_for_case.html:29
-#: templates/logs/emaillog_list_for_monitoring.html:21
+#: logs/templates/logs/emaillog_list_for_case.html:29
+#: logs/templates/logs/emaillog_list_for_monitoring.html:21
 msgid "Logs"
 msgstr "Dziennik"
 
-#: templates/logs/emaillog_list_for_monitoring.html:36
+#: logs/templates/logs/emaillog_list_for_monitoring.html:36
 msgid "Download .csv"
 msgstr "Pobierz .csv"
 
-#: urls.py:8
+#: logs/urls.py:8
 msgid "^case-(?P<case_pk>[\\d-]+)$"
 msgstr "^spraw-(?P<case_pk>[\\d-]+)$"
 
-#: urls.py:13
+#: logs/urls.py:13
 msgid "^monitoring-(?P<monitoring_pk>[\\d-]+)$"
 msgstr "^monitoring-(?P<monitoring_pk>[\\d-]+)$"
 
-#: urls.py:18
+#: logs/urls.py:18
 msgid "^monitoring-(?P<monitoring_pk>[\\d-]+)/export$"
 msgstr "^monitoring-(?P<monitoring_pk>[\\d-]+)/eksport$"
 
-#: urls.py:22
+#: logs/urls.py:22
 msgid "^log-(?P<pk>[\\d-]+)$"
 msgstr "^wpis-(?P<pk>[\\d-]+)$"
diff --git a/feder/letters/migrations/0023_auto_20201118_1754.py b/feder/letters/migrations/0023_auto_20201118_1754.py
@@ -0,0 +1,33 @@
+# Generated by Django 2.2.16 on 2020-11-18 17:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("letters", "0022_remove_letter_message"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="letter",
+            name="html_body",
+            field=models.TextField(blank=True, verbose_name="Text in HTML"),
+        ),
+        migrations.AddField(
+            model_name="letter",
+            name="html_quote",
+            field=models.TextField(blank=True, verbose_name="Quote in HTML"),
+        ),
+        migrations.AlterField(
+            model_name="letter",
+            name="is_spam",
+            field=models.IntegerField(
+                choices=[(0, "Unknown"), (1, "Spam"), (2, "Non-spam")],
+                db_index=True,
+                default=0,
+                verbose_name="Is SPAM?",
+            ),
+        ),
+    ]