Better (and translated) delete forms. [skip ci]

resources/lang/nl/form.php

@@ -29,5 +29,32 @@ return [
     'amount'                      => 'Bedrag',
     'date'                        => 'Datum',
     'category'                    => 'Categorie',
-    'tags'                        => 'Tags'
+    'tags'                        => 'Tags',
+    'deletePermanently'           => 'Verwijderen',
+    'cancel'                      => 'Annuleren',
+
+    'delete_account'              => 'Verwijder rekening ":name"',
+    'delete_bill'                 => 'Verwijder rekening ":name"',
+    'delete_budget'               => 'Verwijder budget ":name"',
+    'delete_category'             => 'Verwijder categorie ":name"',
+    'delete_currency'             => 'Verwijder munteenheid ":name"',
+    'delete_piggyBank'            => 'Verwijder spaarpotje ":name"',
+    'delete_journal'              => 'Verwijder transactie met omschrijving ":description"',
+
+    'account_areYouSure'          => 'Weet je zeker dat je de rekening met naam ":name" wilt verwijderen?',
+    'bill_areYouSure'             => 'Weet je zeker dat je de rekening met naam ":name" wilt verwijderen?',
+    'budget_areYouSure'           => 'Weet je zeker dat je het budget met naam ":name" wilt verwijderen?',
+    'category_areYouSure'         => 'Weet je zeker dat je het category met naam ":name" wilt verwijderen?',
+    'currency_areYouSure'         => 'Weet je zeker dat je de munteenheid met naam ":name" wilt verwijderen?',
+    'piggyBank_areYouSure'        => 'Weet je zeker dat je het spaarpotje met naam ":name" wilt verwijderen?',
+    'journal_areYouSure'          => 'Weet je zeker dat je de transactie met naam ":description" wilt verwijderen?',
+
+    'permDeleteWarning'           => 'Dingen verwijderen uit Firefly is permanent en kan niet ongedaan gemaakt worden.',
+    'also_delete_transactions'    => 'Ook de enige transactie verbonden aan deze rekening wordt verwijderd.' .
+                                     '|Ook alle transacties verbonden aan deze rekening worden verwijderd.',
+    'also_delete_piggyBanks'      => 'Ook het spaarpotje verbonden aan deze rekening wordt verwijderd.' .
+                                     '|Ook alle spaarpotjes verbonden aan deze rekening worden verwijderd.',
+    'bill_keep_transactions'      => 'De transactie verbonden aan deze rekening blijft bewaard.|De transacties verbonden aan deze rekening blijven bewaard.',
+    'budget_keep_transactions'    => 'De transactie verbonden aan dit budget blijft bewaard.|De transacties verbonden aan dit budget blijven bewaard.',
+    'category_keep_transactions'  => 'De transactie verbonden aan deze categorie blijft bewaard.|De transacties verbonden aan deze categorie blijven bewaard.',
 ];

resources/twig/accounts/delete.twig

@@ -3,29 +3,30 @@
 {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute().getName(), account) }}
 {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('accounts.destroy',account.id)}) }}
 <div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
+    <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
         <div class="panel panel-red">
             <div class="panel-heading">
-                Delete account "{{ account.name }}"
+                <i class="fa fa-exclamation-circle"></i>
+                {{ trans('form.delete_account', {'name': account.name}) }}
             </div>
             <div class="panel-body">
-                <p>
+                <p class="text-danger">
-                Are you sure that you want to delete the {{account.accountType.type|lower}} "{{account.name}}"?
+                    {{ trans('form.permDeleteWarning') }}
                 </p>
-
+                <p>
+                    {{ trans('form.account_areYouSure', {'name': account.name}) }}
+                </p>
+                <p>
+                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
+                    <a href="{{URL.previous()}}" class="btn-default btn">{{ trans('form.cancel') }}</a >
+                </p>
+                <p class="small">
                 {% if account.transactions|length > 0 %}
-                    <p class="text-danger">
+                    {{ Lang.choice('form.also_delete_transactions', account.transactions|length) }}
-                        {{account.accountType.type|capitalize}} "{{ account.name }}" still has {{ account.transactions|length }} transaction(s) associated to it. These will be deleted as well.
+                {% endif %}<br />
-                    </p>
-                {% endif %}
                 {% if account.piggyBanks|length > 0 %}
-                    <p class="text-danger">
+                    {{ Lang.choice('form.also_delete_piggyBanks', account.piggyBanks|length) }}
-                        {{account.accountType.type|capitalize}} "{{ account.name }}" still has {{ account.piggyBanks|length }} piggy bank(s) associated to it. These will be deleted as well.
-                    </p>
                 {% endif %}
