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

Restored some cache [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-06-27 22:22:27 +02:00
parent 2c2ed26c38
commit 4673170531
10 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,13 +33,9 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
],
];
// language:
$language = Preferences::get('language', 'en')->data;
$format = Config::get('firefly.month.' . $language);
/** @var array $entry */
foreach ($entries as $entry) {
$data['labels'][] = $entry[0]->formatLocalized($format);
$data['labels'][] = trans('firefly.spent');
$data['datasets'][0]['data'][] = $entry[1];
}

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

@@ -22,10 +22,6 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
*/
public function all(Collection $entries)
{
// language:
$language = Preferences::get('language', 'en')->data;
$format = Config::get('firefly.month.' . $language);
$data = [
'count' => 1,
'labels' => [],
@@ -38,7 +34,7 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
];
foreach ($entries as $entry) {
$data['labels'][] = $entry[0]->formatLocalized($format);
$data['labels'][] = trans('firefly.spent');
$data['datasets'][0]['data'][] = round($entry[1], 2);
}