From 7ebc1351fe417ff2c6fff4f7f962427632e3335b Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Sun, 10 Jan 2021 22:40:13 +0100 Subject: [PATCH 1/2] updated documentation #316 --- docs/configuration.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/configuration.rst b/docs/configuration.rst index 4828c4fa5..ac2efd390 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -423,6 +423,9 @@ PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS= E.g. /foo/bar/file.pdf will add the tags "foo" and "bar" to the consumed file. Paperless will create any tags that don't exist yet. + This is useful for sorting documents with certain tags such as ``car`` or + ``todo`` prior to consumption. These folders won't be deleted. + PAPERLESS_CONSUMER_RECURSIVE must be enabled for this to work. Defaults to false. From e96809a08e6d1fe57551d1aac0065b3f060fe9b8 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Sun, 10 Jan 2021 22:47:24 +0100 Subject: [PATCH 2/2] translation for login/logout pages #212 --- src/documents/templates/index.html | 3 +- .../templates/registration/logged_out.html | 7 +- .../templates/registration/login.html | 19 ++-- src/locale/en-us/LC_MESSAGES/django.po | 106 ++++++++++++------ 4 files changed, 90 insertions(+), 45 deletions(-) diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html index 21112b643..285e48d3f 100644 --- a/src/documents/templates/index.html +++ b/src/documents/templates/index.html @@ -1,6 +1,7 @@ {% load static %} +{% load i18n %} @@ -16,7 +17,7 @@ - Loading... + {% translate "Paperless-ng is loading..." %} diff --git a/src/documents/templates/registration/logged_out.html b/src/documents/templates/registration/logged_out.html index 1448b641e..bf21b95f8 100644 --- a/src/documents/templates/registration/logged_out.html +++ b/src/documents/templates/registration/logged_out.html @@ -1,6 +1,7 @@ {% load static %} +{% load i18n %} @@ -9,7 +10,7 @@ - Paperless Sign In + {% translate "Paperless-ng signed out" %} @@ -37,8 +38,8 @@ diff --git a/src/documents/templates/registration/login.html b/src/documents/templates/registration/login.html index 7f1fc79dd..ba46d3adf 100644 --- a/src/documents/templates/registration/login.html +++ b/src/documents/templates/registration/login.html @@ -1,6 +1,7 @@ {% load static %} +{% load i18n %} @@ -9,7 +10,7 @@ - Paperless Sign In + {% translate "Paperless-ng sign in" %} @@ -38,17 +39,19 @@ diff --git a/src/locale/en-us/LC_MESSAGES/django.po b/src/locale/en-us/LC_MESSAGES/django.po index b3e448058..414caba52 100644 --- a/src/locale/en-us/LC_MESSAGES/django.po +++ b/src/locale/en-us/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-06 19:50+0000\n" +"POT-Creation-Date: 2021-01-10 21:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgid "Automatic" msgstr "" #: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25 -#: paperless_mail/models.py:111 +#: paperless_mail/models.py:109 msgid "name" msgstr "" @@ -338,6 +338,46 @@ msgstr "" msgid "filter rules" msgstr "" +#: documents/templates/index.html:20 +msgid "Paperless-ng is loading..." +msgstr "" + +#: documents/templates/registration/logged_out.html:13 +msgid "Paperless-ng signed out" +msgstr "" + +#: documents/templates/registration/logged_out.html:41 +msgid "You have been successfully logged out. Bye!" +msgstr "" + +#: documents/templates/registration/logged_out.html:42 +msgid "Sign in again" +msgstr "" + +#: documents/templates/registration/login.html:13 +msgid "Paperless-ng sign in" +msgstr "" + +#: documents/templates/registration/login.html:42 +msgid "Please sign in." +msgstr "" + +#: documents/templates/registration/login.html:45 +msgid "Your username and password didn't match. Please try again." +msgstr "" + +#: documents/templates/registration/login.html:48 +msgid "Username" +msgstr "" + +#: documents/templates/registration/login.html:49 +msgid "Password" +msgstr "" + +#: documents/templates/registration/login.html:54 +msgid "Sign in" +msgstr "" + #: paperless/settings.py:268 msgid "English" msgstr "" @@ -451,132 +491,132 @@ msgstr "" msgid "Only process attachments." msgstr "" -#: paperless_mail/models.py:70 +#: paperless_mail/models.py:68 msgid "Process all files, including 'inline' attachments." msgstr "" -#: paperless_mail/models.py:80 +#: paperless_mail/models.py:78 msgid "Mark as read, don't process read mails" msgstr "" -#: paperless_mail/models.py:81 +#: paperless_mail/models.py:79 msgid "Flag the mail, don't process flagged mails" msgstr "" -#: paperless_mail/models.py:82 +#: paperless_mail/models.py:80 msgid "Move to specified folder" msgstr "" -#: paperless_mail/models.py:83 +#: paperless_mail/models.py:81 msgid "Delete" msgstr "" -#: paperless_mail/models.py:90 +#: paperless_mail/models.py:88 msgid "Use subject as title" msgstr "" -#: paperless_mail/models.py:91 +#: paperless_mail/models.py:89 msgid "Use attachment filename as title" msgstr "" -#: paperless_mail/models.py:101 +#: paperless_mail/models.py:99 msgid "Do not assign a correspondent" msgstr "" -#: paperless_mail/models.py:103 +#: paperless_mail/models.py:101 msgid "Use mail address" msgstr "" -#: paperless_mail/models.py:105 +#: paperless_mail/models.py:103 msgid "Use name (or mail address if not available)" msgstr "" -#: paperless_mail/models.py:107 +#: paperless_mail/models.py:105 msgid "Use correspondent selected below" msgstr "" -#: paperless_mail/models.py:115 +#: paperless_mail/models.py:113 msgid "order" msgstr "" -#: paperless_mail/models.py:122 +#: paperless_mail/models.py:120 msgid "account" msgstr "" -#: paperless_mail/models.py:126 +#: paperless_mail/models.py:124 msgid "folder" msgstr "" -#: paperless_mail/models.py:130 +#: paperless_mail/models.py:128 msgid "filter from" msgstr "" -#: paperless_mail/models.py:133 +#: paperless_mail/models.py:131 msgid "filter subject" msgstr "" -#: paperless_mail/models.py:136 +#: paperless_mail/models.py:134 msgid "filter body" msgstr "" -#: paperless_mail/models.py:140 +#: paperless_mail/models.py:138 msgid "filter attachment filename" msgstr "" -#: paperless_mail/models.py:142 +#: paperless_mail/models.py:140 msgid "" "Only consume documents which entirely match this filename if specified. " "Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." msgstr "" -#: paperless_mail/models.py:148 +#: paperless_mail/models.py:146 msgid "maximum age" msgstr "" -#: paperless_mail/models.py:150 +#: paperless_mail/models.py:148 msgid "Specified in days." msgstr "" -#: paperless_mail/models.py:153 +#: paperless_mail/models.py:151 msgid "attachment type" msgstr "" -#: paperless_mail/models.py:156 +#: paperless_mail/models.py:154 msgid "" "Inline attachments include embedded images, so it's best to combine this " "option with a filename filter." msgstr "" -#: paperless_mail/models.py:161 +#: paperless_mail/models.py:159 msgid "action" msgstr "" -#: paperless_mail/models.py:167 +#: paperless_mail/models.py:165 msgid "action parameter" msgstr "" -#: paperless_mail/models.py:169 +#: paperless_mail/models.py:167 msgid "" "Additional parameter for the action selected above, i.e., the target folder " "of the move to folder action." msgstr "" -#: paperless_mail/models.py:175 +#: paperless_mail/models.py:173 msgid "assign title from" msgstr "" -#: paperless_mail/models.py:185 +#: paperless_mail/models.py:183 msgid "assign this tag" msgstr "" -#: paperless_mail/models.py:193 +#: paperless_mail/models.py:191 msgid "assign this document type" msgstr "" -#: paperless_mail/models.py:197 +#: paperless_mail/models.py:195 msgid "assign correspondent from" msgstr "" -#: paperless_mail/models.py:207 +#: paperless_mail/models.py:205 msgid "assign this correspondent" msgstr ""