From 33e4b0ae8c1010a6b262df78288e8ff33397e1ad Mon Sep 17 00:00:00 2001
From: Juanjo Garcia <juanjo.garcia@nan-tic.com>
Date: Mon, 2 Aug 2021 14:01:55 +0200
Subject: [PATCH] Add catalan translation. Fix translations.

---
 taxes_by_invoice/babel.cfg                    |   3 +-
 taxes_by_invoice/messages.pot                 |  39 +++++++--
 taxes_by_invoice/templates/header_macro.html  |   6 +-
 .../translations/ca/LC_MESSAGES/messages.mo   | Bin 0 -> 1395 bytes
 .../translations/ca/LC_MESSAGES/messages.po   |  79 ++++++++++--------
 .../translations/es/LC_MESSAGES/messages.mo   | Bin 0 -> 1363 bytes
 .../translations/es/LC_MESSAGES/messages.po   |  65 +++++++++-----
 7 files changed, 128 insertions(+), 64 deletions(-)

diff --git a/taxes_by_invoice/babel.cfg b/taxes_by_invoice/babel.cfg
index d940b8c..5eb801e 100644
--- a/taxes_by_invoice/babel.cfg
+++ b/taxes_by_invoice/babel.cfg
@@ -1,3 +1,2 @@
 [jinja2: **/templates/**.html]
-[jinja2: **.jinja]
-extensions=jinja2.ext.autoescape,jinja2.ext.with_
+extensions=jinja2.ext.autoescape,jinja2.ext.with_,formencode_jinja2.formfill
\ No newline at end of file
diff --git a/taxes_by_invoice/messages.pot b/taxes_by_invoice/messages.pot
index ab44325..0eab0d4 100644
--- a/taxes_by_invoice/messages.pot
+++ b/taxes_by_invoice/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-07-21 13:20+0200\n"
+"POT-Creation-Date: 2021-08-02 13:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 
-#: templates/detail_macro.html:6
+#: templates/detail_macro.html:6 templates/detail_macro.html:20
 msgid "Move Date"
 msgstr ""
 
@@ -33,8 +33,7 @@ msgstr ""
 msgid "Invoice"
 msgstr ""
 
-#: templates/detail_macro.html:10 templates/detail_macro.html:20
-#: templates/detail_macro.html:24
+#: templates/detail_macro.html:10 templates/detail_macro.html:24
 msgid "Date"
 msgstr ""
 
@@ -62,11 +61,39 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/taxes_by_invoice.html:15
+#: templates/header_macro.html:19 templates/taxes_by_invoice.html:15
 msgid "Taxes By Invoice and Period"
 msgstr ""
 
-#: templates/taxes_by_invoice.html:17
+#: templates/header_macro.html:19 templates/taxes_by_invoice.html:17
 msgid "Taxes By Invoice"
 msgstr ""
 
+#: templates/header_macro.html:31
+msgid "Fiscal Year"
+msgstr ""
+
+#: templates/header_macro.html:31
+msgid "Periods:"
+msgstr ""
+
+#: templates/header_macro.html:31
+msgid "All Periods"
+msgstr ""
+
+#: templates/header_macro.html:32
+msgid "This document includes cancelled invoices marked with a *"
+msgstr ""
+
+#: templates/header_macro.html:32
+msgid "This document not includes cancelled invoices"
+msgstr ""
+
+#: templates/header_macro.html:35
+msgid "Parties: "
+msgstr ""
+
+#: templates/header_macro.html:35
+msgid "All Parties"
+msgstr ""
+
diff --git a/taxes_by_invoice/templates/header_macro.html b/taxes_by_invoice/templates/header_macro.html
index 1b1fef3..9d6dcd6 100644
--- a/taxes_by_invoice/templates/header_macro.html
+++ b/taxes_by_invoice/templates/header_macro.html
@@ -28,11 +28,11 @@
     <table style="width: 1110px !important; margin-left: -70px !important;">
         <thead>
         <tr>
-            <td>{{ _('Fiscal Year')}}: {{ data['parameters']['fiscal_year']}} {% if data['parameters']['periods'] %}{{ _('Periods:')}} {{data['parameters']['periods']}} {% else %}{{ _('All Periods')}}{% endif %}</td>
-            <td style="text-align: right;">{% if data['parameters']['include_cancel'] %}{{ _('This document includes cancelled invoices marked with a *')}}{% else %}{{ _('This document not includes cancelled invoices')}}{% endif %}</td>
+            <td>{{ _('Fiscal Year') }}: {{ data['parameters']['fiscal_year']}} {% if data['parameters']['periods'] %}{{ _('Periods:') }} {{data['parameters']['periods']}} {% else %}{{ _('All Periods') }}{% endif %}</td>
+            <td style="text-align: right;">{% if data['parameters']['include_cancel'] %}{{ _('This document includes cancelled invoices marked with a *') }}{% else %}{{ _('This document not includes cancelled invoices') }}{% endif %}</td>
         </tr>
         <tr>
-            <td>{% if data['parameters']['parties'] %}{{ _('Parties: ')}}{{ data['parameters']['parties']}}{% else %}{{ _('All Parties')}}{% endif %}</td>
+            <td>{% if data['parameters']['parties'] %}{{ _('Parties: ') }}{{ data['parameters']['parties']}}{% else %}{{ _('All Parties') }}{% endif %}</td>
         </tr>
         </thead>
     </table>
diff --git a/taxes_by_invoice/translations/ca/LC_MESSAGES/messages.mo b/taxes_by_invoice/translations/ca/LC_MESSAGES/messages.mo
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4fbc3e54fa15a81dccaaa7c6b356401f068179ce 100644
GIT binary patch
literal 1395
zcmaKr!EX~s6vn4Ch2T<DMePZsJT6sfG{JGJCM<-;PVCCaPAq4Ml;dP~;w-FZoSE5x
zk4QaL0tqA}E?nAMrS{k!TLI@@d#F_Y0saWS+1<n>qO7#@+xKSPd!Khd|2H%BgyH%e
z_eI<<eel+me!$on#6$37Fe`Z<oI?BntbmWp_*uFC6X@%H1J8oLgCBx_mGMh(8u8y{
z{vYsD#Q%a9z}MhaaQYNu9BhCefg|t}@Blmq{s4LnkHFK2XCcb>`2w5)7eTM{CKj(_
z1N3#<px3<%dY${AuN#A2=Z~O2{}A-&o`Syr&){d^FW@ZrC-@!s3ao;&5b1UHuy~zY
z;CV3i$$Av&OgUChQ|bxh5^0NPX%Zb<)(}?a3(Zj|?y)uDBx@x$5-Dv<VOU!o=p>S?
zs}CgQyX);1D_aG`dPSpv`D)zKQe#YqRVNc9R7^z)3-=OBv5vB#RE`oArCE&XNT^7r
zsf>}zM_U>Sa|iL=#O;xwuTE4d{oZO8YA4cSo#^tpLm@q*Z_CK>cFeb=v58gz_4*q(
zo2wyhHT#?GjrB@jj<j*SYX?cp8`;3}PzTiP*4v$x`r2B*xw%>CZG?Q)Na4_d`&SiE
zty){))g@l7(ZbikH{Z@xYt<?a^1eJs{G@lETP)6XgmpYLLfKR}Z31fD>U3zm-fhzL
zW20|WIzkOHF~G=390fd-V(2q;z0+AqlX-0hH!8g}Ga}_JZH6`=HOfP~T)Rfa<MNk^
zE-ll-<x02RZBAav!hE%|s+Ggn;^BCNQBK}-S4OEw)HRCsgt5{sXKt4-P0o4oyVCHc
zigcW)K|o78iK~1sl{9!mc$edV8e&JLRGVMI1h%S&BX|&B&5}$lhL{LnWs(?4^Ws+x
zt4z#0*B*}My>|t*MC9=MSY3^&@G(0~<@>@~`~cxS$GnrnqJ81yqHn;^PFq((Tf#`%
zEgKhm$CH%!BY8Ee?`P7w<HpumS$^d2=YOQayB*e!@&_^8p-jQtC+n5Y{~Q0?qHuPx
L9*N97Khg9C_iT5T

literal 0
HcmV?d00001

diff --git a/taxes_by_invoice/translations/ca/LC_MESSAGES/messages.po b/taxes_by_invoice/translations/ca/LC_MESSAGES/messages.po
index bfb9c32..a5224e2 100644
--- a/taxes_by_invoice/translations/ca/LC_MESSAGES/messages.po
+++ b/taxes_by_invoice/translations/ca/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-06-29 12:11+0200\n"
-"PO-Revision-Date: 2021-06-29 11:58+0200\n"
+"POT-Creation-Date: 2021-08-02 13:46+0200\n"
+"PO-Revision-Date: 2021-08-02 13:47+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: ca\n"
 "Language-Team: ca <LL@li.org>\n"
@@ -18,72 +18,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 
-#: templates/detail_macro.html:5
+#: templates/detail_macro.html:6 templates/detail_macro.html:20
 msgid "Move Date"
-msgstr ""
+msgstr "Data assentament"
 
-#: templates/detail_macro.html:6 templates/detail_macro.html:19
+#: templates/detail_macro.html:7 templates/detail_macro.html:21
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
-#: templates/detail_macro.html:7 templates/detail_macro.html:20
+#: templates/detail_macro.html:8 templates/detail_macro.html:22
 msgid "NIF"
-msgstr ""
+msgstr "NIF"
 
-#: templates/detail_macro.html:8 templates/detail_macro.html:21
+#: templates/detail_macro.html:9 templates/detail_macro.html:23
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
-#: templates/detail_macro.html:9 templates/detail_macro.html:18
-#: templates/detail_macro.html:22
+#: templates/detail_macro.html:10 templates/detail_macro.html:24
 msgid "Date"
-msgstr ""
+msgstr "Data Factura"
 
-#: templates/detail_macro.html:10 templates/detail_macro.html:23
+#: templates/detail_macro.html:11 templates/detail_macro.html:25
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
-#: templates/detail_macro.html:11 templates/detail_macro.html:24
+#: templates/detail_macro.html:12 templates/detail_macro.html:26
 msgid "Tax"
-msgstr ""
+msgstr "Impost"
 
-#: templates/detail_macro.html:12 templates/detail_macro.html:25
+#: templates/detail_macro.html:13 templates/detail_macro.html:27
 msgid "Base + Tax"
-msgstr ""
+msgstr "Base+Imp."
 
-#: templates/detail_macro.html:13 templates/detail_macro.html:26
+#: templates/detail_macro.html:14 templates/detail_macro.html:28
 msgid "Total Invoice"
-msgstr ""
+msgstr "Total factura"
 
-#: templates/detail_macro.html:45
+#: templates/detail_macro.html:38
 msgid "Total Period"
-msgstr ""
+msgstr "Total període"
 
-#: templates/detail_macro.html:45 templates/detail_macro.html:55
+#: templates/detail_macro.html:38 templates/detail_macro.html:48
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #: templates/header_macro.html:19 templates/taxes_by_invoice.html:15
 msgid "Taxes By Invoice and Period"
-msgstr ""
+msgstr "Impostos per factura i període"
 
 #: templates/header_macro.html:19 templates/taxes_by_invoice.html:17
 msgid "Taxes By Invoice"
-msgstr ""
+msgstr "Impostos per factura"
 
-#: templates/header_macro.html:29
+#: templates/header_macro.html:31
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Any Fiscal"
 
-#: templates/header_macro.html:29
+#: templates/header_macro.html:31
+msgid "Periods:"
+msgstr "Períodes:"
+
+#: templates/header_macro.html:31
 msgid "All Periods"
-msgstr ""
+msgstr "Tots els períodes"
 
 #: templates/header_macro.html:32
-msgid "Parties"
-msgstr ""
+msgid "This document includes cancelled invoices marked with a *"
+msgstr "Aquest document inclou factures cancel·lades marcades amb un *"
 
 #: templates/header_macro.html:32
+msgid "This document not includes cancelled invoices"
+msgstr "Aquest document no inclou factures cancel·lades"
+
+#: templates/header_macro.html:35
+msgid "Parties: "
+msgstr "Tercers: "
+
+#: templates/header_macro.html:35
 msgid "All Parties"
-msgstr ""
+msgstr "Tots els tercers"
 
diff --git a/taxes_by_invoice/translations/es/LC_MESSAGES/messages.mo b/taxes_by_invoice/translations/es/LC_MESSAGES/messages.mo
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9ed9cf856f3dbf0f537c56345c60dbe3012043cc 100644
GIT binary patch
literal 1363
zcmaKqO>Y!87{^`8OS=Vxpq$|FaBGPiHp^Q&B#2FRw%TepS#72fNPuK!oQ+}D-rAnP
zR^ozsZ4Z@t?Wu<z+G|ghdO&;w&U^+w0)NlUCO{D***`ze_<6DYe|7rsZw%j;80Rtm
z4aQsF-A@=h2KyfP1t@F&03L?@6l{RcYWwH<|F7WZ@c#~e3jSH!e}SLD{-^f;2cClc
z96SfU1it}agB-kgh_NH!ZSVwmA3P4`V5l_%kHS8NW=?}A!870mF!Xm7Q|KcC!#O%&
zsMiNWzI$Nk?-3ZzVZgBe$C^KZXJP*W68HzW0=@u4e}~Xq=&y+><hur*1UtdmPE%88
z&)RuTLt(v=u3Ag0Oy<~{aI&0effDhAb%d9!t6VB_x+8^U1G6Wo^ltRJtWFUT8&(M-
z7NRhuqqQ0J^qx_v{GWq_&Zr7u$*yvgnY5Tl?Mdl0FET`@LZ>p%Wd>K7#L-09N3b6&
zze|EHz89&@N26I{yvVEhps(PYH!`&5p-esRWqey&r;LthINJO!UQcK{9&PnDHyR^3
zHP-Wi8>@`36=TN}6Hz>9_xiWmoz5uU+G-3p6TWVx@W{Z!RYlZlww8EvnKxUsbUC_m
zZK2s}HnEY9<emzZKD_UGwXZLn=ZO{C<-!{qQTO|PpElZqm{#5?eY4RQdR&MxN=mnH
z@I;D9@X$)Xe=Apu#*S|`hIwH{&b!7=Tts?Wnr^jqgR14~SDG%Y($d$BL2nQrT*=a6
zv$1Zp$7}IqHbp5fpZH7DTqu2m(p_Pl^s9y6;mZg6Li0P)@>r)PQ+gcH@&n}?-%2el
zZU}cdi)c+ekU6y$mr;SO7bqa`UYT)}V|Zy(X^nf!HI?@H-(kanZWnr!=_2cj)Z=t4
zeuyBIDnmP^hFMplK@v_OxnV)VNu9RRaGefG3h6u&@2?0CPdjzq4|-`v^M+XLyxbSH
rsZ>3a^Z2>CMJ7sBr{y9wnhFhFzZa}O8eb{8nrVLSQtLt2<$2f}mU3;9

literal 0
HcmV?d00001

diff --git a/taxes_by_invoice/translations/es/LC_MESSAGES/messages.po b/taxes_by_invoice/translations/es/LC_MESSAGES/messages.po
index 826e0ee..6097d34 100644
--- a/taxes_by_invoice/translations/es/LC_MESSAGES/messages.po
+++ b/taxes_by_invoice/translations/es/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-07-21 13:20+0200\n"
-"PO-Revision-Date: 2021-07-21 13:21+0200\n"
+"POT-Creation-Date: 2021-08-02 13:46+0200\n"
+"PO-Revision-Date: 2021-08-02 13:47+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: es\n"
 "Language-Team: es <LL@li.org>\n"
@@ -18,56 +18,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 
-#: templates/detail_macro.html:6
+#: templates/detail_macro.html:6 templates/detail_macro.html:20
 msgid "Move Date"
-msgstr ""
+msgstr "Fecha asiento"
 
 #: templates/detail_macro.html:7 templates/detail_macro.html:21
 msgid "Account"
-msgstr ""
+msgstr "Cuenta"
 
 #: templates/detail_macro.html:8 templates/detail_macro.html:22
 msgid "NIF"
-msgstr ""
+msgstr "NIF"
 
 #: templates/detail_macro.html:9 templates/detail_macro.html:23
 msgid "Invoice"
 msgstr ""
 
-#: templates/detail_macro.html:10 templates/detail_macro.html:20
-#: templates/detail_macro.html:24
+#: templates/detail_macro.html:10 templates/detail_macro.html:24
 msgid "Date"
-msgstr ""
+msgstr "Factura"
 
 #: templates/detail_macro.html:11 templates/detail_macro.html:25
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 #: templates/detail_macro.html:12 templates/detail_macro.html:26
 msgid "Tax"
-msgstr ""
+msgstr "Impuestos"
 
 #: templates/detail_macro.html:13 templates/detail_macro.html:27
 msgid "Base + Tax"
-msgstr ""
+msgstr "Base+Imp."
 
 #: templates/detail_macro.html:14 templates/detail_macro.html:28
 msgid "Total Invoice"
-msgstr ""
+msgstr "Total Factura"
 
 #: templates/detail_macro.html:38
 msgid "Total Period"
-msgstr ""
+msgstr "Total Período"
 
 #: templates/detail_macro.html:38 templates/detail_macro.html:48
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
-#: templates/taxes_by_invoice.html:15
+#: templates/header_macro.html:19 templates/taxes_by_invoice.html:15
 msgid "Taxes By Invoice and Period"
-msgstr ""
+msgstr "Impuestos por factura y período"
 
-#: templates/taxes_by_invoice.html:17
+#: templates/header_macro.html:19 templates/taxes_by_invoice.html:17
 msgid "Taxes By Invoice"
-msgstr ""
+msgstr "Impuestos por factura"
+
+#: templates/header_macro.html:31
+msgid "Fiscal Year"
+msgstr "Ejercicio fiscal"
+
+#: templates/header_macro.html:31
+msgid "Periods:"
+msgstr "Períodos"
+
+#: templates/header_macro.html:31
+msgid "All Periods"
+msgstr "Todos los períodos"
+
+#: templates/header_macro.html:32
+msgid "This document includes cancelled invoices marked with a *"
+msgstr "Este documento incluye facturas canceladas marcadas con un *"
+
+#: templates/header_macro.html:32
+msgid "This document not includes cancelled invoices"
+msgstr "Este documento no incluye facturas canceladas"
+
+#: templates/header_macro.html:35
+msgid "Parties: "
+msgstr "Terceros: "
+
+#: templates/header_macro.html:35
+msgid "All Parties"
+msgstr "Todos los terceros"