From ff7219a9556a379204efc77d17463de125e023c6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Nov 2023 02:15:04 +0100 Subject: [PATCH] Update languages --- app/Helpers/Collector/GroupCollector.php | 3 +++ app/Support/Amount.php | 2 +- package-lock.json | 9 +++------ resources/lang/ja_JP/validation.php | 2 +- resources/lang/sl_SI/breadcrumbs.php | 2 +- resources/lang/sl_SI/firefly.php | 14 +++++++------- resources/lang/sl_SI/form.php | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php index c862a62e4e..d880d50016 100644 --- a/app/Helpers/Collector/GroupCollector.php +++ b/app/Helpers/Collector/GroupCollector.php @@ -782,6 +782,9 @@ class GroupCollector implements GroupCollectorInterface /** @var array $transaction */ foreach ($group['transactions'] as $transaction) { $currencyId = (int)$transaction['currency_id']; + if(null === $transaction['amount']) { + throw new FireflyException(sprintf('Amount is NULL for a transaction in group #%d, please investigate.', $groudId)); + } // set default: if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) { diff --git a/app/Support/Amount.php b/app/Support/Amount.php index 805a3ab3e0..9055f79117 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -28,7 +28,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\UserGroup; use FireflyIII\User; -use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Support\Collection; use NumberFormatter; @@ -151,6 +150,7 @@ class Amount $default = $userGroup->currencies()->where('group_default', true)->first(); if (null === $default) { $default = $this->getSystemCurrency(); + // could be the user group has no default right now. $userGroup->currencies()->sync([$default->id => ['group_default' => true]]); } $cache->store($default); diff --git a/package-lock.json b/package-lock.json index 5e595ed529..6e8add1966 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1033,16 +1033,13 @@ } }, "node_modules/vite-plugin-full-reload": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/vite-plugin-full-reload/-/vite-plugin-full-reload-1.0.5.tgz", - "integrity": "sha512-kVZFDFWr0DxiHn6MuDVTQf7gnWIdETGlZh0hvTiMXzRN80vgF4PKbONSq8U1d0WtHsKaFODTQgJeakLacoPZEQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/vite-plugin-full-reload/-/vite-plugin-full-reload-1.1.0.tgz", + "integrity": "sha512-3cObNDzX6DdfhD9E7kf6w2mNunFpD7drxyNgHLw+XwIYAgb+Xt16SEXo0Up4VH+TMf3n+DSVJZtW2POBGcBYAA==", "dev": true, "dependencies": { "picocolors": "^1.0.0", "picomatch": "^2.3.1" - }, - "peerDependencies": { - "vite": "^2 || ^3 || ^4" } }, "node_modules/vite-plugin-manifest-sri": { diff --git a/resources/lang/ja_JP/validation.php b/resources/lang/ja_JP/validation.php index 3abe3b0457..8093cc338f 100644 --- a/resources/lang/ja_JP/validation.php +++ b/resources/lang/ja_JP/validation.php @@ -44,7 +44,7 @@ return [ 'invalid_query_currency' => 'クエリには異なる通貨設定の口座を含めることはできません。', 'iban' => '無効なIBANです。', 'zero_or_more' => '数値はマイナスにできません。', - 'no_asset_account' => 'This is not an asset account.', + 'no_asset_account' => 'これは資産口座ではありません。', 'date_or_time' => '数値はISO 8601 準拠の有効な日付や時刻である必要があります。', 'source_equals_destination' => '引き出し口座と預け入れ口座が同じです。', 'unique_account_number_for_user' => 'この口座番号は既に使われているようです。', diff --git a/resources/lang/sl_SI/breadcrumbs.php b/resources/lang/sl_SI/breadcrumbs.php index 8c7cd68108..fc719492e1 100644 --- a/resources/lang/sl_SI/breadcrumbs.php +++ b/resources/lang/sl_SI/breadcrumbs.php @@ -97,7 +97,7 @@ return [ 'logout_others' => 'Odjavi druge seje', 'asset_accounts' => 'Premoženjski računi', 'expense_accounts' => 'Računi stroškov', - 'revenue_accounts' => 'Račun dohodkov', + 'revenue_accounts' => 'Računi prihodkov', 'liabilities_accounts' => 'Obveznosti', 'placeholder' => '[Placeholder]', ]; diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php index ef796fbba3..d657097751 100644 --- a/resources/lang/sl_SI/firefly.php +++ b/resources/lang/sl_SI/firefly.php @@ -85,7 +85,7 @@ return [ 'go_to_expense_accounts' => 'Oglej si račune stroškov', 'go_to_revenue_accounts' => 'Oglej si račune prihodkov', 'go_to_piggies' => 'Na hranilnike', - 'new_deposit' => 'Nov prihodek', + 'new_deposit' => 'Nov polog', 'new_transfer' => 'Nov prenos', 'new_transfers' => 'Nov prenos', 'new_asset_account' => 'Nov račun sredstev', @@ -1812,7 +1812,7 @@ return [ 'details_for_cash' => 'Podrobnosti za gotovinski račun ":name"', 'store_new_asset_account' => 'Shrani nov račun sredstev', 'store_new_expense_account' => 'Shrani nov račun stroškov', - 'store_new_revenue_account' => 'Shranite nov račun prihodkov', + 'store_new_revenue_account' => 'Shrani nov račun prihodkov', 'edit_asset_account' => 'Uredi račun sredstev ":name"', 'edit_expense_account' => 'Uredi račun stroškov ":name"', 'edit_revenue_account' => 'Uredi račun prihodkov ":name"', @@ -1840,8 +1840,8 @@ return [ 'expense_accounts' => 'Računi stroškov', 'expense_accounts_inactive' => 'Računi sredstev (neaktivno)', 'revenue_account' => 'Račun prihodkov', - 'revenue_accounts' => 'Račun prihodkov', - 'revenue_accounts_inactive' => 'Račun prihodkov (neaktivno)', + 'revenue_accounts' => 'Računi prihodkov', + 'revenue_accounts_inactive' => 'Računi prihodkov (neaktivno)', 'cash_accounts' => 'Gotovinski računi', 'Cash account' => 'Gotovinski račun', 'liabilities_accounts' => 'Obveznosti', @@ -2128,7 +2128,7 @@ return [ 'liability_direction_credit' => 'Dolžan sem ta dolg', 'liability_direction_debit' => 'Ta dolg dolgujem nekomu drugemu', 'liability_direction_credit_short' => 'Ta dolg je bil dolgovan', - 'liability_direction_debit_short' => 'Dolgujejo ta dolg', + 'liability_direction_debit_short' => 'Dolgujem', 'liability_direction__short' => 'Neznano', 'liability_direction_null_short' => 'Neznano', 'Liability credit' => 'Kredit za obveznost', @@ -2347,7 +2347,7 @@ return [ 'left_for_piggy_banks' => 'Preostalo za hranilnike', 'sum_of_piggy_banks' => 'Vsota hranilnikov', 'saved_so_far' => 'Privarčevano do sedaj', - 'left_to_save' => 'Preostanek za varčevanje', + 'left_to_save' => 'Preostalo za varčevanje', 'suggested_amount' => 'Predlagani mesečni znesek varčevanja', 'add_money_to_piggy_title' => 'Dodaj denar na hranilnik ":name"', 'remove_money_from_piggy_title' => 'Odstrani denar s hranilnika ":name"', @@ -2604,7 +2604,7 @@ return [ 'no_transactions_imperative_transfers' => 'Ste že premikali denar naokoli? Potem pa to vnesite:', 'no_transactions_create_transfers' => 'Ustvari prenos', 'no_piggies_title_default' => 'Ustvarimo nov hranilnik!', - 'no_piggies_intro_default' => 'Hranilnikov še nimate. Lahko jih ustvarite, da razdelite svoje prihranke in spremljate, za kaj varčujete.', + 'no_piggies_intro_default' => 'Nimate še hranilnikov. Lahko jih ustvarite, da razdelite svoje prihranke in spremljate, za kaj varčujete.', 'no_piggies_imperative_default' => 'Ali imate stvari za katere varčujete? Ustvarite hranilnik in z njim sledite varčevanju:', 'no_piggies_create_default' => 'Ustvari nov hranilnik', 'no_bills_title_default' => 'Ustvari nov račun!', diff --git a/resources/lang/sl_SI/form.php b/resources/lang/sl_SI/form.php index a9b3a87431..46bb053c27 100644 --- a/resources/lang/sl_SI/form.php +++ b/resources/lang/sl_SI/form.php @@ -209,7 +209,7 @@ return [ 'bill_keep_transactions' => 'Edina transakcija, ki je povezana s tem računom, ne izbrisana.|Vseh :count transakcij, povezanih s tem računom, ne bo izbrisanih.', 'budget_keep_transactions' => 'Edina transakcija, povezana s tem proračunom, ne izbrisana.|Vseh :count transakcij, povezanih s tem proračunom, bo ohranjenih.', 'category_keep_transactions' => 'Edina transakcija, povezana s to kategorijo, ne bo izbrisana.|Vseh :count transakcij, povezanih s to kategorijo bo ohranjenih.', - 'recurring_keep_transactions' => 'Edina transakcija, ustvarjeno s to ponavljajočo transakcijo, ne izbrisana.|Vseh :count transakcij, ustvarjenih s to ponavljajočo transakcijo bo ohranjenih.', + 'recurring_keep_transactions' => 'Edina transakcija, ustvarjena s to ponavljajočo transakcijo, ne izbrisana.|Vseh :count transakcij, ustvarjenih s to ponavljajočo transakcijo bo ohranjenih.', 'tag_keep_transactions' => 'Edina transakcija, povezana s to oznako, ne bo izbrisana.|Vseh :count transakcij, povezanih s to oznako bo ohranjenih.', 'check_for_updates' => 'Preveri za posodobitve', 'liability_direction' => 'Odgovornost not/ven',