added en-GB language

src-ui/angular.json

@@ -18,7 +18,8 @@
 				"locales": {
 					"de": "src/locale/messages.de.xlf",
 					"nl-NL": "src/locale/messages.nl_NL.xlf",
-					"fr": "src/locale/messages.fr.xlf"
+					"fr": "src/locale/messages.fr.xlf",
+					"en-GB": "src/locale/messages.en_GB.xlf"
 				}
 			},
 			"architect": {

src-ui/src/app/app.module.ts

@@ -64,10 +64,12 @@ import { CustomDatePipe } from './pipes/custom-date.pipe';
 import localeFr from '@angular/common/locales/fr';
 import localeNl from '@angular/common/locales/nl';
 import localeDe from '@angular/common/locales/de';
+import localeEnGb from '@angular/common/locales/en-GB';
 
 registerLocaleData(localeFr)
 registerLocaleData(localeNl)
 registerLocaleData(localeDe)
+registerLocaleData(localeEnGb)
 
 @NgModule({
   declarations: [

src-ui/src/app/components/manage/settings/settings.component.html

@@ -167,7 +167,7 @@
     </li>
   </ul>
 
-  <div [ngbNavOutlet]="nav" class="border-left border-right border-bottom p-3 mb-3 shadow"></div>
+  <div [ngbNavOutlet]="nav" class="border-left border-right border-bottom p-3 mb-3 shadow-sm"></div>
 
   <button type="submit" class="btn btn-primary" i18n>Save</button>
 </form>

src-ui/src/app/services/settings.service.ts

@@ -80,6 +80,7 @@ export class SettingsService {
   getLanguageOptions(): LanguageOption[] {
     return [
       {code: "en-US", name: $localize`English (US)`, englishName: "English (US)"},
+      {code: "en-GB", name: $localize`English (GB)`, englishName: "English (GB)"},
       {code: "de", name: $localize`German`, englishName: "German"},
       {code: "nl", name: $localize`Dutch`, englishName: "Dutch"},
       {code: "fr", name: $localize`French`, englishName: "French"}

src-ui/src/locale/messages.en_GB.xlf

@@ -515,7 +515,7 @@
       </trans-unit>
       <trans-unit datatype="html" id="8fa4d523f7b91df4390120b85ed0406138273e1a">
         <source>Color</source>
-        <target>Color</target>
+        <target>Colour</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.html</context>
           <context context-type="linenumber">20</context>

src/locale/en_GB/LC_MESSAGES/django.po

@@ -76,7 +76,7 @@ msgstr "correspondents"
 
 #: documents/models.py:98
 msgid "color"
-msgstr "color"
+msgstr "colour"
 
 #: documents/models.py:102
 msgid "is inbox tag"

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-28 22:02+0100\n"
+"POT-Creation-Date: 2021-02-16 14:52+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"
@@ -21,144 +21,144 @@ msgstr ""
 msgid "Documents"
 msgstr ""
 
-#: documents/models.py:33
+#: documents/models.py:32
 msgid "Any word"
 msgstr ""
 
-#: documents/models.py:34
+#: documents/models.py:33
 msgid "All words"
 msgstr ""
 
-#: documents/models.py:35
+#: documents/models.py:34
 msgid "Exact match"
 msgstr ""
 
-#: documents/models.py:36
+#: documents/models.py:35
 msgid "Regular expression"
 msgstr ""
 
-#: documents/models.py:37
+#: documents/models.py:36
 msgid "Fuzzy word"
 msgstr ""
 
-#: documents/models.py:38
+#: documents/models.py:37
 msgid "Automatic"
 msgstr ""
 
-#: documents/models.py:42 documents/models.py:352 paperless_mail/models.py:25
+#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25
 #: paperless_mail/models.py:109
 msgid "name"
 msgstr ""
 
-#: documents/models.py:46
+#: documents/models.py:45
 msgid "match"
 msgstr ""
 
-#: documents/models.py:50
+#: documents/models.py:49
 msgid "matching algorithm"
 msgstr ""
 
-#: documents/models.py:56
+#: documents/models.py:55
 msgid "is insensitive"
 msgstr ""
 
-#: documents/models.py:75 documents/models.py:135
+#: documents/models.py:74 documents/models.py:134
 msgid "correspondent"
 msgstr ""
 
-#: documents/models.py:76
+#: documents/models.py:75
 msgid "correspondents"
 msgstr ""
 
-#: documents/models.py:98
+#: documents/models.py:97
 msgid "color"
 msgstr ""
 
-#: documents/models.py:102
+#: documents/models.py:101
 msgid "is inbox tag"
 msgstr ""
 
-#: documents/models.py:104
+#: documents/models.py:103
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
 msgstr ""
 
-#: documents/models.py:109
+#: documents/models.py:108
 msgid "tag"
 msgstr ""
 
-#: documents/models.py:110 documents/models.py:166
+#: documents/models.py:109 documents/models.py:165
 msgid "tags"
 msgstr ""
 
-#: documents/models.py:116 documents/models.py:148
+#: documents/models.py:115 documents/models.py:147
 msgid "document type"
 msgstr ""
 
-#: documents/models.py:117
+#: documents/models.py:116
 msgid "document types"
 msgstr ""
 
-#: documents/models.py:125
+#: documents/models.py:124
 msgid "Unencrypted"
 msgstr ""
 
-#: documents/models.py:126
+#: documents/models.py:125
 msgid "Encrypted with GNU Privacy Guard"
 msgstr ""
 
-#: documents/models.py:139
+#: documents/models.py:138
 msgid "title"
 msgstr ""
 
-#: documents/models.py:152
+#: documents/models.py:151
 msgid "content"
 msgstr ""
 
-#: documents/models.py:154
+#: documents/models.py:153
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
 msgstr ""
 
-#: documents/models.py:159
+#: documents/models.py:158
 msgid "mime type"
 msgstr ""
 
-#: documents/models.py:170
+#: documents/models.py:169
 msgid "checksum"
 msgstr ""
 
-#: documents/models.py:174
+#: documents/models.py:173
 msgid "The checksum of the original document."
 msgstr ""
 
-#: documents/models.py:178
+#: documents/models.py:177
 msgid "archive checksum"
 msgstr ""
 
-#: documents/models.py:183
+#: documents/models.py:182
 msgid "The checksum of the archived document."
 msgstr ""
 
-#: documents/models.py:187 documents/models.py:330
+#: documents/models.py:186 documents/models.py:342
 msgid "created"
 msgstr ""
 
-#: documents/models.py:191
+#: documents/models.py:190
 msgid "modified"
 msgstr ""
 
-#: documents/models.py:195
+#: documents/models.py:194
 msgid "storage type"
 msgstr ""
 
-#: documents/models.py:203
+#: documents/models.py:202
 msgid "added"
 msgstr ""
 
-#: documents/models.py:207
+#: documents/models.py:206
 msgid "filename"
 msgstr ""
 
@@ -167,178 +167,186 @@ msgid "Current filename in storage"
 msgstr ""
 
 #: documents/models.py:216
+msgid "archive filename"
+msgstr ""
+
+#: documents/models.py:222
+msgid "Current archive filename in storage"
+msgstr ""
+
+#: documents/models.py:226
 msgid "archive serial number"
 msgstr ""
 
-#: documents/models.py:221
+#: documents/models.py:231
 msgid "The position of this document in your physical document archive."
 msgstr ""
 
-#: documents/models.py:227
+#: documents/models.py:237
 msgid "document"
 msgstr ""
 
-#: documents/models.py:228
+#: documents/models.py:238
 msgid "documents"
 msgstr ""
 
-#: documents/models.py:313
+#: documents/models.py:325
 msgid "debug"
 msgstr ""
 
-#: documents/models.py:314
+#: documents/models.py:326
 msgid "information"
 msgstr ""
 
-#: documents/models.py:315
+#: documents/models.py:327
 msgid "warning"
 msgstr ""
 
-#: documents/models.py:316
+#: documents/models.py:328
 msgid "error"
 msgstr ""
 
-#: documents/models.py:317
+#: documents/models.py:329
 msgid "critical"
 msgstr ""
 
-#: documents/models.py:321
+#: documents/models.py:333
 msgid "group"
 msgstr ""
 
-#: documents/models.py:324
+#: documents/models.py:336
 msgid "message"
 msgstr ""
 
-#: documents/models.py:327
+#: documents/models.py:339
 msgid "level"
 msgstr ""
 
-#: documents/models.py:334
+#: documents/models.py:346
 msgid "log"
 msgstr ""
 
-#: documents/models.py:335
+#: documents/models.py:347
 msgid "logs"
 msgstr ""
 
-#: documents/models.py:346 documents/models.py:396
+#: documents/models.py:358 documents/models.py:408
 msgid "saved view"
 msgstr ""
 
-#: documents/models.py:347
+#: documents/models.py:359
 msgid "saved views"
 msgstr ""
 
-#: documents/models.py:350
+#: documents/models.py:362
 msgid "user"
 msgstr ""
 
-#: documents/models.py:356
+#: documents/models.py:368
 msgid "show on dashboard"
 msgstr ""
 
-#: documents/models.py:359
+#: documents/models.py:371
 msgid "show in sidebar"
 msgstr ""
 
-#: documents/models.py:363
+#: documents/models.py:375
 msgid "sort field"
 msgstr ""
 
-#: documents/models.py:366
+#: documents/models.py:378
 msgid "sort reverse"
 msgstr ""
 
-#: documents/models.py:372
+#: documents/models.py:384
 msgid "title contains"
 msgstr ""
 
-#: documents/models.py:373
+#: documents/models.py:385
 msgid "content contains"
 msgstr ""
 
-#: documents/models.py:374
+#: documents/models.py:386
 msgid "ASN is"
 msgstr ""
 
-#: documents/models.py:375
+#: documents/models.py:387
 msgid "correspondent is"
 msgstr ""
 
-#: documents/models.py:376
+#: documents/models.py:388
 msgid "document type is"
 msgstr ""
 
-#: documents/models.py:377
+#: documents/models.py:389
 msgid "is in inbox"
 msgstr ""
 
-#: documents/models.py:378
+#: documents/models.py:390
 msgid "has tag"
 msgstr ""
 
-#: documents/models.py:379
+#: documents/models.py:391
 msgid "has any tag"
 msgstr ""
 
-#: documents/models.py:380
+#: documents/models.py:392
 msgid "created before"
 msgstr ""
 
-#: documents/models.py:381
+#: documents/models.py:393
 msgid "created after"
 msgstr ""
 
-#: documents/models.py:382
+#: documents/models.py:394
 msgid "created year is"
 msgstr ""
 
-#: documents/models.py:383
+#: documents/models.py:395
 msgid "created month is"
 msgstr ""
 
-#: documents/models.py:384
+#: documents/models.py:396
 msgid "created day is"
 msgstr ""
 
-#: documents/models.py:385
+#: documents/models.py:397
 msgid "added before"
 msgstr ""
 
-#: documents/models.py:386
+#: documents/models.py:398
 msgid "added after"
 msgstr ""
 
-#: documents/models.py:387
+#: documents/models.py:399
 msgid "modified before"
 msgstr ""
 
-#: documents/models.py:388
+#: documents/models.py:400
 msgid "modified after"
 msgstr ""
 
-#: documents/models.py:389
+#: documents/models.py:401
 msgid "does not have tag"
 msgstr ""
 
-#: documents/models.py:400
+#: documents/models.py:412
 msgid "rule type"
 msgstr ""
 
-#: documents/models.py:404
+#: documents/models.py:416
 msgid "value"
 msgstr ""
 
-#: documents/models.py:410
+#: documents/models.py:422
 msgid "filter rule"
 msgstr ""
 
-#: documents/models.py:411
+#: documents/models.py:423
 msgid "filter rules"
 msgstr ""
 
-#: documents/serialisers.py:383
+#: documents/serialisers.py:370
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr ""
@@ -383,19 +391,23 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
-#: paperless/settings.py:286
-msgid "English"
+#: paperless/settings.py:291
+msgid "English (US)"
 msgstr ""
 
-#: paperless/settings.py:287
+#: paperless/settings.py:292
+msgid "English (GB)"
+msgstr ""
+
+#: paperless/settings.py:293
 msgid "German"
 msgstr ""
 
-#: paperless/settings.py:288
+#: paperless/settings.py:294
 msgid "Dutch"
 msgstr ""
 
-#: paperless/settings.py:289
+#: paperless/settings.py:295
 msgid "French"
 msgstr ""
 

src/paperless/settings.py

@@ -288,7 +288,8 @@ if os.getenv("PAPERLESS_DBHOST"):
 LANGUAGE_CODE = 'en-us'
 
 LANGUAGES = [
-    ("en-us", _("English")),
+    ("en-us", _("English (US)")),
+    ("en-gb", _("English (GB)")),
     ("de", _("German")),
     ("nl-nl", _("Dutch")),
     ("fr", _("French"))