-                <p>
-                    <button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
-                    <a href="{{URL.previous()}}" class="btn-default btn">Cancel</a >
                 </p>
             </div>
         </div>

resources/twig/bills/delete.twig

@@ -3,26 +3,27 @@
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, bill) }}
     {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('bills.destroy',bill.id)}) }}
 <div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
+    <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
         <div class="panel panel-red">
             <div class="panel-heading">
-                Delete bill "{{ bill.name }}"
+                <i class="fa fa-exclamation-circle"></i>
+                {{ trans('form.delete_bill', {'name': bill.name}) }}
             </div>
             <div class="panel-body">
-                <p>
+                <p class="text-danger">
-                Are you sure that you want to delete bill "{{ bill.name }}"?
+                    {{ trans('form.permDeleteWarning') }}
                 </p>
-
+                <p>
+                    {{ trans('form.bill_areYouSure', {'name': bill.name}) }}
+                </p>
+                <p>
+                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
+                    <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a >
+                </p>
+                <p class="small">
                 {% if bill.transactionjournals|length > 0 %}
-                    <p class="text-info">
+                    {{ Lang.choice('form.bill_keep_transactions', bill.transactionjournals|length) }}
-                        Bill "{{ bill.name }}" still has {{ bill.transactionjournals|length }} transactions connected
-                        to it. These will <strong>not</strong> be removed but will lose their connection to this bill.
-                    </p>
                 {% endif %}
-
-                <p>
-                    <button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
-                    <a href="{{ URL.previous() }}" class="btn-default btn">Cancel</a >
                 </p>
             </div>
         </div>

resources/twig/budgets/delete.twig

@@ -3,26 +3,29 @@
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget) }}
     {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('budgets.destroy',budget.id) })  }}
         <div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
+    <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
         <div class="panel panel-red">
             <div class="panel-heading">
-                Delete budget "{{ budget.name}}"
+                <i class="fa fa-exclamation-circle"></i>
+                {{ trans('form.delete_budget', {'name': budget.name}) }}
             </div>
             <div class="panel-body">
+                <p class="text-danger">
+                    {{ trans('form.permDeleteWarning') }}
+                </p>
                 <p>
-                Are you sure that you want to delete budget "{{ budget.name }}"?
+                    {{ trans('form.budget_areYouSure', {'name': budget.name}) }}
                 </p>
 
+                <p>
+                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
+                    <a href="{{URL.previous()}}" class="btn-default btn">{{ trans('form.cancel') }}</a >
+                </p>
+
+                <p class="small">
                 {% if budget.transactionjournals|length > 0 %}
-                    <p class="text-info">
+                    {{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals|length) }}
-                        Budget "{{ budget.name }}" still has {{ budget.transactionjournals|length }} transactions connected
-                        to it. These will <strong>not</strong> be removed but will lose their connection to this budget.
-                    </p>
                 {% endif %}
-
-                <p>
-                    <button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
-                    <a href="{{URL.previous()}}" class="btn-default btn">Cancel</a >
                 </p>
             </div>
         </div>

resources/twig/categories/delete.twig

@@ -3,26 +3,28 @@
 {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category) }}
 {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('categories.destroy',category.id)}) }}
 <div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
+    <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
         <div class="panel panel-red">
             <div class="panel-heading">
-                Delete category "{{ category.name }}"
+                <i class="fa fa-exclamation-circle"></i>
+                {{ trans('form.delete_category', {'name': category.name}) }}
             </div>
             <div class="panel-body">
+                <p class="text-danger">
+                    {{ trans('form.permDeleteWarning') }}
+                </p>
                 <p>
-                Are you sure that you want to delete category "{{ category.name }}"?
+                    {{ trans('form.category_areYouSure', {'name': category.name}) }}
                 </p>
 
+                <p>
+                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
+                    <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a >
+                </p>
+                <p class="small">
                 {% if category.transactionjournals|length > 0 %}
-                    <p class="text-info">
+                    {{ Lang.choice('form.category_keep_transactions', category.transactionjournals|length) }}
-                        Category "{{ category.name }}" still has {{ category.transactionjournals|length }} transactions connected
-                        to it. These will <strong>not</strong> be removed but will lose their connection to this category.
-                    </p>
                 {% endif %}
-
-                <p>
-                    <button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
-                    <a href="{{ URL.previous() }}" class="btn-default btn">Cancel</a >
                 </p>
             </div>
         </div>

