IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-19 01:14:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-12-17

Browse Source
This commit is contained in:
JC5
2025-12-17 08:47:31 +01:00
parent 486e0d5ed5
commit 012df6bb24
50 changed files with 419 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Support/Navigation.php
+3 -2
View File
@@ -32,6 +32,7 @@ use FireflyIII\Support\Calendar\Calculator;
use FireflyIII\Support\Calendar\Periodicity;
use Illuminate\Support\Facades\Log;
use Throwable;
use FireflyIII\Support\Facades\Steam;
/**
* Class Navigation.
@@ -404,7 +405,7 @@ class Navigation
*/
public function listOfPeriods(Carbon $start, Carbon $end): array
{
$locale = \FireflyIII\Support\Facades\Steam::getLocale();
$locale = Steam::getLocale();
// define period to increment
$increment = 'addDay';
$format = $this->preferredCarbonFormat($start, $end);
@@ -536,7 +537,7 @@ class Navigation
*/
public function preferredCarbonLocalizedFormat(Carbon $start, Carbon $end): string
{
$locale = \FireflyIII\Support\Facades\Steam::getLocale();
$locale = Steam::getLocale();
$diff = $start->diffInMonths($end, true);
if ($diff >= 1.001 && $diff < 12.001) {
return (string)trans('config.month_js', [], $locale);