Some translations, playing around with popups. [skip ci]

app/Http/Controllers/BudgetController.php

@@ -60,7 +60,7 @@ class BudgetController extends Controller
             Session::put('budgets.create.url', URL::previous());
         }
         Session::forget('budgets.create.fromStore');
-        $subTitle = 'Create a new budget';
+        $subTitle = trans('firefly.create_new_budget');
 
         return view('budgets.create', compact('subTitle'));
     }

public/js/budgets.js

@@ -20,7 +20,7 @@ $(function () {
 function updateSingleRange(e) {
     // get some values:
     var input = $(e.target);
-    var id    = input.data('id');
+    var id = input.data('id');
     var value = parseInt(input.val());
     var spent = parseFloat($('#spent-' + id).data('value'));
 
@@ -95,7 +95,9 @@ function updateTotal() {
 }
 
 function updateIncome(e) {
-    $('#monthlyBudgetModal').empty().load('budgets/income').modal('show');
+    $('#monthlyBudgetModal').empty().load('budgets/income', function () {
+        $('#monthlyBudgetModal').modal('show');
+    });
 
     return false;
 }
@@ -112,7 +114,7 @@ function updateRanges() {
         var value = parseInt(input.val());
 
         // calculate sum:
-        sum += value
+        sum += value;
 
         // update small display:
         $('#budget-range-display-' + id).text('\u20AC ' + value.toFixed(2));

resources/lang/en/firefly.php

@@ -20,6 +20,10 @@ return [
     'from'                          => 'From',
     'to'                            => 'To',
 
+    'showEverything'                => 'Show everything',
+    'create_new_budget'             => 'Create a new budget',
+    'store_new_budget'              => ' Store new budget',
+
     'availableIn'                   => 'Available in :date',
     'transactionsWithoutBudget'     => 'Expenses without budget',
     'transactionsWithoutBudgetDate' => 'Expenses without budget in :date',

resources/lang/nl/firefly.php

@@ -20,6 +20,10 @@ return [
     'from'                          => 'Van',
     'to'                            => 'Tot',
 
+    'showEverything'                => 'Laat alles zien',
+    'create_new_budget'             => 'Maak een nieuw budget',
+    'store_new_budget'              => 'Sla nieuw budget op',
+
     'availableIn'                   => 'Beschikbaar in :date',
     'transactionsWithoutBudget'     => 'Uitgaven zonder budget',
     'transactionsWithoutBudgetDate' => 'Uitgaven zonder budget in :date',

resources/twig/budgets/create.twig

@@ -31,7 +31,7 @@
     <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
         <p>
             <button type="submit" class="btn btn-lg btn-success">
-                <i class="fa fa-plus-circle"></i> Store new budget
+                <i class="fa fa-plus-circle"></i> {{ 'store_new_budget'|_ }}
             </button>
         </p>
     </div>

resources/twig/budgets/edit.twig

@@ -1,12 +1,6 @@
 {% extends "./layout/default.twig" %}
 {% block content %}
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, budget) }}
-<div class="row">
-        <div class="col-lg-12 col-md-12 col-sm-12">
-            <p class="lead">Use budgets to organize and limit your expenses.</p>
-        </div>
-    </div>
-
     {{ Form.model(budget, {'class' : 'form-horizontal','id' : 'update','url' : route('budgets.update',budget.id) } ) }}
     <input type="hidden" name="id" value="{{budget.id}}" />
     <div class="row">

resources/twig/budgets/income.twig

@@ -1,13 +1,12 @@
-<form style="display: inline;" id="income" action="{{route('budgets.postIncome')}}" method="POST">
+<div class="modal-dialog">
-    <input type="hidden" name="_token" value="{{ csrf_token() }}"
+    <div class="modal-content">
-
+        <div class="modal-header">
-    <div class="modal-dialog">
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
-        <div class="modal-content">
+            <h4 class="modal-title" id="myModalLabel">Update (expected) available amount for {{Session.get('start').format('F Y')}}</h4>
-            <div class="modal-header">
+        </div>
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
+        <form style="display: inline;" id="income" action="{{route('budgets.postIncome')}}" method="POST">
-                <h4 class="modal-title" id="myModalLabel">Update (expected) available amount for {{Session.get('start').format('F Y')}}</h4>
-            </div>
             <div class="modal-body">
+                <input type="hidden" name="_token" value="{{ csrf_token() }}"
                 <div class="input-group">
                     <div class="input-group-addon">{{ getCurrencySymbol() }}</div>
                     <input step="any" class="form-control" id="amount" value="{{ amount.data }}" autocomplete="off" name="amount" type="number">
@@ -17,6 +16,6 @@
                 <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
                 <button type="submit" class="btn btn-primary">Update</button>
             </div>
-        </div>
+        </form>
     </div>
-</form>
+</div>

resources/twig/budgets/index.twig

@@ -185,6 +185,8 @@
 
     <!-- DIALOG -->
     <div class="modal fade" id="monthlyBudgetModal">
+
+        
     </div><!-- /.modal -->
 
 {% endblock %}

resources/twig/budgets/show.twig

@@ -29,29 +29,29 @@
 
          <div class="panel panel-default">
             <div class="panel-heading">
-                Transactions
+                {{ 'transactions'|_ }}
             </div>
              {% include 'list/journals.twig' %}
         </div>
     </div>
     <div class="col-lg-3 col-md-3 col-sm-5">
         {% if limits|length == 1 %}
-        <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">Show everything</a></p>
+        <p class="small text-center"><a href="{{ route('budgets.show',budget.id) }}">{{ 'showEverything'|_ }}</a></p>
         {% endif %}
 
         {% for limit in limits %}
             {% for rep in limit.limitRepetitions %}
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        <a href="{{route('budgets.show',[budget.id,rep.id])}}">{{rep.startdate.format('F Y')}}</a>
+                        <a href="{{route('budgets.show',[budget.id,rep.id])}}">{{rep.startdate.formatLocalized(monthFormat)}}</a>
                     </div>
                     <div class="panel-body">
                         <div class="row">
                             <div class="col-lg-6 col-md-6 col-sm-6">
-                                Amount: {{ rep.amount|formatAmount  }}
+                                {{ 'amount'|_ }}: {{ rep.amount|formatAmount  }}
                             </div>
                             <div class="col-lg-6 col-md-6 col-sm-6">
-                                Spent: {{ spentInRepetitionCorrected(rep)|formatAmount }}
+                                {{ 'spent'|_ }}: {{ spentInRepetitionCorrected(rep)|formatAmount }}
                             </div>
                         </div>
                         <div class="row">
@@ -79,7 +79,7 @@
         {% endfor %}
 
         {% if limits|length == 1 %}
-            <p class="small text-center"><a href="{{route('budgets.show',budget.id)}}">Show everything</a></p>
+            <p class="small text-center"><a href="{{route('budgets.show',budget.id)}}">{{ 'showEverything'|_ }}</a></p>
         {% endif %}
 
     </div>

resources/twig/piggy-banks/add.twig

@@ -1,18 +1,16 @@
-
+<div class="modal-dialog">
-    <div class="modal-dialog">
+    <div class="modal-content">
-        <div class="modal-content">
+        <div class="modal-header">
-            <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
+            <h4 class="modal-title" id="myModalLabel">Add money to {{ piggyBank.name }}</h4>
-                <h4 class="modal-title" id="myModalLabel">Add money to {{ piggyBank.name }}</h4>
+        </div>
-            </div>
+        <form style="display: inline;" id="add" action="{{ route('piggy-banks.add', piggyBank.id) }}" method="POST">
-            <form style="display: inline;" id="add" action="{{ route('piggy-banks.add', piggyBank.id) }}" method="POST">
-
             <div class="modal-body">
                 <p>
                     The maximum amount you can add is {{ maxAmount|formatAmount }}.
                 </p>
                 <div class="input-group">
-                    <div class="input-group-addon">{{ getCurrencySymbol() }}</div>
+                    <div class="input-group-addon">{{ getCurrencySymbol()|raw }}</div>
                     <input type="hidden" name="_token" value="{{ csrf_token() }}" />
                     <input step="any" class="form-control" id="amount" autocomplete="off" name="amount" max="{{ maxAmount|round(2) }}" type="number" />
                 </div>
@@ -21,7 +19,7 @@
                 <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
                 <button type="submit" class="btn btn-primary">Add</button>
             </div>
-            </form>
+        </form>
-        </div>
     </div>
+</div>
 

resources/twig/piggy-banks/remove.twig

@@ -12,7 +12,7 @@
                     The maximum amount you can remove is {{ currentRelevantRepAmount(piggyBank)|formatAmount }}
                 </p>
                 <div class="input-group">
-                    <div class="input-group-addon">{{ getCurrencySymbol() }}</div>
+                    <div class="input-group-addon">{{ getCurrencySymbol()|raw }}</div>
                     <input step="any" class="form-control" id="amount" autocomplete="off" name="amount" max="{{ currentRelevantRepAmount(piggyBank)|round(2) }}" type="number">
                 </div>
             </div>