Compare commits

..

6 Commits

Author SHA1 Message Date
github-actions[bot]
62c676157f Merge pull request #11565 from firefly-iii/release-1768939166
🤖 Automatically merge the PR into the develop branch.
2026-01-20 20:59:34 +01:00
JC5
24df659ecb 🤖 Auto commit for release 'develop' on 2026-01-20 2026-01-20 20:59:26 +01:00
James Cole
9180cdbc66 Add error box. 2026-01-20 20:55:35 +01:00
github-actions[bot]
7a6245f246 Merge pull request #11564 from firefly-iii/release-1768934499
🤖 Automatically merge the PR into the develop branch.
2026-01-20 19:41:46 +01:00
JC5
e156a4eedc 🤖 Auto commit for release 'develop' on 2026-01-20 2026-01-20 19:41:39 +01:00
James Cole
c63fead216 Add jquery. 2026-01-20 19:37:11 +01:00
6 changed files with 85 additions and 71 deletions

69
composer.lock generated
View File

@@ -1878,16 +1878,16 @@
},
{
"name": "laravel/framework",
"version": "v12.47.0",
"version": "v12.48.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "ab8114c2e78f32e64eb238fc4b495bea3f8b80ec"
"reference": "0f0974a9769378ccd9c9935c09b9927f3a606830"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/ab8114c2e78f32e64eb238fc4b495bea3f8b80ec",
"reference": "ab8114c2e78f32e64eb238fc4b495bea3f8b80ec",
"url": "https://api.github.com/repos/laravel/framework/zipball/0f0974a9769378ccd9c9935c09b9927f3a606830",
"reference": "0f0974a9769378ccd9c9935c09b9927f3a606830",
"shasum": ""
},
"require": {
@@ -2000,7 +2000,7 @@
"league/flysystem-sftp-v3": "^3.25.1",
"mockery/mockery": "^1.6.10",
"opis/json-schema": "^2.4.1",
"orchestra/testbench-core": "^10.8.1",
"orchestra/testbench-core": "^10.9.0",
"pda/pheanstalk": "^5.0.6|^7.0.0",
"php-http/discovery": "^1.15",
"phpstan/phpstan": "^2.0",
@@ -2096,7 +2096,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2026-01-13T15:29:06+00:00"
"time": "2026-01-20T16:12:36+00:00"
},
{
"name": "laravel/passport",
@@ -2235,16 +2235,16 @@
},
{
"name": "laravel/sanctum",
"version": "v4.2.3",
"version": "v4.2.4",
"source": {
"type": "git",
"url": "https://github.com/laravel/sanctum.git",
"reference": "47d26f1d310879ff757b971f5a6fc631d18663fd"
"reference": "dadd2277ff0f05cdb435c8b6a0bcedcf3b5519a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/sanctum/zipball/47d26f1d310879ff757b971f5a6fc631d18663fd",
"reference": "47d26f1d310879ff757b971f5a6fc631d18663fd",
"url": "https://api.github.com/repos/laravel/sanctum/zipball/dadd2277ff0f05cdb435c8b6a0bcedcf3b5519a9",
"reference": "dadd2277ff0f05cdb435c8b6a0bcedcf3b5519a9",
"shasum": ""
},
"require": {
@@ -2294,7 +2294,7 @@
"issues": "https://github.com/laravel/sanctum/issues",
"source": "https://github.com/laravel/sanctum"
},
"time": "2026-01-11T18:20:25+00:00"
"time": "2026-01-15T14:37:16+00:00"
},
{
"name": "laravel/serializable-closure",
@@ -6282,38 +6282,39 @@
},
{
"name": "spatie/laravel-ignition",
"version": "2.9.1",
"version": "2.10.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-ignition.git",
"reference": "1baee07216d6748ebd3a65ba97381b051838707a"
"reference": "2abefdcca6074a9155f90b4ccb3345af8889d5f5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/1baee07216d6748ebd3a65ba97381b051838707a",
"reference": "1baee07216d6748ebd3a65ba97381b051838707a",
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/2abefdcca6074a9155f90b4ccb3345af8889d5f5",
"reference": "2abefdcca6074a9155f90b4ccb3345af8889d5f5",
"shasum": ""
},
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"illuminate/support": "^10.0|^11.0|^12.0",
"php": "^8.1",
"spatie/ignition": "^1.15",
"symfony/console": "^6.2.3|^7.0",
"symfony/var-dumper": "^6.2.3|^7.0"
"illuminate/support": "^11.0|^12.0",
"nesbot/carbon": "^2.72|^3.0",
"php": "^8.2",
"spatie/ignition": "^1.15.1",
"symfony/console": "^7.4|^8.0",
"symfony/var-dumper": "^7.4|^8.0"
},
"require-dev": {
"livewire/livewire": "^2.11|^3.3.5",
"mockery/mockery": "^1.5.1",
"openai-php/client": "^0.8.1|^0.10",
"orchestra/testbench": "8.22.3|^9.0|^10.0",
"pestphp/pest": "^2.34|^3.7",
"phpstan/extension-installer": "^1.3.1",
"phpstan/phpstan-deprecation-rules": "^1.1.1|^2.0",
"phpstan/phpstan-phpunit": "^1.3.16|^2.0",
"vlucas/phpdotenv": "^5.5"
"livewire/livewire": "^3.7.0|^4.0",
"mockery/mockery": "^1.6.12",
"openai-php/client": "^0.10.3",
"orchestra/testbench": "^v9.16.0|^10.6",
"pestphp/pest": "^3.7|^4.0",
"phpstan/extension-installer": "^1.4.3",
"phpstan/phpstan-deprecation-rules": "^2.0.3",
"phpstan/phpstan-phpunit": "^2.0.8",
"vlucas/phpdotenv": "^5.6.2"
},
"suggest": {
"openai-php/client": "Require get solutions from OpenAI",
@@ -6369,7 +6370,7 @@
"type": "github"
}
],
"time": "2025-02-20T13:13:55+00:00"
"time": "2026-01-20T13:16:11+00:00"
},
{
"name": "spatie/period",
@@ -11302,11 +11303,11 @@
},
{
"name": "phpstan/phpstan",
"version": "2.1.34",
"version": "2.1.35",
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/070ba754a949fcade788e16e8dc5a5935b7cf2ee",
"reference": "070ba754a949fcade788e16e8dc5a5935b7cf2ee",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/72f843c7f59d3aac0b7510f5e70913a9b72a8e88",
"reference": "72f843c7f59d3aac0b7510f5e70913a9b72a8e88",
"shasum": ""
},
"require": {
@@ -11351,7 +11352,7 @@
"type": "github"
}
],
"time": "2026-01-19T19:52:16+00:00"
"time": "2026-01-20T17:33:48+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",

