From 454ad3091a1085f283759ea71d8305e57ab140d8 Mon Sep 17 00:00:00 2001 From: Florian Gareis Date: Sun, 21 Mar 2021 00:38:27 +0100 Subject: [PATCH 1/3] Add some missing translations --- resources/assets/js/plugins/ar.json | 6 ++++++ resources/assets/js/plugins/de.json | 6 ++++++ resources/assets/js/plugins/en.json | 6 ++++++ resources/assets/js/plugins/es.json | 6 ++++++ resources/assets/js/plugins/fr.json | 6 ++++++ resources/assets/js/plugins/hi.json | 6 ++++++ resources/assets/js/plugins/it.json | 6 ++++++ resources/assets/js/plugins/lv.json | 6 ++++++ resources/assets/js/plugins/nl.json | 6 ++++++ resources/assets/js/plugins/pt-br.json | 6 ++++++ resources/assets/js/plugins/pt.json | 6 ++++++ resources/assets/js/plugins/sr.json | 6 ++++++ resources/assets/js/plugins/sv.json | 6 ++++++ resources/assets/js/views/customers/Index.vue | 4 ++-- resources/assets/js/views/expenses/Index.vue | 2 +- resources/assets/js/views/items/Index.vue | 2 +- resources/assets/js/views/payments/Index.vue | 4 ++-- 17 files changed, 84 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/plugins/ar.json b/resources/assets/js/plugins/ar.json index 51f62066..67d8129a 100644 --- a/resources/assets/js/plugins/ar.json +++ b/resources/assets/js/plugins/ar.json @@ -177,6 +177,8 @@ "copy_billing_address": "نسخ من عنوان الفوترة", "no_customers": "لا يوجد عملاء حتى الآن!", "no_customers_found": "لم يتم الحصول على عملاء!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "سوف يحتوي هذا القسم على قائمة العملاء.", "primary_display_name": "اسم العرض الرئيسي", "select_currency": "اختر العملة", @@ -200,6 +202,7 @@ "added_on": "أضيف في", "price": "السعر", "date_of_creation": "تاريخ الإنشاء", + "not_selected": "No item selected", "action": "إجراء", "add_item": "إضافة صنف", "save_item": "حفظ الصنف", @@ -434,6 +437,8 @@ "update_payment": "تحديث الدفعة", "payment": "دفعة | مدفوعات", "no_payments": "لا يوجد مدفوعات حتى الآن!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "لا توجد مدفوعات مطابقة!", "list_of_payments": "سوف تحتوي هذه القائمة على مدفوعات الفواتير.", "select_payment_mode": "اختر طريقة الدفع", @@ -463,6 +468,7 @@ "receipt": "سند القبض", "amount": "المبلغ المطلوب", "action": "إجراء", + "not_selected": "Not selected", "note": "ملاحظة", "category_id": "رمز الفئة", "date": "تاريخ النفقات", diff --git a/resources/assets/js/plugins/de.json b/resources/assets/js/plugins/de.json index 4a26c34e..3b775620 100644 --- a/resources/assets/js/plugins/de.json +++ b/resources/assets/js/plugins/de.json @@ -177,6 +177,8 @@ "copy_billing_address": "Rechnungsadresse kopieren", "no_customers": "Noch keine Kunden!", "no_customers_found": "Keine Kunden gefunden!", + "no_contact": "Kein Kontakt", + "no_contact_name": "Kein Kontaktname", "list_of_customers": "Dieser Abschnitt enthält die Liste der Kunden.", "primary_display_name": "Primärer Anzeige Name", "select_currency": "Währung wählen", @@ -200,6 +202,7 @@ "added_on": "Hinzugefügt am", "price": "Preis", "date_of_creation": "Erstellt am", + "not_selected": "Keine ausgewählt", "action": "Aktion", "add_item": "Artikel hinzufügen", "save_item": "Artikel speichern", @@ -434,6 +437,8 @@ "update_payment": "Zahlung ändern", "payment": "Zahlung | Zahlungen", "no_payments": "Keine Zahlungen vorhanden!", + "not_selected": "Nicht ausgewählt", + "no_invoice": "Keine Rechnung", "no_matching_payments": "Es gibt keine passenden Zahlungen!", "list_of_payments": "Dieser Abschnitt enthält die Liste der Zahlungen.", "select_payment_mode": "Wählen Sie den Zahlungsmodus", @@ -462,6 +467,7 @@ "description": "Beschreibung", "receipt": "Eingang", "amount": "Summe", + "not_selected": "Nicht ausgewählt", "action": "Aktion", "note": "Hinweis", "category_id": "Kategorie-Id", diff --git a/resources/assets/js/plugins/en.json b/resources/assets/js/plugins/en.json index f4c91e58..00cdb567 100644 --- a/resources/assets/js/plugins/en.json +++ b/resources/assets/js/plugins/en.json @@ -178,6 +178,8 @@ "copy_billing_address": "Copy from Billing", "no_customers": "No customers yet!", "no_customers_found": "No customers found!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "This section will contain the list of customers.", "primary_display_name": "Primary Display Name", "select_currency": "Select currency", @@ -201,6 +203,7 @@ "added_on": "Added On", "price": "Price", "date_of_creation": "Date Of Creation", + "not_selected": "No item selected", "action": "Action", "add_item": "Add Item", "save_item": "Save Item", @@ -435,6 +438,8 @@ "update_payment": "Update Payment", "payment": "Payment | Payments", "no_payments": "No payments yet!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "There are no matching payments!", "list_of_payments": "This section will contain the list of payments.", "select_payment_mode": "Select payment mode", @@ -464,6 +469,7 @@ "receipt": "Receipt", "amount": "Amount", "action": "Action", + "not_selected": "Not selected", "note": "Note", "category_id": "Category Id", "date": "Date", diff --git a/resources/assets/js/plugins/es.json b/resources/assets/js/plugins/es.json index 80cc0837..0972aefb 100644 --- a/resources/assets/js/plugins/es.json +++ b/resources/assets/js/plugins/es.json @@ -177,6 +177,8 @@ "copy_billing_address": "Copia de facturación", "no_customers": "¡Aún no hay clientes!", "no_customers_found": "¡No se encontraron clientes!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "Esta sección contendrá la lista de clientes.", "primary_display_name": "Nombre de visualización principal", "select_currency": "Seleccione el tipo de moneda", @@ -200,6 +202,7 @@ "added_on": "Añadido", "price": "Precio", "date_of_creation": "Fecha de creación", + "not_selected": "No item selected", "action": "Acción", "add_item": "Añadir artículo", "save_item": "Guardar artículo", @@ -434,6 +437,8 @@ "update_payment": "Actualizar pago", "payment": "Pago | Pagos", "no_payments": "¡Aún no hay pagos!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "¡No hay pagos equivalentes!", "list_of_payments": "Esta sección contendrá la lista de pagos.", "select_payment_mode": "Seleccionar modo de pago", @@ -463,6 +468,7 @@ "receipt": "Recibo", "amount": "Cantidad", "action": "Acción", + "not_selected": "Not selected", "note": "Nota", "category_id": "Categoria ID", "date": "Fecha de gastos", diff --git a/resources/assets/js/plugins/fr.json b/resources/assets/js/plugins/fr.json index c0a68d19..e7d8e451 100644 --- a/resources/assets/js/plugins/fr.json +++ b/resources/assets/js/plugins/fr.json @@ -177,6 +177,8 @@ "copy_billing_address": "Copier depuis l'adresse de facturation", "no_customers": "Vous n’avez pas encore de clients !", "no_customers_found": "Aucun client !", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "Cette section contiendra la liste des clients.", "primary_display_name": "Nom d'affichage principal", "select_currency": "Sélectionnez la devise", @@ -200,6 +202,7 @@ "added_on": "Ajouté le", "price": "Prix", "date_of_creation": "Date de création", + "not_selected": "No item selected", "action": "action", "add_item": "Ajouter un article", "save_item": "Enregistrer l'article", @@ -434,6 +437,8 @@ "update_payment": "Mettre à jour le paiement", "payment": "Paiement | Paiements", "no_payments": "Aucun paiement pour le moment !", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "Il n'y a aucun paiement correspondant !", "list_of_payments": "Cette section contiendra la liste des paiements", "select_payment_mode": "Sélectionnez le moyen de paiement", @@ -463,6 +468,7 @@ "receipt": "Reçu", "amount": "Montant", "action": "action", + "not_selected": "Not selected", "note": "Remarque", "category_id": "Identifiant de catégorie", "date": "Date", diff --git a/resources/assets/js/plugins/hi.json b/resources/assets/js/plugins/hi.json index 4b664e1b..3396b61d 100644 --- a/resources/assets/js/plugins/hi.json +++ b/resources/assets/js/plugins/hi.json @@ -177,6 +177,8 @@ "copy_billing_address": "Copy from Billing", "no_customers": "No customers yet!", "no_customers_found": "No customers found!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "This section will contain the list of customers.", "primary_display_name": "Primary Display Name", "select_currency": "Select currency", @@ -200,6 +202,7 @@ "added_on": "Added On", "price": "Price", "date_of_creation": "Date Of Creation", + "not_selected": "No item selected", "action": "Action", "add_item": "Add Item", "save_item": "Save Item", @@ -434,6 +437,8 @@ "update_payment": "Update Payment", "payment": "Payment | Payments", "no_payments": "No payments yet!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "There are no matching payments!", "list_of_payments": "This section will contain the list of payments.", "select_payment_mode": "Select payment mode", @@ -463,6 +468,7 @@ "receipt": "Receipt", "amount": "Amount", "action": "Action", + "not_selected": "Not selected", "note": "Note", "category_id": "Category Id", "date": "Date", diff --git a/resources/assets/js/plugins/it.json b/resources/assets/js/plugins/it.json index b17fe02f..1c8060f8 100644 --- a/resources/assets/js/plugins/it.json +++ b/resources/assets/js/plugins/it.json @@ -177,6 +177,8 @@ "copy_billing_address": "Copia da Fatturazione", "no_customers": "Ancora nessun Cliente!", "no_customers_found": "Nessun cliente trovato!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "Qui ci sarà la lista dei tuoi clienti", "primary_display_name": "Mostra il Nome Principale", "select_currency": "Selezione Valùta", @@ -200,6 +202,7 @@ "added_on": "Aggiunto il", "price": "Prezzo", "date_of_creation": "Data di creazione", + "not_selected": "No item selected", "action": "Azione", "add_item": "Aggiungi Commessa", "save_item": "Salva", @@ -434,6 +437,8 @@ "update_payment": "Aggiorna pagamento", "payment": "Pagamento | Pagamenti", "no_payments": "Ancora nessun pagamento!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "Non ci sono pagamenti!", "list_of_payments": "Questa sezione conterrà la lista dei pagamenti.", "select_payment_mode": "Seleziona modalità di pagamento", @@ -463,6 +468,7 @@ "receipt": "Ricevuta", "amount": "Ammontare", "action": "Azione", + "not_selected": "Not selected", "note": "Nota", "category_id": "Id categoria", "date": "Data Spesa", diff --git a/resources/assets/js/plugins/lv.json b/resources/assets/js/plugins/lv.json index 2920871f..43e0ea38 100644 --- a/resources/assets/js/plugins/lv.json +++ b/resources/assets/js/plugins/lv.json @@ -177,6 +177,8 @@ "copy_billing_address": "Kopēt no juridiskās adreses", "no_customers": "Pagaidām nav klientu!", "no_customers_found": "Klienti netika atrasti!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "Šajā sadaļā būs klientu saraksts.", "primary_display_name": "Klienta nosaukums", "select_currency": "Izvēlieties valūtu", @@ -200,6 +202,7 @@ "added_on": "Pievienots", "price": "Cena", "date_of_creation": "Izveidošanas datums", + "not_selected": "No item selected", "action": "Darbība", "add_item": "Pievienot", "save_item": "Saglabāt", @@ -434,6 +437,8 @@ "update_payment": "Labot maksājumu", "payment": "Maksājums | Maksājumi", "no_payments": "Nav pievienotu maksājumu!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "Netika atrasts neviens maksājums!", "list_of_payments": "Šajā sadaļā būs maksājumu saraksts.", "select_payment_mode": "Izvēlēties maksājuma veidu", @@ -463,6 +468,7 @@ "receipt": "Čeks", "amount": "Summa", "action": "Darbība", + "not_selected": "Not selected", "note": "Piezīme", "category_id": "Kategorijas Id", "date": "Datums", diff --git a/resources/assets/js/plugins/nl.json b/resources/assets/js/plugins/nl.json index dfec6fbf..0f2982dd 100644 --- a/resources/assets/js/plugins/nl.json +++ b/resources/assets/js/plugins/nl.json @@ -177,6 +177,8 @@ "copy_billing_address": "Kopiëren van facturering", "no_customers": "Nog geen klanten!", "no_customers_found": "Geen klanten gevonden!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "Hier vind je jouw klanten terug.", "primary_display_name": "Primaire weergavenaam", "select_currency": "Selecteer valuta", @@ -200,6 +202,7 @@ "added_on": "Toegevoegd", "price": "Prijs", "date_of_creation": "Datum van creatie", + "not_selected": "No item selected", "action": "Actie", "add_item": "Voeg item toe", "save_item": "Item opslaan", @@ -434,6 +437,8 @@ "update_payment": "Betaling bijwerken", "payment": "Betaling | Betalingen", "no_payments": "Nog geen betalingen!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "Er zijn geen overeenkomende betalingen!", "list_of_payments": "Hier vind je jouw betalingen terug.", "select_payment_mode": "Selecteer betalingswijze", @@ -463,6 +468,7 @@ "receipt": "Bon", "amount": "Bedrag", "action": "Actie", + "not_selected": "Not selected", "note": "Notitie", "category_id": "Categorie ID", "date": "Uitgavendatum", diff --git a/resources/assets/js/plugins/pt-br.json b/resources/assets/js/plugins/pt-br.json index f676b54e..6243bbf8 100644 --- a/resources/assets/js/plugins/pt-br.json +++ b/resources/assets/js/plugins/pt-br.json @@ -158,6 +158,8 @@ "copy_billing_address": "Cópia de faturamento", "no_customers": "Ainda não há clientes!", "no_customers_found": "Clientes não encontrados!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "Esta seção conterá a lista de clientes.", "primary_display_name": "Nome de exibição principal", "select_currency": "Selecione o tipo de moeda", @@ -181,6 +183,7 @@ "added_on": "Adicionado", "price": "Preço", "date_of_creation": "Data de criação", + "not_selected": "No item selected", "action": "Ação", "add_item": "Adicionar item", "save_item": "Salvar item", @@ -413,6 +416,8 @@ "update_payment": "Atualizar Pagamento", "payment": "Pagamento | Pagamentos", "no_payments": "Ainda sem pagamentos!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "Não há pagamentos correspondentes!", "list_of_payments": "Esta seção conterá a lista de pagamentos.", "select_payment_mode": "Selecione a forma de pagamento", @@ -436,6 +441,7 @@ "receipt": "Receita", "amount": "Montante", "action": "Ação", + "not_selected": "Not selected", "note": "Observação", "category_id": "Categoria", "date": "Data da Despesa", diff --git a/resources/assets/js/plugins/pt.json b/resources/assets/js/plugins/pt.json index 32da0918..204ec38b 100644 --- a/resources/assets/js/plugins/pt.json +++ b/resources/assets/js/plugins/pt.json @@ -177,6 +177,8 @@ "copy_billing_address": "Cópia de faturamento", "no_customers": "Ainda não há clientes!", "no_customers_found": "Clientes não encontrados!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "Esta seção conterá a lista de clientes.", "primary_display_name": "Nome de exibição principal", "select_currency": "Selecione o tipo de moeda", @@ -200,6 +202,7 @@ "added_on": "Adicionado", "price": "Preço", "date_of_creation": "Data de criação", + "not_selected": "No item selected", "action": "Ação", "add_item": "Adicionar item", "save_item": "Salvar item", @@ -434,6 +437,8 @@ "update_payment": "Atualizar Pagamento", "payment": "Pagamento | Pagamentos", "no_payments": "Ainda sem pagamentos!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "Não há pagamentos correspondentes!", "list_of_payments": "Esta seção conterá a lista de pagamentos.", "select_payment_mode": "Selecione a forma de pagamento", @@ -463,6 +468,7 @@ "receipt": "Receita", "amount": "Montante", "action": "Ação", + "not_selected": "Not selected", "note": "Observação", "category_id": "Categoria", "date": "Data da Despesa", diff --git a/resources/assets/js/plugins/sr.json b/resources/assets/js/plugins/sr.json index aa88a808..4efa49cb 100644 --- a/resources/assets/js/plugins/sr.json +++ b/resources/assets/js/plugins/sr.json @@ -178,6 +178,8 @@ "copy_billing_address": "Kopiraj iz adrese za naplatu", "no_customers": "Još uvek nema klijenata!", "no_customers_found": "Klijenti nisu pronađeni!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "Ova sekcija će da sadrži spisak klijenata.", "primary_display_name": "Primarni naziv koji se prikazuje", "select_currency": "Odaberi valutu", @@ -201,6 +203,7 @@ "added_on": "Datum dodavanja", "price": "Cena", "date_of_creation": "Datum kreiranja", + "not_selected": "No item selected", "action": "Akcije", "add_item": "Dodaj Stavku", "save_item": "Sačuvaj Stavku", @@ -435,6 +438,8 @@ "update_payment": "Ažuriraj Uplatu", "payment": "Uplata | Uplate", "no_payments": "Još uvek nema uplata!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "Ne postoje uplate koje odgovaraju pretrazi!", "list_of_payments": "Ova sekcija će da sadrži listu uplata.", "select_payment_mode": "Odaberi način plaćanja", @@ -464,6 +469,7 @@ "receipt": "Račun", "amount": "Iznos", "action": "Akcija", + "not_selected": "Not selected", "note": "Napomena", "category_id": "ID kategorije", "date": "Datum", diff --git a/resources/assets/js/plugins/sv.json b/resources/assets/js/plugins/sv.json index 46208687..65e72847 100644 --- a/resources/assets/js/plugins/sv.json +++ b/resources/assets/js/plugins/sv.json @@ -178,6 +178,8 @@ "copy_billing_address": "Kopiera från faktura", "no_customers": "Inga kunder än!", "no_customers_found": "Hittade inga kunder!", + "no_contact": "No contact", + "no_contact_name": "No contact name", "list_of_customers": "Här kommer det finnas en lista med kunder.", "primary_display_name": "Visningsnamn", "select_currency": "Välj valuta", @@ -201,6 +203,7 @@ "added_on": "Tillagd den", "price": "Pris", "date_of_creation": "Skapandedatum", + "not_selected": "No item selected", "action": "Handling", "add_item": "Skapa artikel", "save_item": "Spara artikel", @@ -435,6 +438,8 @@ "update_payment": "Uppdatera betalning", "payment": "Betalning | Betalningar", "no_payments": "Inga betalningar än!", + "not_selected": "Not selected", + "no_invoice": "No invoice", "no_matching_payments": "Inga matchande betalningar!", "list_of_payments": "Här kommer listan med betalningar finnas.", "select_payment_mode": "Välj betalningssätt", @@ -464,6 +469,7 @@ "receipt": "Kvitto", "amount": "Summa", "action": "Handling", + "not_selected": "Not selected", "note": "Notering", "category_id": "Kategorins ID", "date": "Datum", diff --git a/resources/assets/js/views/customers/Index.vue b/resources/assets/js/views/customers/Index.vue index dcfeca0c..0105f618 100644 --- a/resources/assets/js/views/customers/Index.vue +++ b/resources/assets/js/views/customers/Index.vue @@ -195,7 +195,7 @@ @@ -208,7 +208,7 @@ diff --git a/resources/assets/js/views/expenses/Index.vue b/resources/assets/js/views/expenses/Index.vue index f0d601b6..7d1cc3eb 100644 --- a/resources/assets/js/views/expenses/Index.vue +++ b/resources/assets/js/views/expenses/Index.vue @@ -208,7 +208,7 @@ > diff --git a/resources/assets/js/views/items/Index.vue b/resources/assets/js/views/items/Index.vue index b149aee1..a451a4ab 100644 --- a/resources/assets/js/views/items/Index.vue +++ b/resources/assets/js/views/items/Index.vue @@ -189,7 +189,7 @@ {{ $t('items.unit') }} - {{ row.unit_name ? row.unit_name : 'Not selected' }} + {{ row.unit_name ? row.unit_name : $t('items.not_selected') }} diff --git a/resources/assets/js/views/payments/Index.vue b/resources/assets/js/views/payments/Index.vue index d1cc9d6e..e391f623 100644 --- a/resources/assets/js/views/payments/Index.vue +++ b/resources/assets/js/views/payments/Index.vue @@ -202,7 +202,7 @@ @@ -216,7 +216,7 @@ From e47cb01ce2d57793c4115232b4fd345e7a4d81dc Mon Sep 17 00:00:00 2001 From: Florian Gareis Date: Sun, 21 Mar 2021 00:44:39 +0100 Subject: [PATCH 2/3] Translate badges --- resources/assets/js/helpers/utilities.js | 32 +++++++++++++++++++ resources/assets/js/plugins/ar.json | 4 +++ resources/assets/js/plugins/de.json | 6 +++- resources/assets/js/plugins/en.json | 4 +++ resources/assets/js/plugins/es.json | 4 +++ resources/assets/js/plugins/fr.json | 4 +++ resources/assets/js/plugins/hi.json | 4 +++ resources/assets/js/plugins/it.json | 4 +++ resources/assets/js/plugins/lv.json | 4 +++ resources/assets/js/plugins/nl.json | 4 +++ resources/assets/js/plugins/pt-br.json | 4 +++ resources/assets/js/plugins/pt.json | 4 +++ resources/assets/js/plugins/sr.json | 4 +++ resources/assets/js/plugins/sv.json | 4 +++ .../js/views/dashboard/DashboardTable.vue | 8 +++-- resources/assets/js/views/estimates/Index.vue | 2 +- resources/assets/js/views/estimates/View.vue | 2 +- resources/assets/js/views/invoices/Index.vue | 4 +-- resources/assets/js/views/invoices/View.vue | 2 +- 19 files changed, 95 insertions(+), 9 deletions(-) diff --git a/resources/assets/js/helpers/utilities.js b/resources/assets/js/helpers/utilities.js index ff9b0021..ead14abb 100644 --- a/resources/assets/js/helpers/utilities.js +++ b/resources/assets/js/helpers/utilities.js @@ -1,3 +1,5 @@ +import i18n from '../plugins/i18n'; + export default { addClass(el, className) { if (el.classList) el.classList.add(className) @@ -245,6 +247,36 @@ export default { } } }, + getStatusTranslation(status) { + switch (status) { + case 'DRAFT': + return i18n.t('general.draft') + case 'PAID': + return i18n.t('invoices.paid') + case 'UNPAID': + return i18n.t('invoices.unpaid') + case 'SENT': + return i18n.t('general.paid') + case 'REJECTED': + return i18n.t('estimates.rejected') + case 'ACCEPTED': + return i18n.t('estimates.accepted') + case 'VIEWED': + return i18n.t('invoices.viewed') + case 'EXPIRED': + return i18n.t('estimates.expired') + case 'PARTIALLY PAID': + return i18n.t('estimates.accepted') + case 'OVERDUE': + return i18n.t('invoices.overdue') + case 'COMPLETED': + return i18n.t('invoices.completed') + case 'DUE': + return i18n.t('general.due') + default: + return status + } + }, compareVersion(v1, v2, options) { const lexicographical = options && options.lexicographical const zeroExtend = options && options.zeroExtend diff --git a/resources/assets/js/plugins/ar.json b/resources/assets/js/plugins/ar.json index 67d8129a..70e97408 100644 --- a/resources/assets/js/plugins/ar.json +++ b/resources/assets/js/plugins/ar.json @@ -273,6 +273,7 @@ "required": "حقل مطلوب" }, "accepted": "مقبول", + "rejected": "Rejected", "sent": "مرسل", "draft": "مسودة", "declined": "مرفوض", @@ -319,6 +320,9 @@ "all": "الكل", "paid": "مدفوع", "unpaid": "غير مدفوع", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "العميل", "paid_status": "حالة الدفع", "ref_no": "رقم المرجع.", diff --git a/resources/assets/js/plugins/de.json b/resources/assets/js/plugins/de.json index 3b775620..7c760956 100644 --- a/resources/assets/js/plugins/de.json +++ b/resources/assets/js/plugins/de.json @@ -273,6 +273,7 @@ "required": "Feld ist erforderlich" }, "accepted": "Angenommen", + "rejected": "Abgelehnt", "sent": "Gesendet", "draft": "Entwurf", "declined": "Abgelehnt", @@ -318,7 +319,10 @@ "years": "{years} Jahre", "all": "Alle", "paid": "Bezahlt", - "unpaid": "Unbezahlte", + "unpaid": "Unbezahlt", + "viewed": "Gesehen", + "overdue": "Überfällig", + "completed": "Abgeschlossen", "customer": "KUNDEN", "paid_status": "BEZAHLT-STATUS", "ref_no": "REF. - NR.", diff --git a/resources/assets/js/plugins/en.json b/resources/assets/js/plugins/en.json index 00cdb567..dc8572df 100644 --- a/resources/assets/js/plugins/en.json +++ b/resources/assets/js/plugins/en.json @@ -274,6 +274,7 @@ "required": "Field is required" }, "accepted": "Accepted", + "rejected": "Rejected", "sent": "Sent", "draft": "Draft", "declined": "Declined", @@ -320,6 +321,9 @@ "all": "All", "paid": "Paid", "unpaid": "Unpaid", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "CUSTOMER", "paid_status": "PAID STATUS", "ref_no": "REF NO.", diff --git a/resources/assets/js/plugins/es.json b/resources/assets/js/plugins/es.json index 0972aefb..4e406764 100644 --- a/resources/assets/js/plugins/es.json +++ b/resources/assets/js/plugins/es.json @@ -273,6 +273,7 @@ "required": "Se requiere campo" }, "accepted": "Aceptado", + "rejected": "Rejected", "sent": "Enviado", "draft": "Borrador", "declined": "Rechazado", @@ -319,6 +320,9 @@ "all": "Todas", "paid": "Pagada", "unpaid": "No pagado", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "CLIENTE", "paid_status": "ESTADO PAGADO", "ref_no": "NÚMERO DE REFERENCIA.", diff --git a/resources/assets/js/plugins/fr.json b/resources/assets/js/plugins/fr.json index e7d8e451..12e58bbd 100644 --- a/resources/assets/js/plugins/fr.json +++ b/resources/assets/js/plugins/fr.json @@ -273,6 +273,7 @@ "required": "Champ requis" }, "accepted": "Accepté", + "rejected": "Rejected", "sent": "Envoyé", "draft": "Brouillon", "declined": "Refusé", @@ -319,6 +320,9 @@ "all": "Toutes", "paid": "Payé", "unpaid": "Non payé", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "CLIENT", "paid_status": "STATUT DU PAIEMENT", "ref_no": "Réf.", diff --git a/resources/assets/js/plugins/hi.json b/resources/assets/js/plugins/hi.json index 3396b61d..683a7fb4 100644 --- a/resources/assets/js/plugins/hi.json +++ b/resources/assets/js/plugins/hi.json @@ -273,6 +273,7 @@ "required": "Field is required" }, "accepted": "Accepted", + "rejected": "Rejected", "sent": "Sent", "draft": "Draft", "declined": "Declined", @@ -319,6 +320,9 @@ "all": "All", "paid": "Paid", "unpaid": "Unpaid", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "CUSTOMER", "paid_status": "PAID STATUS", "ref_no": "REF NO.", diff --git a/resources/assets/js/plugins/it.json b/resources/assets/js/plugins/it.json index 1c8060f8..e15320cb 100644 --- a/resources/assets/js/plugins/it.json +++ b/resources/assets/js/plugins/it.json @@ -273,6 +273,7 @@ "required": "Campo obbligatorio" }, "accepted": "Accettato", + "rejected": "Rejected", "sent": "Inviato", "draft": "Bozza", "declined": "Rifiutato", @@ -319,6 +320,9 @@ "all": "Tutti", "paid": "Pagato", "unpaid": "Insoluto", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "CLIENTE", "paid_status": "STATO DI PAGAMENTO", "ref_no": "RIF N.", diff --git a/resources/assets/js/plugins/lv.json b/resources/assets/js/plugins/lv.json index 43e0ea38..272295cf 100644 --- a/resources/assets/js/plugins/lv.json +++ b/resources/assets/js/plugins/lv.json @@ -273,6 +273,7 @@ "required": "Šis lauks ir obligāts" }, "accepted": "Apstiprināts", + "rejected": "Rejected", "sent": "Nosūtīts", "draft": "Melnraksts", "declined": "Noraidīts", @@ -319,6 +320,9 @@ "all": "Visi", "paid": "Apmaksāts", "unpaid": "Neapmaksāts", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "KLIENTS", "paid_status": "APMAKSAS STATUS", "ref_no": "REF NR.", diff --git a/resources/assets/js/plugins/nl.json b/resources/assets/js/plugins/nl.json index 0f2982dd..1cfe388e 100644 --- a/resources/assets/js/plugins/nl.json +++ b/resources/assets/js/plugins/nl.json @@ -273,6 +273,7 @@ "required": "Veld is vereist" }, "accepted": "Geaccepteerd", + "rejected": "Rejected", "sent": "Verzonden", "draft": "Concept", "declined": "Geweigerd", @@ -319,6 +320,9 @@ "all": "Allemaal", "paid": "Betaald", "unpaid": "Onbetaald", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "Klant", "paid_status": "Betaling", "ref_no": "REF NR.", diff --git a/resources/assets/js/plugins/pt-br.json b/resources/assets/js/plugins/pt-br.json index 6243bbf8..23dbd1ec 100644 --- a/resources/assets/js/plugins/pt-br.json +++ b/resources/assets/js/plugins/pt-br.json @@ -253,6 +253,7 @@ "required": "Campo obrigatório" }, "accepted": "Aceito", + "rejected": "Rejected", "sent": "Enviado", "draft": "Rascunho", "declined": "Rejeitado", @@ -299,6 +300,9 @@ "all": "Todas", "paid": "Paga", "unpaid": "Não Paga", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "CLIENTE", "paid_status": "STATUS PAGAMENTO", "ref_no": "REFERÊNCIA", diff --git a/resources/assets/js/plugins/pt.json b/resources/assets/js/plugins/pt.json index 204ec38b..c0dce0b6 100644 --- a/resources/assets/js/plugins/pt.json +++ b/resources/assets/js/plugins/pt.json @@ -273,6 +273,7 @@ "required": "Campo obrigatório" }, "accepted": "Aceito", + "rejected": "Rejected", "sent": "Enviado", "draft": "Rascunho", "declined": "Rejeitado", @@ -319,6 +320,9 @@ "all": "Todas", "paid": "Paga", "unpaid": "Não Paga", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "CLIENTE", "paid_status": "STATUS PAGAMENTO", "ref_no": "REFERÊNCIA", diff --git a/resources/assets/js/plugins/sr.json b/resources/assets/js/plugins/sr.json index 4efa49cb..5fc326dd 100644 --- a/resources/assets/js/plugins/sr.json +++ b/resources/assets/js/plugins/sr.json @@ -274,6 +274,7 @@ "required": "Polje je obavezno" }, "accepted": "Prihvaćeno", + "rejected": "Rejected", "sent": "Poslato", "draft": "U izradi", "declined": "Odbijeno", @@ -320,6 +321,9 @@ "all": "Sve", "paid": "Plaćeno", "unpaid": "Neplaćeno", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "KLIJENT", "paid_status": "STATUS UPLATE", "ref_no": "POZIV NA BROJ", diff --git a/resources/assets/js/plugins/sv.json b/resources/assets/js/plugins/sv.json index 65e72847..7d302d6f 100644 --- a/resources/assets/js/plugins/sv.json +++ b/resources/assets/js/plugins/sv.json @@ -274,6 +274,7 @@ "required": "Fältet är tvingande" }, "accepted": "Accepterad", + "rejected": "Rejected", "sent": "Skickat", "draft": "Utkast", "declined": "Avvisad", @@ -320,6 +321,9 @@ "all": "Alla", "paid": "Betalda", "unpaid": "Obetalda", + "viewed": "Viewed", + "overdue": "Overdue", + "completed": "Completed", "customer": "KUNDER", "paid_status": "BETALSTATUS", "ref_no": "REF NR.", diff --git a/resources/assets/js/views/dashboard/DashboardTable.vue b/resources/assets/js/views/dashboard/DashboardTable.vue index 8ebdb13b..620e961e 100644 --- a/resources/assets/js/views/dashboard/DashboardTable.vue +++ b/resources/assets/js/views/dashboard/DashboardTable.vue @@ -65,9 +65,11 @@ :color="$utils.getBadgeStatusColor(row.status).color" > {{ - row.status != 'PARTIALLY_PAID' - ? row.status - : row.status.replace('_', ' ') + $utils.getStatusTranslation( + row.status != 'PARTIALLY_PAID' + ? row.status + : row.status.replace('_', ' ') + ) }} diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue index d0203e3d..36ec9710 100644 --- a/resources/assets/js/views/estimates/Index.vue +++ b/resources/assets/js/views/estimates/Index.vue @@ -254,7 +254,7 @@ :color="$utils.getBadgeStatusColor(row.status).color" class="px-3 py-1" > - {{ row.status }} + {{ $utils.getStatusTranslation(row.status) }} diff --git a/resources/assets/js/views/estimates/View.vue b/resources/assets/js/views/estimates/View.vue index 099a13a1..1693e5ce 100644 --- a/resources/assets/js/views/estimates/View.vue +++ b/resources/assets/js/views/estimates/View.vue @@ -172,7 +172,7 @@ :color="$utils.getBadgeStatusColor(estimate.status).color" class="px-1 text-xs" > - {{ estimate.status }} + {{ $utils.getStatusTranslation(estimate.status) }} diff --git a/resources/assets/js/views/invoices/Index.vue b/resources/assets/js/views/invoices/Index.vue index c0e4f42f..1d563381 100644 --- a/resources/assets/js/views/invoices/Index.vue +++ b/resources/assets/js/views/invoices/Index.vue @@ -241,7 +241,7 @@ :bg-color="$utils.getBadgeStatusColor(row.status).bgColor" :color="$utils.getBadgeStatusColor(row.status).color" > - {{ row.status.replace('_', ' ') }} + {{ $utils.getStatusTranslation(row.status.replace('_', ' ')) }} @@ -258,7 +258,7 @@ :bg-color="$utils.getBadgeStatusColor(row.status).bgColor" :color="$utils.getBadgeStatusColor(row.status).color" > - {{ row.paid_status.replace('_', ' ') }} + {{ $utils.getStatusTranslation(row.paid_status.replace('_', ' ')) }} diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue index 1fc76bfc..b4d956a8 100644 --- a/resources/assets/js/views/invoices/View.vue +++ b/resources/assets/js/views/invoices/View.vue @@ -189,7 +189,7 @@ :font-size="$utils.getBadgeStatusColor(invoice.status).fontSize" class="px-1 text-xs" > - {{ invoice.status }} + {{ $utils.getStatusTranslation(invoice.status) }} From 57b302666af7b72c59f226bc8a61be3fa40ea1df Mon Sep 17 00:00:00 2001 From: Florian Gareis Date: Mon, 22 Mar 2021 10:17:01 +0100 Subject: [PATCH 3/3] Address review comments --- resources/assets/js/helpers/utilities.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/helpers/utilities.js b/resources/assets/js/helpers/utilities.js index ead14abb..7028d53c 100644 --- a/resources/assets/js/helpers/utilities.js +++ b/resources/assets/js/helpers/utilities.js @@ -256,7 +256,7 @@ export default { case 'UNPAID': return i18n.t('invoices.unpaid') case 'SENT': - return i18n.t('general.paid') + return i18n.t('general.sent') case 'REJECTED': return i18n.t('estimates.rejected') case 'ACCEPTED': @@ -266,7 +266,7 @@ export default { case 'EXPIRED': return i18n.t('estimates.expired') case 'PARTIALLY PAID': - return i18n.t('estimates.accepted') + return i18n.t('estimates.partially_paid') case 'OVERDUE': return i18n.t('invoices.overdue') case 'COMPLETED':