kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-23 12:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Small layout and translation fixes [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-07-10 05:39:35 +02:00
parent 137208c3fd
commit b6960fb0e5
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Generator/Chart/Report/ChartJsReportChartGenerator.php
View File

@@ -61,7 +61,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
$data = [ $data = [
'count' => 2, 'count' => 2,
'labels' => [], 'labels' => [trans('firefly.sum_of_year'), trans('firefly.average_of_year')],
'datasets' => [ 'datasets' => [
[ [
'label' => trans('firefly.income'), 'label' => trans('firefly.income'),

2
resources/lang/en/firefly.php
View File

@@ -324,6 +324,8 @@ return [
'topX' => 'top :number', 'topX' => 'top :number',
'showTheRest' => 'Show everything', 'showTheRest' => 'Show everything',
'hideTheRest' => 'Show only the top :number', 'hideTheRest' => 'Show only the top :number',
'sum_of_year' => 'Sum of year',
'average_of_year' => 'Average of year',
// charts: // charts:
'dayOfMonth' => 'Day of the month', 'dayOfMonth' => 'Day of the month',

2
resources/lang/nl/firefly.php
View File

@@ -294,6 +294,8 @@ return [
'quarterly' => 'Elk kwartaal', 'quarterly' => 'Elk kwartaal',
'half-year' => 'Elk half jaar', 'half-year' => 'Elk half jaar',
'yearly' => 'Jaarlijks', 'yearly' => 'Jaarlijks',
'sum_of_year' => 'Som van jaar',
'average_of_year' => 'Gemiddelde in jaar',
// reports: // reports:
'reportForYear' => 'Jaaroverzicht :year', 'reportForYear' => 'Jaaroverzicht :year',

4
resources/twig/reports/year.twig
View File

@@ -7,7 +7,7 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-lg-10 col-md-8 col-sm-12"> <div class="col-lg-8 col-md-8 col-sm-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3> <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-2 col-md-4 col-sm-12"> <div class="col-lg-4 col-md-4 col-sm-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3> <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>