kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Update translations

Browse Source
This commit is contained in:
James Cole
2023-11-15 06:32:41 +01:00
parent 67ef185a72
commit 8f26bbdaa0
35 changed files with 240 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V2/Controllers/Autocomplete/AccountController.php
View File

@@ -125,8 +125,8 @@ class AccountController extends Controller
$allItems,
static function (array $a, array $b): int {
$order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
$pos_a = (int) array_search($a['type'], $order, true);
$pos_b = (int) array_search($b['type'], $order, true);
$pos_a = (int)array_search($a['type'], $order, true);
$pos_b = (int)array_search($b['type'], $order, true);
return $pos_a - $pos_b;
}

4
app/Api/V2/Controllers/Chart/BudgetController.php
View File

@@ -170,7 +170,7 @@ class BudgetController extends Controller
*/
private function noBudgetLimits(Budget $budget, Carbon $start, Carbon $end): array
{
$spent = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
$spent = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
return $this->processExpenses($budget->id, $spent, $start, $end);
}
@@ -274,7 +274,7 @@ class BudgetController extends Controller
*/
private function processLimit(Budget $budget, BudgetLimit $limit): array
{
$end = clone $limit->end_date;
$end = clone $limit->end_date;
$end->endOfDay();
$spent = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection([$budget]));
$limitCurrencyId = $limit->transaction_currency_id;

4
app/Api/V2/Controllers/Controller.php
View File

@@ -108,10 +108,10 @@ class Controller extends BaseController
}
if (null !== $date) {
try {
$obj = Carbon::parse((string) $date, config('app.timezone'));
$obj = Carbon::parse((string)$date, config('app.timezone'));
} catch (InvalidDateException | InvalidFormatException $e) {
// don't care
app('log')->warning(sprintf('Ignored invalid date "%s" in API v2 controller parameter check: %s', substr((string) $date, 0, 20), $e->getMessage()));
app('log')->warning(sprintf('Ignored invalid date "%s" in API v2 controller parameter check: %s', substr((string)$date, 0, 20), $e->getMessage()));
}
// out of range? set to null.
if (null !== $obj && ($obj->year <= 1900 || $obj->year > 2099)) {

1
app/Api/V2/Controllers/Model/Budget/ShowController.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Api\V2\Controllers\Controller;
use FireflyIII\Api\V2\Request\Generic\DateRequest;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use Illuminate\Http\JsonResponse;
/**

10
app/Api/V2/Controllers/Model/Budget/SumController.php
View File

@@ -26,9 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Budget;
use FireflyIII\Api\V2\Controllers\Controller;
use FireflyIII\Api\V2\Request\Generic\DateRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use Illuminate\Http\JsonResponse;
/**
@@ -63,8 +61,8 @@ class SumController extends Controller
*/
public function budgeted(DateRequest $request): JsonResponse
{
$data = $request->getAll();
$result = $this->repository->budgetedInPeriod($data['start'], $data['end']);
$data = $request->getAll();
$result = $this->repository->budgetedInPeriod($data['start'], $data['end']);
return response()->json($result);
}
@@ -79,8 +77,8 @@ class SumController extends Controller
*/
public function spent(DateRequest $request): JsonResponse
{
$data = $request->getAll();
$result = $this->repository->spentInPeriod($data['start'], $data['end']);
$data = $request->getAll();
$result = $this->repository->spentInPeriod($data['start'], $data['end']);
return response()->json($result);
}

4
app/Api/V2/Controllers/Model/BudgetLimit/ListController.php
View File

@@ -26,12 +26,8 @@ namespace FireflyIII\Api\V2\Controllers\Model\BudgetLimit;
use FireflyIII\Api\V2\Controllers\Controller;
use FireflyIII\Api\V2\Request\Generic\DateRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
use FireflyIII\Transformers\V2\BudgetLimitTransformer;
use Illuminate\Http\JsonResponse;
use Illuminate\Pagination\LengthAwarePaginator;
/**
* Class ListController

1
app/Api/V2/Controllers/Summary/NetWorthController.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Helpers\Report\NetWorthInterface;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
use Illuminate\Http\JsonResponse;