View File

@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-01-20',
'build_time' => 1768884917,
'build_time' => 1768939064,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.

24
package-lock.json generated
View File

@@ -4131,9 +4131,9 @@
"license": "MIT"
},
"node_modules/baseline-browser-mapping": {
"version": "2.9.15",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.15.tgz",
"integrity": "sha512-kX8h7K2srmDyYnXRIppo4AH/wYgzWVCs+eKr3RusRSQ5PvRYoEFmR/I0PbdTjKFAoKqp5+kbxnNTFO9jOfSVJg==",
"version": "2.9.16",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.16.tgz",
"integrity": "sha512-KeUZdBuxngy825i8xvzaK1Ncnkx0tBmb3k8DkEuqjKRkmtvNTjey2ZsNeh8Dw4lfKvbCOu9oeNx2TKm2vHqcRw==",
"dev": true,
"license": "Apache-2.0",
"bin": {
@@ -7104,9 +7104,9 @@
}
},
"node_modules/i18next": {
"version": "25.7.4",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-25.7.4.tgz",
"integrity": "sha512-hRkpEblXXcXSNbw8mBNq9042OEetgyB/ahc/X17uV/khPwzV+uB8RHceHh3qavyrkPJvmXFKXME2Sy1E0KjAfw==",
"version": "25.8.0",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.0.tgz",
"integrity": "sha512-urrg4HMFFMQZ2bbKRK7IZ8/CTE7D8H4JRlAwqA2ZwDRFfdd0K/4cdbNNLgfn9mo+I/h9wJu61qJzH7jCFAhUZQ==",
"funding": [
{
"type": "individual",
@@ -7135,9 +7135,9 @@
}
},
"node_modules/i18next-chained-backend": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/i18next-chained-backend/-/i18next-chained-backend-5.0.1.tgz",
"integrity": "sha512-J2DZFvvJOrrfHPnTWMUm758+Da8J7JZXaOlo7dWgN+Vtkl4pH/0gy+i+iDFp+wkRVy6SbK6Ef57DQTbBBlOhaQ==",
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/i18next-chained-backend/-/i18next-chained-backend-5.0.2.tgz",
"integrity": "sha512-PiTQAfAfXldDXRl2m+mHXxbqV94rloxX0Sb++da/EmJdHoiNEwlT4BtFoUhjsm7lrJ62mtgbwglENrFH2lUNow==",
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.28.4"
@@ -7854,9 +7854,9 @@
}
},
"node_modules/laravel-vite-plugin": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-2.0.1.tgz",
"integrity": "sha512-zQuvzWfUKQu9oNVi1o0RZAJCwhGsdhx4NEOyrVQwJHaWDseGP9tl7XUPLY2T8Cj6+IrZ6lmyxlR1KC8unf3RLA==",
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-2.1.0.tgz",
"integrity": "sha512-z+ck2BSV6KWtYcoIzk9Y5+p4NEjqM+Y4i8/H+VZRLq0OgNjW2DqyADquwYu5j8qRvaXwzNmfCWl1KrMlV1zpsg==",
"dev": true,
"license": "MIT",
"dependencies": {

View File

@@ -1,18 +1,18 @@
{
"firefly": {
"administrations_page_title": "Financial administrations",
"administrations_index_menu": "Financial administrations",
"administrations_page_title": "\uc7a5\ubd80 \uad00\ub9ac",
"administrations_index_menu": "\uc7a5\ubd80 \uad00\ub9ac",
"expires_at": "Expires at",
"temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its primary currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
"administration_currency_form_help": "It may take a long time for the page to load if you change the primary currency because transaction may need to be converted to your (new) primary currency.",
"administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
"temp_administrations_introduction": "\uace7 Firefly III\uc5d0\uc11c \uc5ec\ub7ec \uac1c\uc758 \uc7a5\ubd80\ub97c \ub9cc\ub4e4\uc5b4 \uad00\ub9ac\ud560 \uc218 \uc788\ub294 \uae30\ub2a5\uc774 \ucd94\uac00\ub429\ub2c8\ub2e4. \uc9c0\uae08\uc740 \ud558\ub098\uc758 \uc7a5\ubd80\ub9cc \uc0ac\uc6a9\ud558\uc2e4 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \uac01 \uc7a5\ubd80\uc758 \uc774\ub984\uacfc \uae30\uc900 \ud1b5\ud654\ub97c \uc124\uc815\ud560 \uc218 \uc788\uc73c\uba70, \uc774 \uc124\uc815\uc740 \uae30\uc874\uc758 \"\uae30\ubcf8 \ud1b5\ud654\" \uc124\uc815\uc744 \ub300\uccb4\ud558\uac8c \ub429\ub2c8\ub2e4. \uc774\uc81c \ud1b5\ud654 \uc124\uc815\uc740 \uac01 \uc7a5\ubd80\uc5d0 \uc885\uc18d\ub418\uba70, \uc7a5\ubd80\ub9c8\ub2e4 \uc11c\ub85c \ub2e4\ub978 \ud1b5\ud654\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
"administration_currency_form_help": "\uae30\uc900 \ud1b5\ud654 \ubcc0\uacbd\uc2dc \uac70\ub798 \ub0b4\uc5ed\uc744 \uc0c8 \uae30\uc900 \ud1b5\ud654\uc5d0 \ub9de\ucdb0 \ubcc0\ud658\ud558\ub294 \uc791\uc5c5\uc744 \uc9c4\ud589\ud569\ub2c8\ub2e4. \ub530\ub77c\uc11c \ud398\uc774\uc9c0\ub97c \ubd88\ub7ec\uc624\ub294 \ub370 \ub9ce\uc740 \uc2dc\uac04\uc774 \uc18c\uc694\ub420 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
"administrations_page_edit_sub_title_js": "\uc7a5\ubd80 \"{title}\" \uc218\uc815",
"table": "\ud45c",
"welcome_back": "\ubb34\uc2a8 \uc77c\uc774\uc8e0?",
"flash_error": "\uc624\ub958!",
"flash_warning": "\uacbd\uace0!",
"flash_success": "\uc131\uacf5!",
"close": "\ub2eb\uae30",
"select_dest_account": "\uc720\ud6a8\ud55c \ub300\uc0c1 \uacc4\uc815 \ub0b4\uc5ed\uc744 \uc120\ud0dd \ub610\ub294 \ud0c0\uc785\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.",
"select_dest_account": "\uc720\ud6a8\ud55c \ubaa9\uc801\uc9c0 \uacc4\uc815 \ub0b4\uc5ed\uc744 \uc120\ud0dd\ud558\uac70\ub098 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
"select_source_account": "\uc720\ud6a8\ud55c \uc18c\uc2a4 \uacc4\uc815 \ub0b4\uc5ed\uc744 \uc120\ud0dd \ub610\ub294 \ud0c0\uc785\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.",
"split_transaction_title": "\ubd84\ud560 \uac70\ub798\uc5d0 \ub300\ud55c \uc124\uba85",
"errors_submission": "\uc81c\ucd9c\ud55c \ub0b4\uc6a9\uc5d0 \ubb38\uc81c\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc544\ub798 \uc624\ub958\ub97c \ud655\uc778\ud574 \uc8fc\uc138\uc694.",
@@ -20,7 +20,7 @@
"split": "\ub098\ub204\uae30",
"single_split": "\ub098\ub204\uae30",
"not_enough_currencies": "Not enough currencies",
"not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
"not_enough_currencies_enabled": "\ub2e8 \ud558\ub098\uc758 \ud654\ud3d0\ub97c \ud65c\uc131\ud654 \ud588\ub2e4\uba74, \ud658\uc728 \uc815\ubcf4\ub97c \ucd94\uac00\ud560 \ud544\uc694\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.",
"transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\uac70\ub798 #{ID} (\"{title}\")<\/a>\uac00 \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
"webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">\uc6f9\ud6c5 #{ID} (\"{title}\")<\/a>\uc774 \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
"webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">\uc6f9\ud6c5 #{ID}<\/a> (\"{title}\")\uc774 \uc5c5\ub370\uc774\ud2b8 \ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
@@ -31,10 +31,10 @@
"apply_rules_checkbox": "\uaddc\uce59 \uc801\uc6a9",
"fire_webhooks_checkbox": "\uc6f9\ud6c5 \uc2e4\ud589",
"no_budget_pointer": "\uc608\uc0b0\uc774 \uc544\uc9c1 \uc5c6\ub294 \uac83 \uac19\uc2b5\ub2c8\ub2e4. <a href=\"budgets\">\uc608\uc0b0<\/a> \ud398\uc774\uc9c0\uc5d0\uc11c \uc608\uc0b0\uc744 \ub9cc\ub4e4\uc5b4\uc57c \ud569\ub2c8\ub2e4. \uc608\uc0b0\uc740 \uc9c0\ucd9c\uc744 \ucd94\uc801\ud558\ub294\ub370 \ub3c4\uc6c0\uc774 \ub429\ub2c8\ub2e4.",
"no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
"source_account": "\uc18c\uc2a4 \uacc4\uc815",
"no_bill_pointer": "\uc544\uc9c1 \uad6c\ub3c5\uc744 \ub4f1\ub85d\ud558\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4. <a href=\"subscriptions\">\uad6c\ub3c5 \ud398\uc774\uc9c0<\/a>\uc5d0\uc11c \uc0dd\uc131\ud558\uc2ed\uc2dc\uc624. \uc774 \uad6c\ub3c5 \ucd94\uc801 \uae30\ub2a5\uc740 \uc9c0\ucd9c \ub0b4\uc5ed\uc744 \ud30c\uc545\ud558\ub294 \ub370 \ub3c4\uc6c0\uc774 \ub429\ub2c8\ub2e4.",
"source_account": "\ucd9c\ubc1c\uc9c0 \uacc4\uc815",
"hidden_fields_preferences": "<a href=\"preferences\">\ud658\uacbd\uc124\uc815<\/a>\uc5d0\uc11c \ub354 \ub9ce\uc740 \uac70\ub798 \uc635\uc158\uc744 \ud65c\uc131\ud654\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
"destination_account": "\ub300\uc0c1 \uacc4\uc815",
"destination_account": "\ubaa9\uc801\uc9c0 \uacc4\uc815",
"add_another_split": "\ub2e4\ub978 \ubd84\ud560 \ucd94\uac00",
"submission": "\uc81c\ucd9c",
"stored_journal": "\uc0c8\ub85c\uc6b4 \":description\" \uac70\ub798 \uc0dd\uc131 \uc131\uacf5",
@@ -59,8 +59,8 @@
"no_piggy_bank": "(\uc800\uae08\ud1b5 \uc5c6\uc74c)",
"description": "\uc124\uba85",
"split_transaction_title_help": "\ubd84\ud560 \uac70\ub798\ub97c \uc0dd\uc131\ud558\ub294 \uacbd\uc6b0 \uac70\ub798\uc758 \ubaa8\ub4e0 \ubd84\ud560\uc5d0 \ub300\ud55c \uc804\uccb4 \uc124\uba85\uc774 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4.",
"destination_account_reconciliation": "\uc870\uc815 \uac70\ub798\uc758 \ub300\uc0c1 \uacc4\uc815\uc740 \ud3b8\uc9d1\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
"source_account_reconciliation": "\uc870\uc815 \uac70\ub798\uc758 \uc18c\uc2a4 \uacc4\uc815\uc740 \ud3b8\uc9d1\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
"destination_account_reconciliation": "\uc870\uc815 \uac70\ub798\uc758 \ubaa9\uc801\uc9c0 \uacc4\uc815\uc740 \ud3b8\uc9d1\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
"source_account_reconciliation": "\uc870\uc815 \uac70\ub798\uc758 \ucd9c\ubc1c\uc9c0 \uacc4\uc815\uc740 \ud3b8\uc9d1\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
"budget": "\uc608\uc0b0",
"bill": "Subscription",
"you_create_withdrawal": "\ucd9c\uae08\uc744 \uc0dd\uc131\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4.",
@@ -103,10 +103,10 @@
"profile_oauth_client_secret_expl": "\ub2e4\uc74c\uc740 \uc0c8 \ud074\ub77c\uc774\uc5b8\ud2b8 \uc554\ud638\uc785\ub2c8\ub2e4. \uc774\ubc88 \ud55c \ubc88\ub9cc \ud45c\uc2dc\ub418\ub2c8 \ub193\uce58\uc9c0 \ub9c8\uc138\uc694! \uc774\uc81c \uc774 \ube44\ubc00 \ubc88\ud638\ub97c \uc0ac\uc6a9\ud558\uc5ec API \uc694\uccad\uc744 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
"profile_oauth_confidential": "\ube44\ubc00",
"profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
"multi_account_warning_unknown": "\uc0dd\uc131\ud55c \uac70\ub798 \uc720\ud615\uc5d0 \ub530\ub77c \ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \uc18c\uc2a4 \ubc0f\/\ub610\ub294 \ub300\uc0c1 \uacc4\uc815\uc740 \ub300\uc0c1 \uacc4\uc815 \uac70\ub798\uc758 \uccab \ubc88\uc9f8 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \ubb34\uc2dc\ub420 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
"multi_account_warning_unknown": "\uc0dd\uc131\ud55c \uac70\ub798 \uc720\ud615\uc5d0 \ub530\ub77c \ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \ucd9c\ubc1c\uc9c0 \ubc0f\/\ub610\ub294 \ubaa9\uc801\uc9c0 \uacc4\uc815\uc740 \ubaa9\uc801\uc9c0 \uacc4\uc815 \uac70\ub798\uc758 \uccab \ubc88\uc9f8 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \ubb34\uc2dc\ub420 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
"multi_account_warning_withdrawal": "\ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \uc18c\uc2a4 \uacc4\uc815\uc740 \uccab \ubc88\uc9f8 \ucd9c\uae08 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \uc7ac\uc815\uc758\ub41c\ub2e4\ub294 \uc810\uc5d0 \uc720\uc758\ud558\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4.",
"multi_account_warning_deposit": "\ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \ub300\uc0c1 \uacc4\uc815\uc740 \uccab \ubc88\uc9f8 \uc785\uae08 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \uc7ac\uc815\uc758\ub41c\ub2e4\ub294 \uc810\uc5d0 \uc720\uc758\ud558\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4.",
"multi_account_warning_transfer": "\ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \uc18c\uc2a4 + \ub300\uc0c1 \uacc4\uc815\uc740 \uccab \ubc88\uc9f8 \uc774\uccb4 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \uc7ac\uc815\uc758\ub41c\ub2e4\ub294 \uc810\uc5d0 \uc720\uc758\ud558\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4.",
"multi_account_warning_deposit": "\ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \ubaa9\uc801\uc9c0 \uacc4\uc815\uc740 \uccab \ubc88\uc9f8 \uc785\uae08 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \uc7ac\uc815\uc758\ub41c\ub2e4\ub294 \uc810\uc5d0 \uc720\uc758\ud558\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4.",
"multi_account_warning_transfer": "\ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \ucd9c\ubc1c\uc9c0\uc640 \ubaa9\uc801\uc9c0 \uacc4\uc815\uc740 \uccab \ubc88\uc9f8 \uc774\uccb4 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \uc7ac\uc815\uc758\ub41c\ub2e4\ub294 \uc810\uc5d0 \uc720\uc758\ud558\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4.",
"webhook_trigger_ANY": "After any event",
"webhook_trigger_STORE_TRANSACTION": "\uac70\ub798 \uc0dd\uc131 \uc774\ud6c4",
"webhook_trigger_UPDATE_TRANSACTION": "\uac70\ub798 \uc5c5\ub370\uc774\ud2b8 \uc774\ud6c4",
@@ -146,12 +146,12 @@
"response": "\uc751\ub2f5",
"visit_webhook_url": "\uc6f9\ud6c5 URL \ubc29\ubb38",
"reset_webhook_secret": "\uc6f9\ud6c5 \uc2dc\ud06c\ub9bf \uc7ac\uc124\uc815",
"header_exchange_rates": "Exchange rates",
"exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
"exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
"exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
"header_exchange_rates_rates": "Exchange rates",
"header_exchange_rates_table": "Table with exchange rates",
"header_exchange_rates": "\ud658\uc728",
"exchange_rates_intro": "Firefly III\ub294 \ud658\uc728 \uc790\ub8cc\ub97c \ub0b4\ub824\ubc1b\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \ub354 \uc790\uc138\ud55c \uc815\ubcf4\ub294 <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">\uc774 \ubb38\uc11c<\/a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624.",
"exchange_rates_from_to": "{from} \u2194 {to} \ud658\uc728",
"exchange_rates_intro_rates": "Firefly III\ub294 \uc544\ub798\uc758 \ud658\uc728 \uc815\ubcf4\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4. \ubc18\ub300 \ubc29\ud5a5\uc758 \ud658\uc728 \uc815\ubcf4\uac00 \uc785\ub825\ub418\uc9c0 \uc54a\uc558\ub2e4\uba74, \uc774 \uac12\uc744 \uae30\uc900\uc73c\ub85c \uc790\ub3d9\uc73c\ub85c \uacc4\uc0b0\ud569\ub2c8\ub2e4. \ud2b9\uc815 \uac70\ub798 \ub0b4\uc5ed\uc5d0 \ub300\ud558\uc5ec \ud574\ub2f9 \uc77c\uc790\uc758 \ud658\uc728 \ub370\uc774\ud130\uac00 \uc5c6\ub2e4\uba74, \uacfc\uac70 \uae30\ub85d \uc911 \uac00\uc7a5 \ucd5c\uadfc\uc758 \ud658\uc728\uc744 \ucc3e\uc544 \uc801\uc6a9\ud569\ub2c8\ub2e4. \ub9cc\uc57d \ucc38\uc870\ud560 \uc218 \uc788\ub294 \ud658\uc728 \ub370\uc774\ud130\uac00 \uc804\ud600 \uc5c6\ub2e4\uba74, \ud658\uc728\uc744 '1'\ub85c \uac04\uc8fc\ud558\uc5ec \uacc4\uc0b0\ud569\ub2c8\ub2e4.",
"header_exchange_rates_rates": "\ud658\uc728",
"header_exchange_rates_table": "\ud658\uc728\ud45c",
"help_rate_form": "On this day, how many {to} will you get for one {from}?",
"add_new_rate": "Add a new exchange rate",
"save_new_rate": "Save new rate"
@@ -160,7 +160,7 @@
"url": "URL",
"active": "\ud65c\uc131",
"interest_date": "\uc774\uc790 \ub0a0\uc9dc",
"administration_currency": "Primary currency",
"administration_currency": "\uae30\uc900 \ud1b5\ud654",
"title": "\uc81c\ubaa9",
"date": "\ub0a0\uc9dc",
"book_date": "\uc608\uc57d\uc77c",
@@ -175,12 +175,12 @@
"webhook_delivery": "\uc804\ub2ec",
"from_currency_to_currency": "{from} &rarr; {to}",
"to_currency_from_currency": "{to} &rarr; {from}",
"rate": "Rate"
"rate": "\ud658\uc728"
},
"list": {
"title": "\uc81c\ubaa9",
"active": "\ud65c\uc131 \uc0c1\ud0dc\uc785\ub2c8\uae4c?",
"primary_currency": "Primary currency",
"primary_currency": "\uae30\uc900 \ud1b5\ud654",
"trigger": "\ud2b8\ub9ac\uac70",
"response": "\uc751\ub2f5",
"delivery": "\uc804\ub2ec",

View File

@@ -24,6 +24,18 @@
aria-expanded="false">{{ 'preferences_notifications'|_ }}</a></li>
</ul>
<div class="tab-content">
{% if errors.any %}
<div class="alert alert-danger" role="alert">
<ul>
{% for bag in errors.getBags %}
{% for error in bag.all %}
<li>{{ error }}</li>
{% endfor %}
{% endfor %}
</ul>
</div>
{% endif %}
<div class="tab-pane active" id="general">
{# general settings here #}
<div class="row">

View File

@@ -593,6 +593,7 @@
return false
}
</script>
<script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}"
nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/show.js?v={{ FF_BUILD_TIME }}"