From 6b555d8db772ebcd71e986f82e12b155f5a2b93c Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Tue, 14 Apr 2015 18:06:41 +0300
Subject: [PATCH] Rename Accounting to Billing

---
 app/views/layouts/application.haml           | 2 +-
 app/views/layouts/registrar/application.haml | 2 +-
 app/views/registrar/invoices/show.haml       | 2 +-
 config/locales/en.yml                        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml
index 73c55c1d7..fafc5ef19 100644
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/application.haml
@@ -42,7 +42,7 @@
                   = t('settings')
                   %span.caret
                 %ul.dropdown-menu{role: "menu"}
-                  %li.dropdown-header= t('accounting')
+                  %li.dropdown-header= t('billing')
                   %li= link_to t('bank_statements'), admin_bank_statements_path
                   %li.divider
                   %li.dropdown-header= t('system')
diff --git a/app/views/layouts/registrar/application.haml b/app/views/layouts/registrar/application.haml
index 85e10adeb..4eec521ba 100644
--- a/app/views/layouts/registrar/application.haml
+++ b/app/views/layouts/registrar/application.haml
@@ -39,7 +39,7 @@
 
               - if can? :show, Invoice
                 - active_class = ['registrar/invoices'].include?(params[:controller]) ? 'active' :nil
-                %li{class: active_class}= link_to t('accounting'), registrar_invoices_path
+                %li{class: active_class}= link_to t('billing'), registrar_invoices_path
 
               - if can? :view, :registrar_xml_console
                 - active_class = ['registrar/xml_consoles'].include?(params[:controller]) ? 'active' :nil
diff --git a/app/views/registrar/invoices/show.haml b/app/views/registrar/invoices/show.haml
index 84d26942e..99752e446 100644
--- a/app/views/registrar/invoices/show.haml
+++ b/app/views/registrar/invoices/show.haml
@@ -4,7 +4,7 @@
       = t('invoice_no', no: @invoice.id)
   .col-sm-6
     %h1.text-right.text-center-xs
-      = link_to(t('back_to_accounting'), registrar_invoices_path, class: 'btn btn-default')
+      = link_to(t('back_to_billing'), registrar_invoices_path, class: 'btn btn-default')
 %hr
 .row
   .col-md-6= render 'registrar/invoices/partials/banklinks'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 68e2991e1..db35f2d72 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -653,10 +653,9 @@ en:
   vat: 'VAT (%{vat_prc}%)'
   unpaid: 'Unpaid'
   your_current_credit_account_balance_is: 'Your current credit account balance is %{balance} EUR'
-  accounting: 'Accounting'
+  billing: 'Billing'
   your_account: 'Your account'
   pay_by_bank_link: 'Pay by bank link'
-  back_to_accounting: 'Back to accounting'
   issue_date: 'Issue date'
   due_date: 'Due date'
   payment_term: 'Payment term'
@@ -676,6 +675,7 @@ en:
   import_th6_bank_statement: 'Import TH6 bank statement'
   back_to_bank_statements: 'Back to bank statements'
   back_to_bank_statement: 'Back to bank statement'
+  back_to_billing: 'Back to billing'
   imported_at: 'Imported at'
   bank_statement: 'Bank statement'
   bank_transactions: 'Bank transactions'