From c2b82fa063b3bced9cd93473d6b3bd06df472689 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sun, 7 Mar 2021 21:34:55 +0100
Subject: [PATCH] fix up some messages

---
 src-ui/angular.json                           |  3 +-
 src-ui/messages.xlf                           | 12 +++---
 .../components/search/search.component.html   |  4 +-
 src/documents/serialisers.py                  |  2 +-
 src/locale/en_US/LC_MESSAGES/django.po        | 42 ++++++++++++-------
 5 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src-ui/angular.json b/src-ui/angular.json
index 12c84bc1b..8b5804521 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -105,7 +105,8 @@
 				"extract-i18n": {
 					"builder": "@angular-devkit/build-angular:extract-i18n",
 					"options": {
-						"browserTarget": "paperless-ui:build"
+						"browserTarget": "paperless-ui:build",
+						"ivy": true
 					}
 				},
 				"test": {
diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 06f65fca1..7049f88ae 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -926,32 +926,32 @@
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2abff6a01d9b342a5a14b7fb90309a95ce934f8e" datatype="html">
-        <source> Showing documents similar to <x id="START_LINK" equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}"/><x id="INTERPOLATION" equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;"/><x id="CLOSE_LINK" equiv-text="&lt;/a&gt;"/></source>
+      <trans-unit id="f7f2e30106223a69bcf0f8e586e6be9dc4e72226" datatype="html">
+        <source>Showing documents similar to <x id="START_LINK" equiv-text="&lt;a routerLink=&quot;/documents/{{more_like}}&quot;&gt;{{more_like_doc?.original_file_name}}"/><x id="INTERPOLATION" equiv-text="{{more_like_doc?.original_file_name}}&lt;/a&gt;"/><x id="CLOSE_LINK" equiv-text="&lt;/a&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">7</context>
+          <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6e0b0a1ea16f18f2fb1586c53d99d2f22e1aee2e" datatype="html">
         <source>Search query: <x id="START_ITALIC_TEXT" equiv-text="&lt;i&gt;{{query}}"/><x id="INTERPOLATION" equiv-text="{{query}}&lt;/i&gt;"/><x id="CLOSE_ITALIC_TEXT" equiv-text="&lt;/i&gt;"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit>
       <trans-unit id="afa760e48c97d64d19c1455d18b7834a2256e23f" datatype="html">
         <source>Did you mean &quot;<x id="START_LINK" equiv-text="&lt;a [routerLink]=&quot;&quot; (click)=&quot;searchCorrectedQuery()&quot;&gt;{{correctedQuery}}"/><x id="INTERPOLATION" equiv-text="{{correctedQuery}}&lt;/a&gt;"/><x id="CLOSE_LINK" equiv-text="&lt;/a&gt;"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fe6ced3fcc803bba5a2e6c1a067b9ce62542500e" datatype="html">
         <source>{VAR_PLURAL, plural, =0 {No results} =1 {One result} other {<x id="INTERPOLATION"/> results}}</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/search/search.component.html</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
       <trans-unit id="41147374f427980a9f1a8cd5e3f4b1666e6f2418" datatype="html">
diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html
index ae0ec8e3e..f794a0feb 100644
--- a/src-ui/src/app/components/search/search.component.html
+++ b/src-ui/src/app/components/search/search.component.html
@@ -3,9 +3,7 @@
 
 <div *ngIf="errorMessage" class="alert alert-danger" i18n>Invalid search query: {{errorMessage}}</div>
 
-<p *ngIf="more_like" i18n>
-    Showing documents similar to <a routerLink="/documents/{{more_like}}">{{more_like_doc?.original_file_name}}</a>
-</p>
+<p *ngIf="more_like" i18n>Showing documents similar to <a routerLink="/documents/{{more_like}}">{{more_like_doc?.original_file_name}}</a></p>
 
 <p *ngIf="query">
     <ng-container i18n>Search query: <i>{{query}}</i></ng-container>
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 6ebf4c541..3641c73a5 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -50,7 +50,7 @@ class MatchingModelSerializer(serializers.ModelSerializer):
                 re.compile(match)
             except Exception as e:
                 raise serializers.ValidationError(
-                    _("Invalid regular expresssion: %(error)s") %
+                    _("Invalid regular expression: %(error)s") %
                     {'error': str(e)}
                 )
         return match
diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po
index 7aaa6ddd1..36359709a 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-02-28 12:40+0100\n"
+"POT-Creation-Date: 2021-03-07 21:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -230,7 +230,7 @@ msgstr ""
 msgid "logs"
 msgstr ""
 
-#: documents/models.py:344 documents/models.py:394
+#: documents/models.py:344 documents/models.py:396
 msgid "saved view"
 msgstr ""
 
@@ -330,25 +330,33 @@ msgstr ""
 msgid "does not have tag"
 msgstr ""
 
-#: documents/models.py:398
+#: documents/models.py:388
+msgid "does not have ASN"
+msgstr ""
+
+#: documents/models.py:389
+msgid "title or content contains"
+msgstr ""
+
+#: documents/models.py:400
 msgid "rule type"
 msgstr ""
 
-#: documents/models.py:402
+#: documents/models.py:404
 msgid "value"
 msgstr ""
 
-#: documents/models.py:408
+#: documents/models.py:410
 msgid "filter rule"
 msgstr ""
 
-#: documents/models.py:409
+#: documents/models.py:411
 msgid "filter rules"
 msgstr ""
 
 #: documents/serialisers.py:53
 #, python-format
-msgid "Invalid regular expresssion: %(error)s"
+msgid "Invalid regular expression: %(error)s"
 msgstr ""
 
 #: documents/serialisers.py:177
@@ -400,38 +408,42 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
-#: paperless/settings.py:297
+#: paperless/settings.py:298
 msgid "English (US)"
 msgstr ""
 
-#: paperless/settings.py:298
+#: paperless/settings.py:299
 msgid "English (GB)"
 msgstr ""
 
-#: paperless/settings.py:299
+#: paperless/settings.py:300
 msgid "German"
 msgstr ""
 
-#: paperless/settings.py:300
+#: paperless/settings.py:301
 msgid "Dutch"
 msgstr ""
 
-#: paperless/settings.py:301
+#: paperless/settings.py:302
 msgid "French"
 msgstr ""
 
-#: paperless/settings.py:302
+#: paperless/settings.py:303
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: paperless/settings.py:303
+#: paperless/settings.py:304
 msgid "Italian"
 msgstr ""
 
-#: paperless/settings.py:304
+#: paperless/settings.py:305
 msgid "Romanian"
 msgstr ""
 
+#: paperless/settings.py:306
+msgid "Russian"
+msgstr ""
+
 #: paperless/urls.py:118
 msgid "Paperless-ng administration"
 msgstr ""