IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-09-03 20:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Chart field name refactor

Browse Source
This commit is contained in:
James Cole
2023-08-01 10:26:26 +02:00
parent 3517452ea1
commit 7c9f7f04b7
4 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Support/Navigation.php
-19
View File
@@ -559,25 +559,6 @@ class Navigation
return $format;
}
/**
* Same as preferredCarbonLocalizedFormat but based on the period.
*
* @param string $period
*
* @return string
*/
public function preferredCarbonLocalizedFormatByPeriod(string $period): string
{
$locale = app('steam')->getLocale();
return match ($period) {
default => (string)trans('config.month_and_day_js', [], $locale),
'1W' => (string)trans('config.week_in_year_js', [], $locale),
'1M' => (string)trans('config.month_js', [], $locale),
'3M', '6M' => (string)trans('config.half_year_js', [], $locale),
'1Y' => (string)trans('config.year_js', [], $locale),
};
}
/**
* If the date difference between start and end is less than a month, method returns "endOfDay". If the difference
* is less than a year, method returns "endOfMonth". If the date difference is larger, method returns "endOfYear".
app/Support/Request/ConvertsDataTypes.php
+1 -1
View File
@@ -376,7 +376,7 @@ trait ConvertsDataTypes
{
$result = null;
try {
$result = $this->get($field) ? new Carbon($this->get($field)) : null;
$result = $this->get($field) ? new Carbon($this->get($field), config('app.timezone')) : null;
} catch (InvalidFormatException $e) {
// @ignoreException
}