IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replaced some language calls.

Browse Source
This commit is contained in:
James Cole
2015-12-24 08:35:08 +01:00
parent 7069e242ae
commit a6d71988f2
13 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Generator/Chart/Account/ChartJsAccountChartGenerator.php
View File

@@ -105,8 +105,7 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
public function frontpage(Collection $accounts, Carbon $start, Carbon $end)
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.monthAndDay.' . $language);
$format = trans('config.month_and_day');
$data = [
'count' => 0,
'labels' => [],
@@ -151,8 +150,7 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator
public function single(Account $account, Carbon $start, Carbon $end)
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.monthAndDay.' . $language);
$format = trans('config.month_and_day');
$data = [
'count' => 1,

3
app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
View File

@@ -71,8 +71,7 @@ class ChartJsBillChartGenerator implements BillChartGenerator
public function single(Bill $bill, Collection $entries)
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$format = trans('config.month');
$data = [
'count' => 3,

7
app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
View File

@@ -24,7 +24,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
public function budget(Collection $entries, $dateFormat = 'month')
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
$format = Config::get('firefly.' . $dateFormat . '.' . $language);
$data = [
@@ -33,7 +33,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
[
'label' => 'Amount',
'data' => [],
]
],
],
];
@@ -115,8 +115,7 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
public function year(Collection $budgets, Collection $entries)
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$format = trans('config.month');
$data = [
'labels' => [],

6
app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
View File

@@ -101,8 +101,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$format = trans('config.month');
$data = [
'count' => 0,
@@ -135,8 +134,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$format = trans('config.month');
$data = [
'count' => 0,

3
app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php
View File

@@ -25,8 +25,7 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.monthAndDay.' . $language);
$format = trans('config.month_and_day');
$data = [
'count' => 1,

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

@@ -22,8 +22,7 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
public function yearInOut(Collection $entries)
{
// language:
$language = Preferences::get('language', env('DEFAULT_LANGUAGE','en_US'))->data;
$format = Config::get('firefly.month.' . $language);
$format = trans('config.month');
$data = [
'count' => 2,