resources/twig/currency/delete.twig

@@ -3,18 +3,22 @@
 {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, currency) }}
 {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('currency.destroy',currency.id)}) }}
 <div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
+    <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
         <div class="panel panel-red">
             <div class="panel-heading">
-                Delete currency "{{ currency.name }}"
+                <i class="fa fa-exclamation-circle"></i>
+                {{ trans('form.delete_currency', {'name': currency.name}) }}
             </div>
             <div class="panel-body">
-                <p>
+                <p class="text-danger">
-                Are you sure that you want to delete currency "{{ currency.name }}"?
+                    {{ trans('form.permDeleteWarning') }}
                 </p>
                 <p>
-                    <button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
+                    {{ trans('form.currency_areYouSure', {'name': currency.name}) }}
-                    <a href="{{ URL.previous }}" class="btn-default btn">Cancel</a >
+                </p>
+                <p>
+                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
+                    <a href="{{ URL.previous }}" class="btn-default btn">{{ trans('form.cancel') }}</a >
                 </p>
             </div>
         </div>

resources/twig/piggy-banks/delete.twig

@@ -3,19 +3,23 @@
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }}
     {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('piggy-banks.destroy',piggyBank.id)})  }}
         <div class="row">
-    <div class="col-lg-6 col-md-12 col-sm-12">
+    <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
         <div class="panel panel-red">
             <div class="panel-heading">
-                Delete piggy bank "{{ piggyBank.name }}"
+                <i class="fa fa-exclamation-circle"></i>
+                {{ trans('form.delete_piggyBank', {'name': piggyBank.name}) }}
             </div>
             <div class="panel-body">
+                <p class="text-danger">
+                    {{ trans('form.permDeleteWarning') }}
+                </p>
                 <p>
-                Are you sure?
+                    {{ trans('form.piggyBank_areYouSure', {'name': piggyBank.name}) }}
                 </p>
 
                 <p>
-                    <button type="submit" class="btn btn-default btn-danger">Delete permanently</button>
+                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
-                    <a href="{{ URL.previous() }}" class="btn-default btn">Cancel</a >
+                    <a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a >
                 </p>
             </div>
         </div>

resources/twig/transactions/delete.twig

@@ -4,34 +4,31 @@
     {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('transactions.destroy',journal.id)}) }}
 
 <div class="row">
-    <div class="col-lg-6 col-md-6 col-sm-12">
+    <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
-        <div class="panel panel-danger">
+        <div class="panel panel-red">
             <div class="panel-heading">
-                <i class="fa fa-exclamation-circle"></i> Destroy "{{ journal.description }}"
+                <i class="fa fa-exclamation-circle"></i>
+                {{ trans('form.delete_journal', {'description': journal.description}) }}
             </div>
             <div class="panel-body">
-                <p>
-                Deleting stuff from Firefly is <em>permanent</em>. This action will remove the transaction and all
-                associated data.
-                </p>
-                <p class="text-success">
-                    This action will not destroy categories, piggy banks, accounts, etc.
-                </p>
                 <p class="text-danger">
-                    Are you sure?
+                    {{ trans('form.permDeleteWarning') }}
                 </p>
-                <div class="btn-group">
+                <p>
-                    <input type="submit" name="submit" value="Delete transaction" class="btn btn-danger" />
+                    {{ trans('form.journal_areYouSure', {'description': journal.description}) }}
+                </p>
+                <p>
+                    <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
                     {% if journal.transactiontype.type == 'Withdrawal' %}
-                        <a href="{{route('transactions.index','withdrawal')}}" class="btn-default btn">Cancel</a>
+                        <a href="{{route('transactions.index','withdrawal')}}" class="btn-default btn">{{ trans('form.cancel') }}</a>
                     {% endif %}
                     {% if journal.transactiontype.type == 'Deposit' %}
-                        <a href="{{route('transactions.index','deposit')}}" class="btn-default btn">Cancel</a>
+                        <a href="{{route('transactions.index','deposit')}}" class="btn-default btn">{{ trans('form.cancel') }}</a>
                     {% endif %}
                     {% if journal.transactiontype.type == 'Transfer' %}
-                        <a href="{{route('transactions.index','transfers')}}" class="btn-default btn">Cancel</a>
+                        <a href="{{route('transactions.index','transfers')}}" class="btn-default btn">{{ trans('form.cancel') }}</a>
                     {% endif %}
-                </div>
+                </p>
             </div>
         </div>
     </div>