paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-28 03:46:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into travis-multiarch-builds

Browse Source
This commit is contained in:
jonaswinkler
2021-01-10 23:46:31 +01:00
parent 5cdf0d5632 5a254e2612
commit c964a9435e
5 changed files with 93 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/configuration.rst
View File

@@ -423,6 +423,9 @@ PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS=<bool>
E.g. <CONSUMPTION_DIR>/foo/bar/file.pdf will add the tags "foo" and "bar" to E.g. <CONSUMPTION_DIR>/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. 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. PAPERLESS_CONSUMER_RECURSIVE must be enabled for this to work.
Defaults to false. Defaults to false.

3
src/documents/templates/index.html
View File

@@ -1,6 +1,7 @@
<!doctype html> <!doctype html>
{% load static %} {% load static %}
{% load i18n %}
<html lang="en"> <html lang="en">
<head> <head>
@@ -16,7 +17,7 @@
<link rel="stylesheet" href="{% static styles_css %}"> <link rel="stylesheet" href="{% static styles_css %}">
</head> </head>
<body> <body>
<app-root>Loading...</app-root> <app-root>{% translate "Paperless-ng is loading..." %}</app-root>
<script src="{% static runtime_js %}" defer></script> <script src="{% static runtime_js %}" defer></script>
<script src="{% static polyfills_js %}" defer></script> <script src="{% static polyfills_js %}" defer></script>
<script src="{% static main_js %}" defer></script> <script src="{% static main_js %}" defer></script>

7
src/documents/templates/registration/logged_out.html
View File

@@ -1,6 +1,7 @@
<!doctype html> <!doctype html>
{% load static %} {% load static %}
{% load i18n %}
<html lang="en"> <html lang="en">
<head> <head>
@@ -9,7 +10,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors"> <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
<meta name="generator" content="Jekyll v4.1.1"> <meta name="generator" content="Jekyll v4.1.1">
<title>Paperless Sign In</title> <title>{% translate "Paperless-ng signed out" %}</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="{% static 'bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'bootstrap.min.css' %}" rel="stylesheet">
@@ -37,8 +38,8 @@
<body class="text-center"> <body class="text-center">
<div class="form-signin"> <div class="form-signin">
<img class="mb-4" src="{% static 'frontend/en-US/assets/logo.svg' %}" alt="" width="300"> <img class="mb-4" src="{% static 'frontend/en-US/assets/logo.svg' %}" alt="" width="300">
<p>You have been successfully logged out. Bye!</p> <p>{% translate "You have been successfully logged out. Bye!" %}</p>
<a href="/">Sign in again</a> <a href="/">{% translate "Sign in again" %}</a>
</div> </div>
</body> </body>
</html> </html>

19
src/documents/templates/registration/login.html
View File

@@ -1,6 +1,7 @@
<!doctype html> <!doctype html>
{% load static %} {% load static %}
{% load i18n %}
<html lang="en"> <html lang="en">
<head> <head>
@@ -9,7 +10,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors"> <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors">
<meta name="generator" content="Jekyll v4.1.1"> <meta name="generator" content="Jekyll v4.1.1">
<title>Paperless Sign In</title> <title>{% translate "Paperless-ng sign in" %}</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="{% static 'bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'bootstrap.min.css' %}" rel="stylesheet">
@@ -38,17 +39,19 @@
<form class="form-signin" method="post"> <form class="form-signin" method="post">
{% csrf_token %} {% csrf_token %}
<img class="mb-4" src="{% static 'frontend/en-US/assets/logo.svg' %}" alt="" width="300"> <img class="mb-4" src="{% static 'frontend/en-US/assets/logo.svg' %}" alt="" width="300">
<p>Please sign in.</p> <p>{% translate "Please sign in." %}</p>
{% if form.errors %} {% if form.errors %}
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
Your username and password didn't match. Please try again. {% translate "Your username and password didn't match. Please try again." %}
</div> </div>
{% endif %} {% endif %}
<label for="inputUsername" class="sr-only">Username</label> {% translate "Username" as i18n_username %}
<input type="text" name="username" id="inputUsername" class="form-control" placeholder="Username" required autofocus> {% translate "Password" as i18n_password %}
<label for="inputPassword" class="sr-only">Password</label> <label for="inputUsername" class="sr-only">{{ i18n_username }}</label>
<input type="password" name="password" id="inputPassword" class="form-control" placeholder="Password" required> <input type="text" name="username" id="inputUsername" class="form-control" placeholder="{{ i18n_username }}" required autofocus>
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button> <label for="inputPassword" class="sr-only">{{ i18n_password }}</label>
<input type="password" name="password" id="inputPassword" class="form-control" placeholder="{{ i18n_password }}" required>
<button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Sign in" %}</button>
</form> </form>
</body> </body>
</html> </html>

