From 74a3d155b0e69fa7913d3224b831bbc887faab57 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 21 Jun 2019 19:10:24 +0200
Subject: [PATCH] Rename some fields in account overviews.

---
 resources/lang/en_US/form.php           | 14 +++++++-------
 resources/views/v1/accounts/create.twig |  6 +++---
 resources/views/v1/list/accounts.twig   |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index 777983a03a..cee7f9c065 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -63,15 +63,15 @@ return [
     'currency'                    => 'Currency',
     'account_id'                  => 'Asset account',
     'budget_id'                   => 'Budget',
-    'opening_balance'              => 'Opening balance',
+    'opening_balance'             => 'Opening balance',
     'tagMode'                     => 'Tag mode',
     'tag_position'                => 'Tag location',
-    'virtualBalance'              => 'Virtual balance',
+    'virtual_balance'              => 'Virtual balance',
     'targetamount'                => 'Target amount',
-    'accountRole'                 => 'Account role',
-    'opening_balance_date'          => 'Opening balance date',
-    'ccType'                      => 'Credit card payment plan',
-    'ccMonthlyPaymentDate'        => 'Credit card monthly payment date',
+    'account_role'                => 'Account role',
+    'opening_balance_date'        => 'Opening balance date',
+    'cc_type'                     => 'Credit card payment plan',
+    'cc_monthly_payment_date'     => 'Credit card monthly payment date',
     'piggy_bank_id'               => 'Piggy bank',
     'returnHere'                  => 'Return here',
     'returnHereExplanation'       => 'After storing, return here to create another one.',
@@ -119,7 +119,7 @@ return [
     'symbol'                      => 'Symbol',
     'code'                        => 'Code',
     'iban'                        => 'IBAN',
-    'accountNumber'               => 'Account number',
+    'account_number'              => 'Account number',
     'creditCardNumber'            => 'Credit card number',
     'has_headers'                 => 'Headers',
     'date_format'                 => 'Date format',
diff --git a/resources/views/v1/accounts/create.twig b/resources/views/v1/accounts/create.twig
index 3d4c83ecfd..2e4f0f384a 100644
--- a/resources/views/v1/accounts/create.twig
+++ b/resources/views/v1/accounts/create.twig
@@ -41,14 +41,14 @@
 
                         {{ ExpandedForm.text('iban') }}
                         {{ ExpandedForm.text('BIC', null, {maxlength: 11}) }}
-                        {{ ExpandedForm.text('accountNumber') }}
+                        {{ ExpandedForm.text('account_number') }}
 
                         {% if what == 'asset' %}
 
                             {{ ExpandedForm.amountNoCurrency('opening_balance') }}
                             {{ ExpandedForm.date('opening_balance_date') }}
-                            {{ ExpandedForm.select('accountRole', roles,null,{helpText : 'asset_account_role_help'|_}) }}
-                            {{ ExpandedForm.amountNoCurrency('virtualBalance') }}
+                            {{ ExpandedForm.select('account_role', roles,null,{helpText : 'asset_account_role_help'|_}) }}
+                            {{ ExpandedForm.amountNoCurrency('virtual_balance') }}
                         {% endif %}
                         {# only correct way to do active checkbox #}
                         {{ ExpandedForm.checkbox('include_net_worth', 1) }}
diff --git a/resources/views/v1/list/accounts.twig b/resources/views/v1/list/accounts.twig
index 499fcf6ad5..c7b0b7a4a2 100644
--- a/resources/views/v1/list/accounts.twig
+++ b/resources/views/v1/list/accounts.twig
@@ -13,7 +13,7 @@
             <th data-defaultsign="az">{{ trans('list.liability_type') }}</th>
             <th data-defaultsign="_19">{{ trans('list.interest') }} ({{ trans('list.interest_period') }})</th>
         {% endif %}
-        <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('form.accountNumber') }}</th>
+        <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('form.account_number') }}</th>
         <th data-defaultsign="_19">{{ trans('list.currentBalance') }}</th>
         <th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
         {# hide last activity to make room for other stuff #}
@@ -41,7 +41,7 @@
             {% if what == "asset" %}
                 <td class="hidden-sm hidden-xs hidden-md">
                     {% for entry in account.accountmeta %}
-                        {% if entry.name == 'accountRole' %}
+                        {% if entry.name == 'account_role' %}
                             {{ ('account_role_'~entry.data)|_ }}
                         {% endif %}
                     {% endfor %}
@@ -53,7 +53,7 @@
                 {{ account.interest }}% ({{ account.interestPeriod|lower }})
             </td>
             {% endif %}
-            <td class="hidden-sm hidden-xs">{{ account.iban }}{% if account.iban == '' %}{{ accountGetMetaField(account, 'accountNumber') }}{% endif %}</td>
+            <td class="hidden-sm hidden-xs">{{ account.iban }}{% if account.iban == '' %}{{ accountGetMetaField(account, 'account_number') }}{% endif %}</td>
             <td data-value="{{ account.endBalance }}" style="text-align: right;">
                 <span style="margin-right:5px;">
                 {{ formatAmountByAccount(account, account.endBalance) }}