From a2c919b0fd1cc993797d6eb92b243b9196e38873 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 13 Mar 2018 11:45:04 +0200
Subject: [PATCH] Use standard translation

#623
---
 app/views/registrar/invoices/partials/_items.haml | 4 ++--
 app/views/registrar/invoices/pdf.haml             | 4 ++--
 config/locales/en.yml                             | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/registrar/invoices/partials/_items.haml b/app/views/registrar/invoices/partials/_items.haml
index 2d485f0ab..3bf4f9a84 100644
--- a/app/views/registrar/invoices/partials/_items.haml
+++ b/app/views/registrar/invoices/partials/_items.haml
@@ -20,11 +20,11 @@
     %tfoot
       %tr
         %th{colspan: 3}
-        %th= t(:total_without_vat)
+        %th= Invoice.human_attribute_name :subtotal
         %td= currency(@invoice.subtotal)
       %tr
         %th.no-border{colspan: 3}
-        %th= t('vat', rate: vat_rate(@invoice.vat_rate))
+        %th= "VAT #{vat_rate(@invoice.vat_rate)}"
         %td= currency(@invoice.vat)
       %tr
         %th.no-border{colspan: 3}
diff --git a/app/views/registrar/invoices/pdf.haml b/app/views/registrar/invoices/pdf.haml
index fcc68f128..9a2dd80f2 100644
--- a/app/views/registrar/invoices/pdf.haml
+++ b/app/views/registrar/invoices/pdf.haml
@@ -238,11 +238,11 @@
               %tfoot
                 %tr
                   %th{colspan: 3}
-                  %th= t(:total_without_vat)
+                  %th= Invoice.human_attribute_name :subtotal
                   %td= "#{currency(@invoice.subtotal)} #{@invoice.currency}"
                 %tr
                   %th.no-border{colspan: 3}
-                  %th= t('vat', rate: vat_rate(@invoice.vat_rate))
+                  %th= "VAT #{vat_rate(@invoice.vat_rate)}"
                   %td= "#{currency(@invoice.vat)} #{@invoice.currency}"
                 %tr
                   %th.no-border{colspan: 3}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 73045367b..2ca4a207b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -543,7 +543,6 @@ en:
   invoice_number: Invoice no.
   seller: 'Seller'
   prepayment: 'Prepayment'
-  vat: 'VAT (%{rate})'
   unpaid: 'Unpaid'
   your_current_account_balance_is: 'Your current account balance is %{balance} %{currency}'
   billing: 'Billing'
@@ -561,7 +560,6 @@ en:
   unit: 'Unit'
   price: 'Price'
   total: 'Total'
-  total_without_vat: 'Total without VAT'
   paid_at: 'Paid at'
   invoice: 'Invoice'
   bank_statements: 'Bank statements'