106
src/locale/en-us/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: 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" "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"
@@ -46,7 +46,7 @@ msgid "Automatic"
msgstr "" msgstr ""
#: documents/models.py:41 documents/models.py:354 paperless_mail/models.py:25 #: 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" msgid "name"
msgstr "" msgstr ""
@@ -338,6 +338,46 @@ msgstr ""
msgid "filter rules" msgid "filter rules"
msgstr "" 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 #: paperless/settings.py:268
msgid "English" msgid "English"
msgstr "" msgstr ""
@@ -451,132 +491,132 @@ msgstr ""
msgid "Only process attachments." msgid "Only process attachments."
msgstr "" msgstr ""
#: paperless_mail/models.py:70 #: paperless_mail/models.py:68
msgid "Process all files, including 'inline' attachments." msgid "Process all files, including 'inline' attachments."
msgstr "" msgstr ""
#: paperless_mail/models.py:80 #: paperless_mail/models.py:78
msgid "Mark as read, don't process read mails" msgid "Mark as read, don't process read mails"
msgstr "" msgstr ""
#: paperless_mail/models.py:81 #: paperless_mail/models.py:79
msgid "Flag the mail, don't process flagged mails" msgid "Flag the mail, don't process flagged mails"
msgstr "" msgstr ""
#: paperless_mail/models.py:82 #: paperless_mail/models.py:80
msgid "Move to specified folder" msgid "Move to specified folder"
msgstr "" msgstr ""
#: paperless_mail/models.py:83 #: paperless_mail/models.py:81
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: paperless_mail/models.py:90 #: paperless_mail/models.py:88
msgid "Use subject as title" msgid "Use subject as title"
msgstr "" msgstr ""
#: paperless_mail/models.py:91 #: paperless_mail/models.py:89
msgid "Use attachment filename as title" msgid "Use attachment filename as title"
msgstr "" msgstr ""
#: paperless_mail/models.py:101 #: paperless_mail/models.py:99
msgid "Do not assign a correspondent" msgid "Do not assign a correspondent"
msgstr "" msgstr ""
#: paperless_mail/models.py:103 #: paperless_mail/models.py:101
msgid "Use mail address" msgid "Use mail address"
msgstr "" msgstr ""
#: paperless_mail/models.py:105 #: paperless_mail/models.py:103
msgid "Use name (or mail address if not available)" msgid "Use name (or mail address if not available)"
msgstr "" msgstr ""
#: paperless_mail/models.py:107 #: paperless_mail/models.py:105
msgid "Use correspondent selected below" msgid "Use correspondent selected below"
msgstr "" msgstr ""
#: paperless_mail/models.py:115 #: paperless_mail/models.py:113
msgid "order" msgid "order"
msgstr "" msgstr ""
#: paperless_mail/models.py:122 #: paperless_mail/models.py:120
msgid "account" msgid "account"
msgstr "" msgstr ""
#: paperless_mail/models.py:126 #: paperless_mail/models.py:124
msgid "folder" msgid "folder"
msgstr "" msgstr ""
#: paperless_mail/models.py:130 #: paperless_mail/models.py:128
msgid "filter from" msgid "filter from"
msgstr "" msgstr ""
#: paperless_mail/models.py:133 #: paperless_mail/models.py:131
msgid "filter subject" msgid "filter subject"
msgstr "" msgstr ""
#: paperless_mail/models.py:136 #: paperless_mail/models.py:134
msgid "filter body" msgid "filter body"
msgstr "" msgstr ""
#: paperless_mail/models.py:140 #: paperless_mail/models.py:138
msgid "filter attachment filename" msgid "filter attachment filename"
msgstr "" msgstr ""
#: paperless_mail/models.py:142 #: paperless_mail/models.py:140
msgid "" msgid ""
"Only consume documents which entirely match this filename if specified. " "Only consume documents which entirely match this filename if specified. "
"Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." "Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
msgstr "" msgstr ""
#: paperless_mail/models.py:148 #: paperless_mail/models.py:146
msgid "maximum age" msgid "maximum age"
msgstr "" msgstr ""
#: paperless_mail/models.py:150 #: paperless_mail/models.py:148
msgid "Specified in days." msgid "Specified in days."
msgstr "" msgstr ""
#: paperless_mail/models.py:153 #: paperless_mail/models.py:151
msgid "attachment type" msgid "attachment type"
msgstr "" msgstr ""
#: paperless_mail/models.py:156 #: paperless_mail/models.py:154
msgid "" msgid ""
"Inline attachments include embedded images, so it's best to combine this " "Inline attachments include embedded images, so it's best to combine this "
"option with a filename filter." "option with a filename filter."
msgstr "" msgstr ""
#: paperless_mail/models.py:161 #: paperless_mail/models.py:159
msgid "action" msgid "action"
msgstr "" msgstr ""
#: paperless_mail/models.py:167 #: paperless_mail/models.py:165
msgid "action parameter" msgid "action parameter"
msgstr "" msgstr ""
#: paperless_mail/models.py:169 #: paperless_mail/models.py:167
msgid "" msgid ""
"Additional parameter for the action selected above, i.e., the target folder " "Additional parameter for the action selected above, i.e., the target folder "
"of the move to folder action." "of the move to folder action."
msgstr "" msgstr ""
#: paperless_mail/models.py:175 #: paperless_mail/models.py:173
msgid "assign title from" msgid "assign title from"
msgstr "" msgstr ""
#: paperless_mail/models.py:185 #: paperless_mail/models.py:183
msgid "assign this tag" msgid "assign this tag"
msgstr "" msgstr ""
#: paperless_mail/models.py:193 #: paperless_mail/models.py:191
msgid "assign this document type" msgid "assign this document type"
msgstr "" msgstr ""
#: paperless_mail/models.py:197 #: paperless_mail/models.py:195
msgid "assign correspondent from" msgid "assign correspondent from"
msgstr "" msgstr ""
#: paperless_mail/models.py:207 #: paperless_mail/models.py:205
msgid "assign this correspondent" msgid "assign this correspondent"
msgstr "" msgstr ""