From 1415c3ef10e3bb31bf42dcdac39d7bba65ce405a Mon Sep 17 00:00:00 2001 From: jordi fita mas Date: Sat, 6 May 2023 11:08:21 +0200 Subject: [PATCH] =?UTF-8?q?Moved=20the=20link=20to=20edit=20expense=20from?= =?UTF-8?q?=20the=20invoicer=E2=80=99s=20name=20to=20a=20menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This menu will also have options like delete, and whatever we like to do to expenses, like invoices do. --- po/ca.po | 48 +++++++++++++++++------------- po/es.po | 48 +++++++++++++++++------------- web/template/expenses/index.gohtml | 24 ++++++++++++--- 3 files changed, 74 insertions(+), 46 deletions(-) diff --git a/po/ca.po b/po/ca.po index 3ecfeb1..72f6bc6 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: numerus\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n" -"POT-Creation-Date: 2023-05-03 12:40+0200\n" +"POT-Creation-Date: 2023-05-06 11:03+0200\n" "PO-Revision-Date: 2023-01-18 17:08+0100\n" "Last-Translator: jordi fita mas \n" "Language-Team: Catalan \n" @@ -49,7 +49,7 @@ msgid "New Invoice" msgstr "Nova factura" #: web/template/invoices/products.gohtml:48 -#: web/template/expenses/index.gohtml:25 web/template/products/index.gohtml:38 +#: web/template/products/index.gohtml:38 msgctxt "product" msgid "All" msgstr "Tots" @@ -135,12 +135,12 @@ msgid "Status" msgstr "Estat" #: web/template/invoices/index.gohtml:51 web/template/contacts/index.gohtml:28 -#: web/template/products/index.gohtml:40 +#: web/template/expenses/index.gohtml:29 web/template/products/index.gohtml:40 msgctxt "title" msgid "Tags" msgstr "Etiquetes" -#: web/template/invoices/index.gohtml:52 web/template/expenses/index.gohtml:29 +#: web/template/invoices/index.gohtml:52 web/template/expenses/index.gohtml:30 msgctxt "title" msgid "Amount" msgstr "Import" @@ -150,7 +150,7 @@ msgctxt "title" msgid "Download" msgstr "Descàrrega" -#: web/template/invoices/index.gohtml:54 +#: web/template/invoices/index.gohtml:54 web/template/expenses/index.gohtml:31 msgctxt "title" msgid "Actions" msgstr "Accions" @@ -161,6 +161,7 @@ msgid "Select invoice %v" msgstr "Selecciona factura %v" #: web/template/invoices/index.gohtml:116 web/template/invoices/view.gohtml:19 +#: web/template/expenses/index.gohtml:58 msgctxt "action" msgid "Edit" msgstr "Edita" @@ -358,6 +359,11 @@ msgctxt "action" msgid "New expense" msgstr "Nova despesa" +#: web/template/expenses/index.gohtml:25 +msgctxt "expense" +msgid "All" +msgstr "Totes" + #: web/template/expenses/index.gohtml:26 msgctxt "title" msgid "Contact" @@ -373,7 +379,7 @@ msgctxt "title" msgid "Invoice Number" msgstr "Número de factura" -#: web/template/expenses/index.gohtml:52 +#: web/template/expenses/index.gohtml:68 msgid "No expenses added yet." msgstr "No hi ha cap despesa." @@ -512,74 +518,74 @@ msgstr "No podeu deixar la contrasenya en blanc." msgid "Invalid user or password." msgstr "Nom d’usuari o contrasenya incorrectes." -#: pkg/products.go:161 pkg/products.go:260 pkg/invoices.go:776 +#: pkg/products.go:164 pkg/products.go:263 pkg/invoices.go:776 msgctxt "input" msgid "Name" msgstr "Nom" -#: pkg/products.go:166 pkg/products.go:287 pkg/expenses.go:158 +#: pkg/products.go:169 pkg/products.go:290 pkg/expenses.go:158 #: pkg/invoices.go:187 pkg/invoices.go:597 pkg/invoices.go:1042 #: pkg/contacts.go:256 msgctxt "input" msgid "Tags" msgstr "Etiquetes" -#: pkg/products.go:170 pkg/invoices.go:191 +#: pkg/products.go:173 pkg/invoices.go:191 msgctxt "input" msgid "Tags Condition" msgstr "Condició de les etiquetes" -#: pkg/products.go:174 pkg/invoices.go:195 +#: pkg/products.go:177 pkg/invoices.go:195 msgctxt "tag condition" msgid "All" msgstr "Totes" -#: pkg/products.go:175 pkg/invoices.go:196 +#: pkg/products.go:178 pkg/invoices.go:196 msgid "Invoices must have all the specified labels." msgstr "Les factures han de tenir totes les etiquetes." -#: pkg/products.go:179 pkg/invoices.go:200 +#: pkg/products.go:182 pkg/invoices.go:200 msgctxt "tag condition" msgid "Any" msgstr "Qualsevol" -#: pkg/products.go:180 pkg/invoices.go:201 +#: pkg/products.go:183 pkg/invoices.go:201 msgid "Invoices must have at least one of the specified labels." msgstr "Les factures han de tenir com a mínim una de les etiquetes." -#: pkg/products.go:266 pkg/invoices.go:790 +#: pkg/products.go:269 pkg/invoices.go:790 msgctxt "input" msgid "Description" msgstr "Descripció" -#: pkg/products.go:271 pkg/invoices.go:794 +#: pkg/products.go:274 pkg/invoices.go:794 msgctxt "input" msgid "Price" msgstr "Preu" -#: pkg/products.go:281 pkg/expenses.go:142 pkg/invoices.go:823 +#: pkg/products.go:284 pkg/expenses.go:142 pkg/invoices.go:823 msgctxt "input" msgid "Taxes" msgstr "Imposts" -#: pkg/products.go:306 pkg/profile.go:92 pkg/invoices.go:867 +#: pkg/products.go:309 pkg/profile.go:92 pkg/invoices.go:867 msgid "Name can not be empty." msgstr "No podeu deixar el nom en blanc." -#: pkg/products.go:307 pkg/invoices.go:868 +#: pkg/products.go:310 pkg/invoices.go:868 msgid "Price can not be empty." msgstr "No podeu deixar el preu en blanc." -#: pkg/products.go:308 pkg/invoices.go:869 +#: pkg/products.go:311 pkg/invoices.go:869 msgid "Price must be a number greater than zero." msgstr "El preu ha de ser un número major a zero." -#: pkg/products.go:310 pkg/expenses.go:180 pkg/expenses.go:185 +#: pkg/products.go:313 pkg/expenses.go:180 pkg/expenses.go:185 #: pkg/invoices.go:877 msgid "Selected tax is not valid." msgstr "Heu seleccionat un impost que no és vàlid." -#: pkg/products.go:311 pkg/expenses.go:181 pkg/expenses.go:186 +#: pkg/products.go:314 pkg/expenses.go:181 pkg/expenses.go:186 #: pkg/invoices.go:878 msgid "You can only select a tax of each class." msgstr "Només podeu seleccionar un impost de cada classe." diff --git a/po/es.po b/po/es.po index 73da364..f222de3 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: numerus\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n" -"POT-Creation-Date: 2023-05-03 12:40+0200\n" +"POT-Creation-Date: 2023-05-06 11:03+0200\n" "PO-Revision-Date: 2023-01-18 17:45+0100\n" "Last-Translator: jordi fita mas \n" "Language-Team: Spanish \n" @@ -49,7 +49,7 @@ msgid "New Invoice" msgstr "Nueva factura" #: web/template/invoices/products.gohtml:48 -#: web/template/expenses/index.gohtml:25 web/template/products/index.gohtml:38 +#: web/template/products/index.gohtml:38 msgctxt "product" msgid "All" msgstr "Todos" @@ -135,12 +135,12 @@ msgid "Status" msgstr "Estado" #: web/template/invoices/index.gohtml:51 web/template/contacts/index.gohtml:28 -#: web/template/products/index.gohtml:40 +#: web/template/expenses/index.gohtml:29 web/template/products/index.gohtml:40 msgctxt "title" msgid "Tags" msgstr "Etiquetes" -#: web/template/invoices/index.gohtml:52 web/template/expenses/index.gohtml:29 +#: web/template/invoices/index.gohtml:52 web/template/expenses/index.gohtml:30 msgctxt "title" msgid "Amount" msgstr "Importe" @@ -150,7 +150,7 @@ msgctxt "title" msgid "Download" msgstr "Descargar" -#: web/template/invoices/index.gohtml:54 +#: web/template/invoices/index.gohtml:54 web/template/expenses/index.gohtml:31 msgctxt "title" msgid "Actions" msgstr "Acciones" @@ -161,6 +161,7 @@ msgid "Select invoice %v" msgstr "Seleccionar factura %v" #: web/template/invoices/index.gohtml:116 web/template/invoices/view.gohtml:19 +#: web/template/expenses/index.gohtml:58 msgctxt "action" msgid "Edit" msgstr "Editar" @@ -358,6 +359,11 @@ msgctxt "action" msgid "New expense" msgstr "Nuevo gasto" +#: web/template/expenses/index.gohtml:25 +msgctxt "expense" +msgid "All" +msgstr "Todos" + #: web/template/expenses/index.gohtml:26 msgctxt "title" msgid "Contact" @@ -373,7 +379,7 @@ msgctxt "title" msgid "Invoice Number" msgstr "Número de factura" -#: web/template/expenses/index.gohtml:52 +#: web/template/expenses/index.gohtml:68 msgid "No expenses added yet." msgstr "No hay gastos." @@ -512,74 +518,74 @@ msgstr "No podéis dejar la contraseña en blanco." msgid "Invalid user or password." msgstr "Nombre de usuario o contraseña inválido." -#: pkg/products.go:161 pkg/products.go:260 pkg/invoices.go:776 +#: pkg/products.go:164 pkg/products.go:263 pkg/invoices.go:776 msgctxt "input" msgid "Name" msgstr "Nombre" -#: pkg/products.go:166 pkg/products.go:287 pkg/expenses.go:158 +#: pkg/products.go:169 pkg/products.go:290 pkg/expenses.go:158 #: pkg/invoices.go:187 pkg/invoices.go:597 pkg/invoices.go:1042 #: pkg/contacts.go:256 msgctxt "input" msgid "Tags" msgstr "Etiquetes" -#: pkg/products.go:170 pkg/invoices.go:191 +#: pkg/products.go:173 pkg/invoices.go:191 msgctxt "input" msgid "Tags Condition" msgstr "Condición de las etiquetas" -#: pkg/products.go:174 pkg/invoices.go:195 +#: pkg/products.go:177 pkg/invoices.go:195 msgctxt "tag condition" msgid "All" msgstr "Todas" -#: pkg/products.go:175 pkg/invoices.go:196 +#: pkg/products.go:178 pkg/invoices.go:196 msgid "Invoices must have all the specified labels." msgstr "Las facturas deben tener todas las etiquetas." -#: pkg/products.go:179 pkg/invoices.go:200 +#: pkg/products.go:182 pkg/invoices.go:200 msgctxt "tag condition" msgid "Any" msgstr "Cualquiera" -#: pkg/products.go:180 pkg/invoices.go:201 +#: pkg/products.go:183 pkg/invoices.go:201 msgid "Invoices must have at least one of the specified labels." msgstr "Las facturas debent tener como mínimo una de las etiquetas." -#: pkg/products.go:266 pkg/invoices.go:790 +#: pkg/products.go:269 pkg/invoices.go:790 msgctxt "input" msgid "Description" msgstr "Descripción" -#: pkg/products.go:271 pkg/invoices.go:794 +#: pkg/products.go:274 pkg/invoices.go:794 msgctxt "input" msgid "Price" msgstr "Precio" -#: pkg/products.go:281 pkg/expenses.go:142 pkg/invoices.go:823 +#: pkg/products.go:284 pkg/expenses.go:142 pkg/invoices.go:823 msgctxt "input" msgid "Taxes" msgstr "Impuestos" -#: pkg/products.go:306 pkg/profile.go:92 pkg/invoices.go:867 +#: pkg/products.go:309 pkg/profile.go:92 pkg/invoices.go:867 msgid "Name can not be empty." msgstr "No podéis dejar el nombre en blanco." -#: pkg/products.go:307 pkg/invoices.go:868 +#: pkg/products.go:310 pkg/invoices.go:868 msgid "Price can not be empty." msgstr "No podéis dejar el precio en blanco." -#: pkg/products.go:308 pkg/invoices.go:869 +#: pkg/products.go:311 pkg/invoices.go:869 msgid "Price must be a number greater than zero." msgstr "El precio tiene que ser un número mayor a cero." -#: pkg/products.go:310 pkg/expenses.go:180 pkg/expenses.go:185 +#: pkg/products.go:313 pkg/expenses.go:180 pkg/expenses.go:185 #: pkg/invoices.go:877 msgid "Selected tax is not valid." msgstr "Habéis escogido un impuesto que no es válido." -#: pkg/products.go:311 pkg/expenses.go:181 pkg/expenses.go:186 +#: pkg/products.go:314 pkg/expenses.go:181 pkg/expenses.go:186 #: pkg/invoices.go:878 msgid "You can only select a tax of each class." msgstr "Solo podéis escoger un impuesto de cada clase." diff --git a/web/template/expenses/index.gohtml b/web/template/expenses/index.gohtml index bd74cb2..3d4408a 100644 --- a/web/template/expenses/index.gohtml +++ b/web/template/expenses/index.gohtml @@ -22,11 +22,13 @@ - + + + @@ -34,8 +36,7 @@ {{- range . }} - + + {{- end }} {{ else }} - + {{ end }}
{{( pgettext "All" "product" )}}{{( pgettext "All" "expense" )}} {{( pgettext "Contact" "title" )}} {{( pgettext "Invoice Date" "title" )}} {{( pgettext "Invoice Number" "title" )}}{{( pgettext "Tags" "title" )}} {{( pgettext "Amount" "title" )}}{{( pgettext "Actions" "title" )}}
{{ .InvoicerName }}{{ .InvoicerName }} {{ .InvoiceDate|formatDate }} {{ .InvoiceNumber }} @@ -45,11 +46,26 @@ {{- end }} {{ .Amount | formatPrice }} +
+ + +
+
{{( gettext "No expenses added yet." )}}{{( gettext "No expenses added yet." )}}