From 064217ccb0209225e94f47d9c705bcf514190c1f Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 05:10:20 +0200 Subject: [PATCH] Auto commit for release 'develop' on 2024-04-25 --- .../Autocomplete/AccountController.php | 4 +- .../V2/Controllers/Chart/BudgetController.php | 16 ++-- .../Controllers/Chart/CategoryController.php | 22 ++--- .../Model/Account/UpdateController.php | 7 +- .../Summary/NetWorthController.php | 4 +- app/Http/Controllers/HomeController.php | 1 + app/Support/Request/ConvertsDataTypes.php | 2 +- composer.lock | 69 ++++++++-------- config/firefly.php | 2 +- package-lock.json | 60 +++++++------- public/v2/i18n/zh-cn.json | 46 +++++------ public/v2/i18n/zh_CN.json | 46 +++++------ resources/lang/zh_CN/firefly.php | 80 +++++++++---------- resources/lang/zh_CN/list.php | 14 ++-- resources/lang/zh_CN/validation.php | 6 +- 15 files changed, 191 insertions(+), 188 deletions(-) diff --git a/app/Api/V2/Controllers/Autocomplete/AccountController.php b/app/Api/V2/Controllers/Autocomplete/AccountController.php index 83b8f560ca..01d2f4fa03 100644 --- a/app/Api/V2/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V2/Controllers/Autocomplete/AccountController.php @@ -95,12 +95,12 @@ class AccountController extends Controller $balance = app('steam')->balance($account, $date); $nameWithBalance = sprintf('%s (%s)', $account->name, app('amount')->formatAnything($currency, $balance, false)); } - $type = (string) trans(sprintf('firefly.%s', $account->accountType->type)); + $type = (string) trans(sprintf('firefly.%s', $account->accountType->type)); $groupedResult[$type] ??= [ 'group ' => $type, 'items' => [], ]; - $allItems[] = [ + $allItems[] = [ 'id' => (string) $account->id, 'value' => (string) $account->id, 'name' => $account->name, diff --git a/app/Api/V2/Controllers/Chart/BudgetController.php b/app/Api/V2/Controllers/Chart/BudgetController.php index a7ee6ccb3e..b24f446a8a 100644 --- a/app/Api/V2/Controllers/Chart/BudgetController.php +++ b/app/Api/V2/Controllers/Chart/BudgetController.php @@ -78,13 +78,13 @@ class BudgetController extends Controller */ public function dashboard(DateRequest $request): JsonResponse { - $params = $request->getAll(); + $params = $request->getAll(); /** @var Carbon $start */ - $start = $params['start']; + $start = $params['start']; /** @var Carbon $end */ - $end = $params['end']; + $end = $params['end']; // code from FrontpageChartGenerator, but not in separate class $budgets = $this->repository->getActiveBudgets(); @@ -205,14 +205,14 @@ class BudgetController extends Controller 'overspent' => '0', 'native_overspent' => '0', ]; - $currentBudgetArray = $block['budgets'][$budgetId]; + $currentBudgetArray = $block['budgets'][$budgetId]; // var_dump($return); /** @var array $journal */ foreach ($currentBudgetArray['transaction_journals'] as $journal) { // convert the amount to the native currency. - $rate = $converter->getCurrencyRate($this->currencies[$currencyId], $this->currency, $journal['date']); - $convertedAmount = bcmul($journal['amount'], $rate); + $rate = $converter->getCurrencyRate($this->currencies[$currencyId], $this->currency, $journal['date']); + $convertedAmount = bcmul($journal['amount'], $rate); if ($journal['foreign_currency_id'] === $this->currency->id) { $convertedAmount = $journal['foreign_amount']; } @@ -255,7 +255,7 @@ class BudgetController extends Controller private function processLimit(Budget $budget, BudgetLimit $limit): array { Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__)); - $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; @@ -273,7 +273,7 @@ class BudgetController extends Controller $filtered[$currencyId] = $entry; } } - $result = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end); + $result = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end); if (1 === count($result)) { $compare = bccomp($limit->amount, app('steam')->positive($result[$limitCurrencyId]['spent'])); if (1 === $compare) { diff --git a/app/Api/V2/Controllers/Chart/CategoryController.php b/app/Api/V2/Controllers/Chart/CategoryController.php index a59e0b62fe..a78a091f8c 100644 --- a/app/Api/V2/Controllers/Chart/CategoryController.php +++ b/app/Api/V2/Controllers/Chart/CategoryController.php @@ -77,7 +77,7 @@ class CategoryController extends Controller Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__)); /** @var Carbon $start */ - $start = $this->parameters->get('start'); + $start = $this->parameters->get('start'); /** @var Carbon $end */ $end = $this->parameters->get('end'); @@ -89,21 +89,21 @@ class CategoryController extends Controller // get journals for entire period: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end)->withAccountInformation(); $collector->setXorAccounts($accounts)->withCategoryInformation(); $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::RECONCILIATION]); - $journals = $collector->getExtractedJournals(); + $journals = $collector->getExtractedJournals(); /** @var array $journal */ foreach ($journals as $journal) { - $currencyId = (int) $journal['currency_id']; - $currency = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId); - $currencies[$currencyId] = $currency; - $categoryName = null === $journal['category_name'] ? (string) trans('firefly.no_category') : $journal['category_name']; - $amount = app('steam')->positive($journal['amount']); - $nativeAmount = $converter->convert($default, $currency, $journal['date'], $amount); - $key = sprintf('%s-%s', $categoryName, $currency->code); + $currencyId = (int) $journal['currency_id']; + $currency = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId); + $currencies[$currencyId] = $currency; + $categoryName = null === $journal['category_name'] ? (string) trans('firefly.no_category') : $journal['category_name']; + $amount = app('steam')->positive($journal['amount']); + $nativeAmount = $converter->convert($default, $currency, $journal['date'], $amount); + $key = sprintf('%s-%s', $categoryName, $currency->code); if ((int) $journal['foreign_currency_id'] === $default->id) { $nativeAmount = app('steam')->positive($journal['foreign_amount']); } @@ -131,7 +131,7 @@ class CategoryController extends Controller $return[$key]['amount'] = bcadd($return[$key]['amount'], $amount); $return[$key]['native_amount'] = bcadd($return[$key]['native_amount'], $nativeAmount); } - $return = array_values($return); + $return = array_values($return); // order by native amount usort($return, static function (array $a, array $b) { diff --git a/app/Api/V2/Controllers/Model/Account/UpdateController.php b/app/Api/V2/Controllers/Model/Account/UpdateController.php index bd339f86e5..fb34a94e5a 100644 --- a/app/Api/V2/Controllers/Model/Account/UpdateController.php +++ b/app/Api/V2/Controllers/Model/Account/UpdateController.php @@ -59,16 +59,17 @@ class UpdateController extends Controller { app('log')->debug(sprintf('Now in %s', __METHOD__)); $data = $request->getUpdateData(); - $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type); + $data['type'] = config('firefly.shortNamesByFullName.'.$account->accountType->type); $account = $this->repository->update($account, $data); $account->refresh(); app('preferences')->mark(); - $transformer = new AccountTransformer(); + $transformer = new AccountTransformer(); $transformer->setParameters($this->parameters); return response() ->api($this->jsonApiObject('accounts', $account, $transformer)) - ->header('Content-Type', self::CONTENT_TYPE); + ->header('Content-Type', self::CONTENT_TYPE) + ; } } diff --git a/app/Api/V2/Controllers/Summary/NetWorthController.php b/app/Api/V2/Controllers/Summary/NetWorthController.php index 441b5abbb8..fcfdaa935f 100644 --- a/app/Api/V2/Controllers/Summary/NetWorthController.php +++ b/app/Api/V2/Controllers/Summary/NetWorthController.php @@ -51,7 +51,7 @@ class NetWorthController extends Controller $this->netWorth = app(NetWorthInterface::class); $this->repository = app(AccountRepositoryInterface::class); // new way of user group validation - $userGroup = $this->validateUserGroup($request); + $userGroup = $this->validateUserGroup($request); $this->netWorth->setUserGroup($userGroup); $this->repository->setUserGroup($userGroup); @@ -79,7 +79,7 @@ class NetWorthController extends Controller ); // skip accounts that should not be in the net worth - $result = $this->netWorth->byAccounts($filtered, $date); + $result = $this->netWorth->byAccounts($filtered, $date); return response()->api($result); } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 9536f9d06a..f0ef462479 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -152,6 +152,7 @@ class HomeController extends Controller /** @var Carbon $start */ $start = session('start', today(config('app.timezone'))->startOfMonth()); + /** @var Carbon $end */ $end = session('end', today(config('app.timezone'))->endOfMonth()); $accounts = $repository->getAccountsById($frontpageArray); diff --git a/app/Support/Request/ConvertsDataTypes.php b/app/Support/Request/ConvertsDataTypes.php index 6f11ab9b18..74c7a3d544 100644 --- a/app/Support/Request/ConvertsDataTypes.php +++ b/app/Support/Request/ConvertsDataTypes.php @@ -159,7 +159,7 @@ trait ConvertsDataTypes if (method_exists($this, 'validateUserGroup')) { // @phpstan-ignore-line $userGroup = $this->validateUserGroup($this); - $repository->setUserGroup($userGroup); + $repository->setUserGroup($userGroup); } // set administration ID diff --git a/composer.lock b/composer.lock index 0f5780319f..4718820352 100644 --- a/composer.lock +++ b/composer.lock @@ -1670,16 +1670,16 @@ }, { "name": "laravel/framework", - "version": "v11.4.0", + "version": "v11.5.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a" + "reference": "e3c24268f1404805e15099b9f035fe310cb30753" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/c1dc67c28811dc5be524a30b18f29ce62126716a", - "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a", + "url": "https://api.github.com/repos/laravel/framework/zipball/e3c24268f1404805e15099b9f035fe310cb30753", + "reference": "e3c24268f1404805e15099b9f035fe310cb30753", "shasum": "" }, "require": { @@ -1871,20 +1871,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-04-16T14:38:51+00:00" + "time": "2024-04-23T15:11:31+00:00" }, { "name": "laravel/passport", - "version": "v12.1.0", + "version": "v12.2.0", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b" + "reference": "b24c6462835a16163141fbe588533d16603212b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/ff4742c71c58a4941b8738496ba96dabdf5e395b", - "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b", + "url": "https://api.github.com/repos/laravel/passport/zipball/b24c6462835a16163141fbe588533d16603212b7", + "reference": "b24c6462835a16163141fbe588533d16603212b7", "shasum": "" }, "require": { @@ -1947,20 +1947,20 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, - "time": "2024-04-15T18:49:04+00:00" + "time": "2024-04-17T17:56:14+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.19", + "version": "v0.1.20", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18" + "reference": "bf9a360c484976692de0f3792f30066f4f4b34a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/0ab75ac3434d9f610c5691758a6146a3d1940c18", - "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18", + "url": "https://api.github.com/repos/laravel/prompts/zipball/bf9a360c484976692de0f3792f30066f4f4b34a2", + "reference": "bf9a360c484976692de0f3792f30066f4f4b34a2", "shasum": "" }, "require": { @@ -2002,9 +2002,9 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.19" + "source": "https://github.com/laravel/prompts/tree/v0.1.20" }, - "time": "2024-04-16T14:20:35+00:00" + "time": "2024-04-18T00:45:25+00:00" }, { "name": "laravel/sanctum", @@ -5189,16 +5189,16 @@ }, { "name": "spatie/backtrace", - "version": "1.5.3", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/spatie/backtrace.git", - "reference": "483f76a82964a0431aa836b6ed0edde0c248e3ab" + "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/backtrace/zipball/483f76a82964a0431aa836b6ed0edde0c248e3ab", - "reference": "483f76a82964a0431aa836b6ed0edde0c248e3ab", + "url": "https://api.github.com/repos/spatie/backtrace/zipball/8373b9d51638292e3bfd736a9c19a654111b4a23", + "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23", "shasum": "" }, "require": { @@ -5206,6 +5206,7 @@ }, "require-dev": { "ext-json": "*", + "laravel/serializable-closure": "^1.3", "phpunit/phpunit": "^9.3", "spatie/phpunit-snapshot-assertions": "^4.2", "symfony/var-dumper": "^5.1" @@ -5235,7 +5236,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/backtrace/tree/1.5.3" + "source": "https://github.com/spatie/backtrace/tree/1.6.1" }, "funding": [ { @@ -5247,7 +5248,7 @@ "type": "other" } ], - "time": "2023-06-28T12:59:17+00:00" + "time": "2024-04-24T13:22:11+00:00" }, { "name": "spatie/flare-client-php", @@ -5403,16 +5404,16 @@ }, { "name": "spatie/laravel-html", - "version": "3.7.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-html.git", - "reference": "df15763c190954ee46a74e0bf5b4b5bbf2e1f170" + "reference": "f1dcd290b9feebf50ad6b5c8e5627b0bf87b7ebe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-html/zipball/df15763c190954ee46a74e0bf5b4b5bbf2e1f170", - "reference": "df15763c190954ee46a74e0bf5b4b5bbf2e1f170", + "url": "https://api.github.com/repos/spatie/laravel-html/zipball/f1dcd290b9feebf50ad6b5c8e5627b0bf87b7ebe", + "reference": "f1dcd290b9feebf50ad6b5c8e5627b0bf87b7ebe", "shasum": "" }, "require": { @@ -5469,7 +5470,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/laravel-html/tree/3.7.0" + "source": "https://github.com/spatie/laravel-html/tree/3.8.0" }, "funding": [ { @@ -5477,7 +5478,7 @@ "type": "custom" } ], - "time": "2024-03-23T11:28:29+00:00" + "time": "2024-04-24T12:52:13+00:00" }, { "name": "spatie/laravel-ignition", @@ -10761,16 +10762,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.19", + "version": "10.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c726f0de022368f6ed103e452a765d3304a996a4" + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c726f0de022368f6ed103e452a765d3304a996a4", - "reference": "c726f0de022368f6ed103e452a765d3304a996a4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3", + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3", "shasum": "" }, "require": { @@ -10842,7 +10843,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20" }, "funding": [ { @@ -10858,7 +10859,7 @@ "type": "tidelift" } ], - "time": "2024-04-17T14:06:18+00:00" + "time": "2024-04-24T06:32:35+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/firefly.php b/config/firefly.php index 5f51f61a27..cf04d45b4d 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -117,7 +117,7 @@ return [ 'expression_engine' => false, // see cer.php for exchange rates feature flag. ], - 'version' => '6.1.15', + 'version' => 'develop/2024-04-25', 'api_version' => '2.0.14', 'db_version' => 24, diff --git a/package-lock.json b/package-lock.json index 07c26c49a2..dfb94b3129 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2943,39 +2943,39 @@ } }, "node_modules/@vue/compiler-core": { - "version": "3.4.24", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.24.tgz", - "integrity": "sha512-vbW/tgbwJYj62N/Ww99x0zhFTkZDTcGh3uwJEuadZ/nF9/xuFMC4693P9r+3sxGXISABpDKvffY5ApH9pmdd1A==", + "version": "3.4.25", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.25.tgz", + "integrity": "sha512-Y2pLLopaElgWnMNolgG8w3C5nNUVev80L7hdQ5iIKPtMJvhVpG0zhnBG/g3UajJmZdvW0fktyZTotEHD1Srhbg==", "dev": true, "dependencies": { "@babel/parser": "^7.24.4", - "@vue/shared": "3.4.24", + "@vue/shared": "3.4.25", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.24", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.24.tgz", - "integrity": "sha512-4XgABML/4cNndVsQndG6BbGN7+EoisDwi3oXNovqL/4jdNhwvP8/rfRMTb6FxkxIxUUtg6AI1/qZvwfSjxJiWA==", + "version": "3.4.25", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.25.tgz", + "integrity": "sha512-Ugz5DusW57+HjllAugLci19NsDK+VyjGvmbB2TXaTcSlQxwL++2PETHx/+Qv6qFwNLzSt7HKepPe4DcTE3pBWg==", "dev": true, "dependencies": { - "@vue/compiler-core": "3.4.24", - "@vue/shared": "3.4.24" + "@vue/compiler-core": "3.4.25", + "@vue/shared": "3.4.25" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.4.24", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.24.tgz", - "integrity": "sha512-nRAlJUK02FTWfA2nuvNBAqsDZuERGFgxZ8sGH62XgFSvMxO2URblzulExsmj4gFZ8e+VAyDooU9oAoXfEDNxTA==", + "version": "3.4.25", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.25.tgz", + "integrity": "sha512-m7rryuqzIoQpOBZ18wKyq05IwL6qEpZxFZfRxlNYuIPDqywrXQxgUwLXIvoU72gs6cRdY6wHD0WVZIFE4OEaAQ==", "dev": true, "dependencies": { "@babel/parser": "^7.24.4", - "@vue/compiler-core": "3.4.24", - "@vue/compiler-dom": "3.4.24", - "@vue/compiler-ssr": "3.4.24", - "@vue/shared": "3.4.24", + "@vue/compiler-core": "3.4.25", + "@vue/compiler-dom": "3.4.25", + "@vue/compiler-ssr": "3.4.25", + "@vue/shared": "3.4.25", "estree-walker": "^2.0.2", "magic-string": "^0.30.10", "postcss": "^8.4.38", @@ -2983,13 +2983,13 @@ } }, "node_modules/@vue/compiler-ssr": { - "version": "3.4.24", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.24.tgz", - "integrity": "sha512-ZsAtr4fhaUFnVcDqwW3bYCSDwq+9Gk69q2r/7dAHDrOMw41kylaMgOP4zRnn6GIEJkQznKgrMOGPMFnLB52RbQ==", + "version": "3.4.25", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.25.tgz", + "integrity": "sha512-H2ohvM/Pf6LelGxDBnfbbXFPyM4NE3hrw0e/EpwuSiYu8c819wx+SVGdJ65p/sFrYDd6OnSDxN1MB2mN07hRSQ==", "dev": true, "dependencies": { - "@vue/compiler-dom": "3.4.24", - "@vue/shared": "3.4.24" + "@vue/compiler-dom": "3.4.25", + "@vue/shared": "3.4.25" } }, "node_modules/@vue/component-compiler-utils": { @@ -3064,9 +3064,9 @@ "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA==" }, "node_modules/@vue/shared": { - "version": "3.4.24", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.24.tgz", - "integrity": "sha512-BW4tajrJBM9AGAknnyEw5tO2xTmnqgup0VTnDAMcxYmqOX0RG0b9aSUGAbEKolD91tdwpA6oCwbltoJoNzpItw==", + "version": "3.4.25", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.25.tgz", + "integrity": "sha512-k0yappJ77g2+KNrIaF0FFnzwLvUBLUYr8VOwz+/6vLsmItFp51AcxLL7Ey3iPd7BIRyWPOcqUjMnm7OkahXllA==", "dev": true }, "node_modules/@webassemblyjs/ast": { @@ -3373,9 +3373,9 @@ } }, "node_modules/alpinejs": { - "version": "3.13.9", - "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.9.tgz", - "integrity": "sha512-BTEJ3fcUpqKlB+aFYSWGVEp8IP3vA96x7wUaNSdb5SJxV5i7s+/Bduxy9D6TokcqpW5MygsnG1eBEFfr4AnQSw==", + "version": "3.13.10", + "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.10.tgz", + "integrity": "sha512-86RB307VWICex0vG15Eq0x058cNNsvS57ohrjN6n/TJAVSFV+zXOK/E34nNHDHc6Poq+yTNCLqEzPqEkRBTMRQ==", "dependencies": { "@vue/reactivity": "~3.1.1" } @@ -5095,9 +5095,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.746", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.746.tgz", - "integrity": "sha512-jeWaIta2rIG2FzHaYIhSuVWqC6KJYo7oSBX4Jv7g+aVujKztfvdpf+n6MGwZdC5hQXbax4nntykLH2juIQrfPg==", + "version": "1.4.748", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.748.tgz", + "integrity": "sha512-VWqjOlPZn70UZ8FTKUOkUvBLeTQ0xpty66qV0yJcAGY2/CthI4xyW9aEozRVtuwv3Kpf5xTesmJUcPwuJmgP4A==", "dev": true }, "node_modules/elliptic": { diff --git a/public/v2/i18n/zh-cn.json b/public/v2/i18n/zh-cn.json index b922a7b781..2b7a83f2ce 100644 --- a/public/v2/i18n/zh-cn.json +++ b/public/v2/i18n/zh-cn.json @@ -10,17 +10,17 @@ "title": "\u6807\u9898" }, "list": { - "drag_and_drop": "Drag and drop", + "drag_and_drop": "\u62d6\u653e", "active": "\u662f\u5426\u542f\u7528\uff1f", "name": "\u540d\u79f0", "type": "\u7c7b\u578b", - "number": "Account number", + "number": "\u8d26\u6237\u53f7\u7801", "liability_type": "\u503a\u52a1\u7c7b\u578b", - "current_balance": "Current balance", - "last_activity": "Last activity", - "amount_due": "Amount due", - "balance_difference": "Balance difference", - "menu": "Menu" + "current_balance": "\u5f53\u524d\u4f59\u989d", + "last_activity": "\u6700\u540e\u6d3b\u52a8", + "amount_due": "\u5230\u671f\u91d1\u989d", + "balance_difference": "\u4f59\u989d\u5dee", + "menu": "\u83dc\u5355" }, "validation": { "bad_type_source": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u6e90\u8d26\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002", @@ -28,22 +28,22 @@ }, "firefly": { "spent": "\u652f\u51fa", - "administration_owner": "Administration owner: {{email}}", - "administration_you": "Your role: {{role}}", - "administration_role_owner": "Owner", - "administration_role_ro": "Read-only", - "administration_role_mng_trx": "Manage transactions", - "administration_role_mng_meta": "Manage classification and meta-data", - "administration_role_mng_budgets": "Manage budgets", - "administration_role_mng_piggies": "Manage piggy banks", - "administration_role_mng_subscriptions": "Manage subscriptions", - "administration_role_mng_rules": "Manage rules", - "administration_role_mng_recurring": "Manage recurring transactions ", - "administration_role_mng_webhooks": "Manage webhooks", - "administration_role_mng_currencies": "Manage currencies", - "administration_role_view_reports": "View reports", - "administration_role_full": "Full access", - "new_administration_created": "New financial administration \"{{title}}\" has been created", + "administration_owner": "\u7ba1\u7406\u5458\u5f52\u5c5e: {{email}}", + "administration_you": "\u4f60\u7684\u89d2\u8272: {{role}}", + "administration_role_owner": "\u6240\u6709\u8005", + "administration_role_ro": "\u53ea\u8bfb", + "administration_role_mng_trx": "\u7ba1\u7406\u4ea4\u6613", + "administration_role_mng_meta": "\u7ba1\u7406\u5206\u7c7b\u548c\u5143\u6570\u636e", + "administration_role_mng_budgets": "\u7ba1\u7406\u9884\u7b97", + "administration_role_mng_piggies": "\u7ba1\u7406\u5b58\u94b1\u7f50", + "administration_role_mng_subscriptions": "\u7ba1\u7406\u8ba2\u9605", + "administration_role_mng_rules": "\u7ba1\u7406\u89c4\u5219", + "administration_role_mng_recurring": "\u7ba1\u7406\u5b9a\u671f\u4ea4\u6613 ", + "administration_role_mng_webhooks": "\u7ba1\u7406 Webhooks", + "administration_role_mng_currencies": "\u7ba1\u7406\u5e01\u79cd", + "administration_role_view_reports": "\u67e5\u770b\u62a5\u8868", + "administration_role_full": "\u5b8c\u5168\u8bbf\u95ee", + "new_administration_created": "\u65b0\u7684\u8d22\u52a1\u7ba1\u7406\u5458 \"{{title}}\" \u5df2\u521b\u5efa", "left": "\u5269\u4f59", "paid": "\u5df2\u4ed8\u6b3e", "errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}", diff --git a/public/v2/i18n/zh_CN.json b/public/v2/i18n/zh_CN.json index b922a7b781..2b7a83f2ce 100644 --- a/public/v2/i18n/zh_CN.json +++ b/public/v2/i18n/zh_CN.json @@ -10,17 +10,17 @@ "title": "\u6807\u9898" }, "list": { - "drag_and_drop": "Drag and drop", + "drag_and_drop": "\u62d6\u653e", "active": "\u662f\u5426\u542f\u7528\uff1f", "name": "\u540d\u79f0", "type": "\u7c7b\u578b", - "number": "Account number", + "number": "\u8d26\u6237\u53f7\u7801", "liability_type": "\u503a\u52a1\u7c7b\u578b", - "current_balance": "Current balance", - "last_activity": "Last activity", - "amount_due": "Amount due", - "balance_difference": "Balance difference", - "menu": "Menu" + "current_balance": "\u5f53\u524d\u4f59\u989d", + "last_activity": "\u6700\u540e\u6d3b\u52a8", + "amount_due": "\u5230\u671f\u91d1\u989d", + "balance_difference": "\u4f59\u989d\u5dee", + "menu": "\u83dc\u5355" }, "validation": { "bad_type_source": "Firefly III \u65e0\u6cd5\u786e\u5b9a\u57fa\u4e8e\u6b64\u6e90\u8d26\u6237\u7684\u4ea4\u6613\u7c7b\u578b\u3002", @@ -28,22 +28,22 @@ }, "firefly": { "spent": "\u652f\u51fa", - "administration_owner": "Administration owner: {{email}}", - "administration_you": "Your role: {{role}}", - "administration_role_owner": "Owner", - "administration_role_ro": "Read-only", - "administration_role_mng_trx": "Manage transactions", - "administration_role_mng_meta": "Manage classification and meta-data", - "administration_role_mng_budgets": "Manage budgets", - "administration_role_mng_piggies": "Manage piggy banks", - "administration_role_mng_subscriptions": "Manage subscriptions", - "administration_role_mng_rules": "Manage rules", - "administration_role_mng_recurring": "Manage recurring transactions ", - "administration_role_mng_webhooks": "Manage webhooks", - "administration_role_mng_currencies": "Manage currencies", - "administration_role_view_reports": "View reports", - "administration_role_full": "Full access", - "new_administration_created": "New financial administration \"{{title}}\" has been created", + "administration_owner": "\u7ba1\u7406\u5458\u5f52\u5c5e: {{email}}", + "administration_you": "\u4f60\u7684\u89d2\u8272: {{role}}", + "administration_role_owner": "\u6240\u6709\u8005", + "administration_role_ro": "\u53ea\u8bfb", + "administration_role_mng_trx": "\u7ba1\u7406\u4ea4\u6613", + "administration_role_mng_meta": "\u7ba1\u7406\u5206\u7c7b\u548c\u5143\u6570\u636e", + "administration_role_mng_budgets": "\u7ba1\u7406\u9884\u7b97", + "administration_role_mng_piggies": "\u7ba1\u7406\u5b58\u94b1\u7f50", + "administration_role_mng_subscriptions": "\u7ba1\u7406\u8ba2\u9605", + "administration_role_mng_rules": "\u7ba1\u7406\u89c4\u5219", + "administration_role_mng_recurring": "\u7ba1\u7406\u5b9a\u671f\u4ea4\u6613 ", + "administration_role_mng_webhooks": "\u7ba1\u7406 Webhooks", + "administration_role_mng_currencies": "\u7ba1\u7406\u5e01\u79cd", + "administration_role_view_reports": "\u67e5\u770b\u62a5\u8868", + "administration_role_full": "\u5b8c\u5168\u8bbf\u95ee", + "new_administration_created": "\u65b0\u7684\u8d22\u52a1\u7ba1\u7406\u5458 \"{{title}}\" \u5df2\u521b\u5efa", "left": "\u5269\u4f59", "paid": "\u5df2\u4ed8\u6b3e", "errors_submission_v2": "\u60a8\u63d0\u4ea4\u7684\u5185\u5bb9\u6709\u8bef\uff0c\u8bf7\u68c0\u67e5\u9519\u8bef\u4fe1\u606f: {{errorMessage}}", diff --git a/resources/lang/zh_CN/firefly.php b/resources/lang/zh_CN/firefly.php index 6c78d5e6b3..7489845f8a 100644 --- a/resources/lang/zh_CN/firefly.php +++ b/resources/lang/zh_CN/firefly.php @@ -1420,34 +1420,34 @@ return [ // Financial administrations 'administration_index' => '财务管理', 'administrations_index_menu' => '财务管理', - 'administrations_breadcrumb' => 'Financial administrations', - 'administrations_page_title' => 'Financial administrations', - 'administrations_page_sub_title' => 'Overview', - 'create_administration' => 'Create new administration', - 'administration_owner' => 'Administration owner: {{email}}', - 'administration_you' => 'Your role: {{role}}', - 'other_users_in_admin' => 'Other users in this administration', - 'administrations_create_breadcrumb' => 'Create new financial administration', - 'administrations_page_create_sub_title' => 'Create new financial administration', - 'basic_administration_information' => 'Basic administration information', - 'new_administration_created' => 'New financial administration "{{title}}" has been created', - 'edit_administration_breadcrumb' => 'Edit financial administration ":title"', - 'administrations_page_edit_sub_title' => 'Edit financial administration ":title"', + 'administrations_breadcrumb' => '财务管理', + 'administrations_page_title' => '财务管理', + 'administrations_page_sub_title' => '概览', + 'create_administration' => '创建新的管理', + 'administration_owner' => '管理员归属: {{email}}', + 'administration_you' => '你的角色: {{role}}', + 'other_users_in_admin' => '其他的管理员账户', + 'administrations_create_breadcrumb' => '创建新的财务管理', + 'administrations_page_create_sub_title' => '创建新的财务管理', + 'basic_administration_information' => '基础管理员信息', + 'new_administration_created' => '新的财务管理员 "{{title}}" 已创建', + 'edit_administration_breadcrumb' => '编辑财务管理员 ":title"', + 'administrations_page_edit_sub_title' => '编辑财务管理员 ":title"', // roles - 'administration_role_owner' => 'Owner', - 'administration_role_ro' => 'Read-only', - 'administration_role_mng_trx' => 'Manage transactions', - 'administration_role_mng_meta' => 'Manage classification and meta-data', - 'administration_role_mng_budgets' => 'Manage budgets', - 'administration_role_mng_piggies' => 'Manage piggy banks', - 'administration_role_mng_subscriptions' => 'Manage subscriptions', - 'administration_role_mng_rules' => 'Manage rules', - 'administration_role_mng_recurring' => 'Manage recurring transactions ', - 'administration_role_mng_webhooks' => 'Manage webhooks', - 'administration_role_mng_currencies' => 'Manage currencies', - 'administration_role_view_reports' => 'View reports', - 'administration_role_full' => 'Full access', + 'administration_role_owner' => '所有者', + 'administration_role_ro' => '只读', + 'administration_role_mng_trx' => '管理交易', + 'administration_role_mng_meta' => '管理分类和元数据', + 'administration_role_mng_budgets' => '管理预算', + 'administration_role_mng_piggies' => '管理存钱罐', + 'administration_role_mng_subscriptions' => '管理订阅', + 'administration_role_mng_rules' => '管理规则', + 'administration_role_mng_recurring' => '管理定期交易 ', + 'administration_role_mng_webhooks' => '管理 Webhooks', + 'administration_role_mng_currencies' => '管理币种', + 'administration_role_view_reports' => '查看报表', + 'administration_role_full' => '完全访问', // profile: 'purge_data_title' => '从 Frefly III 清除数据', @@ -1962,19 +1962,19 @@ return [ 'interest_calc_quarterly' => '每季度', 'initial_balance_account' => '初始余额账户“:account”', 'list_options' => '列表选项', - 'account_column_opt_drag_and_drop' => 'Drag and drop', - 'account_column_opt_active' => 'Active', - 'account_column_opt_name' => 'Name', - 'account_column_opt_type' => 'Type', - 'account_column_opt_liability_type' => 'Liability type', - 'account_column_opt_liability_direction' => 'Liability direction', - 'account_column_opt_liability_interest' => 'Liability interest', - 'account_column_opt_number' => 'Account number', - 'account_column_opt_current_balance' => 'Current balance', - 'account_column_opt_amount_due' => 'Amount due', - 'account_column_opt_last_activity' => 'Last activity', - 'account_column_opt_balance_difference' => 'Balance difference', - 'account_column_opt_menu' => 'Menu', + 'account_column_opt_drag_and_drop' => '拖放', + 'account_column_opt_active' => '启用', + 'account_column_opt_name' => '名称', + 'account_column_opt_type' => '类别', + 'account_column_opt_liability_type' => '债务类型', + 'account_column_opt_liability_direction' => '赔偿责任方向', + 'account_column_opt_liability_interest' => '债务利息', + 'account_column_opt_number' => '账户号码', + 'account_column_opt_current_balance' => '当前余额', + 'account_column_opt_amount_due' => '到期金额', + 'account_column_opt_last_activity' => '最后活动', + 'account_column_opt_balance_difference' => '余额差', + 'account_column_opt_menu' => '菜单', // categories: 'new_category' => '新分类', @@ -2158,7 +2158,7 @@ return [ 'logout' => '退出登录', 'logout_other_sessions' => '退出所有其他已登录设备', 'toggleNavigation' => '切换导览', - 'toggle_dropdown' => 'Toggle dropdown', + 'toggle_dropdown' => '切换下拉列表', 'searchPlaceholder' => '搜索…', 'version' => '版本', 'dashboard' => '仪表盘', diff --git a/resources/lang/zh_CN/list.php b/resources/lang/zh_CN/list.php index 88640c145e..915ce6bb6f 100644 --- a/resources/lang/zh_CN/list.php +++ b/resources/lang/zh_CN/list.php @@ -67,13 +67,13 @@ return [ 'source' => '来源', 'next_expected_match' => '预期下次支付', 'automatch' => '自动匹配？', - 'drag_and_drop' => 'Drag and drop', - 'number' => 'Account number', - 'current_balance' => 'Current balance', - 'last_activity' => 'Last activity', - 'amount_due' => 'Amount due', - 'balance_difference' => 'Balance difference', - 'menu' => 'Menu', + 'drag_and_drop' => '拖放', + 'number' => '账户号码', + 'current_balance' => '当前余额', + 'last_activity' => '最后活动', + 'amount_due' => '到期金额', + 'balance_difference' => '余额差', + 'menu' => '菜单', /* * PLEASE DO NOT EDIT THIS FILE DIRECTLY. diff --git a/resources/lang/zh_CN/validation.php b/resources/lang/zh_CN/validation.php index 5e66fa38aa..f818979d4b 100644 --- a/resources/lang/zh_CN/validation.php +++ b/resources/lang/zh_CN/validation.php @@ -68,8 +68,8 @@ return [ 'invalid_selection' => '您的选择无效', 'belongs_user' => '此值关联至一个似乎不存在的对象。', 'belongs_user_or_user_group' => '此值关联至当前财务管理中一个似乎不存在的对象。', - 'no_access_group' => 'The user has no access to this user group.', - 'no_accepted_roles_defined' => 'No access roles have been defined for this endpoint, access denied.', + 'no_access_group' => '用户没有访问此用户组的权限。', + 'no_accepted_roles_defined' => '此端点没有定义访问角色，访问被拒绝。', 'at_least_one_transaction' => '至少需要一笔交易', 'recurring_transaction_id' => '至少需要一笔交易。', 'need_id_to_match' => '您需要提交一个含有ID的条目，API才能匹配。', @@ -302,7 +302,7 @@ return [ // no access to administration: 'no_access_user_group' => '您没有管理员访问权限', - 'administration_owner_rename' => 'You can\'t rename your standard administration.', + 'administration_owner_rename' => '您不能重命名您的标准管理员', ]; /*