From 8797a58efc76fa3da7dc708fdd4899034d9abbf5 Mon Sep 17 00:00:00 2001 From: Joel Nordell Date: Mon, 22 Feb 2021 22:20:41 -0600 Subject: [PATCH 01/42] Add apple-touch-icon for iOS devices "Add to Home Screen" --- src-ui/angular.json | 2 ++ src-ui/src/apple-touch-icon.png | Bin 0 -> 6272 bytes src-ui/src/index.html | 1 + 3 files changed, 3 insertions(+) create mode 100644 src-ui/src/apple-touch-icon.png diff --git a/src-ui/angular.json b/src-ui/angular.json index a26dd8713..edf428fc7 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -36,6 +36,7 @@ "aot": true, "assets": [ "src/favicon.ico", + "src/apple-touch-icon.png", "src/assets", "src/manifest.webmanifest", { "glob": "pdf.worker.min.js", @@ -112,6 +113,7 @@ "karmaConfig": "karma.conf.js", "assets": [ "src/favicon.ico", + "src/apple-touch-icon.png", "src/assets", "src/manifest.webmanifest" ], diff --git a/src-ui/src/apple-touch-icon.png b/src-ui/src/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..46388a873d15b42999b0a173c8d33a224b80ca51 GIT binary patch literal 6272 zcmb_h^;cBU7QQe#ghQh;lz@tWbW3+jch^uuNew-SfFPw35&{AO0y2OINT-y5!cY=J zNq494uJ4!k54^k9y?4!7_ndY1*?WKc`}V|WYbuiv(-H#!K%%OmpbNfR|J{U8@ToiP zN&voYc+08k6M|PTp?x&?o5)ke#2Wx^n*F=+p1*!64-Ue86pelKJRE#bHeLt-g+g&V zyCc2rY&;R%9$t=_+Y+<@aQCmOf~>y(`>iZT8R~J`sM#5WiFE-7i!gbRtoF!+5UWck zV^apreVQQsyouX!T+oWxhe~lm$DN-#Cv3^aob&}JDijp*Ke0t`e%bu{+||6c0^#78 zdX{aqnJ(ann+~#E>1UsPw7<4i1eGPE<{QT+3|H>~B0exf$it&xGK94J0JGEod7$Ez z0_VJGxK0mn19^IJn(L-Qhe6Op!elDCJ~7_c{!z|4&L1ZSWirlfL_Ill8X__HVK8s{ z>fiT|6^`S=Mr2>PER}k3eP^==!k>kg-pEC5WCLLwOZfhOnKhtHG>R;#)`N4uGc6U zYw=!RjKMB<_j4936NEgDxAa=@26SX7XrR^}PFKpuzz^66&19lvTWUgJmM2Fn5c2QI z(9w0fwhGaF-(dCgNtO7s*LZ}ndk4kQLW@T2y+gfDk~~IQ(TbOwE|>a>yNp^!TCVTE z+$oq=zhh#=lG-}@eH2>K{}LvX7T++LX$! zB!q$+Qi+t?oa|pn2{1Rwk6$Pgk-5g=tUc?oH16E)oNQkh10m$B^NS|5Q!O|rofQJ@ zKQH->e$j=oQKIijyS_4wRYP2IxyvuJ*=dr$0N2hRDW{D)qC(54itv<9K3gcpb0Sor z`RJXLaJshf)DRU4c)s1o0*6p0AMzLl8k{d1>j}Jj0zXydf$c|zLNHiNlRZ=Khj!xo zIE^GA*@d6OWSl-(=F%F*na)}%qhjmo5Ornh zJP){z0$l4}Cuw%%G0CJCmtrgdoUAU@nw(#TPv!w-?hZlD!bYf`cDsp)AoI9HkAG|R z4bT^x^wK%6(xe6N46F-+K`%SZKm6ZGVOcD9V)lL$K2wK3TP;_b2vVYyiZHo@gXU{rf?b=$j3sVtd>%k}_%a&Ffd z#-gqX-)&UC$(0%2KWcLWGcW?y>J9oq$?slNxfCN_ap%?5PT=V#g~tgVo;_fxSFT2$ z8fPBXhk$%bwdE7RxMifJw7jp(f{_W~#Suw_4rR$z&!zJL)dU%L3Mw0It{D0L=w9emcX^bG~R zDR=;RY-)AyIvaEO9Cqdd4mYiW59~M-%q61Y^~UlN&|In1rb?hUEq?;w{sxKMMi{-L zf{})&vWRTT$COkRb43r?)|MkJs%koByAu^tQlIUOA#mIHT%e^C3A)M}TjIT&o)3(6 z3YlzGAH3Z$SFGMQsC?+c;F0tz>-+*XPWcM_5-(Khb|t@8v5ARca)|`zG-Kj-@l?6u zK6#buzzNX+5|87{jYW+<6U;+uB6w>Tm;t1>THfD6)vdwx+zV&gD-?Kj7@|z_Gjt-6sm+>v%Qf(-|Qub3mMT&G`(x(R2FJp>A z<%>QgR*RvzT4*PDovUYjLIF{)J<)yr0P`QbM1hbBnH5%sN}oUYRitH|*I($XM7m_l zu6Pnc!Qhyn{hMzhpcHI9`x^po1I`b0__z;K{Ae+~K|qCiRx;|+KTZAu(O~G5auJx) zw!C`8wq*I1B>nT7(*EzyrO_*RB@6IG_A)7Viev%K;Aa8!V> z{g=MnTgrRY`x`FTkGRSqB%*g$*Ki%g%sj;SMrqz=QBtJv2RB$0#NUHK2D zp+djvRN4M$UdDv6CiPW>E^s6Z*=3`*Ya)%`d{ZlG^wqxAe{M_rV%=5C<=m}d;_8yy zZx0&1Dn)Pmh6Z%JV8HtUVQfeKz^kFEy?!8cokiPNlry9#;*Vh=X}IQzXqX z{tn3;SU(tMU0J-npDAJ|T*G_O#Uim?hToU~GR!Mbi^ znm6z}G?;+VQEJ{aN^y4*&?R7(x~@nxGyy?abcU7})lMDQ6QcZBHm>iB0Mc#4!(zZ+ei-ae6BSK?2;=>jP{QYHfr^1wb-! z>YplHygj3Q!u!Og1c&r~*_k#?I{U=;2$o=V^#TbuY%_xd8@G`B(TqB2CEGrY9B6-j z8kiz$Y=(6R0rQ5Y**_U~dq~PHaPdAP#=%T&dhEX3ij3}j$Q>w^sE zToP*j6@>_ECv;NMucsCQRCRskl5P?CI`L2q^~JcEN9gbA$=>EatZ!J-eo(X)NZLr< zJ8av;!U0qlxWRJ~a;u4ycmC7Rg`ohUq< zRa4{+mF(?rwUMNF-LlC~qf1cy`{$qgC-;hMrcaXUQrkcy!fJ!qyCzHM$fE<~2dusp zYuB$vyT%luu`xP-wk%&&RS|0>74>zzi*1o}IKG7`s36{fG5PXJe)!D(kGpq>k@0UZ z>d8@VOQW=lTvdwj8h>Ds><2Ym9Kur!ac%#+GN!JEKG)tr>CeVE8PrDho)~d1ki1UH zd?Ec-%O$0*$NbmNxEK4u4nNaFj86|JF^Gv9jI=VgzI5o>hNxR2JTBFBwmyx$benze z_$_z9Lggdep`%F ze5j|U2;2CYeVAk8CM{sa_S64-pS^t%db?rN(r$MUD8F4l6*HjtfO7r^MxOkR2qBMU z(@64oDP@H7-$Lqu76sSKM)&gmId_>@{(ZHX-&V;nh>)=@(Ton7tJ%cTd;PUbBJJl?3-kMD&L z=Nn9!nWGCqi_-!jfQ+>agOBqtg-&VFqT#vQ)4GOf5)hMVG>qLi-}pKh7LHw_wU_EY z8Q0_6Ww<@$0V^4zCnjQ&=W37X< ztfa8#Gr|!w0==$ZR#yrFfAZcU!oiuAayH^>?$T%z?2Nib$lpy^wdYB{bEg2sc6eGh zA8)l2`cb5GCIX%->@b*m^VAPZk3o2nUc)?hXcwP25HzVuP&5Tb8NN0ZxogyvYoIZ6 zwhBV6%4lGJ^jGG}%oQ8lv7-5pxtomwt;p}l=}`ZdL&D;ME-#63OV3t@EFN4IX1%F& z{IM;j%o`sPEv|NLru+|FFv87XIaVmkPPi%k-J2^?1oSPaYLcs=pr+svi@*a?FTdcI zds#VSViau^j0YPFz{oITM2x1`XO~1#2=a&^K!qJ`LVVLNdqmm{CD{OpLOT^s;ZILwMoYX~$-wwVVvUd2kE zA2%}rJ%dA1t;HhYeew zdOlY(wqv$dySH+5D^6luUl;3Pr*P@?m3D@-;VoqV-;}=j{H$&vMHgE7CQ0c_UP>9G z?FY(+nl*y~mLZQ@rxLCrUb}4G3s$Z7B7S^w85ZJ5rdw1?;dcN9i19@fIpGk4=DzhB zuM}d@AMdOCllK;iaUStjZz+9ip7KV5nrH03bnez^!m0n{qtmVa(Dh5i~6VTg;y%(KqiSu;`rI`YL-15j{mk zR+XZ{f7pCG-%=b5EtT2D7kaWT(bqrSDnOm;O|`HdcWp);W+hp9*KmGl)%|{>ArmST z0lKk5(JI}Sde>n4u>vPNzxF^}g}%abf<9|7CnJ<@PyC%gUiw_NtsU^e+Ft;~ASe%w z&G2jc^Lh`Mk_OFK069KneKlE2Ev;`dkH#kGRSF*Q?~r|?ubIDouh!w*xQDCGTjcbq=X_!?CKKi60fX5}nOstzS6uT%tsz;a{*aYau(Yz#0YMA$O`BHef-b4*H zr&gOBt(`<^4atVs6R#0Z7=I0Q*eX{F%P_ywOB%BA5^oB;$E2+@5!!^;Y z{h;eBP~A2=8r*Lq3Fig0D~zlEPLKjJVIB{Y_YQ~ZxhZ3KJ)B@*brCz!v^pVivtcVF z>;eGKB3FP0}nE!j9ERY=4ZMKYdOO5Hcle5MzdQ_x+u z`RBzsT4TjIMSb#z>u_PL@&uzS8~`*6s3S;RZ;!}PjoF*Fu!GW|Ko2$0d~|xjc%V~4 zbY*=K^t^uwCCJ6z3bU<(57G~Ei$4dea;`SV9GmY*T__0nK4~NIgUiG~TL=VbjTGr%3dynp zN%8um$;jEwa3&J%Q-%+TZp!Gw({p^e*HHg`IW+9=yC)`TM|N@XqvYl+DiGKvIi@!F zszy<4C@*Fqeh#)9>ZyLCr5FD|SY+5;m(m%JMHCXer<0~>(kyn*t|jwELH5>=!k&^g z6l`GrBbl0K=a5WKu_aD|SA-b$8UkC`Gw=Yx4AAGeZJ&_P6MTek)eny|7h7gixlu=c zEQ}d^xSISfjADdb<=)6yWc(b745d$}<1} literal 0 HcmV?d00001 diff --git a/src-ui/src/index.html b/src-ui/src/index.html index b05f9123b..39ecd824c 100644 --- a/src-ui/src/index.html +++ b/src-ui/src/index.html @@ -9,6 +9,7 @@ + From f397c5472c014dead0650aa82fd7df0fff18554b Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Tue, 23 Feb 2021 12:35:24 +0100 Subject: [PATCH 02/42] validation for regular expressions on matching models #605 --- src/documents/serialisers.py | 39 +++++++++++++------------- src/documents/tests/test_api.py | 37 +++++++++++++++++++++++- src/locale/en_US/LC_MESSAGES/django.po | 10 +++++-- 3 files changed, 63 insertions(+), 23 deletions(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 66736bdbf..652e5fe30 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -1,11 +1,13 @@ +import re + import magic from django.utils.text import slugify from rest_framework import serializers from rest_framework.fields import SerializerMethodField from . import bulk_edit -from .models import Correspondent, Tag, Document, Log, DocumentType, \ - SavedView, SavedViewFilterRule +from .models import Correspondent, Tag, Document, DocumentType, \ + SavedView, SavedViewFilterRule, MatchingModel from .parsers import is_mime_type_supported from django.utils.translation import gettext as _ @@ -33,16 +35,27 @@ class DynamicFieldsModelSerializer(serializers.ModelSerializer): self.fields.pop(field_name) -class CorrespondentSerializer(serializers.ModelSerializer): +class MatchingModelSerializer(serializers.ModelSerializer): document_count = serializers.IntegerField(read_only=True) - last_correspondence = serializers.DateTimeField(read_only=True) - def get_slug(self, obj): return slugify(obj.name) slug = SerializerMethodField() + def validate_match(self, match): + if 'matching_algorithm' in self.initial_data and self.initial_data['matching_algorithm'] == MatchingModel.MATCH_REGEX: # NOQA: E501 + try: + re.compile(match) + except Exception as e: + raise serializers.ValidationError(_("Invalid regular expresssion: ") + str(e)) + return match + + +class CorrespondentSerializer(MatchingModelSerializer): + + last_correspondence = serializers.DateTimeField(read_only=True) + class Meta: model = Correspondent fields = ( @@ -57,13 +70,7 @@ class CorrespondentSerializer(serializers.ModelSerializer): ) -class DocumentTypeSerializer(serializers.ModelSerializer): - - document_count = serializers.IntegerField(read_only=True) - - def get_slug(self, obj): - return slugify(obj.name) - slug = SerializerMethodField() +class DocumentTypeSerializer(MatchingModelSerializer): class Meta: model = DocumentType @@ -78,13 +85,7 @@ class DocumentTypeSerializer(serializers.ModelSerializer): ) -class TagSerializer(serializers.ModelSerializer): - - document_count = serializers.IntegerField(read_only=True) - - def get_slug(self, obj): - return slugify(obj.name) - slug = SerializerMethodField() +class TagSerializer(MatchingModelSerializer): class Meta: model = Tag diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 7486154e1..cbd10ac71 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -14,7 +14,7 @@ from rest_framework.test import APITestCase from whoosh.writing import AsyncWriter from documents import index, bulk_edit -from documents.models import Document, Correspondent, DocumentType, Tag, SavedView +from documents.models import Document, Correspondent, DocumentType, Tag, SavedView, MatchingModel from documents.tests.utils import DirectoriesMixin @@ -772,6 +772,41 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, 200) self.assertListEqual(response.data, ["test", "test2"]) + def test_invalid_regex_other_algorithm(self): + for endpoint in ['correspondents', 'tags', 'document_types']: + response = self.client.post(f"/api/{endpoint}/", { + "name": "test", + "matching_algorithm": MatchingModel.MATCH_ANY, + "match": "[" + }, format='json') + self.assertEqual(response.status_code, 201, endpoint) + + def test_invalid_regex(self): + for endpoint in ['correspondents', 'tags', 'document_types']: + response = self.client.post(f"/api/{endpoint}/", { + "name": "test", + "matching_algorithm": MatchingModel.MATCH_REGEX, + "match": "[" + }, format='json') + self.assertEqual(response.status_code, 400, endpoint) + + def test_valid_regex(self): + for endpoint in ['correspondents', 'tags', 'document_types']: + response = self.client.post(f"/api/{endpoint}/", { + "name": "test", + "matching_algorithm": MatchingModel.MATCH_REGEX, + "match": "[0-9]" + }, format='json') + self.assertEqual(response.status_code, 201, endpoint) + + def test_regex_no_algorithm(self): + for endpoint in ['correspondents', 'tags', 'document_types']: + response = self.client.post(f"/api/{endpoint}/", { + "name": "test", + "match": "[0-9]" + }, format='json') + self.assertEqual(response.status_code, 201, endpoint) + class TestBulkEdit(DirectoriesMixin, APITestCase): diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index cb31bbc8c..c234d5c2a 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-16 14:52+0100\n" +"POT-Creation-Date: 2021-02-23 12:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -346,7 +346,11 @@ msgstr "" msgid "filter rules" msgstr "" -#: documents/serialisers.py:370 +#: documents/serialisers.py:52 +msgid "Invalid regular expresssion: " +msgstr "" + +#: documents/serialisers.py:376 #, python-format msgid "File type %(type)s not supported" msgstr "" @@ -411,7 +415,7 @@ msgstr "" msgid "French" msgstr "" -#: paperless/urls.py:114 +#: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "" From 5d94a983d2da4b1e180e91ae4c9290a7ebd91eb1 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Tue, 23 Feb 2021 13:09:41 +0100 Subject: [PATCH 03/42] move codestyle checks into separate job --- .github/workflows/ci.yml | 44 ++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbb718cc8..cb61b753b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.7 - name: Get pip cache dir id: pip-cache @@ -49,6 +49,39 @@ jobs: name: documentation path: docs/_build/html/ + codestyle: + runs-on: ubuntu-20.04 + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - + name: Get pip cache dir + id: pip-cache + run: | + echo "::set-output name=dir::$(pip cache dir)" + - + name: Persistent Github pip cache + uses: actions/cache@v2 + with: + path: ${{ steps.pip-cache.outputs.dir }} + key: ${{ runner.os }}-pip${{ matrix.python-version }} + - + name: Prepare tests + run: | + pip install --upgrade pipenv + pipenv install --system --dev --ignore-pipfile + - + name: Codestyle + run: | + cd src/ + pycodestyle + tests: runs-on: ubuntu-20.04 strategy: @@ -87,11 +120,6 @@ jobs: run: | cd src/ pytest - - - name: Codestyle - run: | - cd src/ - pycodestyle - name: Publish coverage results if: matrix.python-version == '3.8' @@ -130,7 +158,7 @@ jobs: path: src/documents/static/frontend/ build-release: - needs: [frontend, documentation, tests] + needs: [frontend, documentation, tests, codestyle] runs-on: ubuntu-20.04 steps: - @@ -240,7 +268,7 @@ jobs: build-docker-image: if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-')) runs-on: ubuntu-latest - needs: [frontend, tests] + needs: [frontend, tests, codestyle] steps: - name: Prepare From 5ce73574c8ba1cadcac0d4450fd58479bacb17a1 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 12:12:00 +0000 Subject: [PATCH 04/42] Apply translations in de translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po' on the 'de' language. --- src/locale/de/LC_MESSAGES/django.po | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 358c9b721..d1a07d18f 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-16 14:52+0100\n" +"POT-Creation-Date: 2021-02-23 12:30+0100\n" "PO-Revision-Date: 2021-02-16 18:37+0000\n" "Last-Translator: Jonas Winkler, 2021\n" "Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n" @@ -354,7 +354,11 @@ msgstr "Filterregel" msgid "filter rules" msgstr "Filterregeln" -#: documents/serialisers.py:370 +#: documents/serialisers.py:52 +msgid "Invalid regular expresssion: " +msgstr "Ungültiger regulärer Ausdruck:" + +#: documents/serialisers.py:376 #, python-format msgid "File type %(type)s not supported" msgstr "Dateityp %(type)s nicht unterstützt" @@ -421,7 +425,7 @@ msgstr "Niederländisch" msgid "French" msgstr "Französisch" -#: paperless/urls.py:114 +#: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "Paperless-ng Administration" From 065ff6eaf5c212bc2a19adf1abb78e1c2aab8fc3 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Tue, 23 Feb 2021 13:13:12 +0100 Subject: [PATCH 05/42] rename some steps --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb61b753b..85db2d482 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip${{ matrix.python-version }} - - name: Prepare tests + name: Install dependencies run: | pip install --upgrade pipenv pipenv install --system --dev --ignore-pipfile @@ -109,7 +109,7 @@ jobs: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-pip${{ matrix.python-version }} - - name: Prepare tests + name: Install dependencies run: | sudo apt-get update -qq sudo apt-get install -qq --no-install-recommends unpaper tesseract-ocr imagemagick ghostscript optipng From f888647b12deec0a63bd3b35a7bd3c288a10290e Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Tue, 23 Feb 2021 13:13:38 +0100 Subject: [PATCH 06/42] front end support for displaying error messages about regular expressions. --- .../correspondent-edit-dialog.component.html | 2 +- .../document-type-edit-dialog.component.html | 2 +- .../tag-list/tag-edit-dialog/tag-edit-dialog.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html index bbc2c8453..26a6dc219 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html @@ -8,7 +8,7 @@
- +
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html index ed9f4f5af..55cd3de5b 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html @@ -9,7 +9,7 @@ - +
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html index fd4c3b7f0..418a5c281 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html @@ -20,7 +20,7 @@ - +
From 7a73e1859660c68b3ca254cd879aa188e7d561c5 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Tue, 23 Feb 2021 13:21:11 +0100 Subject: [PATCH 07/42] fix pycodestyle and messages --- src/documents/serialisers.py | 5 ++++- src/locale/en_US/LC_MESSAGES/django.po | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 652e5fe30..adda7117e 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -48,7 +48,10 @@ class MatchingModelSerializer(serializers.ModelSerializer): try: re.compile(match) except Exception as e: - raise serializers.ValidationError(_("Invalid regular expresssion: ") + str(e)) + raise serializers.ValidationError( + _("Invalid regular expresssion: %(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 c234d5c2a..27d628455 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-23 12:30+0100\n" +"POT-Creation-Date: 2021-02-23 13:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -347,10 +347,11 @@ msgid "filter rules" msgstr "" #: documents/serialisers.py:52 -msgid "Invalid regular expresssion: " +#, python-format +msgid "Invalid regular expresssion: %(error)s" msgstr "" -#: documents/serialisers.py:376 +#: documents/serialisers.py:378 #, python-format msgid "File type %(type)s not supported" msgstr "" From 440abcda7c993806646020239509deff46e81d75 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 09:09:47 +0000 Subject: [PATCH 08/42] Apply translations in fr translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po' on the 'fr' language. --- src/locale/fr/LC_MESSAGES/django.po | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 244d45fb5..6acd81649 100644 --- a/src/locale/fr/LC_MESSAGES/django.po +++ b/src/locale/fr/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-16 14:52+0100\n" +"POT-Creation-Date: 2021-02-23 13:20+0100\n" "PO-Revision-Date: 2021-02-16 18:37+0000\n" "Last-Translator: Philmo67, 2021\n" "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n" @@ -356,7 +356,12 @@ msgstr "règle de filtrage" msgid "filter rules" msgstr "règles de filtrage" -#: documents/serialisers.py:370 +#: documents/serialisers.py:52 +#, python-format +msgid "Invalid regular expresssion: %(error)s" +msgstr "Expression régulière incorrecte : %(error)s" + +#: documents/serialisers.py:378 #, python-format msgid "File type %(type)s not supported" msgstr "Type de fichier %(type)s non pris en charge" @@ -423,7 +428,7 @@ msgstr "Néerlandais" msgid "French" msgstr "Français" -#: paperless/urls.py:114 +#: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "Administration de Paperless-ng" From 1328fa9e5ec486ff92e5ea4885a5c89fe586f375 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 11:52:24 +0000 Subject: [PATCH 09/42] Apply translations in de translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po' on the 'de' language. --- src/locale/de/LC_MESSAGES/django.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index d1a07d18f..c031ebc85 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-23 12:30+0100\n" +"POT-Creation-Date: 2021-02-23 13:20+0100\n" "PO-Revision-Date: 2021-02-16 18:37+0000\n" "Last-Translator: Jonas Winkler, 2021\n" "Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n" @@ -355,10 +355,11 @@ msgid "filter rules" msgstr "Filterregeln" #: documents/serialisers.py:52 -msgid "Invalid regular expresssion: " -msgstr "Ungültiger regulärer Ausdruck:" +#, python-format +msgid "Invalid regular expresssion: %(error)s" +msgstr "Ungültiger regulärer Ausdruck: %(error)s" -#: documents/serialisers.py:376 +#: documents/serialisers.py:378 #, python-format msgid "File type %(type)s not supported" msgstr "Dateityp %(type)s nicht unterstützt" From 39505c9764221b278c90d30c8b1ba5436a85b9d0 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 13:33:41 +0000 Subject: [PATCH 10/42] Translate /src-ui/messages.xlf in pt_BR translation completed for the source file '/src-ui/messages.xlf' on the 'pt_BR' language. --- src-ui/src/locale/messages.pt_BR.xlf | 2337 ++++++++++++++++++++++++++ 1 file changed, 2337 insertions(+) create mode 100644 src-ui/src/locale/messages.pt_BR.xlf diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf new file mode 100644 index 000000000..ac3b557ad --- /dev/null +++ b/src-ui/src/locale/messages.pt_BR.xlf @@ -0,0 +1,2337 @@ + + + + + Document added + Documento adicionado + + src/app/app.component.ts + 51 + + + + Document was added to paperless. + Documento foi adicionado ao paperless. + + src/app/app.component.ts + 51 + + + + Open document + Abrir documento + + src/app/app.component.ts + 51 + + + + Could not add : + Não foi possível adicionar : + + src/app/app.component.ts + 59 + + + + New document detected + Novo documento detectado + + src/app/app.component.ts + 65 + + + + Document is being processed by paperless. + Documento está sendo processado pelo paperless. + + src/app/app.component.ts + 65 + + + + Documents + Documentos + + src/app/components/document-list/document-list.component.ts + 49 + + + + View "" saved successfully. + Visualização &quot;&quot; salva com sucesso. + + src/app/components/document-list/document-list.component.ts + 115 + + + + View "" created successfully. + Visualização &quot;&quot; criada com sucesso. + + src/app/components/document-list/document-list.component.ts + 136 + + + + Select + Selecionar + + src/app/components/document-list/document-list.component.html + 7 + + + + Select none + Selecionar nenhum + + src/app/components/document-list/document-list.component.html + 10 + + + + Select page + Selecionar página + + src/app/components/document-list/document-list.component.html + 11 + + + + Select all + Selecionar todos + + src/app/components/document-list/document-list.component.html + 12 + + + + Sort + Ordenar + + src/app/components/document-list/document-list.component.html + 39 + + + + Views + Visualizações + + src/app/components/document-list/document-list.component.html + 64 + + + + Save as... + Salvar como... + + src/app/components/document-list/document-list.component.html + 72 + + + + Save "" + Salvar &quot;&quot; + + src/app/components/document-list/document-list.component.html + 71 + + + + {VAR_PLURAL, plural, =1 {Selected of one document} other {Selected of documents}} + {VAR_PLURAL, plural, =1 {Selecionado de um documento} other {Selecionado of documentos}} + + src/app/components/document-list/document-list.component.html + 85 + + + + {VAR_PLURAL, plural, =1 {One document} other { documents}} + {VAR_PLURAL, plural, =1 {Um documento} other { documentos}} + + src/app/components/document-list/document-list.component.html + 86 + + + + (filtered) + (filtrado) + + src/app/components/document-list/document-list.component.html + 86 + + + + ASN + NSA + + src/app/components/document-list/document-list.component.html + 105 + + + + Correspondent + Correspondente + + src/app/components/document-list/document-list.component.html + 111 + + + + Title + Título + + src/app/components/document-list/document-list.component.html + 117 + + + + Document type + Tipo de Documento + + src/app/components/document-list/document-list.component.html + 123 + + + + Created + Criado + + src/app/components/document-list/document-list.component.html + 129 + + + + Added + Adicionado + + src/app/components/document-list/document-list.component.html + 135 + + + + Confirm delete + Confirmar exclusão + + src/app/components/document-detail/document-detail.component.ts + 203 + + + + Do you really want to delete document ""? + Você realmente deseja excluir o documento &quot;&quot;? + + src/app/components/document-detail/document-detail.component.ts + 204 + + + + The files for this document will be deleted permanently. This operation cannot be undone. + Os arquivos desse documento serão excluídos permanentemente. Essa operação não pode ser revertida. + + src/app/components/document-detail/document-detail.component.ts + 205 + + + + Delete document + Excluir documento + + src/app/components/document-detail/document-detail.component.ts + 207 + + + + Error deleting document: + Erro ao excluir documento: + + src/app/components/document-detail/document-detail.component.ts + 214 + + + + Delete + Excluir + + src/app/components/document-detail/document-detail.component.html + 15 + + + + Download + Baixar + + src/app/components/document-detail/document-detail.component.html + 23 + + + + More like this + Mais como este + + src/app/components/document-detail/document-detail.component.html + 38 + + + + Close + Fechar + + src/app/components/document-detail/document-detail.component.html + 44 + + + + Details + Detalhes + + src/app/components/document-detail/document-detail.component.html + 56 + + + + Content + Conteúdo + + src/app/components/document-detail/document-detail.component.html + 72 + + + + Metadata + Metadados + + src/app/components/document-detail/document-detail.component.html + 81 + + + + Discard + Descartar + + src/app/components/document-detail/document-detail.component.html + 130 + + + + Save + Salvar + + src/app/components/document-detail/document-detail.component.html + 132 + + + + Page + Página + + src/app/components/document-detail/document-detail.component.html + 4 + + + + of + de + + src/app/components/document-detail/document-detail.component.html + 8 + + + + Download original + Baixar original + + src/app/components/document-detail/document-detail.component.html + 29 + + + + Archive serial number + Número de série de arquivamento + + src/app/components/document-detail/document-detail.component.html + 60 + + + + Date created + Data de criação + + src/app/components/document-detail/document-detail.component.html + 61 + + + + Date modified + Data de modificação + + src/app/components/document-detail/document-detail.component.html + 87 + + + + Date added + Data de adição + + src/app/components/document-detail/document-detail.component.html + 91 + + + + Media filename + Nome do arquivo + + src/app/components/document-detail/document-detail.component.html + 95 + + + + Original MD5 checksum + Soma de verificação MD5 original + + src/app/components/document-detail/document-detail.component.html + 99 + + + + Original file size + Tamanho do arquivo original + + src/app/components/document-detail/document-detail.component.html + 103 + + + + Original mime type + Tipo mime original + + src/app/components/document-detail/document-detail.component.html + 107 + + + + Archive MD5 checksum + Soma de verificação MD5 de arquivamento + + src/app/components/document-detail/document-detail.component.html + 111 + + + + Archive file size + Tamanho arquivado + + src/app/components/document-detail/document-detail.component.html + 115 + + + + Original document metadata + Metadados do documento original + + src/app/components/document-detail/document-detail.component.html + 121 + + + + Archived document metadata + Metadados do documento arquivado + + src/app/components/document-detail/document-detail.component.html + 122 + + + + Save & next + Salvar & próximo + + src/app/components/document-detail/document-detail.component.html + 131 + + + + Hello , welcome to Paperless-ng! + Olá , bem-vindo ao Paperless-ng! + + src/app/components/dashboard/dashboard.component.ts + 33 + + + + Welcome to Paperless-ng! + Bem-vindo ao Paperless-ng! + + src/app/components/dashboard/dashboard.component.ts + 35 + + + + Dashboard + Painel de controle + + src/app/components/dashboard/dashboard.component.html + 1 + + + + Do you really want to delete the tag ""? + Você realmente deseja excluir a etiqueta &quot;&quot;? + + src/app/components/manage/tag-list/tag-list.component.ts + 30 + + + + Tags + Etiquetas + + src/app/components/manage/tag-list/tag-list.component.html + 1 + + + + Create + Criar + + src/app/components/manage/tag-list/tag-list.component.html + 2 + + + + Filter by: + Filtrar por: + + src/app/components/manage/tag-list/tag-list.component.html + 8 + + + + Name + Nome + + src/app/components/manage/tag-list/tag-list.component.html + 9 + + + + Color + Cor + + src/app/components/manage/tag-list/tag-list.component.html + 20 + + + + Matching + Detecção + + src/app/components/manage/tag-list/tag-list.component.html + 21 + + + + Document count + Número de documentos + + src/app/components/manage/tag-list/tag-list.component.html + 22 + + + + Actions + Ações + + src/app/components/manage/tag-list/tag-list.component.html + 23 + + + + Documents + Documentos + + src/app/components/manage/tag-list/tag-list.component.html + 38 + + + + Edit + Editar + + src/app/components/manage/tag-list/tag-list.component.html + 43 + + + + Do you really want to delete the document type ""? + Você realmente deseja excluir o tipo de documento &quot;&quot;? + + src/app/components/manage/document-type-list/document-type-list.component.ts + 26 + + + + Document types + Tipos de documento + + src/app/components/manage/document-type-list/document-type-list.component.html + 1 + + + + Logs + Logs + + src/app/components/manage/logs/logs.component.html + 1 + + + + Saved view "" deleted. + Visualização &quot;&quot; excluída. + + src/app/components/manage/settings/settings.component.ts + 67 + + + + Settings saved successfully. + Configurações salvas com sucesso. + + src/app/components/manage/settings/settings.component.ts + 87 + + + + Use system language + Usar linguagem do sistema + + src/app/components/manage/settings/settings.component.ts + 91 + + + + Use date format of display language + Usar formato de data da linguagem de exibição + + src/app/components/manage/settings/settings.component.ts + 96 + + + + ISO 8601 + ISO 8601 + + src/app/components/manage/settings/settings.component.ts + 97 + + + + Error while storing settings on server: + Erro ao salvar configurações: + + src/app/components/manage/settings/settings.component.ts + 114 + + + + Settings + Configurações + + src/app/components/manage/settings/settings.component.html + 1 + + + + General settings + Configurações gerais + + src/app/components/manage/settings/settings.component.html + 10 + + + + Notifications + Notificações + + src/app/components/manage/settings/settings.component.html + 115 + + + + Saved views + Visualizações + + src/app/components/manage/settings/settings.component.html + 133 + + + + Appearance + Aparência + + src/app/components/manage/settings/settings.component.html + 13 + + + + Display language + Linguagem de exibição + + src/app/components/manage/settings/settings.component.html + 17 + + + + You need to reload the page after applying a new language. + Você precisar recarregar a página depois de escolher uma nova linguagem. + + src/app/components/manage/settings/settings.component.html + 25 + + + + Date display + Exibição de data + + src/app/components/manage/settings/settings.component.html + 32 + + + + Date format + Formato de data + + src/app/components/manage/settings/settings.component.html + 45 + + + + Short: + Curto: + + src/app/components/manage/settings/settings.component.html + 51 + + + + Medium: + Médio: + + src/app/components/manage/settings/settings.component.html + 55 + + + + Long: + Longo: + + src/app/components/manage/settings/settings.component.html + 59 + + + + Items per page + Itens por página + + src/app/components/manage/settings/settings.component.html + 67 + + + + Document editor + Editor de documentos + + src/app/components/manage/settings/settings.component.html + 83 + + + + Use PDF viewer provided by the browser + Usar visualizador de PDF do navegador + + src/app/components/manage/settings/settings.component.html + 87 + + + + This is usually faster for displaying large PDF documents, but it might not work on some browsers. + Isso é geralmente mais rápido para exibir grandes documentos PDF, mas poderá não funcionar em alguns navegadores. + + src/app/components/manage/settings/settings.component.html + 87 + + + + Dark mode + Modo noturno + + src/app/components/manage/settings/settings.component.html + 94 + + + + Use system settings + Usar configurações do sistema + + src/app/components/manage/settings/settings.component.html + 97 + + + + Enable dark mode + Habilitar modo noturno + + src/app/components/manage/settings/settings.component.html + 98 + + + + Bulk editing + Edição em massa + + src/app/components/manage/settings/settings.component.html + 102 + + + + Show confirmation dialogs + Mostrar janelas de confirmação + + src/app/components/manage/settings/settings.component.html + 106 + + + + Deleting documents will always ask for confirmation. + Ao excluir um documento, sempre será pedido uma confirmação. + + src/app/components/manage/settings/settings.component.html + 106 + + + + Apply on close + Aplicar ao fechar + + src/app/components/manage/settings/settings.component.html + 107 + + + + Document processing + Processamento de documentos + + src/app/components/manage/settings/settings.component.html + 118 + + + + Show notifications when new documents are detected + Exibir notificações quando novos documentos forem detectados + + src/app/components/manage/settings/settings.component.html + 122 + + + + Show notifications when document processing completes successfully + Exibir notificações quando o processamento de um documento concluir com sucesso + + src/app/components/manage/settings/settings.component.html + 123 + + + + Show notifications when document processing fails + Exibir notificações quando o processamento de um documento falhar + + src/app/components/manage/settings/settings.component.html + 124 + + + + Suppress notifications on dashboard + Não exibir notificações no painel de controle + + src/app/components/manage/settings/settings.component.html + 125 + + + + This will suppress all messages about document processing status on the dashboard. + Isso esconderá todas as mensagens sobre o status de processamento de documentos no painel de controle. + + src/app/components/manage/settings/settings.component.html + 125 + + + + Appears on + Aparece em + + src/app/components/manage/settings/settings.component.html + 145 + + + + Show on dashboard + Exibir no painel de controle + + src/app/components/manage/settings/settings.component.html + 148 + + + + Show in sidebar + Mostrar na navegação lateral + + src/app/components/manage/settings/settings.component.html + 152 + + + + No saved views defined. + Nenhuma visualização definida. + + src/app/components/manage/settings/settings.component.html + 162 + + + + 404 Not Found + 404 Não Encontrado + + src/app/components/not-found/not-found.component.html + 7 + + + + Do you really want to delete the correspondent ""? + Você realmente deseja excluir o correspondente &quot;&quot;? + + src/app/components/manage/correspondent-list/correspondent-list.component.ts + 26 + + + + Correspondents + Correspondentes + + src/app/components/manage/correspondent-list/correspondent-list.component.html + 1 + + + + Last correspondence + Última correspondência + + src/app/components/manage/correspondent-list/correspondent-list.component.html + 22 + + + + Confirmation + Confirmação + + src/app/components/common/confirm-dialog/confirm-dialog.component.ts + 17 + + + + Confirm + Confirmar + + src/app/components/common/confirm-dialog/confirm-dialog.component.ts + 29 + + + + Cancel + Cancelar + + src/app/components/common/confirm-dialog/confirm-dialog.component.html + 12 + + + + Create new correspondent + Criar novo correspondente + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts + 21 + + + + Edit correspondent + Editar correspondente + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts + 25 + + + + Matching algorithm + Algoritmo de detecção + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 10 + + + + Matching pattern + Padrão de detecção + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 11 + + + + Case insensitive + Não diferenciar maiúsculas de minúsculas + + src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html + 12 + + + + Create new tag + Criar nova etiqueta + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts + 21 + + + + Edit tag + Editar etiqueta + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts + 25 + + + + Inbox tag + Etiqueta caixa de entrada + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html + 21 + + + + Inbox tags are automatically assigned to all consumed documents. + Etiquetas de caixa de entrada são atribuídas automaticamente para todos os documentos consumidos. + + src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html + 21 + + + + Create new document type + Criar novo tipo de documento + + src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts + 21 + + + + Edit document type + Editar tipo de documento + + src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts + 25 + + + + Search results + Resultados da busca + + src/app/components/search/search.component.html + 1 + + + + Invalid search query: + Termo de pesquisa inválido: + + src/app/components/search/search.component.html + 4 + + + + Showing documents similar to + Exibindo documentos similares a + + src/app/components/search/search.component.html + 7 + + + + Search query: + Termo de pesquisa: + + src/app/components/search/search.component.html + 11 + + + + Did you mean ""? + Você quis dizer &quot;&quot;? + + src/app/components/search/search.component.html + 13 + + + + {VAR_PLURAL, plural, =0 {No results} =1 {One result} other { results}} + {VAR_PLURAL, plural, =0 {Sem resultados} =1 {Um resultado} other { resultados}} + + src/app/components/search/search.component.html + 18 + + + + Paperless-ng + Paperless-ng + + src/app/components/app-frame/app-frame.component.html + 11 + + app title + + + Search documents + Procurar documentos + + src/app/components/app-frame/app-frame.component.html + 15 + + + + Logout + Encerrar sessão + + src/app/components/app-frame/app-frame.component.html + 45 + + + + Manage + Gerenciar + + src/app/components/app-frame/app-frame.component.html + 107 + + + + Admin + Admin + + src/app/components/app-frame/app-frame.component.html + 149 + + + + Info + Informação + + src/app/components/app-frame/app-frame.component.html + 155 + + + + Documentation + Documentação + + src/app/components/app-frame/app-frame.component.html + 162 + + + + GitHub + GitHub + + src/app/components/app-frame/app-frame.component.html + 170 + + + + Suggest an idea + Sugerir uma idéia + + src/app/components/app-frame/app-frame.component.html + 176 + + + + Logged in as + Sessão iniciada como + + src/app/components/app-frame/app-frame.component.html + 34 + + + + Open documents + Abrir documentos + + src/app/components/app-frame/app-frame.component.html + 87 + + + + Close all + Fechar todos + + src/app/components/app-frame/app-frame.component.html + 101 + + + + Correspondent: + Correspondente: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 29 + + + + Without correspondent + Sem correspondente + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 31 + + + + Type: + Tipo: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 36 + + + + Without document type + Sem tipo de documento + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 38 + + + + Tag: + Etiqueta: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 42 + + + + Without any tag + Sem etiquetas + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 46 + + + + Title: + Título: + + src/app/components/document-list/filter-editor/filter-editor.component.ts + 50 + + + + Filter tags + Filtrar etiquetas + + src/app/components/document-list/filter-editor/filter-editor.component.html + 12 + + + + Filter correspondents + Filtrar correspondentes + + src/app/components/document-list/filter-editor/filter-editor.component.html + 20 + + + + Filter document types + Filtrar tipos de documento + + src/app/components/document-list/filter-editor/filter-editor.component.html + 27 + + + + Reset filters + Limpar filtros + + src/app/components/document-list/filter-editor/filter-editor.component.html + 50 + + + + Not assigned + Não atribuído + + src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts + 166 + + Filter drop down element to filter for documents with no correspondent/type/tag assigned + + + Apply + Aplicar + + src/app/components/common/filterable-dropdown/filterable-dropdown.component.html + 26 + + + + Last 7 days + Últimos 7 dias + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 24 + + + + Last month + Último mês + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 25 + + + + Last 3 months + Últimos 3 meses + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 26 + + + + Last year + Último ano + + src/app/components/common/date-dropdown/date-dropdown.component.ts + 27 + + + + After + Antes + + src/app/components/common/date-dropdown/date-dropdown.component.html + 13 + + + + Before + Depois + + src/app/components/common/date-dropdown/date-dropdown.component.html + 29 + + + + Clear + Limpar + + src/app/components/common/date-dropdown/date-dropdown.component.html + 18 + + + + View + Ver + + src/app/components/document-list/document-card-large/document-card-large.component.html + 50 + + + + Created: + Criado: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 67 + + + + Filter by correspondent + Filtrar por correspondente + + src/app/components/document-list/document-card-large/document-card-large.component.html + 20 + + + + Filter by tag + Filtrar por etiqueta + + src/app/components/document-list/document-card-large/document-card-large.component.html + 24 + + + + Score: + Nota: + + src/app/components/document-list/document-card-large/document-card-large.component.html + 62 + + + + View in browser + Visualizar no navegador + + src/app/components/document-list/document-card-small/document-card-small.component.html + 40 + + + + Error executing bulk operation: + Erro ao executar operação em massa: + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 74 + + + + "" + &quot;&quot; + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 113 + + + + "" and "" + &quot;&quot; e &quot;&quot; + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 115 + + This is for messages like 'modify "tag1" and "tag2"' + + + , + , + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 117 + + this is used to separate enumerations and should probably be a comma and a whitespace in most languages + + + and "" + e &quot;&quot; + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 118 + + this is for messages like 'modify "tag1", "tag2" and "tag3"' + + + Confirm tags assignment + Confirmar atribuição de etiqueta + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 127 + + + + This operation will add the tag "" to selected document(s). + Essa operação irá adicionar a etiqueta &quot;&quot; em documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 130 + + + + This operation will add the tags to selected document(s). + Essa operação irá adicionar as etiquetas em documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 132 + + + + This operation will remove the tag "" from selected document(s). + Essa operação irá remover a etiqueta &quot;&quot; de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 135 + + + + This operation will remove the tags from selected document(s). + Essa operação irá remover as etiquetas de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 137 + + + + This operation will add the tags and remove the tags on selected document(s). + Essa operação irá adicionar as etiquetas e remover as etiquetas de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 139 + + + + Confirm correspondent assignment + Confirmar atribuição de correspondente + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 159 + + + + This operation will assign the correspondent "" to selected document(s). + Essa operação irá atribuir o correspondente &quot;&quot; para documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 161 + + + + This operation will remove the correspondent from selected document(s). + Essa operação irá remover o correspondente de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 163 + + + + Confirm document type assignment + Confirmar atribuição de tipo de documento + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 182 + + + + This operation will assign the document type "" to selected document(s). + Essa operação irá atribuir o tipo de documento &quot;&quot; para documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 184 + + + + This operation will remove the document type from selected document(s). + Essa operação irá remover o tipo de documento de documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 186 + + + + Delete confirm + Confirmar exlcusão + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 201 + + + + This operation will permanently delete selected document(s). + Essa operação irá excluir permanentemente documento(s) selecionado(s). + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 202 + + + + This operation cannot be undone. + Essa operação não pode ser revertida. + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 203 + + + + Delete document(s) + Apagar documento(s) + + src/app/components/document-list/bulk-editor/bulk-editor.component.ts + 205 + + + + Select: + Selecionar: + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 10 + + + + All + Todos + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 20 + + + + Edit: + Editar: + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 27 + + + + Download originals + Descarregar originais + + src/app/components/document-list/bulk-editor/bulk-editor.component.html + 68 + + + + Suggestions: + Sugestões: + + src/app/components/common/input/select/select.component.html + 26 + + + + Save current view + Salvar visualização atual + + src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html + 3 + + + + Show all + Mostrar todos + + src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html + 3 + + + + Statistics + Estatísticas + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 1 + + + + Total documents: + Total de documentos: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 4 + + + + Documents in inbox: + Documentos na caixa de entrada: + + src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html + 3 + + + + Processing: + Processando: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 32 + + + + Failed: + Falha: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 35 + + + + Added: + Adicionado: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 38 + + + + Connecting... + Conectando... + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 118 + + + + Uploading... + Enviando... + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 123 + + + + Upload complete, waiting... + Envio concluído, esperando... + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 126 + + + + HTTP error: + Erro HTTP: + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts + 136 + + + + Upload new documents + Enviar novos documentos + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 1 + + + + Drop documents here or + Solte documentos aqui ou + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 13 + + + + Browse files + Navegar arquivos + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 13 + + + + Dismiss completed + Esconder completos + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 4 + + This button dismisses all status messages about processed documents on the dashboard (failed and successful) + + + {VAR_PLURAL, plural, =1 {One more document} other { more documents}} + {VAR_PLURAL, plural, =1 {Mais um documento} other {Mais documentos} + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 25 + + This is shown as a summary line when there are more than 5 document in the processing pipeline. + + + Open document + Abrir documento + + src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html + 45 + + + + First steps + Primeiros passos + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 1 + + + + Paperless is running! :) + O Paperless está a correr! :) + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 5 + + + + You can start uploading documents by dropping them in the file upload box to the right or by dropping them in the configured consumption folder and they'll start showing up in the documents list. After you've added some metadata to your documents, use the filtering mechanisms of paperless to create custom views (such as 'Recently added', 'Tagged TODO') and they will appear on the dashboard instead of this message. + Pode começar a carregar documentos deixando-os na caixa de carregamento de ficheiros à direita, ou deixando-os na pasta de consumo pré-configurada, que eles depois aparecem na lista de documentos. Depois de ter adicionado alguns meta-dados aos seus documentos, utilize os mecanismos de filtragem do Paperless para criar visualizações personalizadas (tais como 'Adicionados recentemente', 'Etiquetados com PARAFAZER'). Posteriormente estes aparecerão no painel em vez desta mensagem. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 6,7 + + + + Paperless offers some more features that try to make your life easier: + O Paperless oferece algumas funcionalidades para tentar tornar a sua vida mais fácil: + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 8 + + + + Once you've got a couple documents in paperless and added metadata to them, paperless can assign that metadata to new documents automatically. + Assim que já tenha alguns documentos previamente adicionados com os respetivos meta-dados, o Paperless consegue adicionar automaticamente meta-dados aos novos documentos. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 10 + + + + You can configure paperless to read your mails and add documents from attached files. + Pode configurar o Paperless para ler os seus e-mails e adicionar os documentos em anexo à plataforma. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 11 + + + + Consult the documentation on how to use these features. The section on basic usage also has some information on how to use paperless in general. + Consulte a documentação para saber como utilizar estas funcionalidades. A secção sobre utilização básica têm informação para o ajudar a utilizar a plataforma de uma forma geral. + + src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.html + 13 + + + + Metadata + Metadados + + src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts + 18 + + + + Select + Selecione + + src/app/components/common/select-dialog/select-dialog.component.ts + 18 + + + + Please select an object + Por favor selecione um objeto + + src/app/components/common/select-dialog/select-dialog.component.ts + 21 + + + + Yes + Sim + + src/app/pipes/yes-no.pipe.ts + 9 + + + + No + Não + + src/app/pipes/yes-no.pipe.ts + 9 + + + + (no title) + (sem título) + + src/app/pipes/document-title.pipe.ts + 12 + + + + English (US) + Inglês (US) + + src/app/services/settings.service.ts + 82 + + + + English (GB) + Inglês (GB) + + src/app/services/settings.service.ts + 83 + + + + German + Alemão + + src/app/services/settings.service.ts + 84 + + + + Dutch + Holandês + + src/app/services/settings.service.ts + 85 + + + + French + Francês + + src/app/services/settings.service.ts + 86 + + + + Document already exists. + Documento já existente. + + src/app/services/consumer-status.service.ts + 15 + + + + File not found. + Arquivo não encontrado. + + src/app/services/consumer-status.service.ts + 16 + + + + Pre-consume script does not exist. + Script pré-consumo não existe. + + src/app/services/consumer-status.service.ts + 17 + + Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Error while executing pre-consume script. + Erro ao executar script pré-consumo. + + src/app/services/consumer-status.service.ts + 18 + + Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Post-consume script does not exist. + Script pós-consumo não existe. + + src/app/services/consumer-status.service.ts + 19 + + Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Error while executing post-consume script. + Erro ao executar script pós-consumo. + + src/app/services/consumer-status.service.ts + 20 + + Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation + + + Received new file. + Novo arquivo recebido. + + src/app/services/consumer-status.service.ts + 21 + + + + File type not supported. + Tipo de arquivo não suportado. + + src/app/services/consumer-status.service.ts + 22 + + + + Processing document... + Processando documento... + + src/app/services/consumer-status.service.ts + 23 + + + + Generating thumbnail... + Gerando imagem... + + src/app/services/consumer-status.service.ts + 24 + + + + Retrieving date from document... + Buscando data do documento... + + src/app/services/consumer-status.service.ts + 25 + + + + Saving document... + Salvando documento... + + src/app/services/consumer-status.service.ts + 26 + + + + Finished. + Encerrado. + + src/app/services/consumer-status.service.ts + 27 + + + + Error + Erro + + src/app/services/toast.service.ts + 35 + + + + Information + Informação + + src/app/services/toast.service.ts + 39 + + + + ASN + NSA + + src/app/services/rest/document.service.ts + 17 + + + + Correspondent + Correspondente + + src/app/services/rest/document.service.ts + 18 + + + + Title + Título + + src/app/services/rest/document.service.ts + 19 + + + + Document type + Tipo de Documento + + src/app/services/rest/document.service.ts + 20 + + + + Created + Criado + + src/app/services/rest/document.service.ts + 21 + + + + Added + Adicionado + + src/app/services/rest/document.service.ts + 22 + + + + Modified + Modificado + + src/app/services/rest/document.service.ts + 23 + + + + Light blue + Azul claro + + src/app/data/paperless-tag.ts + 6 + + + + Blue + Azul + + src/app/data/paperless-tag.ts + 7 + + + + Light green + Verde claro + + src/app/data/paperless-tag.ts + 8 + + + + Green + Verde + + src/app/data/paperless-tag.ts + 9 + + + + Light red + Vermelho claro + + src/app/data/paperless-tag.ts + 10 + + + + Red + Vermelho + + src/app/data/paperless-tag.ts + 11 + + + + Light orange + Laranja claro + + src/app/data/paperless-tag.ts + 12 + + + + Orange + Laranja + + src/app/data/paperless-tag.ts + 13 + + + + Light violet + Violeta claro + + src/app/data/paperless-tag.ts + 14 + + + + Violet + Violeta + + src/app/data/paperless-tag.ts + 15 + + + + Brown + Marrom + + src/app/data/paperless-tag.ts + 16 + + + + Black + Preto + + src/app/data/paperless-tag.ts + 17 + + + + Light grey + Cinza claro + + src/app/data/paperless-tag.ts + 18 + + + + Create new item + Criar novo item + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 50 + + + + Edit item + Editar item + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 54 + + + + Could not save element: + Não podemos salvar elemento: + + src/app/components/common/edit-dialog/edit-dialog.component.ts + 58 + + + + Automatic + Automático + + src/app/components/manage/generic-list/generic-list.component.ts + 39 + + + + Do you really want to delete this element? + Você realmente quer excluir esse elemento? + + src/app/components/manage/generic-list/generic-list.component.ts + 97 + + + + Associated documents will not be deleted. + Documentos associados não serão excluidos. + + src/app/components/manage/generic-list/generic-list.component.ts + 104 + + + + Delete + Excluir + + src/app/components/manage/generic-list/generic-list.component.ts + 106 + + + + Error while deleting element: + Erro ao excluir elemento: + + src/app/components/manage/generic-list/generic-list.component.ts + 114 + + + + Any word + Qualquer palavra + + src/app/data/matching-model.ts + 12 + + + + Any: Document contains any of these words (space separated) + Qualquer: Documento contém qualquer uma dessas palavras (separadas por espaço) + + src/app/data/matching-model.ts + 12 + + + + All words + Todas as palavras + + src/app/data/matching-model.ts + 13 + + + + All: Document contains all of these words (space separated) + Todas: Documento contém todas essas palavras (separadas por espaço) + + src/app/data/matching-model.ts + 13 + + + + Exact match + Detecção exata + + src/app/data/matching-model.ts + 14 + + + + Exact: Document contains this string + Exata: Documento contém essa palavra + + src/app/data/matching-model.ts + 14 + + + + Regular expression + Expressão regular + + src/app/data/matching-model.ts + 15 + + + + Regular expression: Document matches this regular expression + Expressão regular: Documento condiz com essa expressão regular + + src/app/data/matching-model.ts + 15 + + + + Fuzzy word + Palavra difusa + + src/app/data/matching-model.ts + 16 + + + + Fuzzy: Document contains a word similar to this word + Fuzzy: Documento contém uma palavra similar à essa. + + src/app/data/matching-model.ts + 16 + + + + Auto: Learn matching automatically + Auto: Aprender detecção automaticamente + + src/app/data/matching-model.ts + 17 + + + + + \ No newline at end of file From c1ddff4ee5c2f817fb4fdcfade5c360f3993b5e6 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 15:00:14 +0000 Subject: [PATCH 11/42] Apply translations in pt_BR translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po' on the 'pt_BR' language. --- src/locale/pt_BR/LC_MESSAGES/django.po | 668 +++++++++++++++++++++++++ 1 file changed, 668 insertions(+) create mode 100644 src/locale/pt_BR/LC_MESSAGES/django.po diff --git a/src/locale/pt_BR/LC_MESSAGES/django.po b/src/locale/pt_BR/LC_MESSAGES/django.po new file mode 100644 index 000000000..e1a74b104 --- /dev/null +++ b/src/locale/pt_BR/LC_MESSAGES/django.po @@ -0,0 +1,668 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +# Translators: +# Jonas Winkler, 2021 +# Rodrigo A , 2021 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-02-23 13:20+0100\n" +"PO-Revision-Date: 2021-02-16 18:37+0000\n" +"Last-Translator: Rodrigo A , 2021\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/paperless/teams/115905/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: documents/apps.py:10 +msgid "Documents" +msgstr "Documentos" + +#: documents/models.py:32 +msgid "Any word" +msgstr "Qualquer palavra" + +#: documents/models.py:33 +msgid "All words" +msgstr "Todas as palavras" + +#: documents/models.py:34 +msgid "Exact match" +msgstr "Detecção exata" + +#: documents/models.py:35 +msgid "Regular expression" +msgstr "Expressão regular" + +#: documents/models.py:36 +msgid "Fuzzy word" +msgstr "Palavra difusa (fuzzy)" + +#: documents/models.py:37 +msgid "Automatic" +msgstr "Automático" + +#: documents/models.py:41 documents/models.py:364 paperless_mail/models.py:25 +#: paperless_mail/models.py:109 +msgid "name" +msgstr "nome" + +#: documents/models.py:45 +msgid "match" +msgstr "detecção" + +#: documents/models.py:49 +msgid "matching algorithm" +msgstr "algoritmo de detecção" + +#: documents/models.py:55 +msgid "is insensitive" +msgstr "diferencia maiúsculas de minúsculas" + +#: documents/models.py:74 documents/models.py:134 +msgid "correspondent" +msgstr "correspondente" + +#: documents/models.py:75 +msgid "correspondents" +msgstr "correspondentes" + +#: documents/models.py:97 +msgid "color" +msgstr "cor" + +#: documents/models.py:101 +msgid "is inbox tag" +msgstr "é etiqueta caixa de entrada" + +#: documents/models.py:103 +msgid "" +"Marks this tag as an inbox tag: All newly consumed documents will be tagged " +"with inbox tags." +msgstr "" +"Marca essa etiqueta como caixa de entrada: Todos os novos documentos " +"consumidos terão as etiquetas de caixa de entrada." + +#: documents/models.py:108 +msgid "tag" +msgstr "etiqueta" + +#: documents/models.py:109 documents/models.py:165 +msgid "tags" +msgstr "etiquetas" + +#: documents/models.py:115 documents/models.py:147 +msgid "document type" +msgstr "tipo de documento" + +#: documents/models.py:116 +msgid "document types" +msgstr "tipos de documento" + +#: documents/models.py:124 +msgid "Unencrypted" +msgstr "Não encriptado" + +#: documents/models.py:125 +msgid "Encrypted with GNU Privacy Guard" +msgstr "Encriptado com GNU Privacy Guard" + +#: documents/models.py:138 +msgid "title" +msgstr "título" + +#: documents/models.py:151 +msgid "content" +msgstr "conteúdo" + +#: documents/models.py:153 +msgid "" +"The raw, text-only data of the document. This field is primarily used for " +"searching." +msgstr "" +"O conteúdo de texto bruto do documento. Esse campo é usado principalmente " +"para busca." + +#: documents/models.py:158 +msgid "mime type" +msgstr "tipo mime" + +#: documents/models.py:169 +msgid "checksum" +msgstr "some de verificação" + +#: documents/models.py:173 +msgid "The checksum of the original document." +msgstr "A soma de verificação original do documento." + +#: documents/models.py:177 +msgid "archive checksum" +msgstr "Soma de verificação de arquivamento." + +#: documents/models.py:182 +msgid "The checksum of the archived document." +msgstr "A soma de verificação do documento arquivado." + +#: documents/models.py:186 documents/models.py:342 +msgid "created" +msgstr "criado" + +#: documents/models.py:190 +msgid "modified" +msgstr "modificado" + +#: documents/models.py:194 +msgid "storage type" +msgstr "tipo de armazenamento" + +#: documents/models.py:202 +msgid "added" +msgstr "adicionado" + +#: documents/models.py:206 +msgid "filename" +msgstr "nome do arquivo" + +#: documents/models.py:212 +msgid "Current filename in storage" +msgstr "Nome do arquivo atual armazenado" + +#: documents/models.py:216 +msgid "archive filename" +msgstr "nome do arquivo para arquivamento" + +#: documents/models.py:222 +msgid "Current archive filename in storage" +msgstr "Nome do arquivo para arquivamento armazenado" + +#: documents/models.py:226 +msgid "archive serial number" +msgstr "número de sério de arquivamento" + +#: documents/models.py:231 +msgid "The position of this document in your physical document archive." +msgstr "A posição deste documento no seu arquivamento físico." + +#: documents/models.py:237 +msgid "document" +msgstr "documento" + +#: documents/models.py:238 +msgid "documents" +msgstr "documentos" + +#: documents/models.py:325 +msgid "debug" +msgstr "debug" + +#: documents/models.py:326 +msgid "information" +msgstr "informação" + +#: documents/models.py:327 +msgid "warning" +msgstr "aviso" + +#: documents/models.py:328 +msgid "error" +msgstr "erro" + +#: documents/models.py:329 +msgid "critical" +msgstr "crítico" + +#: documents/models.py:333 +msgid "group" +msgstr "grupo" + +#: documents/models.py:336 +msgid "message" +msgstr "mensagem" + +#: documents/models.py:339 +msgid "level" +msgstr "nível" + +#: documents/models.py:346 +msgid "log" +msgstr "log" + +#: documents/models.py:347 +msgid "logs" +msgstr "logs" + +#: documents/models.py:358 documents/models.py:408 +msgid "saved view" +msgstr "visualização" + +#: documents/models.py:359 +msgid "saved views" +msgstr "visualizações" + +#: documents/models.py:362 +msgid "user" +msgstr "usuário" + +#: documents/models.py:368 +msgid "show on dashboard" +msgstr "exibir no painel de controle" + +#: documents/models.py:371 +msgid "show in sidebar" +msgstr "exibir no painel lateral" + +#: documents/models.py:375 +msgid "sort field" +msgstr "ordenar campo" + +#: documents/models.py:378 +msgid "sort reverse" +msgstr "odernar reverso" + +#: documents/models.py:384 +msgid "title contains" +msgstr "título contém" + +#: documents/models.py:385 +msgid "content contains" +msgstr "conteúdo contém" + +#: documents/models.py:386 +msgid "ASN is" +msgstr "NSA é" + +#: documents/models.py:387 +msgid "correspondent is" +msgstr "correspondente é" + +#: documents/models.py:388 +msgid "document type is" +msgstr "tipo de documento é" + +#: documents/models.py:389 +msgid "is in inbox" +msgstr "é caixa de entrada" + +#: documents/models.py:390 +msgid "has tag" +msgstr "contém etiqueta" + +#: documents/models.py:391 +msgid "has any tag" +msgstr "contém qualquer etiqueta" + +#: documents/models.py:392 +msgid "created before" +msgstr "criado antes de" + +#: documents/models.py:393 +msgid "created after" +msgstr "criado depois de" + +#: documents/models.py:394 +msgid "created year is" +msgstr "ano de criação é" + +#: documents/models.py:395 +msgid "created month is" +msgstr "mês de criação é" + +#: documents/models.py:396 +msgid "created day is" +msgstr "dia de criação é" + +#: documents/models.py:397 +msgid "added before" +msgstr "adicionado antes de" + +#: documents/models.py:398 +msgid "added after" +msgstr "adicionado depois de" + +#: documents/models.py:399 +msgid "modified before" +msgstr "modificado antes de" + +#: documents/models.py:400 +msgid "modified after" +msgstr "modificado depois de" + +#: documents/models.py:401 +msgid "does not have tag" +msgstr "não tem etiqueta" + +#: documents/models.py:412 +msgid "rule type" +msgstr "tipo de regra" + +#: documents/models.py:416 +msgid "value" +msgstr "valor" + +#: documents/models.py:422 +msgid "filter rule" +msgstr "regra de filtragem" + +#: documents/models.py:423 +msgid "filter rules" +msgstr "regras de filtragem" + +#: documents/serialisers.py:52 +#, python-format +msgid "Invalid regular expresssion: %(error)s" +msgstr "Expressão regular inválida: %(error)s" + +#: documents/serialisers.py:378 +#, python-format +msgid "File type %(type)s not supported" +msgstr "Tipo de arquivo %(type)s não suportado" + +#: documents/templates/index.html:20 +msgid "Paperless-ng is loading..." +msgstr "Paperless-ng está carregando..." + +#: documents/templates/registration/logged_out.html:13 +msgid "Paperless-ng signed out" +msgstr "Paperless-ng saiu" + +#: documents/templates/registration/logged_out.html:41 +msgid "You have been successfully logged out. Bye!" +msgstr "Sua sessão foi encerrada com sucesso. Até mais!" + +#: documents/templates/registration/logged_out.html:42 +msgid "Sign in again" +msgstr "Entre novamente" + +#: documents/templates/registration/login.html:13 +msgid "Paperless-ng sign in" +msgstr "Entrar no Paperless-ng" + +#: documents/templates/registration/login.html:42 +msgid "Please sign in." +msgstr "Por favor, entre na sua conta" + +#: documents/templates/registration/login.html:45 +msgid "Your username and password didn't match. Please try again." +msgstr "Seu usuário e senha estão incorretos. Por favor, tente novamente." + +#: documents/templates/registration/login.html:48 +msgid "Username" +msgstr "Usuário" + +#: documents/templates/registration/login.html:49 +msgid "Password" +msgstr "Senha" + +#: documents/templates/registration/login.html:54 +msgid "Sign in" +msgstr "Entrar" + +#: paperless/settings.py:291 +msgid "English (US)" +msgstr "Inglês (EUA)" + +#: paperless/settings.py:292 +msgid "English (GB)" +msgstr "Inglês (GB)" + +#: paperless/settings.py:293 +msgid "German" +msgstr "Alemão" + +#: paperless/settings.py:294 +msgid "Dutch" +msgstr "Holandês" + +#: paperless/settings.py:295 +msgid "French" +msgstr "Francês" + +#: paperless/urls.py:118 +msgid "Paperless-ng administration" +msgstr "Administração do Paperless-ng" + +#: paperless_mail/admin.py:25 +msgid "Filter" +msgstr "Filtro" + +#: paperless_mail/admin.py:27 +msgid "" +"Paperless will only process mails that match ALL of the filters given below." +msgstr "" +"Paperless processará somente e-mails que se encaixam em TODOS os filtros " +"abaixo." + +#: paperless_mail/admin.py:37 +msgid "Actions" +msgstr "Ações" + +#: paperless_mail/admin.py:39 +msgid "" +"The action applied to the mail. This action is only performed when documents" +" were consumed from the mail. Mails without attachments will remain entirely" +" untouched." +msgstr "" +"A ação se aplica ao e-mail. Essa ação só é executada quando documentos foram" +" consumidos do e-mail. E-mails sem anexos permanecerão intactos." + +#: paperless_mail/admin.py:46 +msgid "Metadata" +msgstr "Metadados" + +#: paperless_mail/admin.py:48 +msgid "" +"Assign metadata to documents consumed from this rule automatically. If you " +"do not assign tags, types or correspondents here, paperless will still " +"process all matching rules that you have defined." +msgstr "" +"Atribua metadados aos documentos consumidos por esta regra automaticamente. " +"Se você não atribuir etiquetas, tipos ou correspondentes aqui, paperless " +"ainda sim processará todas as regras de detecção que você definiu." + +#: paperless_mail/apps.py:9 +msgid "Paperless mail" +msgstr "Paperless mail" + +#: paperless_mail/models.py:11 +msgid "mail account" +msgstr "conta de e-mail" + +#: paperless_mail/models.py:12 +msgid "mail accounts" +msgstr "contas de e-mail" + +#: paperless_mail/models.py:19 +msgid "No encryption" +msgstr "Sem encriptação" + +#: paperless_mail/models.py:20 +msgid "Use SSL" +msgstr "Usar SSL" + +#: paperless_mail/models.py:21 +msgid "Use STARTTLS" +msgstr "Usar STARTTLS" + +#: paperless_mail/models.py:29 +msgid "IMAP server" +msgstr "Servidor IMAP" + +#: paperless_mail/models.py:33 +msgid "IMAP port" +msgstr "Porta IMAP" + +#: paperless_mail/models.py:36 +msgid "" +"This is usually 143 for unencrypted and STARTTLS connections, and 993 for " +"SSL connections." +msgstr "" +"É geralmente 143 para não encriptado e conexões STARTTLS, e 993 para " +"conexões SSL." + +#: paperless_mail/models.py:40 +msgid "IMAP security" +msgstr "segurança IMAP" + +#: paperless_mail/models.py:46 +msgid "username" +msgstr "usuário" + +#: paperless_mail/models.py:50 +msgid "password" +msgstr "senha" + +#: paperless_mail/models.py:60 +msgid "mail rule" +msgstr "regra de e-mail" + +#: paperless_mail/models.py:61 +msgid "mail rules" +msgstr "regras de e-mail" + +#: paperless_mail/models.py:67 +msgid "Only process attachments." +msgstr "Processar somente anexos." + +#: paperless_mail/models.py:68 +msgid "Process all files, including 'inline' attachments." +msgstr "Processar todos os arquivos, incluindo anexos 'inline'." + +#: paperless_mail/models.py:78 +msgid "Mark as read, don't process read mails" +msgstr "Marcar como lido, não processar e-mails lidos" + +#: paperless_mail/models.py:79 +msgid "Flag the mail, don't process flagged mails" +msgstr "Sinalizar o e-mail, não processar e-mails sinalizados" + +#: paperless_mail/models.py:80 +msgid "Move to specified folder" +msgstr "Mover para pasta especificada" + +#: paperless_mail/models.py:81 +msgid "Delete" +msgstr "Excluir" + +#: paperless_mail/models.py:88 +msgid "Use subject as title" +msgstr "Usar assunto como título" + +#: paperless_mail/models.py:89 +msgid "Use attachment filename as title" +msgstr "Usar nome do arquivo anexo como título" + +#: paperless_mail/models.py:99 +msgid "Do not assign a correspondent" +msgstr "Não atribuir um correspondente" + +#: paperless_mail/models.py:101 +msgid "Use mail address" +msgstr "Usar endereço de e-mail" + +#: paperless_mail/models.py:103 +msgid "Use name (or mail address if not available)" +msgstr "Usar nome (ou endereço de e-mail se não disponível)" + +#: paperless_mail/models.py:105 +msgid "Use correspondent selected below" +msgstr "Usar correspondente selecionado abaixo" + +#: paperless_mail/models.py:113 +msgid "order" +msgstr "ordem" + +#: paperless_mail/models.py:120 +msgid "account" +msgstr "conta" + +#: paperless_mail/models.py:124 +msgid "folder" +msgstr "pasta" + +#: paperless_mail/models.py:128 +msgid "filter from" +msgstr "filtrar de" + +#: paperless_mail/models.py:131 +msgid "filter subject" +msgstr "filtrar assunto" + +#: paperless_mail/models.py:134 +msgid "filter body" +msgstr "filtrar corpo" + +#: paperless_mail/models.py:138 +msgid "filter attachment filename" +msgstr "filtrar nome do arquivo anexo" + +#: 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 "" +"Consumir somente documentos que correspondem a este nome de arquivo se especificado.\n" +"Curingas como *.pdf ou *invoice* são permitidos. Sem diferenciação de maiúsculas e minúsculas." + +#: paperless_mail/models.py:146 +msgid "maximum age" +msgstr "idade máxima" + +#: paperless_mail/models.py:148 +msgid "Specified in days." +msgstr "Especificada em dias." + +#: paperless_mail/models.py:151 +msgid "attachment type" +msgstr "tipo de anexo" + +#: paperless_mail/models.py:154 +msgid "" +"Inline attachments include embedded images, so it's best to combine this " +"option with a filename filter." +msgstr "" +"Anexos inline incluem imagens inseridas, por isso é melhor combinar essa " +"opção com um filtro de nome de arquivo." + +#: paperless_mail/models.py:159 +msgid "action" +msgstr "ação" + +#: paperless_mail/models.py:165 +msgid "action parameter" +msgstr "parâmetro da ação" + +#: 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 "" +"Parâmetro adicional para a ação selecionada acima, por exemplo: a pasta de " +"destino da ação de mover pasta." + +#: paperless_mail/models.py:173 +msgid "assign title from" +msgstr "atribuir título de" + +#: paperless_mail/models.py:183 +msgid "assign this tag" +msgstr "atribuir esta etiqueta" + +#: paperless_mail/models.py:191 +msgid "assign this document type" +msgstr "atribuir este tipo de documento" + +#: paperless_mail/models.py:195 +msgid "assign correspondent from" +msgstr "atribuir correspondente de" + +#: paperless_mail/models.py:205 +msgid "assign this correspondent" +msgstr "atribuir este correspondente" From 191d9a7b2b5bcdb91d1323275259e69b26c5abc1 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 16:39:41 +0100 Subject: [PATCH 12/42] add configuration for pt-br --- src-ui/angular.json | 3 ++- src-ui/src/app/app.module.ts | 2 ++ src-ui/src/app/services/settings.service.ts | 3 ++- src/paperless/settings.py | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src-ui/angular.json b/src-ui/angular.json index edf428fc7..2877408d2 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -19,7 +19,8 @@ "de": "src/locale/messages.de.xlf", "nl-NL": "src/locale/messages.nl_NL.xlf", "fr": "src/locale/messages.fr.xlf", - "en-GB": "src/locale/messages.en_GB.xlf" + "en-GB": "src/locale/messages.en_GB.xlf", + "pt-BR": "src/locale/messages.pt_BR.xlf" } }, "architect": { diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 54c19a216..0773a9ace 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -64,11 +64,13 @@ 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 localePt from '@angular/common/locales/pt-PT'; import localeEnGb from '@angular/common/locales/en-GB'; registerLocaleData(localeFr) registerLocaleData(localeNl) registerLocaleData(localeDe) +registerLocaleData(localePt, "pt-BR") registerLocaleData(localeEnGb) @NgModule({ diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index d511fa65f..393417e31 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -83,7 +83,8 @@ export class SettingsService { {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"} + {code: "fr", name: $localize`French`, englishName: "French"}, + {code: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)"} ] } diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 7c4e36391..4c860351f 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -292,7 +292,8 @@ LANGUAGES = [ ("en-gb", _("English (GB)")), ("de", _("German")), ("nl-nl", _("Dutch")), - ("fr", _("French")) + ("fr", _("French")), + ("pt-br", _("Portuguese (Brazil)")) ] LOCALE_PATHS = [ From d836756e1920b0279f479c006580fee481a04fb6 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 16:43:55 +0100 Subject: [PATCH 13/42] fix up quoting (hope this gets pushed into transifex --- src-ui/src/locale/messages.pt_BR.xlf | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf index ac3b557ad..0efe12ad0 100644 --- a/src-ui/src/locale/messages.pt_BR.xlf +++ b/src-ui/src/locale/messages.pt_BR.xlf @@ -59,7 +59,7 @@ View "" saved successfully. - Visualização &quot;&quot; salva com sucesso. + Visualização "" salva com sucesso. src/app/components/document-list/document-list.component.ts 115 @@ -67,7 +67,7 @@ View "" created successfully. - Visualização &quot;&quot; criada com sucesso. + Visualização "" criada com sucesso. src/app/components/document-list/document-list.component.ts 136 @@ -131,7 +131,7 @@ Save "" - Salvar &quot;&quot; + Salvar "" src/app/components/document-list/document-list.component.html 71 @@ -219,7 +219,7 @@ Do you really want to delete document ""? - Você realmente deseja excluir o documento &quot;&quot;? + Você realmente deseja excluir o documento ""? src/app/components/document-detail/document-detail.component.ts 204 @@ -475,7 +475,7 @@ Do you really want to delete the tag ""? - Você realmente deseja excluir a etiqueta &quot;&quot;? + Você realmente deseja excluir a etiqueta ""? src/app/components/manage/tag-list/tag-list.component.ts 30 @@ -563,7 +563,7 @@ Do you really want to delete the document type ""? - Você realmente deseja excluir o tipo de documento &quot;&quot;? + Você realmente deseja excluir o tipo de documento ""? src/app/components/manage/document-type-list/document-type-list.component.ts 26 @@ -587,7 +587,7 @@ Saved view "" deleted. - Visualização &quot;&quot; excluída. + Visualização "" excluída. src/app/components/manage/settings/settings.component.ts 67 @@ -907,7 +907,7 @@ Do you really want to delete the correspondent ""? - Você realmente deseja excluir o correspondente &quot;&quot;? + Você realmente deseja excluir o correspondente ""? src/app/components/manage/correspondent-list/correspondent-list.component.ts 26 @@ -1075,7 +1075,7 @@ Did you mean ""? - Você quis dizer &quot;&quot;? + Você quis dizer ""? src/app/components/search/search.component.html 13 @@ -1405,7 +1405,7 @@ "" - &quot;&quot; + "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts 113 @@ -1413,7 +1413,7 @@ "" and "" - &quot;&quot; e &quot;&quot; + "" e "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts 115 @@ -1431,7 +1431,7 @@ and "" - e &quot;&quot; + e "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts 118 @@ -1448,7 +1448,7 @@ This operation will add the tag "" to selected document(s). - Essa operação irá adicionar a etiqueta &quot;&quot; em documento(s) selecionado(s). + Essa operação irá adicionar a etiqueta "" em documento(s) selecionado(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 130 @@ -1464,7 +1464,7 @@ This operation will remove the tag "" from selected document(s). - Essa operação irá remover a etiqueta &quot;&quot; de documento(s) selecionado(s). + Essa operação irá remover a etiqueta "" de documento(s) selecionado(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 135 @@ -1496,7 +1496,7 @@ This operation will assign the correspondent "" to selected document(s). - Essa operação irá atribuir o correspondente &quot;&quot; para documento(s) selecionado(s). + Essa operação irá atribuir o correspondente "" para documento(s) selecionado(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 161 @@ -1520,7 +1520,7 @@ This operation will assign the document type "" to selected document(s). - Essa operação irá atribuir o tipo de documento &quot;&quot; para documento(s) selecionado(s). + Essa operação irá atribuir o tipo de documento "" para documento(s) selecionado(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts 184 From 15861ea41a47e3bc89bf5276974f7cb59e2167da Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 16:50:05 +0100 Subject: [PATCH 14/42] add translation strings for portuguese --- src-ui/messages.xlf | 37 +++++++++++++++----------- src/locale/en_US/LC_MESSAGES/django.po | 6 ++++- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 95e0fad15..e1747ba03 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -531,28 +531,21 @@ Use system language src/app/components/manage/settings/settings.component.ts - 91 + 92 Use date format of display language src/app/components/manage/settings/settings.component.ts - 96 - - - - ISO 8601 - - src/app/components/manage/settings/settings.component.ts - 97 + 98 Error while storing settings on server: src/app/components/manage/settings/settings.component.ts - 114 + 115 @@ -1630,35 +1623,49 @@ English (US) src/app/services/settings.service.ts - 82 + 84 English (GB) src/app/services/settings.service.ts - 83 + 85 German src/app/services/settings.service.ts - 84 + 86 Dutch src/app/services/settings.service.ts - 85 + 87 French src/app/services/settings.service.ts - 86 + 88 + + + + Portuguese (Brazil) + + src/app/services/settings.service.ts + 89 + + + + ISO 8601 + + src/app/services/settings.service.ts + 95 diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index 27d628455..c4e8ee97b 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-23 13:20+0100\n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -416,6 +416,10 @@ msgstr "" msgid "French" msgstr "" +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "" + #: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "" From 6b20177b09745f3197017873727deaf1338ae3a9 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 17:41:32 +0100 Subject: [PATCH 15/42] update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83ef1c1ed..c935d90a8 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ The documentation for Paperless-ng is available on [ReadTheDocs](https://paperle # Translation -Paperless is currently available in English, German, Dutch and French. Translation is coordinated at transifex: https://www.transifex.com/paperless/paperless-ng +Paperless is currently available in English, German, Dutch, French, and Portuguese. Translation is coordinated at transifex: https://www.transifex.com/paperless/paperless-ng If you want to see paperless in your own language, request that language at transifex and you can start translating after I approve the language. From 035b0a449b240a2615cb0599ff242604a7864e83 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 18:00:26 +0100 Subject: [PATCH 16/42] use ng-bootstrap date selector, with proper formatting/parsing according to the current locale #177 --- src-ui/src/app/app.module.ts | 14 +++-- .../input/date-time/date-time.component.html | 13 ---- .../input/date-time/date-time.component.ts | 61 ------------------- .../common/input/date/date.component.html | 15 +++++ .../date.component.scss} | 0 .../date.component.spec.ts} | 12 ++-- .../common/input/date/date.component.ts | 32 ++++++++++ .../document-detail.component.html | 2 +- .../manage/settings/settings.component.ts | 9 +-- src-ui/src/app/services/settings.service.ts | 36 ++++++++--- src-ui/src/app/utils/ngb-date-adapter.ts | 23 +++++++ .../app/utils/ngb-date-parser-formatter.ts | 59 ++++++++++++++++++ 12 files changed, 176 insertions(+), 100 deletions(-) delete mode 100644 src-ui/src/app/components/common/input/date-time/date-time.component.html delete mode 100644 src-ui/src/app/components/common/input/date-time/date-time.component.ts create mode 100644 src-ui/src/app/components/common/input/date/date.component.html rename src-ui/src/app/components/common/input/{date-time/date-time.component.scss => date/date.component.scss} (100%) rename src-ui/src/app/components/common/input/{date-time/date-time.component.spec.ts => date/date.component.spec.ts} (55%) create mode 100644 src-ui/src/app/components/common/input/date/date.component.ts create mode 100644 src-ui/src/app/utils/ngb-date-adapter.ts create mode 100644 src-ui/src/app/utils/ngb-date-parser-formatter.ts diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 0773a9ace..9e0dc56de 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { NgbDateAdapter, NgbDateParserFormatter, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { DocumentListComponent } from './components/document-list/document-list.component'; import { DocumentDetailComponent } from './components/document-detail/document-detail.component'; @@ -39,7 +39,6 @@ import { SelectComponent } from './components/common/input/select/select.compone import { CheckComponent } from './components/common/input/check/check.component'; import { SaveViewConfigDialogComponent } from './components/document-list/save-view-config-dialog/save-view-config-dialog.component'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; -import { DateTimeComponent } from './components/common/input/date-time/date-time.component'; import { TagsComponent } from './components/common/input/tags/tags.component'; import { SortableDirective } from './directives/sortable.directive'; import { CookieService } from 'ngx-cookie-service'; @@ -60,6 +59,9 @@ import { NgSelectModule } from '@ng-select/ng-select'; import { NumberComponent } from './components/common/input/number/number.component'; import { SafePipe } from './pipes/safe.pipe'; import { CustomDatePipe } from './pipes/custom-date.pipe'; +import { DateComponent } from './components/common/input/date/date.component'; +import { ISODateAdapter } from './utils/ngb-date-adapter'; +import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter'; import localeFr from '@angular/common/locales/fr'; import localeNl from '@angular/common/locales/nl'; @@ -106,7 +108,6 @@ registerLocaleData(localeEnGb) SelectComponent, CheckComponent, SaveViewConfigDialogComponent, - DateTimeComponent, TagsComponent, SortableDirective, SavedViewWidgetComponent, @@ -122,7 +123,8 @@ registerLocaleData(localeEnGb) SelectDialogComponent, NumberComponent, SafePipe, - CustomDatePipe + CustomDatePipe, + DateComponent ], imports: [ BrowserModule, @@ -144,7 +146,9 @@ registerLocaleData(localeEnGb) multi: true }, FilterPipe, - DocumentTitlePipe + DocumentTitlePipe, + {provide: NgbDateAdapter, useClass: ISODateAdapter}, + {provide: NgbDateParserFormatter, useClass: LocalizedDateParserFormatter} ], bootstrap: [AppComponent] }) diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.html b/src-ui/src/app/components/common/input/date-time/date-time.component.html deleted file mode 100644 index 7c002db1b..000000000 --- a/src-ui/src/app/components/common/input/date-time/date-time.component.html +++ /dev/null @@ -1,13 +0,0 @@ -
-
- - -
-
- - -
-
- - - \ No newline at end of file diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.ts b/src-ui/src/app/components/common/input/date-time/date-time.component.ts deleted file mode 100644 index bce208ec8..000000000 --- a/src-ui/src/app/components/common/input/date-time/date-time.component.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { formatDate } from '@angular/common'; -import { Component, forwardRef, Input, OnInit } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; - -@Component({ - providers: [{ - provide: NG_VALUE_ACCESSOR, - useExisting: forwardRef(() => DateTimeComponent), - multi: true - }], - selector: 'app-input-date-time', - templateUrl: './date-time.component.html', - styleUrls: ['./date-time.component.scss'] -}) -export class DateTimeComponent implements OnInit,ControlValueAccessor { - - constructor() { - } - - onChange = (newValue: any) => {}; - - onTouched = () => {}; - - writeValue(newValue: any): void { - this.dateValue = formatDate(newValue, 'yyyy-MM-dd', "en-US") - this.timeValue = formatDate(newValue, 'HH:mm:ss', 'en-US') - } - registerOnChange(fn: any): void { - this.onChange = fn; - } - registerOnTouched(fn: any): void { - this.onTouched = fn; - } - setDisabledState?(isDisabled: boolean): void { - this.disabled = isDisabled; - } - - @Input() - titleDate: string = "Date" - - @Input() - titleTime: string - - @Input() - disabled: boolean = false - - @Input() - hint: string - - timeValue - - dateValue - - ngOnInit(): void { - } - - dateOrTimeChanged() { - this.onChange(formatDate(this.dateValue + "T" + this.timeValue,"yyyy-MM-ddTHH:mm:ssZZZZZ", "en-us", "UTC")) - } - -} diff --git a/src-ui/src/app/components/common/input/date/date.component.html b/src-ui/src/app/components/common/input/date/date.component.html new file mode 100644 index 000000000..ca9ccc040 --- /dev/null +++ b/src-ui/src/app/components/common/input/date/date.component.html @@ -0,0 +1,15 @@ +
+ +
+ +
+ +
+
Invalid date.
+
+
diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.scss b/src-ui/src/app/components/common/input/date/date.component.scss similarity index 100% rename from src-ui/src/app/components/common/input/date-time/date-time.component.scss rename to src-ui/src/app/components/common/input/date/date.component.scss diff --git a/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts b/src-ui/src/app/components/common/input/date/date.component.spec.ts similarity index 55% rename from src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts rename to src-ui/src/app/components/common/input/date/date.component.spec.ts index 0657768bd..ea92c7b30 100644 --- a/src-ui/src/app/components/common/input/date-time/date-time.component.spec.ts +++ b/src-ui/src/app/components/common/input/date/date.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { DateTimeComponent } from './date-time.component'; +import { DateComponent } from './date.component'; -describe('DateTimeComponent', () => { - let component: DateTimeComponent; - let fixture: ComponentFixture; +describe('DateComponent', () => { + let component: DateComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ DateTimeComponent ] + declarations: [ DateComponent ] }) .compileComponents(); }); beforeEach(() => { - fixture = TestBed.createComponent(DateTimeComponent); + fixture = TestBed.createComponent(DateComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src-ui/src/app/components/common/input/date/date.component.ts b/src-ui/src/app/components/common/input/date/date.component.ts new file mode 100644 index 000000000..b3b863581 --- /dev/null +++ b/src-ui/src/app/components/common/input/date/date.component.ts @@ -0,0 +1,32 @@ +import { Component, forwardRef, Input, OnInit, ViewChild } from '@angular/core'; +import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { NgbDateAdapter, NgbDateParserFormatter, NgbDatepickerContent } from '@ng-bootstrap/ng-bootstrap'; +import { SettingsService } from 'src/app/services/settings.service'; +import { v4 as uuidv4 } from 'uuid'; +import { AbstractInputComponent } from '../abstract-input'; + + +@Component({ + providers: [{ + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => DateComponent), + multi: true + }], + selector: 'app-input-date', + templateUrl: './date.component.html', + styleUrls: ['./date.component.scss'] +}) +export class DateComponent extends AbstractInputComponent implements OnInit { + + constructor(private settings: SettingsService) { + super() + } + + ngOnInit(): void { + super.ngOnInit() + this.placeholder = this.settings.getLocalizedDateInputFormat() + } + + placeholder: string + +} diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index 2814a1242..f9b87aee3 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -58,7 +58,7 @@ - + o.code == dateLocale)?.dateInputFormat || "yyyy-mm-dd" + } + get(key: string): any { let setting = SETTINGS.find(s => s.key == key) diff --git a/src-ui/src/app/utils/ngb-date-adapter.ts b/src-ui/src/app/utils/ngb-date-adapter.ts new file mode 100644 index 000000000..19711319d --- /dev/null +++ b/src-ui/src/app/utils/ngb-date-adapter.ts @@ -0,0 +1,23 @@ +import { Injectable } from "@angular/core"; +import { NgbDateAdapter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"; + +@Injectable() +export class ISODateAdapter extends NgbDateAdapter { + + fromModel(value: string | null): NgbDateStruct | null { + if (value) { + let date = new Date(value) + return { + day : date.getDate(), + month : date.getMonth() + 1, + year : date.getFullYear() + } + } else { + return null + } + } + + toModel(date: NgbDateStruct | null): string | null { + return date ? new Date(date.year, date.month - 1, date.day).toISOString() : null + } +} diff --git a/src-ui/src/app/utils/ngb-date-parser-formatter.ts b/src-ui/src/app/utils/ngb-date-parser-formatter.ts new file mode 100644 index 000000000..7d819a6bf --- /dev/null +++ b/src-ui/src/app/utils/ngb-date-parser-formatter.ts @@ -0,0 +1,59 @@ +import { Injectable } from "@angular/core" +import { NgbDateParserFormatter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap" +import { SettingsService } from "../services/settings.service" + +@Injectable() +export class LocalizedDateParserFormatter extends NgbDateParserFormatter { + + constructor(private settings: SettingsService) { + super() + } + + private getDateInputFormat() { + return this.settings.getLocalizedDateInputFormat() + } + + /** + * This constructs a regular expression from a date input format which is then + * used to parse dates. + */ + private getDateParseRegex() { + return new RegExp( + "^" + this.getDateInputFormat() + .replace('dd', '(?[0-9]+)') + .replace('mm', '(?[0-9]+)') + .replace('yyyy', '(?[0-9]+)') + .split('.').join('\\.\\s*') + "$" // allow whitespace(s) after dot (specific for German) + ) + } + + parse(value: string): NgbDateStruct | null { + let match = this.getDateParseRegex().exec(value) + if (match) { + let dateStruct = { + day: +match.groups.day, + month: +match.groups.month, + year: +match.groups.year + } + if (dateStruct.year <= (new Date().getFullYear() - 2000)) { + dateStruct.year += 2000 + } else if (dateStruct.year < 100) { + dateStruct.year += 1900 + } + return dateStruct + } else { + return null + } + } + + format(date: NgbDateStruct | null): string { + if (date) { + return this.getDateInputFormat() + .replace('dd', date.day.toString().padStart(2, '0')) + .replace('mm', date.month.toString().padStart(2, '0')) + .replace('yyyy', date.year.toString().padStart(4, '0')) + } else { + return null + } + } +} \ No newline at end of file From 96b8d35a000f0b1ebb32dbe045fbcc969704520c Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 18:00:35 +0100 Subject: [PATCH 17/42] update dependencies --- src-ui/package-lock.json | 6 +++--- src-ui/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json index 148bc72eb..fd6d69538 100644 --- a/src-ui/package-lock.json +++ b/src-ui/package-lock.json @@ -2055,9 +2055,9 @@ } }, "@ng-bootstrap/ng-bootstrap": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-8.0.0.tgz", - "integrity": "sha512-v77Gfd8xHH+exq0WqIqVRlxbUEHdA/2+RUJenUP2IDTQN9E1rWl7O461/kosr+0XPuxPArHQJxhh/WsCYckcNg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-8.0.4.tgz", + "integrity": "sha512-EdxTwOPOtlvfnwrglPniulmzdnXdXH3lTGaGAY1HrYRvdtGg6wicRvl+BvwVE/3Qik5NPkOWMVghUHpv3evIYg==", "requires": { "tslib": "^2.0.0" } diff --git a/src-ui/package.json b/src-ui/package.json index d6082c6b9..a4d014284 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -20,7 +20,7 @@ "@angular/platform-browser": "~10.1.5", "@angular/platform-browser-dynamic": "~10.1.5", "@angular/router": "~10.1.5", - "@ng-bootstrap/ng-bootstrap": "^8.0.0", + "@ng-bootstrap/ng-bootstrap": "^8.0.4", "@ng-select/ng-select": "^5.0.9", "bootstrap": "^4.5.0", "file-saver": "^2.0.5", From d2719b530992ad15e0fcdb8ed8015d6358715f68 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 18:08:55 +0100 Subject: [PATCH 18/42] added a missing string --- src-ui/messages.xlf | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index e1747ba03..d04d5a6f8 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -1598,6 +1598,13 @@ 21 + + Invalid date. + + src/app/components/common/input/date/date.component.html + 13 + + Yes @@ -1623,49 +1630,49 @@ English (US) src/app/services/settings.service.ts - 84 + 88 English (GB) src/app/services/settings.service.ts - 85 + 89 German src/app/services/settings.service.ts - 86 + 90 Dutch src/app/services/settings.service.ts - 87 + 91 French src/app/services/settings.service.ts - 88 + 92 Portuguese (Brazil) src/app/services/settings.service.ts - 89 + 93 ISO 8601 src/app/services/settings.service.ts - 95 + 98 From fc75e88cb790b5eb48a76b38c59840a1bf7530b1 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 17:10:20 +0000 Subject: [PATCH 19/42] Apply translations in de translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po' on the 'de' language. --- src/locale/de/LC_MESSAGES/django.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index c031ebc85..0343c5a94 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-23 13:20+0100\n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" "PO-Revision-Date: 2021-02-16 18:37+0000\n" "Last-Translator: Jonas Winkler, 2021\n" "Language-Team: German (https://www.transifex.com/paperless/teams/115905/de/)\n" @@ -426,6 +426,10 @@ msgstr "Niederländisch" msgid "French" msgstr "Französisch" +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "Portugiesisch (Brasilien)" + #: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "Paperless-ng Administration" From 56204f8497539ca2a04297ddafd7fa1f60bb8bfe Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 17:10:24 +0000 Subject: [PATCH 20/42] Translate /src-ui/messages.xlf in de translation completed for the source file '/src-ui/messages.xlf' on the 'de' language. --- src-ui/src/locale/messages.de.xlf | 48 ++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de.xlf index 6802f8dce..a9762c286 100644 --- a/src-ui/src/locale/messages.de.xlf +++ b/src-ui/src/locale/messages.de.xlf @@ -606,7 +606,7 @@ Benutze Systemsprache src/app/components/manage/settings/settings.component.ts - 91 + 92 @@ -614,15 +614,7 @@ Benutze Datumsformat der Anzeigesprache src/app/components/manage/settings/settings.component.ts - 96 - - - - ISO 8601 - ISO 8601 - - src/app/components/manage/settings/settings.component.ts - 97 + 98 @@ -630,7 +622,7 @@ Fehler beim Speichern der Einstellungen auf dem Server: src/app/components/manage/settings/settings.component.ts - 114 + 115 @@ -1832,6 +1824,14 @@ 21 + + Invalid date. + Ungültiges Datum. + + src/app/components/common/input/date/date.component.html + 13 + + Yes Ja @@ -1861,7 +1861,7 @@ Englisch (US) src/app/services/settings.service.ts - 82 + 88 @@ -1869,7 +1869,7 @@ Englisch (UK) src/app/services/settings.service.ts - 83 + 89 @@ -1877,7 +1877,7 @@ Deutsch src/app/services/settings.service.ts - 84 + 90 @@ -1885,7 +1885,7 @@ Niederländisch src/app/services/settings.service.ts - 85 + 91 @@ -1893,7 +1893,23 @@ Französisch src/app/services/settings.service.ts - 86 + 92 + + + + Portuguese (Brazil) + Portugiesisch (Brasilien) + + src/app/services/settings.service.ts + 93 + + + + ISO 8601 + ISO 8601 + + src/app/services/settings.service.ts + 98 From 0db14d6f744f3045731996c3b2a42a4362ec7788 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 17:18:07 +0000 Subject: [PATCH 21/42] Apply translations in pt_BR translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po' on the 'pt_BR' language. --- src/locale/pt_BR/LC_MESSAGES/django.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/locale/pt_BR/LC_MESSAGES/django.po b/src/locale/pt_BR/LC_MESSAGES/django.po index e1a74b104..7800b0c88 100644 --- a/src/locale/pt_BR/LC_MESSAGES/django.po +++ b/src/locale/pt_BR/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-23 13:20+0100\n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" "PO-Revision-Date: 2021-02-16 18:37+0000\n" "Last-Translator: Rodrigo A , 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/paperless/teams/115905/pt_BR/)\n" @@ -425,6 +425,10 @@ msgstr "Holandês" msgid "French" msgstr "Francês" +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "Português (Brasil)" + #: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "Administração do Paperless-ng" From bec5365ac9378ac7e8309b48f0be85d84d2cfc33 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 17:18:26 +0000 Subject: [PATCH 22/42] Translate /src-ui/messages.xlf in pt_BR translation completed for the source file '/src-ui/messages.xlf' on the 'pt_BR' language. --- src-ui/src/locale/messages.pt_BR.xlf | 48 ++++++++++++++++++---------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf index 0efe12ad0..ff438073d 100644 --- a/src-ui/src/locale/messages.pt_BR.xlf +++ b/src-ui/src/locale/messages.pt_BR.xlf @@ -606,7 +606,7 @@ Usar linguagem do sistema src/app/components/manage/settings/settings.component.ts - 91 + 92 @@ -614,15 +614,7 @@ Usar formato de data da linguagem de exibição src/app/components/manage/settings/settings.component.ts - 96 - - - - ISO 8601 - ISO 8601 - - src/app/components/manage/settings/settings.component.ts - 97 + 98 @@ -630,7 +622,7 @@ Erro ao salvar configurações: src/app/components/manage/settings/settings.component.ts - 114 + 115 @@ -1832,6 +1824,14 @@ 21 + + Invalid date. + Data inválida. + + src/app/components/common/input/date/date.component.html + 13 + + Yes Sim @@ -1861,7 +1861,7 @@ Inglês (US) src/app/services/settings.service.ts - 82 + 88 @@ -1869,7 +1869,7 @@ Inglês (GB) src/app/services/settings.service.ts - 83 + 89 @@ -1877,7 +1877,7 @@ Alemão src/app/services/settings.service.ts - 84 + 90 @@ -1885,7 +1885,7 @@ Holandês src/app/services/settings.service.ts - 85 + 91 @@ -1893,7 +1893,23 @@ Francês src/app/services/settings.service.ts - 86 + 92 + + + + Portuguese (Brazil) + Português (Brasil) + + src/app/services/settings.service.ts + 93 + + + + ISO 8601 + ISO 8601 + + src/app/services/settings.service.ts + 98 From 1896aa7da1fdc417b1b290db52ecfb2c3edd0570 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 18:45:05 +0100 Subject: [PATCH 23/42] use new date inputs for the date filter as well --- src-ui/src/app/app.module.ts | 4 +-- .../date-dropdown.component.html | 22 +++++++++++++-- .../date-dropdown/date-dropdown.component.ts | 16 +++++++++-- src-ui/src/app/utils/ngb-iso-date-adapter.ts | 27 +++++++++++++++++++ ...dapter.ts => ngb-iso-date-time-adapter.ts} | 2 +- 5 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 src-ui/src/app/utils/ngb-iso-date-adapter.ts rename src-ui/src/app/utils/{ngb-date-adapter.ts => ngb-iso-date-time-adapter.ts} (89%) diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 9e0dc56de..46d8df9a1 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -60,7 +60,7 @@ import { NumberComponent } from './components/common/input/number/number.compone import { SafePipe } from './pipes/safe.pipe'; import { CustomDatePipe } from './pipes/custom-date.pipe'; import { DateComponent } from './components/common/input/date/date.component'; -import { ISODateAdapter } from './utils/ngb-date-adapter'; +import { ISODateTimeAdapter } from './utils/ngb-iso-date-time-adapter'; import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter'; import localeFr from '@angular/common/locales/fr'; @@ -147,7 +147,7 @@ registerLocaleData(localeEnGb) }, FilterPipe, DocumentTitlePipe, - {provide: NgbDateAdapter, useClass: ISODateAdapter}, + {provide: NgbDateAdapter, useClass: ISODateTimeAdapter}, {provide: NgbDateParserFormatter, useClass: LocalizedDateParserFormatter} ], bootstrap: [AppComponent] diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html index b70a04103..ee8e6e6f4 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html @@ -20,8 +20,17 @@
- + +
+ +
+
- + +
+ +
+ diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts index 27472bdc7..e21b28312 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.ts @@ -1,7 +1,10 @@ import { formatDate } from '@angular/common'; import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from '@angular/core'; +import { NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap'; import { Subject, Subscription } from 'rxjs'; -import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { debounceTime } from 'rxjs/operators'; +import { SettingsService } from 'src/app/services/settings.service'; +import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'; export interface DateSelection { before?: string @@ -16,10 +19,17 @@ const LAST_YEAR = 3 @Component({ selector: 'app-date-dropdown', templateUrl: './date-dropdown.component.html', - styleUrls: ['./date-dropdown.component.scss'] + styleUrls: ['./date-dropdown.component.scss'], + providers: [ + {provide: NgbDateAdapter, useClass: ISODateAdapter}, + ] }) export class DateDropdownComponent implements OnInit, OnDestroy { + constructor(settings: SettingsService) { + this.datePlaceHolder = settings.getLocalizedDateInputFormat() + } + quickFilters = [ {id: LAST_7_DAYS, name: $localize`Last 7 days`}, {id: LAST_MONTH, name: $localize`Last month`}, @@ -27,6 +37,8 @@ export class DateDropdownComponent implements OnInit, OnDestroy { {id: LAST_YEAR, name: $localize`Last year`} ] + datePlaceHolder: string + @Input() dateBefore: string diff --git a/src-ui/src/app/utils/ngb-iso-date-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-adapter.ts new file mode 100644 index 000000000..e43602a16 --- /dev/null +++ b/src-ui/src/app/utils/ngb-iso-date-adapter.ts @@ -0,0 +1,27 @@ +import { Injectable } from "@angular/core"; +import { NgbDateAdapter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"; + +@Injectable() +export class ISODateAdapter extends NgbDateAdapter { + + fromModel(value: string | null): NgbDateStruct | null { + if (value) { + let date = new Date(value) + return { + day : date.getDate(), + month : date.getMonth() + 1, + year : date.getFullYear() + } + } else { + return null + } + } + + toModel(date: NgbDateStruct | null): string | null { + if (date) { + return date.year.toString().padStart(4, '0') + "-" + date.month.toString().padStart(2, '0') + "-" + date.day.toString().padStart(2, '0') + } else { + return null + } + } +} diff --git a/src-ui/src/app/utils/ngb-date-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts similarity index 89% rename from src-ui/src/app/utils/ngb-date-adapter.ts rename to src-ui/src/app/utils/ngb-iso-date-time-adapter.ts index 19711319d..21a97a19a 100644 --- a/src-ui/src/app/utils/ngb-date-adapter.ts +++ b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts @@ -2,7 +2,7 @@ import { Injectable } from "@angular/core"; import { NgbDateAdapter, NgbDateStruct } from "@ng-bootstrap/ng-bootstrap"; @Injectable() -export class ISODateAdapter extends NgbDateAdapter { +export class ISODateTimeAdapter extends NgbDateAdapter { fromModel(value: string | null): NgbDateStruct | null { if (value) { From a5ba14e4464dbbc9e4167c98f644a7a5b34721c2 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 19:03:03 +0100 Subject: [PATCH 24/42] version bump --- src-ui/src/environments/environment.prod.ts | 2 +- src/paperless/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index d170a0f02..6c97ac1cb 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -2,7 +2,7 @@ export const environment = { production: true, apiBaseUrl: "/api/", appTitle: "Paperless-ng", - version: "1.2.0", + version: "1.2.1", webSocketHost: window.location.host, webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:") }; diff --git a/src/paperless/version.py b/src/paperless/version.py index 09ac5f672..d93cd02b0 100644 --- a/src/paperless/version.py +++ b/src/paperless/version.py @@ -1 +1 @@ -__version__ = (1, 2, 0) +__version__ = (1, 2, 1) From f038bb90bb2c936064f5997bf627997056f7405d Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 19:03:21 +0100 Subject: [PATCH 25/42] fixes for #600 --- src-ui/src/index.html | 2 +- src/documents/templates/index.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src-ui/src/index.html b/src-ui/src/index.html index 39ecd824c..4308a6b16 100644 --- a/src-ui/src/index.html +++ b/src-ui/src/index.html @@ -9,7 +9,7 @@ - + diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html index 285e48d3f..b71aaaeb6 100644 --- a/src/documents/templates/index.html +++ b/src/documents/templates/index.html @@ -15,6 +15,7 @@ + {% translate "Paperless-ng is loading..." %} From 6a64bf6fc16e5b806faf1aa5a91866913ecc6051 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 19:05:06 +0100 Subject: [PATCH 26/42] changelog --- docs/changelog.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index b23ca5137..d2ec7ec69 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,17 @@ Changelog ********* +paperless-ng 1.2.1 +################## + +* Added translation into Portuguese (Brazil). + +* The date input fields now respect the currently selected date format. + +* Added a fancy icon when adding paperless to the home screen on iOS devices. + +* When using regular expression matching, the regular expression is now validated before saving the tag/correspondent/type. + paperless-ng 1.2.0 ################## From 6ae65e0ab43b90122b0d94871fc912f022693149 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 19:21:15 +0100 Subject: [PATCH 27/42] changelog --- docs/changelog.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index d2ec7ec69..137fa2fd2 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -8,11 +8,11 @@ Changelog paperless-ng 1.2.1 ################## -* Added translation into Portuguese (Brazil). +* `Rodrigo Avelino `_ translated Paperless into Portuguese (Brazil). * The date input fields now respect the currently selected date format. -* Added a fancy icon when adding paperless to the home screen on iOS devices. +* Added a fancy icon when adding paperless to the home screen on iOS devices. Thanks to `Joel Nordell `_. * When using regular expression matching, the regular expression is now validated before saving the tag/correspondent/type. From 8465b8cfca7ca8c36c02047166bd86e50e8feabc Mon Sep 17 00:00:00 2001 From: Jonas Winkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 19:27:16 +0100 Subject: [PATCH 28/42] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 01ac30fa1..b21173ba5 100644 --- a/README.md +++ b/README.md @@ -77,9 +77,9 @@ The documentation for Paperless-ng is available on [ReadTheDocs](https://paperle # Translation -Paperless is currently available in English, German, Dutch, French, and Portuguese. Translation is coordinated at transifex: https://www.transifex.com/paperless/paperless-ng +Paperless is currently available in English, German, Dutch, French, and Portuguese. -If you want to see paperless in your own language, request that language at transifex and you can start translating after I approve the language. +There's an active translation project at transifex! If you want to help out by translating paperless into your language, please head over to https://github.com/jonaswinkler/paperless-ng/issues/212 for details. # Feature Requests From c22af0a7825fad1db9bc23075e06449a182e63b8 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 18:43:39 +0000 Subject: [PATCH 29/42] Apply translations in en_GB translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po' on the 'en_GB' language. --- src/locale/en_GB/LC_MESSAGES/django.po | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/locale/en_GB/LC_MESSAGES/django.po b/src/locale/en_GB/LC_MESSAGES/django.po index f0c5b0381..dbdd4b2a5 100644 --- a/src/locale/en_GB/LC_MESSAGES/django.po +++ b/src/locale/en_GB/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-16 14:52+0100\n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" "PO-Revision-Date: 2021-02-16 18:37+0000\n" "Last-Translator: Jonas Winkler, 2021\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/paperless/teams/115905/en_GB/)\n" @@ -355,7 +355,12 @@ msgstr "filter rule" msgid "filter rules" msgstr "filter rules" -#: documents/serialisers.py:370 +#: documents/serialisers.py:52 +#, python-format +msgid "Invalid regular expresssion: %(error)s" +msgstr "Invalid regular expresssion: %(error)s" + +#: documents/serialisers.py:378 #, python-format msgid "File type %(type)s not supported" msgstr "File type %(type)s not supported" @@ -420,7 +425,11 @@ msgstr "Dutch" msgid "French" msgstr "French" -#: paperless/urls.py:114 +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "Portuguese (Brazil)" + +#: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "Paperless-ng administration" From 800f4deb909ee2b661e234743d1fa2fbf1698c87 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 18:43:40 +0000 Subject: [PATCH 30/42] Translate /src-ui/messages.xlf in en_GB translation completed for the source file '/src-ui/messages.xlf' on the 'en_GB' language. --- src-ui/src/locale/messages.en_GB.xlf | 48 ++++++++++++++++++---------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/src-ui/src/locale/messages.en_GB.xlf b/src-ui/src/locale/messages.en_GB.xlf index f5e711c39..b413a50a1 100644 --- a/src-ui/src/locale/messages.en_GB.xlf +++ b/src-ui/src/locale/messages.en_GB.xlf @@ -606,7 +606,7 @@ Use system language src/app/components/manage/settings/settings.component.ts - 91 + 92 @@ -614,15 +614,7 @@ Use date format of display language src/app/components/manage/settings/settings.component.ts - 96 - - - - ISO 8601 - ISO 8601 - - src/app/components/manage/settings/settings.component.ts - 97 + 98 @@ -630,7 +622,7 @@ Error while storing settings on server: src/app/components/manage/settings/settings.component.ts - 114 + 115 @@ -1832,6 +1824,14 @@ 21 + + Invalid date. + Invalid date. + + src/app/components/common/input/date/date.component.html + 13 + + Yes Yes @@ -1861,7 +1861,7 @@ English (US) src/app/services/settings.service.ts - 82 + 88 @@ -1869,7 +1869,7 @@ English (GB) src/app/services/settings.service.ts - 83 + 89 @@ -1877,7 +1877,7 @@ German src/app/services/settings.service.ts - 84 + 90 @@ -1885,7 +1885,7 @@ Dutch src/app/services/settings.service.ts - 85 + 91 @@ -1893,7 +1893,23 @@ French src/app/services/settings.service.ts - 86 + 92 + + + + Portuguese (Brazil) + Portuguese (Brazil) + + src/app/services/settings.service.ts + 93 + + + + ISO 8601 + ISO 8601 + + src/app/services/settings.service.ts + 98 From 2f2b5b90ea0812e3d9212169f4847b53b93b5f2e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 17 Jan 2021 19:46:44 +0100 Subject: [PATCH 31/42] Dark mode compatibility --- src-ui/src/theme_dark.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss index 4e850f017..751ff2b15 100644 --- a/src-ui/src/theme_dark.scss +++ b/src-ui/src/theme_dark.scss @@ -246,6 +246,16 @@ $border-color-dark-mode: #47494f; } } + .btn-light:not(:disabled):not(.disabled) { + background-color: $bg-dark-mode; + color: $text-color-dark-mode-accent; + + &:hover { + background-color: $text-color-dark-mode; + color: $bg-dark-mode; + } + } + .btn-link:not(:disabled):not(.disabled) { color: $primary-dark-mode; } @@ -366,6 +376,12 @@ $border-color-dark-mode: #47494f; .progress-bar.bg-primary { background-color: darken($primary-dark-mode, 5%) !important; } + + .ngb-dp-header, + .ngb-dp-weekdays, + .ngb-dp-month { + background-color: $bg-light-dark-mode; + } } body.color-scheme-dark { From e43ab23a45e7065f8cb29417445ba00c5e33cfbd Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 19:29:33 +0000 Subject: [PATCH 32/42] Apply translations in fr translation completed for the source file '/src/locale/en_US/LC_MESSAGES/django.po' on the 'fr' language. --- src/locale/fr/LC_MESSAGES/django.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 6acd81649..3b4fbce3f 100644 --- a/src/locale/fr/LC_MESSAGES/django.po +++ b/src/locale/fr/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-23 13:20+0100\n" +"POT-Creation-Date: 2021-02-24 16:49+0100\n" "PO-Revision-Date: 2021-02-16 18:37+0000\n" "Last-Translator: Philmo67, 2021\n" "Language-Team: French (https://www.transifex.com/paperless/teams/115905/fr/)\n" @@ -428,6 +428,10 @@ msgstr "Néerlandais" msgid "French" msgstr "Français" +#: paperless/settings.py:296 +msgid "Portuguese (Brazil)" +msgstr "Portugais (Brésil)" + #: paperless/urls.py:118 msgid "Paperless-ng administration" msgstr "Administration de Paperless-ng" From d6cbea97f9b5993f12b1d1ea02fc99ca3a811587 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 19:30:01 +0000 Subject: [PATCH 33/42] Translate /src-ui/messages.xlf in fr translation completed for the source file '/src-ui/messages.xlf' on the 'fr' language. --- src-ui/src/locale/messages.fr.xlf | 50 ++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr.xlf index 79045b3b4..05b9fdab7 100644 --- a/src-ui/src/locale/messages.fr.xlf +++ b/src-ui/src/locale/messages.fr.xlf @@ -606,7 +606,7 @@ Utiliser la langue du système src/app/components/manage/settings/settings.component.ts - 91 + 92 @@ -614,15 +614,7 @@ Utiliser le format de date de la langue d'affichage src/app/components/manage/settings/settings.component.ts - 96 - - - - ISO 8601 - ISO 8601 - - src/app/components/manage/settings/settings.component.ts - 97 + 98 @@ -630,7 +622,7 @@ Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : src/app/components/manage/settings/settings.component.ts - 114 + 115 @@ -819,7 +811,7 @@ Document processing - Traitement de document + Traitement de documents src/app/components/manage/settings/settings.component.html 118 @@ -1832,6 +1824,14 @@ 21 + + Invalid date. + Date incorrecte. + + src/app/components/common/input/date/date.component.html + 13 + + Yes Oui @@ -1861,7 +1861,7 @@ Anglais (US) src/app/services/settings.service.ts - 82 + 88 @@ -1869,7 +1869,7 @@ Anglais (GB) src/app/services/settings.service.ts - 83 + 89 @@ -1877,7 +1877,7 @@ Allemand src/app/services/settings.service.ts - 84 + 90 @@ -1885,7 +1885,7 @@ Néerlandais src/app/services/settings.service.ts - 85 + 91 @@ -1893,7 +1893,23 @@ Français src/app/services/settings.service.ts - 86 + 92 + + + + Portuguese (Brazil) + Portugais (Brésil) + + src/app/services/settings.service.ts + 93 + + + + ISO 8601 + ISO 8601 + + src/app/services/settings.service.ts + 98 From 3d3300ac32b52b7f9d5733525c9b6cd39db1ac89 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Wed, 24 Feb 2021 22:27:43 +0100 Subject: [PATCH 34/42] add versioning support to the API --- src-ui/src/app/app.module.ts | 5 ++++ .../api-version.interceptor.spec.ts | 16 ++++++++++++ .../interceptors/api-version.interceptor.ts | 25 +++++++++++++++++++ src-ui/src/app/services/auth.interceptor.ts | 0 src-ui/src/environments/environment.prod.ts | 1 + src-ui/src/environments/environment.ts | 1 + src/paperless/settings.py | 7 ++++-- 7 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 src-ui/src/app/interceptors/api-version.interceptor.spec.ts create mode 100644 src-ui/src/app/interceptors/api-version.interceptor.ts delete mode 100644 src-ui/src/app/services/auth.interceptor.ts diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 46d8df9a1..0cc42292b 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -62,6 +62,7 @@ import { CustomDatePipe } from './pipes/custom-date.pipe'; import { DateComponent } from './components/common/input/date/date.component'; import { ISODateTimeAdapter } from './utils/ngb-iso-date-time-adapter'; import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter'; +import { ApiVersionInterceptor } from './interceptors/api-version.interceptor'; import localeFr from '@angular/common/locales/fr'; import localeNl from '@angular/common/locales/nl'; @@ -144,6 +145,10 @@ registerLocaleData(localeEnGb) provide: HTTP_INTERCEPTORS, useClass: CsrfInterceptor, multi: true + },{ + provide: HTTP_INTERCEPTORS, + useClass: ApiVersionInterceptor, + multi: true }, FilterPipe, DocumentTitlePipe, diff --git a/src-ui/src/app/interceptors/api-version.interceptor.spec.ts b/src-ui/src/app/interceptors/api-version.interceptor.spec.ts new file mode 100644 index 000000000..7ad51f687 --- /dev/null +++ b/src-ui/src/app/interceptors/api-version.interceptor.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ApiVersionInterceptor } from './api-version.interceptor'; + +describe('ApiVersionInterceptor', () => { + beforeEach(() => TestBed.configureTestingModule({ + providers: [ + ApiVersionInterceptor + ] + })); + + it('should be created', () => { + const interceptor: ApiVersionInterceptor = TestBed.inject(ApiVersionInterceptor); + expect(interceptor).toBeTruthy(); + }); +}); diff --git a/src-ui/src/app/interceptors/api-version.interceptor.ts b/src-ui/src/app/interceptors/api-version.interceptor.ts new file mode 100644 index 000000000..95aa6ef16 --- /dev/null +++ b/src-ui/src/app/interceptors/api-version.interceptor.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@angular/core'; +import { + HttpRequest, + HttpHandler, + HttpEvent, + HttpInterceptor +} from '@angular/common/http'; +import { Observable } from 'rxjs'; +import { environment } from 'src/environments/environment'; + +@Injectable() +export class ApiVersionInterceptor implements HttpInterceptor { + + constructor() {} + + intercept(request: HttpRequest, next: HttpHandler): Observable> { + request = request.clone({ + setHeaders: { + 'Accept': `application/json; version=${environment.apiVersion}` + } + }) + + return next.handle(request); + } +} diff --git a/src-ui/src/app/services/auth.interceptor.ts b/src-ui/src/app/services/auth.interceptor.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index 6c97ac1cb..50cf6d954 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -1,6 +1,7 @@ export const environment = { production: true, apiBaseUrl: "/api/", + apiVersion: "1", appTitle: "Paperless-ng", version: "1.2.1", webSocketHost: window.location.host, diff --git a/src-ui/src/environments/environment.ts b/src-ui/src/environments/environment.ts index b2c40e261..b0ac843d5 100644 --- a/src-ui/src/environments/environment.ts +++ b/src-ui/src/environments/environment.ts @@ -5,6 +5,7 @@ export const environment = { production: false, apiBaseUrl: "http://localhost:8000/api/", + apiVersion: "1", appTitle: "Paperless-ng", version: "DEVELOPMENT", webSocketHost: "localhost:8000", diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 4c860351f..48712954c 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -112,7 +112,10 @@ REST_FRAMEWORK = { 'rest_framework.authentication.BasicAuthentication', 'rest_framework.authentication.SessionAuthentication', 'rest_framework.authentication.TokenAuthentication' - ] + ], + 'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning', + 'DEFAULT_VERSION': 'v1', + 'ALLOWED_VERSIONS': ['1', '2'] } if DEBUG: @@ -142,7 +145,7 @@ ASGI_APPLICATION = "paperless.asgi.application" STATIC_URL = os.getenv("PAPERLESS_STATIC_URL", "/static/") -# what is this used for? +# TODO: what is this used for? TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', From 018b53db1b4b8b061ea1fcb7b99c102ab3227d83 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:37:39 +0100 Subject: [PATCH 35/42] fix pt-br calendar --- src-ui/src/app/app.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 0cc42292b..cf28b1e0a 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -67,7 +67,7 @@ import { ApiVersionInterceptor } from './interceptors/api-version.interceptor'; import localeFr from '@angular/common/locales/fr'; import localeNl from '@angular/common/locales/nl'; import localeDe from '@angular/common/locales/de'; -import localePt from '@angular/common/locales/pt-PT'; +import localePt from '@angular/common/locales/pt'; import localeEnGb from '@angular/common/locales/en-GB'; registerLocaleData(localeFr) From 3872c3c49bf291f50044ad0777707dd8cd0b87f6 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:42:21 +0100 Subject: [PATCH 36/42] fixes #603 --- src-ui/src/app/components/app-frame/app-frame.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 34a978fe5..5692d9f78 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -94,7 +94,7 @@  {{d.title | documentTitle}} -
  • +
  • From 0fa9d71da8c741c95353e045bede57fb33897933 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:42:38 +0100 Subject: [PATCH 37/42] fix duplicate IDs --- .../common/date-dropdown/date-dropdown.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html index ee8e6e6f4..dc329f964 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html @@ -20,7 +20,7 @@
    -
    -
    -
    Invalid date.
    +
    Invalid date.
    + {{hint}}
    From 463696e6a8c66af421296c1b3fd9ec0581890eda Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:42:06 +0100 Subject: [PATCH 42/42] changelog --- docs/changelog.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 137fa2fd2..73e457176 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -8,7 +8,7 @@ Changelog paperless-ng 1.2.1 ################## -* `Rodrigo Avelino `_ translated Paperless into Portuguese (Brazil). +* `Rodrigo Avelino `_ translated Paperless into Portuguese (Brazil)! * The date input fields now respect the currently selected date format. @@ -16,6 +16,8 @@ paperless-ng 1.2.1 * When using regular expression matching, the regular expression is now validated before saving the tag/correspondent/type. +* Regression fix: Dates on the front end did not respect date locale settings in some cases. + paperless-ng 1.2.0 ##################