diff --git a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
index 5a757dd35f..ee19f22b16 100644
--- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
+++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
@@ -66,9 +66,9 @@ class PiggyBankController extends Controller
*/
public function piggyBanks(AutocompleteRequest $request): JsonResponse
{
- $data = $request->getData();
- $piggies = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
- $response = [];
+ $data = $request->getData();
+ $piggies = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
+ $response = [];
/** @var PiggyBank $piggy */
foreach ($piggies as $piggy) {
@@ -96,9 +96,9 @@ class PiggyBankController extends Controller
*/
public function piggyBanksWithBalance(AutocompleteRequest $request): JsonResponse
{
- $data = $request->getData();
- $piggies = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
- $response = [];
+ $data = $request->getData();
+ $piggies = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
+ $response = [];
/** @var PiggyBank $piggy */
foreach ($piggies as $piggy) {
diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.php
index f1f41e5905..8296d0ee68 100644
--- a/app/Api/V1/Controllers/Data/DestroyController.php
+++ b/app/Api/V1/Controllers/Data/DestroyController.php
@@ -63,8 +63,8 @@ class DestroyController extends Controller
*/
public function destroy(DestroyRequest $request): JsonResponse
{
- $objects = $request->getObjects();
- $this->unused = $request->boolean('unused', false);
+ $objects = $request->getObjects();
+ $this->unused = $request->boolean('unused', false);
$allExceptAssets = [AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::RECONCILIATION, AccountType::REVENUE];
$all = [AccountType::ASSET, AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEBT, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::RECONCILIATION];
@@ -101,11 +101,11 @@ class DestroyController extends Controller
private function destroyBudgets(): void
{
/** @var AvailableBudgetRepositoryInterface $abRepository */
- $abRepository = app(AvailableBudgetRepositoryInterface::class);
+ $abRepository = app(AvailableBudgetRepositoryInterface::class);
$abRepository->destroyAll();
/** @var BudgetLimitRepositoryInterface $blRepository */
- $blRepository = app(BudgetLimitRepositoryInterface::class);
+ $blRepository = app(BudgetLimitRepositoryInterface::class);
$blRepository->destroyAll();
/** @var BudgetRepositoryInterface $budgetRepository */
diff --git a/app/Api/V1/Controllers/Data/PurgeController.php b/app/Api/V1/Controllers/Data/PurgeController.php
index d80b60315b..39c7826528 100644
--- a/app/Api/V1/Controllers/Data/PurgeController.php
+++ b/app/Api/V1/Controllers/Data/PurgeController.php
@@ -53,7 +53,7 @@ class PurgeController extends Controller
public function purge(): JsonResponse
{
/** @var User $user */
- $user = auth()->user();
+ $user = auth()->user();
// some manual code, too lazy to call all repositories.
@@ -67,14 +67,14 @@ class PurgeController extends Controller
$repository = app(PiggyBankRepositoryInterface::class);
$repository->setUser($user);
$repository->purgeAll();
-// $set = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
-// ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
-// ;
-//
-// /** @var PiggyBank $piggy */
-// foreach ($set as $piggy) {
-// $piggy->forceDelete();
-// }
+ // $set = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
+ // ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
+ // ;
+ //
+ // /** @var PiggyBank $piggy */
+ // foreach ($set as $piggy) {
+ // $piggy->forceDelete();
+ // }
// rule group
RuleGroup::whereUserId($user->id)->onlyTrashed()->forceDelete();
diff --git a/app/Api/V1/Controllers/Insight/Expense/BillController.php b/app/Api/V1/Controllers/Insight/Expense/BillController.php
index 7fb26fda2b..2a764e0884 100644
--- a/app/Api/V1/Controllers/Insight/Expense/BillController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/BillController.php
@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Illuminate\Http\JsonResponse;
diff --git a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php
index 3a0c13b51b..a9d80e935d 100644
--- a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php
@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
use Illuminate\Http\JsonResponse;
/**
diff --git a/app/Api/V1/Controllers/Insight/Expense/TagController.php b/app/Api/V1/Controllers/Insight/Expense/TagController.php
index c13982f10b..093954ac45 100644
--- a/app/Api/V1/Controllers/Insight/Expense/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Expense/TagController.php
@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Http\JsonResponse;
diff --git a/app/Api/V1/Controllers/Insight/Income/PeriodController.php b/app/Api/V1/Controllers/Insight/Income/PeriodController.php
index 2b96c7b010..f71c21fa14 100644
--- a/app/Api/V1/Controllers/Insight/Income/PeriodController.php
+++ b/app/Api/V1/Controllers/Insight/Income/PeriodController.php
@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
use Illuminate\Http\JsonResponse;
/**
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php
index f8f6b6ac60..39dcd4a0f1 100644
--- a/app/Api/V1/Controllers/Insight/Income/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php
@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Http\JsonResponse;
diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
index 6f4cd02427..5da7d3050c 100644
--- a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php
@@ -72,14 +72,14 @@ class StoreController extends Controller
$data['notes'] = $data['notes'];
$data['budget_id'] = $budget->id;
- $budgetLimit = $this->blRepository->store($data);
- $manager = $this->getManager();
+ $budgetLimit = $this->blRepository->store($data);
+ $manager = $this->getManager();
/** @var BudgetLimitTransformer $transformer */
- $transformer = app(BudgetLimitTransformer::class);
+ $transformer = app(BudgetLimitTransformer::class);
$transformer->setParameters($this->parameters);
- $resource = new Item($budgetLimit, $transformer, 'budget_limits');
+ $resource = new Item($budgetLimit, $transformer, 'budget_limits');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.php
index 05ffbd58d6..f1021ad5ec 100644
--- a/app/Api/V1/Controllers/Summary/BasicController.php
+++ b/app/Api/V1/Controllers/Summary/BasicController.php
@@ -32,7 +32,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Report\NetWorthInterface;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
-use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
diff --git a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
index 08f2a160be..16814d24a6 100644
--- a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php
@@ -53,10 +53,11 @@ class UpdateRequest extends FormRequest
'currency_code' => ['currency_code', 'convertString'],
'notes' => ['notes', 'stringWithNewlines'],
];
- if(false === $this->has('notes')) {
+ if (false === $this->has('notes')) {
// ignore notes, not submitted.
unset($fields['notes']);
}
+
return $this->getAllData($fields);
}
diff --git a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
index 2566cfe8ba..5b1917d21b 100644
--- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
@@ -27,7 +27,6 @@ namespace FireflyIII\Api\V1\Requests\Models\PiggyBank;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Rules\IsValidPositiveAmount;
use FireflyIII\Rules\IsValidZeroOrMoreAmount;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -96,9 +95,9 @@ class StoreRequest extends FormRequest
$validator->after(
function (Validator $validator): void {
// validate start before end only if both are there.
- $data = $validator->getData();
- $currency = $this->getCurrencyFromData($data);
- $targetAmount = (string) ($data['target_amount'] ?? '0');
+ $data = $validator->getData();
+ $currency = $this->getCurrencyFromData($data);
+ $targetAmount = (string) ($data['target_amount'] ?? '0');
$currentAmount = '0';
if (array_key_exists('accounts', $data) && is_array($data['accounts'])) {
$repository = app(AccountRepositoryInterface::class);
@@ -110,18 +109,18 @@ class StoreRequest extends FormRequest
// check currency here.
$accountCurrency = $repository->getAccountCurrency($account);
$isMultiCurrency = $repository->getMetaValue($account, 'is_multi_currency');
- $currentAmount = bcadd($currentAmount, (string)($array['current_amount'] ?? '0'));
+ $currentAmount = bcadd($currentAmount, (string)($array['current_amount'] ?? '0'));
if ($accountCurrency->id !== $currency->id && 'true' !== $isMultiCurrency) {
$validator->errors()->add(sprintf('accounts.%d', $index), trans('validation.invalid_account_currency'));
}
- $type = $account->accountType->type;
+ $type = $account->accountType->type;
if (!in_array($type, $types, true)) {
$validator->errors()->add(sprintf('accounts.%d', $index), trans('validation.invalid_account_type'));
}
}
}
}
- if(bccomp($targetAmount, $currentAmount) === -1 && bccomp($targetAmount, '0') === 1) {
+ if (-1 === bccomp($targetAmount, $currentAmount) && 1 === bccomp($targetAmount, '0')) {
$validator->errors()->add('target_amount', trans('validation.current_amount_too_much'));
}
}
@@ -146,6 +145,7 @@ class StoreRequest extends FormRequest
'current_amount' => $this->clearString((string) ($entry['current_amount'] ?? '0')),
];
}
+
return $return;
}
@@ -163,6 +163,7 @@ class StoreRequest extends FormRequest
return $currency;
}
}
+
throw new FireflyException('Unexpected empty currency.');
}
}
diff --git a/app/Api/V2/Controllers/Chart/BalanceController.php b/app/Api/V2/Controllers/Chart/BalanceController.php
index eb5e8270ed..91af9acb40 100644
--- a/app/Api/V2/Controllers/Chart/BalanceController.php
+++ b/app/Api/V2/Controllers/Chart/BalanceController.php
@@ -30,7 +30,6 @@ use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
use FireflyIII\Support\Chart\ChartData;
use FireflyIII\Support\Http\Api\AccountBalanceGrouped;
diff --git a/app/Api/V2/Controllers/Chart/CategoryController.php b/app/Api/V2/Controllers/Chart/CategoryController.php
index 5515aabdf6..af0c2d1e89 100644
--- a/app/Api/V2/Controllers/Chart/CategoryController.php
+++ b/app/Api/V2/Controllers/Chart/CategoryController.php
@@ -31,7 +31,6 @@ use FireflyIII\Enums\TransactionTypeEnum;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\AccountType;
-use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\Http\Api\CleansChartData;
diff --git a/app/Api/V2/Controllers/Summary/BasicController.php b/app/Api/V2/Controllers/Summary/BasicController.php
index 382d019832..3d84a3f77b 100644
--- a/app/Api/V2/Controllers/Summary/BasicController.php
+++ b/app/Api/V2/Controllers/Summary/BasicController.php
@@ -33,7 +33,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Report\NetWorthInterface;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
-use FireflyIII\Models\TransactionType;
use FireflyIII\Models\UserGroup;
use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
diff --git a/app/Console/Commands/Tools/ApplyRules.php b/app/Console/Commands/Tools/ApplyRules.php
index 023864e1aa..a27c5643a3 100644
--- a/app/Console/Commands/Tools/ApplyRules.php
+++ b/app/Console/Commands/Tools/ApplyRules.php
@@ -265,8 +265,8 @@ class ApplyRules extends Command
private function verifyInputDates(): void
{
// parse start date.
- $inputStart = today(config('app.timezone'))->startOfMonth();
- $startString = $this->option('start_date');
+ $inputStart = today(config('app.timezone'))->startOfMonth();
+ $startString = $this->option('start_date');
if (null === $startString) {
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
@@ -281,8 +281,8 @@ class ApplyRules extends Command
}
// parse end date
- $inputEnd = today(config('app.timezone'));
- $endString = $this->option('end_date');
+ $inputEnd = today(config('app.timezone'));
+ $endString = $this->option('end_date');
if (null !== $endString && '' !== $endString) {
$inputEnd = Carbon::createFromFormat('Y-m-d', $endString);
}
@@ -297,7 +297,7 @@ class ApplyRules extends Command
}
$this->start_date = $inputStart;
- $this->endDate = $inputEnd;
+ $this->endDate = $inputEnd;
}
private function grabAllRules(): void
diff --git a/app/Console/Commands/Upgrade/UpgradeMultiPiggyBanks.php b/app/Console/Commands/Upgrade/UpgradeMultiPiggyBanks.php
index f987a0b3d5..e425277e1b 100644
--- a/app/Console/Commands/Upgrade/UpgradeMultiPiggyBanks.php
+++ b/app/Console/Commands/Upgrade/UpgradeMultiPiggyBanks.php
@@ -1,4 +1,6 @@
get(self::CONFIG_NAME, false);
@@ -74,10 +71,6 @@ class UpgradeMultiPiggyBanks extends Command
return false;
}
-
- /**
- *
- */
private function markAsExecuted(): void
{
app('fireflyconfig')->set(self::CONFIG_NAME, true);
@@ -89,6 +82,7 @@ class UpgradeMultiPiggyBanks extends Command
$this->accountRepository = app(AccountRepositoryInterface::class);
$set = PiggyBank::whereNotNull('account_id')->get();
Log::debug(sprintf('Will update %d piggy banks(s).', $set->count()));
+
/** @var PiggyBank $piggyBank */
foreach ($set as $piggyBank) {
$this->upgradePiggyBank($piggyBank);
@@ -99,8 +93,8 @@ class UpgradeMultiPiggyBanks extends Command
{
$this->repository->setUser($piggyBank->account->user);
$this->accountRepository->setUser($piggyBank->account->user);
- $repetition = $this->repository->getRepetition($piggyBank);
- $currency = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrencyByUserGroup($piggyBank->account->user->userGroup);
+ $repetition = $this->repository->getRepetition($piggyBank);
+ $currency = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrencyByUserGroup($piggyBank->account->user->userGroup);
// update piggy bank to have a currency.
$piggyBank->transaction_currency_id = $currency->id;
@@ -108,7 +102,7 @@ class UpgradeMultiPiggyBanks extends Command
// store current amount in account association.
$piggyBank->accounts()->sync([$piggyBank->account->id => ['current_amount' => $repetition->current_amount]]);
- $piggyBank->account_id = null;
+ $piggyBank->account_id = null;
$piggyBank->save();
// remove all repetitions (no longer used)
diff --git a/app/Events/RegisteredUser.php b/app/Events/RegisteredUser.php
index 4b1d28490b..2c5dac36f0 100644
--- a/app/Events/RegisteredUser.php
+++ b/app/Events/RegisteredUser.php
@@ -43,7 +43,7 @@ class RegisteredUser extends Event
*/
public function __construct(OwnerNotifiable $owner, User $user)
{
- $this->user = $user;
+ $this->user = $user;
$this->owner = $owner;
}
}
diff --git a/app/Events/Security/UnknownUserAttemptedLogin.php b/app/Events/Security/UnknownUserAttemptedLogin.php
index 4f49d63d2f..871b0b7316 100644
--- a/app/Events/Security/UnknownUserAttemptedLogin.php
+++ b/app/Events/Security/UnknownUserAttemptedLogin.php
@@ -1,4 +1,5 @@
address));
@@ -64,13 +65,13 @@ class AdminEventHandler
}
}
-
public function sendInvitationNotification(InvitationCreated $event): void
{
$sendMail = app('fireflyconfig')->get('notification_invite_created', true)->data;
if (false === $sendMail) {
return;
}
+
try {
$owner = new OwnerNotifiable();
Notification::send($owner, new UserInvitation($owner, $event->invitee));
@@ -131,18 +132,27 @@ class AdminEventHandler
switch ($event->channel) {
case 'email':
$class = TestNotificationEmail::class;
+
break;
+
case 'slack':
$class = TestNotificationSlack::class;
+
break;
+
case 'ntfy':
$class = TestNotificationNtfy::class;
+
break;
+
case 'pushover':
$class = TestNotificationPushover::class;
+
break;
+
default:
app('log')->error(sprintf('Unknown channel "%s" in sendTestNotification method.', $event->channel));
+
return;
}
Log::debug(sprintf('Will send %s as a notification.', $class));
diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index 7d2e377716..ffda8cdbed 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -82,8 +82,8 @@ class UserEventHandler
$repository = app(UserRepositoryInterface::class);
/** @var User $user */
- $user = $event->user;
- $count = $repository->count();
+ $user = $event->user;
+ $count = $repository->count();
// only act when there is 1 user in the system and he has no admin rights.
if (1 === $count && !$repository->hasRole($user, 'owner')) {
@@ -115,13 +115,13 @@ class UserEventHandler
*/
public function createGroupMembership(RegisteredUser $event): void
{
- $user = $event->user;
- $groupExists = true;
- $groupTitle = $user->email;
- $index = 1;
+ $user = $event->user;
+ $groupExists = true;
+ $groupTitle = $user->email;
+ $index = 1;
/** @var UserGroup $group */
- $group = null;
+ $group = null;
// create a new group.
while (true === $groupExists) { // @phpstan-ignore-line
@@ -131,7 +131,7 @@ class UserEventHandler
break;
}
- $groupTitle = sprintf('%s-%d', $user->email, $index);
+ $groupTitle = sprintf('%s-%d', $user->email, $index);
++$index;
if ($index > 99) {
throw new FireflyException('Email address can no longer be used for registrations.');
@@ -139,7 +139,7 @@ class UserEventHandler
}
/** @var null|UserRole $role */
- $role = UserRole::where('title', UserRoleEnum::OWNER->value)->first();
+ $role = UserRole::where('title', UserRoleEnum::OWNER->value)->first();
if (null === $role) {
throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');
}
@@ -165,7 +165,7 @@ class UserEventHandler
$repository = app(UserRepositoryInterface::class);
/** @var User $user */
- $user = $event->user;
+ $user = $event->user;
if ($repository->hasRole($user, 'demo')) {
// set user back to English.
app('preferences')->setForUser($user, 'language', 'en_US');
@@ -186,7 +186,7 @@ class UserEventHandler
return; // do not email demo user.
}
- $list = app('preferences')->getForUser($user, 'login_ip_history', [])->data;
+ $list = app('preferences')->getForUser($user, 'login_ip_history', [])->data;
if (!is_array($list)) {
$list = [];
}
@@ -223,6 +223,7 @@ class UserEventHandler
$sendMail = (bool) app('fireflyconfig')->get('notification_admin_new_reg', true)->data;
if ($sendMail) {
$owner = $event->owner;
+
try {
Notification::send($owner, new AdminRegistrationNotification($event->owner, $event->user));
} catch (\Exception $e) { // @phpstan-ignore-line
@@ -369,7 +370,7 @@ class UserEventHandler
public function storeUserIPAddress(ActuallyLoggedIn $event): void
{
app('log')->debug('Now in storeUserIPAddress');
- $user = $event->user;
+ $user = $event->user;
if ($user->hasRole('demo')) {
app('log')->debug('Do not log demo user logins');
@@ -386,8 +387,8 @@ class UserEventHandler
return;
}
- $inArray = false;
- $ip = request()->ip();
+ $inArray = false;
+ $ip = request()->ip();
app('log')->debug(sprintf('User logging in from IP address %s', $ip));
// update array if in array
@@ -415,7 +416,7 @@ class UserEventHandler
$preference = array_values($preference);
/** @var bool $send */
- $send = app('preferences')->getForUser($user, 'notification_user_login', true)->data;
+ $send = app('preferences')->getForUser($user, 'notification_user_login', true)->data;
app('preferences')->setForUser($user, 'login_ip_history', $preference);
if (false === $inArray && true === $send) {
diff --git a/app/Handlers/Observer/PiggyBankObserver.php b/app/Handlers/Observer/PiggyBankObserver.php
index 74eb37b211..da111a17af 100644
--- a/app/Handlers/Observer/PiggyBankObserver.php
+++ b/app/Handlers/Observer/PiggyBankObserver.php
@@ -36,14 +36,14 @@ class PiggyBankObserver
{
app('log')->debug('Observe "created" of a piggy bank. DO NOTHING.');
-// $repetition = new PiggyBankRepetition();
-// $repetition->piggyBank()->associate($piggyBank);
-// $repetition->start_date = $piggyBank->start_date;
-// $repetition->start_date_tz = $piggyBank->start_date->format('e');
-// $repetition->target_date = $piggyBank->target_date;
-// $repetition->target_date_tz = $piggyBank->target_date?->format('e');
-// $repetition->current_amount = '0';
-// $repetition->save();
+ // $repetition = new PiggyBankRepetition();
+ // $repetition->piggyBank()->associate($piggyBank);
+ // $repetition->start_date = $piggyBank->start_date;
+ // $repetition->start_date_tz = $piggyBank->start_date->format('e');
+ // $repetition->target_date = $piggyBank->target_date;
+ // $repetition->target_date_tz = $piggyBank->target_date?->format('e');
+ // $repetition->current_amount = '0';
+ // $repetition->save();
}
/**
diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php
index 8c8b3bf2b0..ce6ab09cbb 100644
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -23,15 +23,9 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
-use FireflyIII\Events\AdminRequestedTestMessage;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
-use FireflyIII\Support\Notifications\UrlValidator;
-use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
diff --git a/app/Http/Controllers/Admin/NotificationController.php b/app/Http/Controllers/Admin/NotificationController.php
index 3fbbcaa078..f1493dfa2d 100644
--- a/app/Http/Controllers/Admin/NotificationController.php
+++ b/app/Http/Controllers/Admin/NotificationController.php
@@ -1,4 +1,5 @@
info('User visits notifications index.');
- $title = (string) trans('firefly.administration');
- $mainTitleIcon = 'fa-hand-spock-o';
- $subTitle = (string) trans('firefly.title_owner_notifications');
- $subTitleIcon = 'envelope-o';
+ $title = (string) trans('firefly.administration');
+ $mainTitleIcon = 'fa-hand-spock-o';
+ $subTitle = (string) trans('firefly.title_owner_notifications');
+ $subTitleIcon = 'envelope-o';
// notification settings:
- $slackUrl = app('fireflyconfig')->getEncrypted('slack_webhook_url', '')->data;
- $pushoverAppToken = app('fireflyconfig')->getEncrypted('pushover_app_token', '')->data;
- $pushoverUserToken = app('fireflyconfig')->getEncrypted('pushover_user_token', '')->data;
- $ntfyServer = app('fireflyconfig')->getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
- $ntfyTopic = app('fireflyconfig')->getEncrypted('ntfy_topic', '')->data;
- $ntfyAuth = app('fireflyconfig')->get('ntfy_auth', false)->data;
- $ntfyUser = app('fireflyconfig')->getEncrypted('ntfy_user', '')->data;
- $ntfyPass = app('fireflyconfig')->getEncrypted('ntfy_pass', '')->data;
- $channels = config('notifications.channels');
- $forcedAvailability = [];
+ $slackUrl = app('fireflyconfig')->getEncrypted('slack_webhook_url', '')->data;
+ $pushoverAppToken = app('fireflyconfig')->getEncrypted('pushover_app_token', '')->data;
+ $pushoverUserToken = app('fireflyconfig')->getEncrypted('pushover_user_token', '')->data;
+ $ntfyServer = app('fireflyconfig')->getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
+ $ntfyTopic = app('fireflyconfig')->getEncrypted('ntfy_topic', '')->data;
+ $ntfyAuth = app('fireflyconfig')->get('ntfy_auth', false)->data;
+ $ntfyUser = app('fireflyconfig')->getEncrypted('ntfy_user', '')->data;
+ $ntfyPass = app('fireflyconfig')->getEncrypted('ntfy_pass', '')->data;
+ $channels = config('notifications.channels');
+ $forcedAvailability = [];
// admin notification settings:
- $notifications = [];
+ $notifications = [];
foreach (config('notifications.notifications.owner') as $key => $info) {
if ($info['enabled']) {
$notifications[$key] = app('fireflyconfig')->get(sprintf('notification_%s', $key), true)->data;
@@ -68,18 +69,31 @@ class NotificationController extends Controller
$forcedAvailability['ntfy'] = '' !== $ntfyTopic;
$forcedAvailability['pushover'] = '' !== $pushoverAppToken && '' !== $pushoverUserToken;
- return view('admin.notifications.index',
- compact(
- 'title', 'subTitle', 'forcedAvailability', 'mainTitleIcon', 'subTitleIcon', 'channels',
- 'slackUrl', 'notifications',
- 'pushoverAppToken', 'pushoverUserToken',
- 'ntfyServer', 'ntfyTopic', 'ntfyAuth', 'ntfyUser', 'ntfyPass'
- ));
+ return view(
+ 'admin.notifications.index',
+ compact(
+ 'title',
+ 'subTitle',
+ 'forcedAvailability',
+ 'mainTitleIcon',
+ 'subTitleIcon',
+ 'channels',
+ 'slackUrl',
+ 'notifications',
+ 'pushoverAppToken',
+ 'pushoverUserToken',
+ 'ntfyServer',
+ 'ntfyTopic',
+ 'ntfyAuth',
+ 'ntfyUser',
+ 'ntfyPass'
+ )
+ );
}
public function postIndex(NotificationRequest $request): RedirectResponse
{
- $all = $request->getAll();
+ $all = $request->getAll();
foreach (config('notifications.notifications.owner') as $key => $info) {
if (array_key_exists($key, $all)) {
@@ -112,7 +126,9 @@ class NotificationController extends Controller
switch ($channel) {
default:
session()->flash('error', (string) trans('firefly.notification_test_failed', ['channel' => $channel]));
+
break;
+
case 'email':
case 'slack':
case 'pushover':
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index f7640be2cd..9ec43cb780 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -28,7 +28,6 @@ use FireflyIII\Events\ActuallyLoggedIn;
use FireflyIII\Events\Security\UnknownUserAttemptedLogin;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Providers\RouteServiceProvider;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use Illuminate\Contracts\Foundation\Application;
@@ -70,7 +69,7 @@ class LoginController extends Controller
public function __construct()
{
parent::__construct();
- $this->username = 'email';
+ $this->username = 'email';
$this->middleware('guest')->except('logout');
$this->repository = app(UserRepositoryInterface::class);
}
@@ -128,7 +127,7 @@ class LoginController extends Controller
}
app('log')->warning('Login attempt failed.');
$username = (string) $request->get($this->username());
- if(null === $this->repository->findByEmail($username)) {
+ if (null === $this->repository->findByEmail($username)) {
// send event to owner.
event(new UnknownUserAttemptedLogin($username));
}
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 418fa13e61..ba75435e18 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -95,7 +95,7 @@ class RegisterController extends Controller
$this->validator($request->all())->validate();
$user = $this->createUser($request->all());
app('log')->info(sprintf('Registered new user %s', $user->email));
- $owner = new OwnerNotifiable();
+ $owner = new OwnerNotifiable();
event(new RegisteredUser($owner, $user));
$this->guard()->login($user);
diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php
index c1dbe62020..0583d02621 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -84,7 +84,7 @@ class BudgetLimitController extends Controller
$budgetLimits = $this->blRepository->getBudgetLimits($budget, $start, $end);
// remove already budgeted currencies with the same date range
- $currencies = $collection->filter(
+ $currencies = $collection->filter(
static function (TransactionCurrency $currency) use ($budgetLimits, $start, $end) {
/** @var BudgetLimit $limit */
foreach ($budgetLimits as $limit) {
@@ -107,6 +107,7 @@ class BudgetLimitController extends Controller
public function show(BudgetLimit $budgetLimit)
{
$notes = $this->blRepository->getNoteText($budgetLimit);
+
return view('budgets.budget-limits.show', compact('budgetLimit', 'notes'));
}
@@ -116,6 +117,7 @@ class BudgetLimitController extends Controller
public function edit(BudgetLimit $budgetLimit)
{
$notes = $this->blRepository->getNoteText($budgetLimit);
+
return view('budgets.budget-limits.edit', compact('budgetLimit', 'notes'));
}
@@ -135,7 +137,7 @@ class BudgetLimitController extends Controller
*
* @throws FireflyException
*/
- public function store(Request $request): JsonResponse | RedirectResponse
+ public function store(Request $request): JsonResponse|RedirectResponse
{
app('log')->debug('Going to store new budget-limit.', $request->all());
// first search for existing one and update it if necessary.
@@ -144,14 +146,14 @@ class BudgetLimitController extends Controller
if (null === $currency || null === $budget) {
throw new FireflyException('No valid currency or budget.');
}
- $start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
- $end = Carbon::createFromFormat('Y-m-d', $request->get('end'));
+ $start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
+ $end = Carbon::createFromFormat('Y-m-d', $request->get('end'));
if (null === $start || null === $end) {
return response()->json([]);
}
- $amount = (string) $request->get('amount');
+ $amount = (string) $request->get('amount');
$start->startOfDay();
$end->startOfDay();
@@ -161,7 +163,7 @@ class BudgetLimitController extends Controller
app('log')->debug(sprintf('Start: %s, end: %s', $start->format('Y-m-d'), $end->format('Y-m-d')));
- $limit = $this->blRepository->find($budget, $currency, $start, $end);
+ $limit = $this->blRepository->find($budget, $currency, $start, $end);
// sanity check on amount:
if (0 === bccomp($amount, '0')) {
@@ -195,25 +197,25 @@ class BudgetLimitController extends Controller
);
}
// parse notes, if any.
- $notes = (string) $request->get('notes');
+ $notes = (string) $request->get('notes');
$this->blRepository->setNoteText($limit, $notes);
if ($request->expectsJson()) {
- $array = $limit->toArray();
+ $array = $limit->toArray();
// add some extra metadata:
- $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $currency);
- $array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';
- $array['left_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, bcadd($array['spent'], $array['amount']));
- $array['amount_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $limit['amount']);
- $array['days_left'] = (string) $this->activeDaysLeft($start, $end);
+ $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $currency);
+ $array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';
+ $array['left_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, bcadd($array['spent'], $array['amount']));
+ $array['amount_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $limit['amount']);
+ $array['days_left'] = (string) $this->activeDaysLeft($start, $end);
// left per day:
- $array['left_per_day'] = 0 === bccomp('0', $array['days_left']) ? bcadd($array['spent'], $array['amount']) : bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']);
+ $array['left_per_day'] = 0 === bccomp('0', $array['days_left']) ? bcadd($array['spent'], $array['amount']) : bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']);
// left per day formatted.
$array['left_per_day_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $array['left_per_day']);
// notes:
- $array['notes'] = $this->blRepository->getNoteText($limit);
+ $array['notes'] = $this->blRepository->getNoteText($limit);
return response()->json($array);
}
@@ -223,7 +225,7 @@ class BudgetLimitController extends Controller
public function update(Request $request, BudgetLimit $budgetLimit): JsonResponse|RedirectResponse
{
- $amount = (string) $request->get('amount');
+ $amount = (string) $request->get('amount');
if ('' === $amount) {
$amount = '0';
}
@@ -235,7 +237,7 @@ class BudgetLimitController extends Controller
$budgetId = $budgetLimit->budget_id;
$currency = $budgetLimit->transactionCurrency;
$this->blRepository->destroyBudgetLimit($budgetLimit);
- $array = [
+ $array = [
'budget_id' => $budgetId,
'left_formatted' => app('amount')->formatAnything($currency, '0'),
'left_per_day_formatted' => app('amount')->formatAnything($currency, '0'),
@@ -248,29 +250,29 @@ class BudgetLimitController extends Controller
if (-1 === bccomp($amount, '0')) {
$amount = bcmul($amount, '-1');
}
- $notes = (string)$request->get('notes');
- if(strlen($notes) > 32768) {
+ $notes = (string)$request->get('notes');
+ if (strlen($notes) > 32768) {
$notes = substr($notes, 0, 32768);
}
- $limit = $this->blRepository->update($budgetLimit, ['amount' => $amount,'notes' => $notes]);
+ $limit = $this->blRepository->update($budgetLimit, ['amount' => $amount, 'notes' => $notes]);
app('preferences')->mark();
- $array = $limit->toArray();
+ $array = $limit->toArray();
- $spentArr = $this->opsRepository->sumExpenses(
+ $spentArr = $this->opsRepository->sumExpenses(
$limit->start_date,
$limit->end_date,
null,
new Collection([$budgetLimit->budget]),
$budgetLimit->transactionCurrency
);
- $daysLeft = $this->activeDaysLeft($limit->start_date, $limit->end_date);
- $array['spent'] = $spentArr[$budgetLimit->transactionCurrency->id]['sum'] ?? '0';
- $array['left_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, bcadd($array['spent'], $array['amount']));
- $array['amount_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $limit['amount']);
- $array['days_left'] = (string) $daysLeft;
- $array['left_per_day'] = 0 === $daysLeft ? bcadd($array['spent'], $array['amount']) : bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']);
+ $daysLeft = $this->activeDaysLeft($limit->start_date, $limit->end_date);
+ $array['spent'] = $spentArr[$budgetLimit->transactionCurrency->id]['sum'] ?? '0';
+ $array['left_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, bcadd($array['spent'], $array['amount']));
+ $array['amount_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $limit['amount']);
+ $array['days_left'] = (string) $daysLeft;
+ $array['left_per_day'] = 0 === $daysLeft ? bcadd($array['spent'], $array['amount']) : bcdiv(bcadd($array['spent'], $array['amount']), $array['days_left']);
// left per day formatted.
$array['amount'] = app('steam')->bcround($limit['amount'], $limit->transactionCurrency->decimal_places);
@@ -278,6 +280,7 @@ class BudgetLimitController extends Controller
if ('true' === $request->get('redirect')) {
return redirect(route('budgets.index'));
}
+
return response()->json($array);
}
}
diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php
index 5fde689d96..ec91cfaef8 100644
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -213,7 +213,7 @@ class IndexController extends Controller
$array['budgeted'][] = [
'id' => $limit->id,
'amount' => $amount,
- 'notes' => $this->blRepository->getNoteText($limit),
+ 'notes' => $this->blRepository->getNoteText($limit),
'start_date' => $limit->start_date->isoFormat($this->monthAndDayFormat),
'end_date' => $limit->end_date->isoFormat($this->monthAndDayFormat),
'in_range' => $limit->start_date->isSameDay($start) && $limit->end_date->isSameDay($end),
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 3597c75351..72fc6ba722 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -43,7 +43,6 @@ use Illuminate\Support\Facades\Log;
*/
class HomeController extends Controller
{
-
/**
* HomeController constructor.
*/
@@ -62,8 +61,8 @@ class HomeController extends Controller
*/
public function dateRange(Request $request): JsonResponse
{
- $stringStart = '';
- $stringEnd = '';
+ $stringStart = '';
+ $stringEnd = '';
try {
$stringStart = e((string) $request->get('start'));
@@ -98,7 +97,7 @@ class HomeController extends Controller
app('log')->debug('Range is now marked as "custom".');
}
- $diff = $start->diffInDays($end, true) + 1;
+ $diff = $start->diffInDays($end, true) + 1;
if ($diff > 366) {
$request->session()->flash('warning', (string) trans('firefly.warning_much_data', ['days' => (int) $diff]));
@@ -153,13 +152,13 @@ class HomeController extends Controller
}
/** @var Carbon $start */
- $start = session('start', today(config('app.timezone'))->startOfMonth());
+ $start = session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */
- $end = session('end', today(config('app.timezone'))->endOfMonth());
- $accounts = $repository->getAccountsById($frontpageArray);
- $today = today(config('app.timezone'));
- $accounts = $accounts->sortBy('order'); // sort frontpage accounts by order
+ $end = session('end', today(config('app.timezone'))->endOfMonth());
+ $accounts = $repository->getAccountsById($frontpageArray);
+ $today = today(config('app.timezone'));
+ $accounts = $accounts->sortBy('order'); // sort frontpage accounts by order
app('log')->debug('Frontpage accounts are ', $frontpageArray);
@@ -169,14 +168,14 @@ class HomeController extends Controller
// collect groups for each transaction.
foreach ($accounts as $account) {
/** @var GroupCollectorInterface $collector */
- $collector = app(GroupCollectorInterface::class);
+ $collector = app(GroupCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->withAccountInformation()->setRange($start, $end)->setLimit(10)->setPage(1);
$set = $collector->getExtractedJournals();
$transactions[] = ['transactions' => $set, 'account' => $account];
}
/** @var User $user */
- $user = auth()->user();
+ $user = auth()->user();
event(new RequestedVersionCheckStatus($user));
return view('index', compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today', 'pageTitle'));
@@ -187,11 +186,11 @@ class HomeController extends Controller
$subTitle = (string) trans('firefly.welcome_back');
$pageTitle = (string) trans('firefly.main_dashboard_page_title');
- $start = session('start', today(config('app.timezone'))->startOfMonth());
- $end = session('end', today(config('app.timezone'))->endOfMonth());
+ $start = session('start', today(config('app.timezone'))->startOfMonth());
+ $end = session('end', today(config('app.timezone'))->endOfMonth());
/** @var User $user */
- $user = auth()->user();
+ $user = auth()->user();
event(new RequestedVersionCheckStatus($user));
return view('index', compact('subTitle', 'start', 'end', 'pageTitle'));
diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php
index d3af975cc2..0edd81cbcc 100644
--- a/app/Http/Controllers/PiggyBank/CreateController.php
+++ b/app/Http/Controllers/PiggyBank/CreateController.php
@@ -94,7 +94,7 @@ class CreateController extends Controller
*/
public function store(PiggyBankStoreRequest $request)
{
- $data = $request->getPiggyBankData();
+ $data = $request->getPiggyBankData();
if (null === $data['start_date']) {
$data['start_date'] = today(config('app.timezone'));
@@ -107,7 +107,7 @@ class CreateController extends Controller
// store attachment(s):
/** @var null|array $files */
- $files = $request->hasFile('attachments') ? $request->file('attachments') : null;
+ $files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachments->saveAttachmentsForModel($piggyBank, $files);
}
@@ -119,7 +119,7 @@ class CreateController extends Controller
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
- $redirect = redirect($this->getPreviousUrl('piggy-banks.create.url'));
+ $redirect = redirect($this->getPreviousUrl('piggy-banks.create.url'));
if (1 === (int) $request->get('create_another')) {
session()->put('piggy-banks.create.fromStore', true);
diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php
index eca160f505..55188f7841 100644
--- a/app/Http/Controllers/PiggyBank/IndexController.php
+++ b/app/Http/Controllers/PiggyBank/IndexController.php
@@ -81,13 +81,13 @@ class IndexController extends Controller
{
$this->cleanupObjectGroups();
$this->piggyRepos->resetOrder();
- $collection = $this->piggyRepos->getPiggyBanks();
+ $collection = $this->piggyRepos->getPiggyBanks();
/** @var Carbon $end */
- $end = session('end', today(config('app.timezone'))->endOfMonth());
+ $end = session('end', today(config('app.timezone'))->endOfMonth());
// transform piggies using the transformer:
- $parameters = new ParameterBag();
+ $parameters = new ParameterBag();
$parameters->set('end', $end);
@@ -96,10 +96,10 @@ class IndexController extends Controller
$accountTransformer->setParameters($parameters);
// data
- $piggyBanks = $this->groupPiggyBanks($collection);
- $accounts = $this->collectAccounts($collection);
- $accounts = $this->mergeAccountsAndPiggies($piggyBanks, $accounts);
- $piggyBanks = $this->makeSums($piggyBanks);
+ $piggyBanks = $this->groupPiggyBanks($collection);
+ $accounts = $this->collectAccounts($collection);
+ $accounts = $this->mergeAccountsAndPiggies($piggyBanks, $accounts);
+ $piggyBanks = $this->makeSums($piggyBanks);
ksort($piggyBanks);
@@ -112,7 +112,7 @@ class IndexController extends Controller
foreach ($piggyBanks as $groupOrder => $group) {
$groupId = $group['object_group_id'];
foreach ($group['piggy_banks'] as $piggy) {
- $currencyId = $piggy['currency_id'];
+ $currencyId = $piggy['currency_id'];
$sums[$groupId][$currencyId] ??= [
'target' => '0',
'saved' => '0',
@@ -164,47 +164,51 @@ class IndexController extends Controller
/** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class);
$transformer->setParameters(new ParameterBag());
- $piggyBanks = [];
+ $piggyBanks = [];
+
/** @var PiggyBank $piggy */
foreach ($collection as $piggy) {
- $array = $transformer->transform($piggy);
- $groupOrder = (int) $array['object_group_order'];
+ $array = $transformer->transform($piggy);
+ $groupOrder = (int) $array['object_group_order'];
$piggyBanks[$groupOrder] ??= [
'object_group_id' => $array['object_group_id'] ?? 0,
'object_group_title' => $array['object_group_title'] ?? trans('firefly.default_group_title_name'),
'piggy_banks' => [],
];
- $array['attachments'] = $this->piggyRepos->getAttachments($piggy);
+ $array['attachments'] = $this->piggyRepos->getAttachments($piggy);
// sum the total amount for the index.
$piggyBanks[$groupOrder]['piggy_banks'][] = $array;
}
+
return $piggyBanks;
}
private function collectAccounts(Collection $collection): array
{
/** @var Carbon $end */
- $end = session('end', today(config('app.timezone'))->endOfMonth());
+ $end = session('end', today(config('app.timezone'))->endOfMonth());
// transform piggies using the transformer:
- $parameters = new ParameterBag();
+ $parameters = new ParameterBag();
$parameters->set('end', $end);
/** @var AccountTransformer $accountTransformer */
$accountTransformer = app(AccountTransformer::class);
$accountTransformer->setParameters($parameters);
- $return = [];
+ $return = [];
+
/** @var PiggyBank $piggy */
foreach ($collection as $piggy) {
$accounts = $piggy->accounts;
+
/** @var Account $account */
foreach ($accounts as $account) {
$array = $accountTransformer->transform($account);
$accountId = (int) $array['id'];
if (!array_key_exists($accountId, $return)) {
- $return[$accountId] = $array;
+ $return[$accountId] = $array;
// add some interesting details:
$return[$accountId]['left'] = $return[$accountId]['current_balance'];
@@ -214,20 +218,21 @@ class IndexController extends Controller
}
// calculate new interesting fields:
-// $return[$accountId]['left'] -= $array['current_amount'];
-// $return[$accountId]['saved'] += $array['current_amount'];
-// $return[$accountId]['target'] += $array['target_amount'];
-// $return[$accountId]['to_save'] += ($array['target_amount'] - $array['current_amount']);
-// $return['account_name'] = $account['name'];
+ // $return[$accountId]['left'] -= $array['current_amount'];
+ // $return[$accountId]['saved'] += $array['current_amount'];
+ // $return[$accountId]['target'] += $array['target_amount'];
+ // $return[$accountId]['to_save'] += ($array['target_amount'] - $array['current_amount']);
+ // $return['account_name'] = $account['name'];
}
}
+
return $return;
}
private function mergeAccountsAndPiggies(array $piggyBanks, array $accounts): array
{
- /** @var array $piggyBank */
+ // @var array $piggyBank
foreach ($piggyBanks as $group) {
foreach ($group['piggy_banks'] as $piggyBank) {
// loop all accounts in this piggy bank subtract the current amount from "left to save" in the $accounts array.
@@ -243,6 +248,7 @@ class IndexController extends Controller
}
}
}
+
return $accounts;
}
}
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index a627286af0..d29ee4b4eb 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -66,14 +66,14 @@ class PreferencesController extends Controller
*/
public function index(AccountRepositoryInterface $repository)
{
- $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
- $isDocker = env('IS_DOCKER', false);
- $groupedAccounts = [];
+ $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
+ $isDocker = env('IS_DOCKER', false);
+ $groupedAccounts = [];
/** @var Account $account */
foreach ($accounts as $account) {
- $type = $account->accountType->type;
- $role = sprintf('opt_group_%s', $repository->getMetaValue($account, 'account_role'));
+ $type = $account->accountType->type;
+ $role = sprintf('opt_group_%s', $repository->getMetaValue($account, 'account_role'));
if (in_array($type, [AccountType::MORTGAGE, AccountType::DEBT, AccountType::LOAN], true)) {
$role = sprintf('opt_group_l_%s', $type);
@@ -94,42 +94,49 @@ class PreferencesController extends Controller
if (!is_array($frontpageAccounts)) {
$frontpageAccounts = $accountIds;
}
- $language = app('steam')->getLanguage();
- $languages = config('firefly.languages');
- $locale = app('preferences')->get('locale', config('firefly.default_locale', 'equal'))->data;
- $listPageSize = app('preferences')->get('listPageSize', 50)->data;
- $darkMode = app('preferences')->get('darkMode', 'browser')->data;
- $customFiscalYear = app('preferences')->get('customFiscalYear', 0)->data;
- $fiscalYearStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data;
+ $language = app('steam')->getLanguage();
+ $languages = config('firefly.languages');
+ $locale = app('preferences')->get('locale', config('firefly.default_locale', 'equal'))->data;
+ $listPageSize = app('preferences')->get('listPageSize', 50)->data;
+ $darkMode = app('preferences')->get('darkMode', 'browser')->data;
+ $customFiscalYear = app('preferences')->get('customFiscalYear', 0)->data;
+ $fiscalYearStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data;
if (is_array($fiscalYearStartStr)) {
$fiscalYearStartStr = '01-01';
}
- $fiscalYearStart = sprintf('%s-%s', date('Y'), (string) $fiscalYearStartStr);
- $tjOptionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data;
- $availableDarkModes = config('firefly.available_dark_modes');
+ $fiscalYearStart = sprintf('%s-%s', date('Y'), (string) $fiscalYearStartStr);
+ $tjOptionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data;
+ $availableDarkModes = config('firefly.available_dark_modes');
// notifications settings
- $slackUrl = app('preferences')->getEncrypted('slack_webhook_url', '')->data;
- $pushoverAppToken = app('preferences')->getEncrypted('pushover_app_token', '')->data;
- $pushoverUserToken = app('preferences')->getEncrypted('pushover_user_token', '')->data;
- $ntfyServer = app('preferences')->getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
- $ntfyTopic = app('preferences')->getEncrypted('ntfy_topic', '')->data;
- $ntfyAuth = app('preferences')->get('ntfy_auth', false)->data;
- $ntfyUser = app('preferences')->getEncrypted('ntfy_user', '')->data;
- $ntfyPass = app('preferences')->getEncrypted('ntfy_pass', '')->data;
+ $slackUrl = app('preferences')->getEncrypted('slack_webhook_url', '')->data;
+ $pushoverAppToken = app('preferences')->getEncrypted('pushover_app_token', '')->data;
+ $pushoverUserToken = app('preferences')->getEncrypted('pushover_user_token', '')->data;
+ $ntfyServer = app('preferences')->getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
+ $ntfyTopic = app('preferences')->getEncrypted('ntfy_topic', '')->data;
+ $ntfyAuth = app('preferences')->get('ntfy_auth', false)->data;
+ $ntfyUser = app('preferences')->getEncrypted('ntfy_user', '')->data;
+ $ntfyPass = app('preferences')->getEncrypted('ntfy_pass', '')->data;
+ $channels = config('notifications.channels');
+ $forcedAvailability = [];
-
- // notification preferences (single value for each):
- $notifications = [];
+ // notification preferences
+ $notifications = [];
foreach (config('notifications.notifications.user') as $key => $info) {
if ($info['enabled']) {
$notifications[$key]
= [
- 'enabled' => app('preferences')->get(sprintf('notification_%s', $key), true)->data,
- 'configurable' => $info['configurable'],
- ];
+ 'enabled' => app('preferences')->get(sprintf('notification_%s', $key), true)->data,
+ 'configurable' => $info['configurable'],
+ ];
}
}
+ // loop all channels to see if they are available.
+ foreach ($channels as $channel => $info) {
+ $forcedAvailability[$channel] = true;
+ }
+ $forcedAvailability['ntfy'] = '' !== $ntfyTopic;
+ $forcedAvailability['pushover'] = '' !== $pushoverAppToken && '' !== $pushoverUserToken;
ksort($languages);
@@ -141,7 +148,7 @@ class PreferencesController extends Controller
app('log')->error($e->getMessage());
$locales = [];
}
- $locales = ['equal' => (string) trans('firefly.equal_to_language')] + $locales;
+ $locales = ['equal' => (string) trans('firefly.equal_to_language')] + $locales;
// an important fallback is that the frontPageAccount array gets refilled automatically
// when it turns up empty.
if (0 === count($frontpageAccounts)) {
@@ -151,7 +158,7 @@ class PreferencesController extends Controller
// for the demo user, the notification settings are automatically emptied.
// this isn't really secure, but it means that the demo site has semi-secret notification settings.
if (auth()->user()->hasRole('demo')) {
- $slackUrl = '';
+ $slackUrl = '';
$pushoverAppToken = '';
$pushoverUserToken = '';
$ntfyServer = '';
@@ -161,9 +168,32 @@ class PreferencesController extends Controller
$ntfyPass = '';
}
- return view('preferences.index', compact('language', 'pushoverAppToken', 'pushoverUserToken',
- 'ntfyServer', 'ntfyTopic', 'ntfyAuth', 'ntfyUser', 'ntfyPass',
- 'groupedAccounts', 'isDocker', 'frontpageAccounts', 'languages', 'darkMode', 'availableDarkModes', 'notifications', 'slackUrl', 'locales', 'locale', 'tjOptionalFields', 'viewRange', 'customFiscalYear', 'listPageSize', 'fiscalYearStart'));
+ return view('preferences.index', compact(
+ 'language',
+ 'pushoverAppToken',
+ 'pushoverUserToken',
+ 'ntfyServer',
+ 'ntfyTopic',
+ 'ntfyAuth',
+ 'ntfyUser',
+ 'forcedAvailability',
+ 'ntfyPass',
+ 'groupedAccounts',
+ 'isDocker',
+ 'frontpageAccounts',
+ 'languages',
+ 'darkMode',
+ 'availableDarkModes',
+ 'notifications',
+ 'slackUrl',
+ 'locales',
+ 'locale',
+ 'tjOptionalFields',
+ 'viewRange',
+ 'customFiscalYear',
+ 'listPageSize',
+ 'fiscalYearStart'
+ ));
}
/**
@@ -188,8 +218,9 @@ class PreferencesController extends Controller
}
// extract notifications:
- $all = $request->all();
- die('fix the reference to the available notifications.');
+ $all = $request->all();
+
+ exit('fix the reference to the available notifications.');
foreach (config('firefly.available_notifications') as $option) {
$key = sprintf('notification_%s', $option);
if (array_key_exists($key, $all)) {
@@ -219,8 +250,8 @@ class PreferencesController extends Controller
}
// custom fiscal year
- $customFiscalYear = 1 === (int) $request->get('customFiscalYear');
- $string = strtotime((string) $request->get('fiscalYearStart'));
+ $customFiscalYear = 1 === (int) $request->get('customFiscalYear');
+ $string = strtotime((string) $request->get('fiscalYearStart'));
if (false !== $string) {
$fiscalYearStart = date('m-d', $string);
app('preferences')->set('customFiscalYear', $customFiscalYear);
@@ -229,15 +260,15 @@ class PreferencesController extends Controller
// save page size:
app('preferences')->set('listPageSize', 50);
- $listPageSize = (int) $request->get('listPageSize');
+ $listPageSize = (int) $request->get('listPageSize');
if ($listPageSize > 0 && $listPageSize < 1337) {
app('preferences')->set('listPageSize', $listPageSize);
}
// language:
/** @var Preference $currentLang */
- $currentLang = app('preferences')->get('language', 'en_US');
- $lang = $request->get('language');
+ $currentLang = app('preferences')->get('language', 'en_US');
+ $lang = $request->get('language');
if (array_key_exists($lang, config('firefly.languages'))) {
app('preferences')->set('language', $lang);
}
@@ -254,8 +285,8 @@ class PreferencesController extends Controller
}
// optional fields for transactions:
- $setOptions = $request->get('tj') ?? [];
- $optionalTj = [
+ $setOptions = $request->get('tj') ?? [];
+ $optionalTj = [
'interest_date' => array_key_exists('interest_date', $setOptions),
'book_date' => array_key_exists('book_date', $setOptions),
'process_date' => array_key_exists('process_date', $setOptions),
@@ -272,7 +303,7 @@ class PreferencesController extends Controller
app('preferences')->set('transaction_journal_optional_fields', $optionalTj);
// dark mode
- $darkMode = $request->get('darkMode') ?? 'browser';
+ $darkMode = $request->get('darkMode') ?? 'browser';
if (in_array($darkMode, config('firefly.available_dark_modes'), true)) {
app('preferences')->set('darkMode', $darkMode);
}
diff --git a/app/Http/Requests/NotificationRequest.php b/app/Http/Requests/NotificationRequest.php
index 8b027ec1b2..f86016bb43 100644
--- a/app/Http/Requests/NotificationRequest.php
+++ b/app/Http/Requests/NotificationRequest.php
@@ -1,4 +1,5 @@
$info) {
- $value = false;
+ $value = false;
if ($this->has(sprintf('notification_%s', $key))) {
$value = true;
}
$return[$key] = $value;
}
- $return['slack_webhook_url'] = $this->convertString('slack_webhook_url');
+ $return['slack_webhook_url'] = $this->convertString('slack_webhook_url');
$return['pushover_app_token'] = $this->convertString('pushover_app_token');
$return['pushover_user_token'] = $this->convertString('pushover_user_token');
- $return['ntfy_server'] = $this->convertString('ntfy_server');
- $return['ntfy_topic'] = $this->convertString('ntfy_topic');
- $return['ntfy_auth'] = $this->convertBoolean($this->get('ntfy_auth'));
- $return['ntfy_user'] = $this->convertString('ntfy_user');
- $return['ntfy_pass'] = $this->convertString('ntfy_pass');
+ $return['ntfy_server'] = $this->convertString('ntfy_server');
+ $return['ntfy_topic'] = $this->convertString('ntfy_topic');
+ $return['ntfy_auth'] = $this->convertBoolean($this->get('ntfy_auth'));
+ $return['ntfy_user'] = $this->convertString('ntfy_user');
+ $return['ntfy_pass'] = $this->convertString('ntfy_pass');
+
return $return;
}
@@ -63,14 +65,14 @@ class NotificationRequest extends FormRequest
{
$rules = [
'slack_webhook_url' => ['nullable', 'url', 'min:1', new IsValidSlackOrDiscordUrl()],
- 'ntfy_server' => ['nullable', 'url', 'min:1'],
- 'ntfy_user' => ['required_with:ntfy_pass,ntfy_auth', 'nullable', 'string', 'min:1'],
- 'ntfy_pass' => ['required_with:ntfy_user,ntfy_auth', 'nullable', 'string', 'min:1'],
+ 'ntfy_server' => ['nullable', 'url', 'min:1'],
+ 'ntfy_user' => ['required_with:ntfy_pass,ntfy_auth', 'nullable', 'string', 'min:1'],
+ 'ntfy_pass' => ['required_with:ntfy_user,ntfy_auth', 'nullable', 'string', 'min:1'],
];
foreach (config('notifications.notifications.owner') as $key => $info) {
$rules[sprintf('notification_%s', $key)] = 'in:0,1';
}
+
return $rules;
}
-
}
diff --git a/app/Http/Requests/PiggyBankStoreRequest.php b/app/Http/Requests/PiggyBankStoreRequest.php
index bc796e74a1..de06a31528 100644
--- a/app/Http/Requests/PiggyBankStoreRequest.php
+++ b/app/Http/Requests/PiggyBankStoreRequest.php
@@ -59,7 +59,7 @@ class PiggyBankStoreRequest extends FormRequest
$accounts = [];
}
foreach ($accounts as $item) {
- $data['accounts'][] = ['account_id' => (int) ($item)];
+ $data['accounts'][] = ['account_id' => (int) $item];
}
return $data;
@@ -105,7 +105,7 @@ class PiggyBankStoreRequest extends FormRequest
if ($accountCurrency->id !== $currency->id && 'true' !== $isMultiCurrency) {
$validator->errors()->add('accounts', trans('validation.invalid_account_currency'));
}
- $type = $account->accountType->type;
+ $type = $account->accountType->type;
if (!in_array($type, $types, true)) {
$validator->errors()->add('accounts', trans('validation.invalid_account_type'));
}
@@ -127,6 +127,7 @@ class PiggyBankStoreRequest extends FormRequest
if (null === $currency) {
return app('amount')->getDefaultCurrency();
}
+
return $currency;
}
}
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index fa797977fc..b92e104bb8 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -44,18 +44,18 @@ class PiggyBank extends Model
protected $casts
= [
- 'created_at' => 'datetime',
- 'updated_at' => 'datetime',
- 'deleted_at' => 'datetime',
+ 'created_at' => 'datetime',
+ 'updated_at' => 'datetime',
+ 'deleted_at' => 'datetime',
'start_date' => 'date',
'target_date' => 'date',
- 'order' => 'int',
- 'active' => 'boolean',
- 'encrypted' => 'boolean',
+ 'order' => 'int',
+ 'active' => 'boolean',
+ 'encrypted' => 'boolean',
'target_amount' => 'string',
];
- protected $fillable = ['name', 'account_id', 'order', 'target_amount', 'start_date', 'start_date_tz', 'target_date', 'target_date_tz', 'active','transaction_currency_id'];
+ protected $fillable = ['name', 'account_id', 'order', 'target_amount', 'start_date', 'start_date_tz', 'target_date', 'target_date_tz', 'active', 'transaction_currency_id'];
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).
@@ -67,9 +67,10 @@ class PiggyBank extends Model
if (auth()->check()) {
$piggyBankId = (int)$value;
$piggyBank = self::where('piggy_banks.id', $piggyBankId)
- ->leftJoin('account_piggy_bank','account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+ ->leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
- ->where('accounts.user_id', auth()->user()->id)->first(['piggy_banks.*']);
+ ->where('accounts.user_id', auth()->user()->id)->first(['piggy_banks.*'])
+ ;
if (null !== $piggyBank) {
return $piggyBank;
}
diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php
index 378af8edb7..2d8cd4b013 100644
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@@ -40,11 +40,11 @@ class PiggyBankRepetition extends Model
protected $casts
= [
- 'created_at' => 'datetime',
- 'updated_at' => 'datetime',
+ 'created_at' => 'datetime',
+ 'updated_at' => 'datetime',
'start_date' => SeparateTimezoneCaster::class,
'target_date' => SeparateTimezoneCaster::class,
- 'virtual_balance' => 'string',
+ 'virtual_balance' => 'string',
];
protected $fillable = ['piggy_bank_id', 'start_date', 'start_date_tz', 'target_date', 'target_date_tz', 'current_amount'];
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 6cdca7d42e..01f49bd228 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -38,7 +38,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Facades\Log;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
diff --git a/app/Notifications/Admin/UnknownUserLoginAttempt.php b/app/Notifications/Admin/UnknownUserLoginAttempt.php
index 98f718544f..d402830e2b 100644
--- a/app/Notifications/Admin/UnknownUserLoginAttempt.php
+++ b/app/Notifications/Admin/UnknownUserLoginAttempt.php
@@ -1,4 +1,5 @@
markdown('emails.owner.unknown-user', ['address' => $this->address])
- ->subject((string) trans('email.unknown_user_subject'));
+ ->subject((string) trans('email.unknown_user_subject'))
+ ;
}
/**
@@ -90,7 +90,8 @@ class UnknownUserLoginAttempt extends Notification
public function toPushover(OwnerNotifiable $notifiable): PushoverMessage
{
return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address]))
- ->title((string) trans('email.unknown_user_subject'));
+ ->title((string) trans('email.unknown_user_subject'))
+ ;
}
public function toNtfy(OwnerNotifiable $notifiable): Message
@@ -108,7 +109,7 @@ class UnknownUserLoginAttempt extends Notification
config(['ntfy-notification-channel.authentication.password' => $settings['ntfy_pass']]);
}
- $message = new Message();
+ $message = new Message();
$message->topic($settings['ntfy_topic']);
$message->title((string) trans('email.unknown_user_subject'));
$message->body((string) trans('email.unknown_user_message', ['address' => $this->address]));
diff --git a/app/Notifications/Admin/UserInvitation.php b/app/Notifications/Admin/UserInvitation.php
index 60a6123c90..5696f41247 100644
--- a/app/Notifications/Admin/UserInvitation.php
+++ b/app/Notifications/Admin/UserInvitation.php
@@ -83,7 +83,8 @@ class UserInvitation extends Notification
{
return (new MailMessage())
->markdown('emails.invitation-created', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email])
- ->subject((string) trans('email.invitation_created_subject'));
+ ->subject((string) trans('email.invitation_created_subject'))
+ ;
}
/**
@@ -107,7 +108,8 @@ class UserInvitation extends Notification
Log::debug('Now in toPushover() for UserInvitation');
return PushoverMessage::create((string) trans('email.invitation_created_body', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email]))
- ->title((string) trans('email.invitation_created_subject'));
+ ->title((string) trans('email.invitation_created_subject'))
+ ;
}
public function toNtfy(OwnerNotifiable $notifiable): Message
@@ -126,7 +128,7 @@ class UserInvitation extends Notification
config(['ntfy-notification-channel.authentication.password' => $settings['ntfy_pass']]);
}
- $message = new Message();
+ $message = new Message();
$message->topic($settings['ntfy_topic']);
$message->title((string) trans('email.invitation_created_subject'));
$message->body((string) trans('email.invitation_created_body', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email]));
diff --git a/app/Notifications/Admin/UserRegistration.php b/app/Notifications/Admin/UserRegistration.php
index acb81fd110..71606cb5ba 100644
--- a/app/Notifications/Admin/UserRegistration.php
+++ b/app/Notifications/Admin/UserRegistration.php
@@ -51,7 +51,7 @@ class UserRegistration extends Notification
*/
public function __construct(OwnerNotifiable $owner, User $user)
{
- $this->user = $user;
+ $this->user = $user;
$this->owner = $owner;
}
@@ -79,7 +79,8 @@ class UserRegistration extends Notification
{
return (new MailMessage())
->markdown('emails.registered-admin', ['email' => $this->user->email, 'id' => $this->user->id])
- ->subject((string) trans('email.registered_subject_admin'));
+ ->subject((string) trans('email.registered_subject_admin'))
+ ;
}
/**
@@ -101,7 +102,8 @@ class UserRegistration extends Notification
Log::debug('Now in toPushover() for UserRegistration');
return PushoverMessage::create((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'invitee' => $this->user->email]))
- ->title((string) trans('email.registered_subject_admin'));
+ ->title((string) trans('email.registered_subject_admin'))
+ ;
}
public function toNtfy(OwnerNotifiable $notifiable): Message
@@ -120,10 +122,10 @@ class UserRegistration extends Notification
config(['ntfy-notification-channel.authentication.password' => $settings['ntfy_pass']]);
}
- $message = new Message();
+ $message = new Message();
$message->topic($settings['ntfy_topic']);
$message->title((string) trans('email.registered_subject_admin'));
- $message->body((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'invitee' => $this->user->email]) );
+ $message->body((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'invitee' => $this->user->email]));
return $message;
}
diff --git a/app/Notifications/Admin/VersionCheckResult.php b/app/Notifications/Admin/VersionCheckResult.php
index 07edf5ef27..a9a347e794 100644
--- a/app/Notifications/Admin/VersionCheckResult.php
+++ b/app/Notifications/Admin/VersionCheckResult.php
@@ -27,7 +27,6 @@ namespace FireflyIII\Notifications\Admin;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Notifications\ReturnsAvailableChannels;
use FireflyIII\Notifications\ReturnsSettings;
-use FireflyIII\Support\Notifications\UrlValidator;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
@@ -108,7 +107,8 @@ class VersionCheckResult extends Notification
Log::debug('Now in toPushover() for VersionCheckResult');
return PushoverMessage::create($this->message)
- ->title((string) trans('email.new_version_email_subject'));
+ ->title((string) trans('email.new_version_email_subject'))
+ ;
}
public function toNtfy(OwnerNotifiable $notifiable): Message
@@ -127,7 +127,7 @@ class VersionCheckResult extends Notification
config(['ntfy-notification-channel.authentication.password' => $settings['ntfy_pass']]);
}
- $message = new Message();
+ $message = new Message();
$message->topic($settings['ntfy_topic']);
$message->title((string) trans('email.new_version_email_subject'));
$message->body($this->message);
diff --git a/app/Notifications/Notifiables/OwnerNotifiable.php b/app/Notifications/Notifiables/OwnerNotifiable.php
index 71c66314c0..4fc165487d 100644
--- a/app/Notifications/Notifiables/OwnerNotifiable.php
+++ b/app/Notifications/Notifiables/OwnerNotifiable.php
@@ -1,4 +1,5 @@
getEncrypted('slack_webhook_url', '')->data;
if (is_array($res)) {
$res = '';
}
+
return (string) $res;
}
@@ -45,8 +46,10 @@ class OwnerNotifiable
Log::debug('Return settings for routeNotificationForPushover');
$pushoverAppToken = (string) app('fireflyconfig')->getEncrypted('pushover_app_token', '')->data;
$pushoverUserToken = (string) app('fireflyconfig')->getEncrypted('pushover_user_token', '')->data;
+
return PushoverReceiver::withUserKey($pushoverUserToken)
- ->withApplicationToken($pushoverAppToken);
+ ->withApplicationToken($pushoverAppToken)
+ ;
}
/**
@@ -59,9 +62,10 @@ class OwnerNotifiable
*/
public function routeNotificationFor($driver, $notification = null)
{
- $method = 'routeNotificationFor' . Str::studly($driver);
+ $method = 'routeNotificationFor'.Str::studly($driver);
if (method_exists($this, $method)) {
Log::debug(sprintf('Redirect for settings to "%s".', $method));
+
return $this->{$method}($notification); // @phpstan-ignore-line
}
Log::debug(sprintf('No method "%s" found, return generic settings.', $method));
diff --git a/app/Notifications/ReturnsAvailableChannels.php b/app/Notifications/ReturnsAvailableChannels.php
index db71c533ca..c63678a551 100644
--- a/app/Notifications/ReturnsAvailableChannels.php
+++ b/app/Notifications/ReturnsAvailableChannels.php
@@ -1,4 +1,5 @@
getEncrypted('slack_webhook_url', '')->data;
+ $channels = ['mail'];
+ $slackUrl = app('fireflyconfig')->getEncrypted('slack_webhook_url', '')->data;
if (UrlValidator::isValidWebhookURL($slackUrl)) {
$channels[] = 'slack';
}
@@ -73,8 +74,8 @@ class ReturnsAvailableChannels
}
Log::debug(sprintf('Final channel set in ReturnsAvailableChannels: %s ', implode(', ', $channels)));
+
// only the owner can get notifications over
return $channels;
}
-
}
diff --git a/app/Notifications/ReturnsSettings.php b/app/Notifications/ReturnsSettings.php
index ce49807fcf..411a4a29a1 100644
--- a/app/Notifications/ReturnsSettings.php
+++ b/app/Notifications/ReturnsSettings.php
@@ -1,4 +1,5 @@
data;
$settings['ntfy_pass'] = FireflyConfig::getEncrypted('ntfy_pass', '')->data;
}
+
return $settings;
}
-
}
diff --git a/app/Notifications/Test/TestNotificationEmail.php b/app/Notifications/Test/TestNotificationEmail.php
index a46ae9725c..a9dc675b71 100644
--- a/app/Notifications/Test/TestNotificationEmail.php
+++ b/app/Notifications/Test/TestNotificationEmail.php
@@ -49,8 +49,6 @@ class TestNotificationEmail extends Notification
/**
* Get the array representation of the notification.
*
- * @param OwnerNotifiable $notifiable
- *
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*
* @return array
@@ -73,9 +71,11 @@ class TestNotificationEmail extends Notification
public function toMail(OwnerNotifiable $notifiable)
{
$address = (string) config('firefly.site_owner');
+
return (new MailMessage())
->markdown('emails.admin-test', ['email' => $address])
- ->subject((string) trans('email.admin_test_subject'));
+ ->subject((string) trans('email.admin_test_subject'))
+ ;
}
/**
diff --git a/app/Notifications/Test/TestNotificationNtfy.php b/app/Notifications/Test/TestNotificationNtfy.php
index 434bee6909..aa7e322af5 100644
--- a/app/Notifications/Test/TestNotificationNtfy.php
+++ b/app/Notifications/Test/TestNotificationNtfy.php
@@ -26,13 +26,12 @@ namespace FireflyIII\Notifications\Test;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
use FireflyIII\Notifications\ReturnsSettings;
-use FireflyIII\User;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
use Ntfy\Message;
use Wijourdil\NtfyNotificationChannel\Channels\NtfyChannel;
-//use Illuminate\Notifications\Slack\SlackMessage;
+// use Illuminate\Notifications\Slack\SlackMessage;
/**
* Class TestNotification
@@ -66,7 +65,6 @@ class TestNotificationNtfy extends Notification
];
}
-
public function toNtfy(OwnerNotifiable $notifiable): Message
{
$settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
@@ -82,7 +80,7 @@ class TestNotificationNtfy extends Notification
config(['ntfy-notification-channel.authentication.password' => $settings['ntfy_pass']]);
}
- $message = new Message();
+ $message = new Message();
$message->topic($settings['ntfy_topic']);
$message->title((string) trans('email.admin_test_subject'));
$message->body((string) trans('email.admin_test_message', ['channel' => 'ntfy']));
diff --git a/app/Notifications/Test/TestNotificationPushover.php b/app/Notifications/Test/TestNotificationPushover.php
index a17da167c0..2f78fab318 100644
--- a/app/Notifications/Test/TestNotificationPushover.php
+++ b/app/Notifications/Test/TestNotificationPushover.php
@@ -25,17 +25,13 @@ declare(strict_types=1);
namespace FireflyIII\Notifications\Test;
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
-use FireflyIII\User;
use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\Log;
use NotificationChannels\Pushover\PushoverChannel;
use NotificationChannels\Pushover\PushoverMessage;
-use Ntfy\Message;
-use Wijourdil\NtfyNotificationChannel\Channels\NtfyChannel;
-//use Illuminate\Notifications\Slack\SlackMessage;
+// use Illuminate\Notifications\Slack\SlackMessage;
/**
* Class TestNotification
@@ -57,8 +53,6 @@ class TestNotificationPushover extends Notification
/**
* Get the array representation of the notification.
*
- * @param OwnerNotifiable $notifiable
- *
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*
* @return array
@@ -69,16 +63,15 @@ class TestNotificationPushover extends Notification
];
}
-
public function toPushover(OwnerNotifiable $notifiable): PushoverMessage
{
Log::debug('Now in toPushover()');
return PushoverMessage::create((string)trans('email.admin_test_message', ['channel' => 'Pushover']))
- ->title((string)trans('email.admin_test_subject'));
+ ->title((string)trans('email.admin_test_subject'))
+ ;
}
-
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
diff --git a/app/Notifications/Test/TestNotificationSlack.php b/app/Notifications/Test/TestNotificationSlack.php
index bf20f6eb54..e711de7283 100644
--- a/app/Notifications/Test/TestNotificationSlack.php
+++ b/app/Notifications/Test/TestNotificationSlack.php
@@ -29,7 +29,7 @@ use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
-//use Illuminate\Notifications\Slack\SlackMessage;
+// use Illuminate\Notifications\Slack\SlackMessage;
/**
* Class TestNotification
@@ -51,8 +51,6 @@ class TestNotificationSlack extends Notification
/**
* Get the array representation of the notification.
*
- * @param OwnerNotifiable $notifiable
- *
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*
* @return array
@@ -66,15 +64,12 @@ class TestNotificationSlack extends Notification
/**
* Get the Slack representation of the notification.
*
- * @param OwnerNotifiable $notifiable
- *
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
*/
public function toSlack(OwnerNotifiable $notifiable)
{
return new SlackMessage()->content((string) trans('email.admin_test_subject'));
- //return new SlackMessage()->text((string) trans('email.admin_test_subject'))->to($url);
+ // return new SlackMessage()->text((string) trans('email.admin_test_subject'))->to($url);
}
/**
@@ -82,8 +77,6 @@ class TestNotificationSlack extends Notification
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*
- * @param OwnerNotifiable $notifiable
- *
* @return array
*/
public function via(OwnerNotifiable $notifiable)
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 7722f48a22..7029bff123 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -25,7 +25,6 @@ namespace FireflyIII\Providers;
use FireflyIII\Events\ActuallyLoggedIn;
use FireflyIII\Events\Admin\InvitationCreated;
-use FireflyIII\Events\AdminRequestedTestMessage;
use FireflyIII\Events\DestroyedTransactionGroup;
use FireflyIII\Events\DetectedNewIPAddress;
use FireflyIII\Events\Model\BudgetLimit\Created;
@@ -137,7 +136,7 @@ class EventServiceProvider extends ServiceProvider
'FireflyIII\Handlers\Events\UserEventHandler@sendEmailChangeUndoMail',
],
// admin related
- TestNotificationChannel::class => [
+ TestNotificationChannel::class => [
'FireflyIII\Handlers\Events\AdminEventHandler@sendTestNotification',
],
NewVersionAvailable::class => [
@@ -147,7 +146,7 @@ class EventServiceProvider extends ServiceProvider
'FireflyIII\Handlers\Events\AdminEventHandler@sendInvitationNotification',
'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationInvite',
],
- UnknownUserAttemptedLogin::class => [
+ UnknownUserAttemptedLogin::class => [
'FireflyIII\Handlers\Events\AdminEventHandler@sendLoginAttemptNotification',
],
diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.php
index f98b3da334..8efff4bf73 100644
--- a/app/Repositories/Budget/BudgetLimitRepository.php
+++ b/app/Repositories/Budget/BudgetLimitRepository.php
@@ -50,10 +50,10 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
*/
public function budgeted(Carbon $start, Carbon $end, TransactionCurrency $currency, ?Collection $budgets = null): string
{
- $query = BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
+ $query = BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
// same complex where query as below.
- ->where(
+ ->where(
static function (Builder $q5) use ($start, $end): void {
$q5->where(
static function (Builder $q1) use ($start, $end): void {
@@ -63,27 +63,30 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
$q2->where('budget_limits.end_date', '<=', $end->format('Y-m-d'));
}
)
- ->orWhere(
- static function (Builder $q3) use ($start, $end): void {
- $q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d'));
- $q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d'));
- }
- );
+ ->orWhere(
+ static function (Builder $q3) use ($start, $end): void {
+ $q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d'));
+ $q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d'));
+ }
+ )
+ ;
}
)
- ->orWhere(
- static function (Builder $q4) use ($start, $end): void {
- // or start is before start AND end is after end.
- $q4->where('budget_limits.start_date', '<=', $start->format('Y-m-d'));
- $q4->where('budget_limits.end_date', '>=', $end->format('Y-m-d'));
- }
- );
+ ->orWhere(
+ static function (Builder $q4) use ($start, $end): void {
+ // or start is before start AND end is after end.
+ $q4->where('budget_limits.start_date', '<=', $start->format('Y-m-d'));
+ $q4->where('budget_limits.end_date', '>=', $end->format('Y-m-d'));
+ }
+ )
+ ;
}
)
- ->where('budget_limits.transaction_currency_id', $currency->id)
- ->whereNull('budgets.deleted_at')
- ->where('budgets.active', true)
- ->where('budgets.user_id', $this->user->id);
+ ->where('budget_limits.transaction_currency_id', $currency->id)
+ ->whereNull('budgets.deleted_at')
+ ->where('budgets.active', true)
+ ->where('budgets.user_id', $this->user->id)
+ ;
if (null !== $budgets && $budgets->count() > 0) {
$query->whereIn('budget_limits.budget_id', $budgets->pluck('id')->toArray());
}
@@ -135,17 +138,19 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
// both are NULL:
if (null === $start && null === $end) {
return BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
- ->with(['budget'])
- ->where('budgets.user_id', $this->user->id)
- ->whereNull('budgets.deleted_at')
- ->get(['budget_limits.*']);
+ ->with(['budget'])
+ ->where('budgets.user_id', $this->user->id)
+ ->whereNull('budgets.deleted_at')
+ ->get(['budget_limits.*'])
+ ;
}
// one of the two is NULL.
if (null === $start xor null === $end) {
$query = BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
- ->with(['budget'])
- ->whereNull('budgets.deleted_at')
- ->where('budgets.user_id', $this->user->id);
+ ->with(['budget'])
+ ->whereNull('budgets.deleted_at')
+ ->where('budgets.user_id', $this->user->id)
+ ;
if (null !== $end) {
// end date must be before $end.
$query->where('end_date', '<=', $end->format('Y-m-d 00:00:00'));
@@ -160,36 +165,39 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
// neither are NULL:
return BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
- ->with(['budget'])
- ->where('budgets.user_id', $this->user->id)
- ->whereNull('budgets.deleted_at')
- ->where(
- static function (Builder $q5) use ($start, $end): void {
- $q5->where(
- static function (Builder $q1) use ($start, $end): void {
- $q1->where(
- static function (Builder $q2) use ($start, $end): void {
- $q2->where('budget_limits.end_date', '>=', $start->format('Y-m-d'));
- $q2->where('budget_limits.end_date', '<=', $end->format('Y-m-d'));
- }
- )
- ->orWhere(
- static function (Builder $q3) use ($start, $end): void {
- $q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d'));
- $q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d'));
- }
- );
- }
- )
- ->orWhere(
- static function (Builder $q4) use ($start, $end): void {
- // or start is before start AND end is after end.
- $q4->where('budget_limits.start_date', '<=', $start->format('Y-m-d'));
- $q4->where('budget_limits.end_date', '>=', $end->format('Y-m-d'));
- }
- );
- }
- )->get(['budget_limits.*']);
+ ->with(['budget'])
+ ->where('budgets.user_id', $this->user->id)
+ ->whereNull('budgets.deleted_at')
+ ->where(
+ static function (Builder $q5) use ($start, $end): void {
+ $q5->where(
+ static function (Builder $q1) use ($start, $end): void {
+ $q1->where(
+ static function (Builder $q2) use ($start, $end): void {
+ $q2->where('budget_limits.end_date', '>=', $start->format('Y-m-d'));
+ $q2->where('budget_limits.end_date', '<=', $end->format('Y-m-d'));
+ }
+ )
+ ->orWhere(
+ static function (Builder $q3) use ($start, $end): void {
+ $q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d'));
+ $q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d'));
+ }
+ )
+ ;
+ }
+ )
+ ->orWhere(
+ static function (Builder $q4) use ($start, $end): void {
+ // or start is before start AND end is after end.
+ $q4->where('budget_limits.start_date', '<=', $start->format('Y-m-d'));
+ $q4->where('budget_limits.end_date', '>=', $end->format('Y-m-d'));
+ }
+ )
+ ;
+ }
+ )->get(['budget_limits.*'])
+ ;
}
public function getBudgetLimits(Budget $budget, ?Carbon $start = null, ?Carbon $end = null): Collection
@@ -214,38 +222,41 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
// when both dates are set:
return $budget->budgetlimits()
- ->where(
- static function (Builder $q5) use ($start, $end): void { // @phpstan-ignore-line
- $q5->where(
- static function (Builder $q1) use ($start, $end): void {
- // budget limit ends within period
- $q1->where(
- static function (Builder $q2) use ($start, $end): void {
- $q2->where('budget_limits.end_date', '>=', $start->format('Y-m-d 00:00:00'));
- $q2->where('budget_limits.end_date', '<=', $end->format('Y-m-d 23:59:59'));
- }
- )
- // budget limit start within period
- ->orWhere(
- static function (Builder $q3) use ($start, $end): void {
- $q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d 00:00:00'));
- $q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d 23:59:59'));
- }
- );
- }
- )
- ->orWhere(
- static function (Builder $q4) use ($start, $end): void {
- // or start is before start AND end is after end.
- $q4->where('budget_limits.start_date', '<=', $start->format('Y-m-d 23:59:59'));
- $q4->where('budget_limits.end_date', '>=', $end->format('Y-m-d 00:00:00'));
- }
- );
- }
- )->orderBy('budget_limits.start_date', 'DESC')->get(['budget_limits.*']);
+ ->where(
+ static function (Builder $q5) use ($start, $end): void { // @phpstan-ignore-line
+ $q5->where(
+ static function (Builder $q1) use ($start, $end): void {
+ // budget limit ends within period
+ $q1->where(
+ static function (Builder $q2) use ($start, $end): void {
+ $q2->where('budget_limits.end_date', '>=', $start->format('Y-m-d 00:00:00'));
+ $q2->where('budget_limits.end_date', '<=', $end->format('Y-m-d 23:59:59'));
+ }
+ )
+ // budget limit start within period
+ ->orWhere(
+ static function (Builder $q3) use ($start, $end): void {
+ $q3->where('budget_limits.start_date', '>=', $start->format('Y-m-d 00:00:00'));
+ $q3->where('budget_limits.start_date', '<=', $end->format('Y-m-d 23:59:59'));
+ }
+ )
+ ;
+ }
+ )
+ ->orWhere(
+ static function (Builder $q4) use ($start, $end): void {
+ // or start is before start AND end is after end.
+ $q4->where('budget_limits.start_date', '<=', $start->format('Y-m-d 23:59:59'));
+ $q4->where('budget_limits.end_date', '>=', $end->format('Y-m-d 00:00:00'));
+ }
+ )
+ ;
+ }
+ )->orderBy('budget_limits.start_date', 'DESC')->get(['budget_limits.*'])
+ ;
}
- public function setUser(null | Authenticatable | User $user): void
+ public function setUser(null|Authenticatable|User $user): void
{
if ($user instanceof User) {
$this->user = $user;
@@ -259,33 +270,34 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
{
// if no currency has been provided, use the user's default currency:
/** @var TransactionCurrencyFactory $factory */
- $factory = app(TransactionCurrencyFactory::class);
- $currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
+ $factory = app(TransactionCurrencyFactory::class);
+ $currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
if (null === $currency) {
$currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
}
- $currency->enabled = true;
+ $currency->enabled = true;
$currency->save();
// find the budget:
- $budget = $this->user->budgets()->find((int) $data['budget_id']);
+ $budget = $this->user->budgets()->find((int) $data['budget_id']);
if (null === $budget) {
throw new FireflyException('200004: Budget does not exist.');
}
// find limit with same date range and currency.
- $limit = $budget->budgetlimits()
- ->where('budget_limits.start_date', $data['start_date']->format('Y-m-d'))
- ->where('budget_limits.end_date', $data['end_date']->format('Y-m-d'))
- ->where('budget_limits.transaction_currency_id', $currency->id)
- ->first(['budget_limits.*']);
+ $limit = $budget->budgetlimits()
+ ->where('budget_limits.start_date', $data['start_date']->format('Y-m-d'))
+ ->where('budget_limits.end_date', $data['end_date']->format('Y-m-d'))
+ ->where('budget_limits.transaction_currency_id', $currency->id)
+ ->first(['budget_limits.*'])
+ ;
if (null !== $limit) {
throw new FireflyException('200027: Budget limit already exists.');
}
app('log')->debug('No existing budget limit, create a new one');
// or create one and return it.
- $limit = new BudgetLimit();
+ $limit = new BudgetLimit();
$limit->budget()->associate($budget);
$limit->start_date = $data['start_date']->format('Y-m-d');
$limit->end_date = $data['end_date']->format('Y-m-d');
@@ -293,7 +305,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
$limit->transaction_currency_id = $currency->id;
$limit->save();
- $noteText = (string) ($data['notes'] ?? '');
+ $noteText = (string) ($data['notes'] ?? '');
if ('' !== $noteText) {
$this->setNoteText($limit, $noteText);
}
@@ -303,13 +315,13 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
return $limit;
}
-
public function find(Budget $budget, TransactionCurrency $currency, Carbon $start, Carbon $end): ?BudgetLimit
{
return $budget->budgetlimits()
- ->where('transaction_currency_id', $currency->id)
- ->where('start_date', $start->format('Y-m-d'))
- ->where('end_date', $end->format('Y-m-d'))->first();
+ ->where('transaction_currency_id', $currency->id)
+ ->where('start_date', $start->format('Y-m-d'))
+ ->where('end_date', $end->format('Y-m-d'))->first()
+ ;
}
/**
@@ -317,8 +329,8 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
*/
public function update(BudgetLimit $budgetLimit, array $data): BudgetLimit
{
- $budgetLimit->amount = array_key_exists('amount', $data) ? $data['amount'] : $budgetLimit->amount;
- $budgetLimit->budget_id = array_key_exists('budget_id', $data) ? $data['budget_id'] : $budgetLimit->budget_id;
+ $budgetLimit->amount = array_key_exists('amount', $data) ? $data['amount'] : $budgetLimit->amount;
+ $budgetLimit->budget_id = array_key_exists('budget_id', $data) ? $data['budget_id'] : $budgetLimit->budget_id;
if (array_key_exists('start', $data)) {
$budgetLimit->start_date = $data['start']->startOfDay();
@@ -330,7 +342,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
}
// if no currency has been provided, use the user's default currency:
- $currency = null;
+ $currency = null;
// update if relevant:
if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
@@ -342,14 +354,14 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
if (null === $currency) {
$currency = $budgetLimit->transactionCurrency ?? app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
}
- $currency->enabled = true;
+ $currency->enabled = true;
$currency->save();
$budgetLimit->transaction_currency_id = $currency->id;
$budgetLimit->save();
// update notes if they exist.
- if(array_key_exists('notes', $data)) {
+ if (array_key_exists('notes', $data)) {
$this->setNoteText($budgetLimit, (string)$data['notes']);
}
@@ -359,26 +371,29 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): ?BudgetLimit
{
// count the limits:
- $limits = $budget->budgetlimits()
- ->where('budget_limits.start_date', $start->format('Y-m-d 00:00:00'))
- ->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00'))
- ->count('budget_limits.*');
+ $limits = $budget->budgetlimits()
+ ->where('budget_limits.start_date', $start->format('Y-m-d 00:00:00'))
+ ->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00'))
+ ->count('budget_limits.*')
+ ;
app('log')->debug(sprintf('Found %d budget limits.', $limits));
// there might be a budget limit for these dates:
/** @var null|BudgetLimit $limit */
- $limit = $budget->budgetlimits()
- ->where('budget_limits.start_date', $start->format('Y-m-d 00:00:00'))
- ->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00'))
- ->first(['budget_limits.*']);
+ $limit = $budget->budgetlimits()
+ ->where('budget_limits.start_date', $start->format('Y-m-d 00:00:00'))
+ ->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00'))
+ ->first(['budget_limits.*'])
+ ;
// if more than 1 limit found, delete the others:
if ($limits > 1 && null !== $limit) {
app('log')->debug(sprintf('Found more than 1, delete all except #%d', $limit->id));
$budget->budgetlimits()
- ->where('budget_limits.start_date', $start->format('Y-m-d 00:00:00'))
- ->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00'))
- ->where('budget_limits.id', '!=', $limit->id)->delete();
+ ->where('budget_limits.start_date', $start->format('Y-m-d 00:00:00'))
+ ->where('budget_limits.end_date', $end->format('Y-m-d 00:00:00'))
+ ->where('budget_limits.id', '!=', $limit->id)->delete()
+ ;
}
// delete if amount is zero.
@@ -400,7 +415,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
}
app('log')->debug('No existing budget limit, create a new one');
// or create one and return it.
- $limit = new BudgetLimit();
+ $limit = new BudgetLimit();
$limit->budget()->associate($budget);
$limit->start_date = $start->startOfDay();
$limit->start_date_tz = $start->format('e');
@@ -413,12 +428,14 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
return $limit;
}
- #[\Override] public function getNoteText(BudgetLimit $budgetLimit): string
+ #[\Override]
+ public function getNoteText(BudgetLimit $budgetLimit): string
{
return (string) $budgetLimit->notes()->first()?->text;
}
- #[\Override] public function setNoteText(BudgetLimit $budgetLimit, string $text): void
+ #[\Override]
+ public function setNoteText(BudgetLimit $budgetLimit, string $text): void
{
$dbNote = $budgetLimit->notes()->first();
if ('' !== $text) {
diff --git a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php
index 12cbcd9da4..7eafcfd149 100644
--- a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php
+++ b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php
@@ -49,6 +49,7 @@ interface BudgetLimitRepositoryInterface
public function destroyAll(): void;
public function getNoteText(BudgetLimit $budgetLimit): string;
+
public function setNoteText(BudgetLimit $budgetLimit, string $text): void;
/**
diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php
index 97cb7ba79f..c0e4cd0db4 100644
--- a/app/Repositories/Currency/CurrencyRepository.php
+++ b/app/Repositories/Currency/CurrencyRepository.php
@@ -106,7 +106,8 @@ class CurrencyRepository implements CurrencyRepositoryInterface
}
}
- #[\Override] public function find(int $currencyId): ?TransactionCurrency
+ #[\Override]
+ public function find(int $currencyId): ?TransactionCurrency
{
return TransactionCurrency::find($currencyId);
}
diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
index f37bc9e1a2..61f21c39d0 100644
--- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
+++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
@@ -30,11 +30,9 @@ use FireflyIII\Factory\PiggyBankFactory;
use FireflyIII\Models\Note;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;
use FireflyIII\Support\Facades\Amount;
-use Illuminate\Database\QueryException;
/**
* Trait ModifiesPiggyBanks
@@ -59,7 +57,7 @@ trait ModifiesPiggyBanks
public function removeAmount(PiggyBank $piggyBank, string $amount, ?TransactionJournal $journal = null): bool
{
- $repetition = $this->getRepetition($piggyBank);
+ $repetition = $this->getRepetition($piggyBank);
if (null === $repetition) {
return false;
}
@@ -74,11 +72,11 @@ trait ModifiesPiggyBanks
public function addAmount(PiggyBank $piggyBank, string $amount, ?TransactionJournal $journal = null): bool
{
- $repetition = $this->getRepetition($piggyBank);
+ $repetition = $this->getRepetition($piggyBank);
if (null === $repetition) {
return false;
}
- $currentAmount = $repetition->current_amount ?? '0';
+ $currentAmount = $repetition->current_amount ?? '0';
$repetition->current_amount = bcadd($currentAmount, $amount);
$repetition->save();
@@ -143,15 +141,15 @@ trait ModifiesPiggyBanks
public function setCurrentAmount(PiggyBank $piggyBank, string $amount): PiggyBank
{
- $repetition = $this->getRepetition($piggyBank);
+ $repetition = $this->getRepetition($piggyBank);
if (null === $repetition) {
return $piggyBank;
}
- $max = $piggyBank->target_amount;
+ $max = $piggyBank->target_amount;
if (1 === bccomp($amount, $max) && 0 !== bccomp($piggyBank->target_amount, '0')) {
$amount = $max;
}
- $difference = bcsub($amount, $repetition->current_amount);
+ $difference = bcsub($amount, $repetition->current_amount);
$repetition->current_amount = $amount;
$repetition->save();
@@ -184,10 +182,10 @@ trait ModifiesPiggyBanks
{
$factory = new PiggyBankFactory();
$factory->user = $this->user;
+
return $factory->store($data);
}
-
public function setOrder(PiggyBank $piggyBank, int $newOrder): bool
{
$oldOrder = $piggyBank->order;
@@ -220,7 +218,8 @@ trait ModifiesPiggyBanks
if ('' === $note) {
$dbNote = $piggyBank->notes()->first();
$dbNote?->delete();
- return ;
+
+ return;
}
$dbNote = $piggyBank->notes()->first();
if (null === $dbNote) {
@@ -249,7 +248,7 @@ trait ModifiesPiggyBanks
// remove money from the rep.
$repetition = $this->getRepetition($piggyBank);
if (null !== $repetition && $repetition->current_amount > $piggyBank->target_amount && 0 !== bccomp($piggyBank->target_amount, '0')) {
- $difference = bcsub($piggyBank->target_amount, $repetition->current_amount);
+ $difference = bcsub($piggyBank->target_amount, $repetition->current_amount);
// an amount will be removed, create "negative" event:
event(new ChangedAmount($piggyBank, $difference, null, null));
diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php
index bd8c78de52..0d9943b5c3 100644
--- a/app/Repositories/PiggyBank/PiggyBankRepository.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php
@@ -95,7 +95,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
public function getAttachments(PiggyBank $piggyBank): Collection
{
- $set = $piggyBank->attachments()->get();
+ $set = $piggyBank->attachments()->get();
/** @var \Storage $disk */
$disk = \Storage::disk('upload');
@@ -122,12 +122,14 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
$amount = '' === $amount ? '0' : $amount;
$sum = bcadd($sum, $amount);
}
+
return $sum;
}
public function getRepetition(PiggyBank $piggyBank): ?PiggyBankRepetition
{
throw new FireflyException('[b] Piggy bank repetitions are EOL.');
+
return $piggyBank->piggyBankRepetitions()->first();
}
@@ -146,15 +148,15 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
throw new FireflyException('[c] Piggy bank repetitions are EOL.');
app('log')->debug(sprintf('Now in getExactAmount(%d, %d, %d)', $piggyBank->id, $repetition->id, $journal->id));
- $operator = null;
- $currency = null;
+ $operator = null;
+ $currency = null;
/** @var JournalRepositoryInterface $journalRepost */
- $journalRepost = app(JournalRepositoryInterface::class);
+ $journalRepost = app(JournalRepositoryInterface::class);
$journalRepost->setUser($this->user);
/** @var AccountRepositoryInterface $accountRepos */
- $accountRepos = app(AccountRepositoryInterface::class);
+ $accountRepos = app(AccountRepositoryInterface::class);
$accountRepos->setUser($this->user);
$defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
@@ -163,10 +165,10 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
app('log')->debug(sprintf('Piggy bank #%d currency is %s', $piggyBank->id, $piggyBankCurrency->code));
/** @var Transaction $source */
- $source = $journal->transactions()->with(['account'])->where('amount', '<', 0)->first();
+ $source = $journal->transactions()->with(['account'])->where('amount', '<', 0)->first();
/** @var Transaction $destination */
- $destination = $journal->transactions()->with(['account'])->where('amount', '>', 0)->first();
+ $destination = $journal->transactions()->with(['account'])->where('amount', '>', 0)->first();
// matches source, which means amount will be removed from piggy:
if ($source->account_id === $piggyBank->account_id) {
@@ -188,7 +190,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
}
// currency of the account + the piggy bank currency are almost the same.
// which amount from the transaction matches?
- $amount = null;
+ $amount = null;
if ((int) $source->transaction_currency_id === $currency->id) {
app('log')->debug('Use normal amount');
$amount = app('steam')->{$operator}($source->amount); // @phpstan-ignore-line
@@ -204,8 +206,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
}
app('log')->debug(sprintf('The currency is %s and the amount is %s', $currency->code, $amount));
- $room = bcsub($piggyBank->target_amount, $repetition->current_amount);
- $compare = bcmul($repetition->current_amount, '-1');
+ $room = bcsub($piggyBank->target_amount, $repetition->current_amount);
+ $compare = bcmul($repetition->current_amount, '-1');
if (0 === bccomp($piggyBank->target_amount, '0')) {
// amount is zero? then the "room" is positive amount of we wish to add or remove.
@@ -237,14 +239,13 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
return (string) $amount;
}
- public function setUser(null | Authenticatable | User $user): void
+ public function setUser(null|Authenticatable|User $user): void
{
if ($user instanceof User) {
$this->user = $user;
}
}
-
/**
* Return note for piggy bank.
*/
@@ -263,12 +264,12 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
{
$currency = app('amount')->getDefaultCurrency();
- $set = $this->getPiggyBanks();
+ $set = $this->getPiggyBanks();
/** @var PiggyBank $piggy */
foreach ($set as $piggy) {
$currentAmount = $this->getRepetition($piggy)->current_amount ?? '0';
- $piggy->name = $piggy->name . ' (' . app('amount')->formatAnything($currency, $currentAmount, false) . ')';
+ $piggy->name = $piggy->name.' ('.app('amount')->formatAnything($currency, $currentAmount, false).')';
}
return $set;
@@ -276,8 +277,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
public function getPiggyBanks(): Collection
{
- return PiggyBank
- ::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+ return PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
->where('accounts.user_id', auth()->user()->id)
->with(
@@ -286,7 +286,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
'objectGroups',
]
)
- ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*']);
+ ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*'])
+ ;
}
/**
@@ -344,17 +345,20 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
$search->whereLike('piggy_banks.name', sprintf('%%%s%%', $query));
}
$search->orderBy('piggy_banks.order', 'ASC')
- ->orderBy('piggy_banks.name', 'ASC');
+ ->orderBy('piggy_banks.name', 'ASC')
+ ;
return $search->take($limit)->get();
}
- #[\Override] public function purgeAll(): void
+ #[\Override]
+ public function purgeAll(): void
{
throw new FireflyException('TODO Not implemented');
}
- #[\Override] public function resetOrder(): void
+ #[\Override]
+ public function resetOrder(): void
{
$factory = new PiggyBankFactory();
$factory->user = $this->user;
diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
index b2c13d5764..b1168bdaa0 100644
--- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
@@ -129,7 +129,7 @@ interface PiggyBankRepositoryInterface
*/
public function setOrder(PiggyBank $piggyBank, int $newOrder): bool;
- public function setUser(null | Authenticatable | User $user): void;
+ public function setUser(null|Authenticatable|User $user): void;
/**
* Store new piggy bank.
diff --git a/app/Rules/Admin/IsValidDiscordUrl.php b/app/Rules/Admin/IsValidDiscordUrl.php
index f0e03c6447..633efb4671 100644
--- a/app/Rules/Admin/IsValidDiscordUrl.php
+++ b/app/Rules/Admin/IsValidDiscordUrl.php
@@ -18,11 +18,11 @@ class IsValidDiscordUrl implements ValidationRule
public function validate(string $attribute, mixed $value, \Closure $fail): void
{
$value = (string)$value;
- if('' === $value) {
+ if ('' === $value) {
return;
}
- if(!str_starts_with($value, 'https://discord.com/api/webhooks/')) {
+ if (!str_starts_with($value, 'https://discord.com/api/webhooks/')) {
$fail('validation.active_url')->translate();
$message = sprintf('IsValidDiscordUrl: "%s" is not a discord URL.', substr($value, 0, 255));
Log::debug($message);
diff --git a/app/Rules/Admin/IsValidSlackOrDiscordUrl.php b/app/Rules/Admin/IsValidSlackOrDiscordUrl.php
index c03e513a59..b3c8967d5b 100644
--- a/app/Rules/Admin/IsValidSlackOrDiscordUrl.php
+++ b/app/Rules/Admin/IsValidSlackOrDiscordUrl.php
@@ -18,11 +18,11 @@ class IsValidSlackOrDiscordUrl implements ValidationRule
public function validate(string $attribute, mixed $value, \Closure $fail): void
{
$value = (string)$value;
- if('' === $value) {
+ if ('' === $value) {
return;
}
- if(!str_starts_with($value, 'https://hooks.slack.com/services/') && !str_starts_with($value, 'https://discord.com/api/webhooks/')) {
+ if (!str_starts_with($value, 'https://hooks.slack.com/services/') && !str_starts_with($value, 'https://discord.com/api/webhooks/')) {
$fail('validation.active_url')->translate();
$message = sprintf('IsValidSlackUrl: "%s" is not a discord or slack URL.', substr($value, 0, 255));
Log::debug($message);
diff --git a/app/Rules/Admin/IsValidSlackUrl.php b/app/Rules/Admin/IsValidSlackUrl.php
index 8eddfa18c2..4851dab73f 100644
--- a/app/Rules/Admin/IsValidSlackUrl.php
+++ b/app/Rules/Admin/IsValidSlackUrl.php
@@ -18,11 +18,11 @@ class IsValidSlackUrl implements ValidationRule
public function validate(string $attribute, mixed $value, \Closure $fail): void
{
$value = (string)$value;
- if('' === $value) {
+ if ('' === $value) {
return;
}
- if(!str_starts_with($value, 'https://hooks.slack.com/services/')) {
+ if (!str_starts_with($value, 'https://hooks.slack.com/services/')) {
$fail('validation.active_url')->translate();
$message = sprintf('IsValidSlackUrl: "%s" is not a slack URL.', substr($value, 0, 255));
Log::debug($message);
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index 22719d612d..737c41a081 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -289,6 +289,7 @@ class ExpandedForm
return $html;
}
+
/**
* @throws FireflyException
*/
@@ -299,7 +300,7 @@ class ExpandedForm
$classes = $this->getHolderClasses($name);
try {
- $html = view('form.password', compact('classes', 'value','name', 'label', 'options'))->render();
+ $html = view('form.password', compact('classes', 'value', 'name', 'label', 'options'))->render();
} catch (\Throwable $e) {
app('log')->debug(sprintf('Could not render passwordWithValue(): %s', $e->getMessage()));
$html = 'Could not render passwordWithValue.';
diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php
index f0cd72f5f5..094ca4b684 100644
--- a/app/Support/FireflyConfig.php
+++ b/app/Support/FireflyConfig.php
@@ -37,7 +37,7 @@ class FireflyConfig
{
public function delete(string $name): void
{
- $fullName = 'ff-config-' . $name;
+ $fullName = 'ff-config-'.$name;
if (\Cache::has($fullName)) {
\Cache::forget($fullName);
}
@@ -57,14 +57,18 @@ class FireflyConfig
}
if ('' === $result->data) {
Log::warning(sprintf('Empty encrypted configuration value found: "%s"', $name));
+
return $result;
}
+
try {
$result->data = decrypt($result->data);
} catch (DecryptException $e) {
Log::error(sprintf('Could not decrypt configuration value "%s": %s', $name, $e->getMessage()));
+
return $result;
}
+
return $result;
}
@@ -75,7 +79,7 @@ class FireflyConfig
*/
public function get(string $name, $default = null): ?Configuration
{
- $fullName = 'ff-config-' . $name;
+ $fullName = 'ff-config-'.$name;
if (\Cache::has($fullName)) {
return \Cache::get($fullName);
}
@@ -83,7 +87,7 @@ class FireflyConfig
try {
/** @var null|Configuration $config */
$config = Configuration::where('name', $name)->first(['id', 'name', 'data']);
- } catch (\Exception | QueryException $e) {
+ } catch (\Exception|QueryException $e) {
throw new FireflyException(sprintf('Could not poll the database: %s', $e->getMessage()), 0, $e);
}
@@ -106,8 +110,10 @@ class FireflyConfig
$encrypted = encrypt($value);
} catch (EncryptException $e) {
Log::error(sprintf('Could not encrypt configuration value "%s": %s', $name, $e->getMessage()));
+
throw new FireflyException(sprintf('Could not encrypt configuration value "%s". Cowardly refuse to continue.', $name));
}
+
return $this->set($name, $encrypted);
}
@@ -129,13 +135,13 @@ class FireflyConfig
$item->name = $name;
$item->data = $value;
$item->save();
- \Cache::forget('ff-config-' . $name);
+ \Cache::forget('ff-config-'.$name);
return $item;
}
$config->data = $value;
$config->save();
- \Cache::forget('ff-config-' . $name);
+ \Cache::forget('ff-config-'.$name);
return $config;
}
diff --git a/app/Support/Form/AccountForm.php b/app/Support/Form/AccountForm.php
index 63f4bb4130..a0df5ef405 100644
--- a/app/Support/Form/AccountForm.php
+++ b/app/Support/Form/AccountForm.php
@@ -155,8 +155,9 @@ class AccountForm
*/
public function assetLiabilityMultiAccountList(string $name, $value = null, ?array $options = null): string
{
- $types = [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::DEBT->value,AccountTypeEnum::LOAN->value];
+ $types = [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value];
$grouped = $this->getAccountsGrouped($types);
+
return $this->multiSelect($name, $grouped, $value, $options);
}
diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php
index 932d77e436..af9c24c3b9 100644
--- a/app/Support/Preferences.php
+++ b/app/Support/Preferences.php
@@ -64,14 +64,18 @@ class Preferences
}
if ('' === $result->data) {
Log::warning(sprintf('Empty encrypted preference found: "%s"', $name));
+
return $result;
}
+
try {
$result->data = decrypt($result->data);
} catch (DecryptException $e) {
Log::error(sprintf('Could not decrypt preference "%s": %s', $name, $e->getMessage()));
+
return $result;
}
+
return $result;
}
@@ -81,12 +85,13 @@ class Preferences
$encrypted = encrypt($value);
} catch (EncryptException $e) {
Log::error(sprintf('Could not encrypt preference "%s": %s', $name, $e->getMessage()));
+
throw new FireflyException(sprintf('Could not encrypt preference "%s". Cowardly refuse to continue.', $name));
}
+
return $this->set($name, $encrypted);
}
-
public function get(string $name, null|array|bool|int|string $default = null): ?Preference
{
/** @var null|User $user */
diff --git a/app/Transformers/BudgetLimitTransformer.php b/app/Transformers/BudgetLimitTransformer.php
index d75440a8fd..afac7c5684 100644
--- a/app/Transformers/BudgetLimitTransformer.php
+++ b/app/Transformers/BudgetLimitTransformer.php
@@ -55,8 +55,8 @@ class BudgetLimitTransformer extends AbstractTransformer
*/
public function transform(BudgetLimit $budgetLimit): array
{
- $repository = app(OperationsRepository::class);
- $limitRepos = app(BudgetLimitRepositoryInterface::class);
+ $repository = app(OperationsRepository::class);
+ $limitRepos = app(BudgetLimitRepositoryInterface::class);
$repository->setUser($budgetLimit->budget->user);
$limitRepos->setUser($budgetLimit->budget->user);
$expenses = $repository->sumExpenses(
@@ -82,7 +82,7 @@ class BudgetLimitTransformer extends AbstractTransformer
$currencySymbol = $currency->symbol;
$currencyDecimalPlaces = $currency->decimal_places;
}
- $amount = app('steam')->bcround($amount, $currencyDecimalPlaces);
+ $amount = app('steam')->bcround($amount, $currencyDecimalPlaces);
return [
'id' => (string) $budgetLimit->id,
@@ -103,7 +103,7 @@ class BudgetLimitTransformer extends AbstractTransformer
'links' => [
[
'rel' => 'self',
- 'uri' => '/budgets/limits/' . $budgetLimit->id,
+ 'uri' => '/budgets/limits/'.$budgetLimit->id,
],
],
];
diff --git a/app/Transformers/PiggyBankTransformer.php b/app/Transformers/PiggyBankTransformer.php
index ae15958fbe..98a0fe4a4f 100644
--- a/app/Transformers/PiggyBankTransformer.php
+++ b/app/Transformers/PiggyBankTransformer.php
@@ -54,22 +54,22 @@ class PiggyBankTransformer extends AbstractTransformer
*/
public function transform(PiggyBank $piggyBank): array
{
- $user = $piggyBank->accounts()->first()->user;
+ $user = $piggyBank->accounts()->first()->user;
// set up repositories
$this->accountRepos->setUser($user);
$this->piggyRepos->setUser($user);
// note
- $notes = $this->piggyRepos->getNoteText($piggyBank);
- $notes = '' === $notes ? null : $notes;
+ $notes = $this->piggyRepos->getNoteText($piggyBank);
+ $notes = '' === $notes ? null : $notes;
$objectGroupId = null;
$objectGroupOrder = null;
$objectGroupTitle = null;
/** @var null|ObjectGroup $objectGroup */
- $objectGroup = $piggyBank->objectGroups->first();
+ $objectGroup = $piggyBank->objectGroups->first();
if (null !== $objectGroup) {
$objectGroupId = $objectGroup->id;
$objectGroupOrder = $objectGroup->order;
@@ -77,14 +77,14 @@ class PiggyBankTransformer extends AbstractTransformer
}
// get currently saved amount:
- $currency = $piggyBank->transactionCurrency;
- $currentAmount = app('steam')->bcround($this->piggyRepos->getCurrentAmount($piggyBank), $currency->decimal_places);
+ $currency = $piggyBank->transactionCurrency;
+ $currentAmount = app('steam')->bcround($this->piggyRepos->getCurrentAmount($piggyBank), $currency->decimal_places);
// Amounts, depending on 0.0 state of target amount
- $percentage = null;
- $targetAmount = $piggyBank->target_amount;
- $leftToSave = null;
- $savePerMonth = null;
+ $percentage = null;
+ $targetAmount = $piggyBank->target_amount;
+ $leftToSave = null;
+ $savePerMonth = null;
if (0 !== bccomp($targetAmount, '0')) { // target amount is not 0.00
$leftToSave = bcsub($piggyBank->target_amount, $currentAmount);
$percentage = (int) bcmul(bcdiv($currentAmount, $targetAmount), '100');
@@ -92,16 +92,16 @@ class PiggyBankTransformer extends AbstractTransformer
$leftToSave = app('steam')->bcround($leftToSave, $currency->decimal_places);
$savePerMonth = app('steam')->bcround($this->piggyRepos->getSuggestedMonthlyAmount($piggyBank), $currency->decimal_places);
}
- $startDate = $piggyBank->start_date?->format('Y-m-d');
- $targetDate = $piggyBank->target_date?->format('Y-m-d');
+ $startDate = $piggyBank->start_date?->format('Y-m-d');
+ $targetDate = $piggyBank->target_date?->format('Y-m-d');
return [
'id' => (string) $piggyBank->id,
'created_at' => $piggyBank->created_at->toAtomString(),
'updated_at' => $piggyBank->updated_at->toAtomString(),
'accounts' => $this->renderAccounts($piggyBank),
- //'account_id' => (string)$piggyBank->account_id,
- //'account_name' => $piggyBank->account->name,
+ // 'account_id' => (string)$piggyBank->account_id,
+ // 'account_name' => $piggyBank->account->name,
'name' => $piggyBank->name,
'currency_id' => (string) $currency->id,
'currency_code' => $currency->code,
@@ -123,7 +123,7 @@ class PiggyBankTransformer extends AbstractTransformer
'links' => [
[
'rel' => 'self',
- 'uri' => '/piggy_banks/' . $piggyBank->id,
+ 'uri' => '/piggy_banks/'.$piggyBank->id,
],
],
];
@@ -134,12 +134,13 @@ class PiggyBankTransformer extends AbstractTransformer
$return = [];
foreach ($piggyBank->accounts()->get() as $account) {
$return[] = [
- 'id' => $account->id,
- 'name' => $account->name,
+ 'id' => $account->id,
+ 'name' => $account->name,
'current_amount' => $account->pivot->current_amount,
// TODO add balance, add left to save.
];
}
+
return $return;
}
}
diff --git a/app/Transformers/V2/PiggyBankTransformer.php b/app/Transformers/V2/PiggyBankTransformer.php
index 8dfb88b69c..bdb2b37895 100644
--- a/app/Transformers/V2/PiggyBankTransformer.php
+++ b/app/Transformers/V2/PiggyBankTransformer.php
@@ -115,6 +115,7 @@ class PiggyBankTransformer extends AbstractTransformer
// grab repetitions (for current amount):
$repetitions = PiggyBankRepetition::whereIn('piggy_bank_id', $piggyBanks)->get();
+
throw new FireflyException('[d] Piggy bank repetitions are EOL.');
/** @var PiggyBankRepetition $repetition */
diff --git a/app/User.php b/app/User.php
index 5f31cdfb27..82484f477a 100644
--- a/app/User.php
+++ b/app/User.php
@@ -49,10 +49,8 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\UserGroup;
use FireflyIII\Models\UserRole;
use FireflyIII\Models\Webhook;
-use FireflyIII\Notifications\Admin\UserInvitation;
use FireflyIII\Notifications\Admin\UserRegistration;
use FireflyIII\Notifications\Admin\VersionCheckResult;
-use FireflyIII\Notifications\Test\TestNotificationDiscord;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -260,38 +258,38 @@ class User extends Authenticatable
app('log')->debug(sprintf('in hasAnyRoleInGroup(%s)', implode(', ', $roles)));
/** @var Collection $dbRoles */
- $dbRoles = UserRole::whereIn('title', $roles)->get();
+ $dbRoles = UserRole::whereIn('title', $roles)->get();
if (0 === $dbRoles->count()) {
app('log')->error(sprintf('Could not find role(s): %s. Probably migration mishap.', implode(', ', $roles)));
return false;
}
- $dbRolesIds = $dbRoles->pluck('id')->toArray();
- $dbRolesTitles = $dbRoles->pluck('title')->toArray();
+ $dbRolesIds = $dbRoles->pluck('id')->toArray();
+ $dbRolesTitles = $dbRoles->pluck('title')->toArray();
/** @var Collection $groupMemberships */
$groupMemberships = $this->groupMemberships()->whereIn('user_role_id', $dbRolesIds)->where('user_group_id', $userGroup->id)->get();
if (0 === $groupMemberships->count()) {
app('log')->error(sprintf(
- 'User #%d "%s" does not have roles %s in user group #%d "%s"',
- $this->id,
- $this->email,
- implode(', ', $roles),
- $userGroup->id,
- $userGroup->title
- ));
+ 'User #%d "%s" does not have roles %s in user group #%d "%s"',
+ $this->id,
+ $this->email,
+ implode(', ', $roles),
+ $userGroup->id,
+ $userGroup->title
+ ));
return false;
}
foreach ($groupMemberships as $membership) {
app('log')->debug(sprintf(
- 'User #%d "%s" has role "%s" in user group #%d "%s"',
- $this->id,
- $this->email,
- $membership->userRole->title,
- $userGroup->id,
- $userGroup->title
- ));
+ 'User #%d "%s" has role "%s" in user group #%d "%s"',
+ $this->id,
+ $this->email,
+ $membership->userRole->title,
+ $userGroup->id,
+ $userGroup->title
+ ));
if (in_array($membership->userRole->title, $dbRolesTitles, true)) {
app('log')->debug(sprintf('Return true, found role "%s"', $membership->userRole->title));
@@ -299,13 +297,13 @@ class User extends Authenticatable
}
}
app('log')->error(sprintf(
- 'User #%d "%s" does not have roles %s in user group #%d "%s"',
- $this->id,
- $this->email,
- implode(', ', $roles),
- $userGroup->id,
- $userGroup->title
- ));
+ 'User #%d "%s" does not have roles %s in user group #%d "%s"',
+ $this->id,
+ $this->email,
+ implode(', ', $roles),
+ $userGroup->id,
+ $userGroup->title
+ ));
return false;
}
@@ -357,13 +355,13 @@ class User extends Authenticatable
*/
public function routeNotificationFor($driver, $notification = null)
{
- $method = 'routeNotificationFor' . Str::studly($driver);
+ $method = 'routeNotificationFor'.Str::studly($driver);
if (method_exists($this, $method)) {
return $this->{$method}($notification); // @phpstan-ignore-line
}
- $email = $this->email;
+ $email = $this->email;
// see if user has alternative email address:
- $pref = app('preferences')->getForUser($this, 'remote_guard_alt_email');
+ $pref = app('preferences')->getForUser($this, 'remote_guard_alt_email');
if (null !== $pref) {
$email = $pref->data;
}
@@ -400,36 +398,36 @@ class User extends Authenticatable
$appToken = (string) app('fireflyconfig')->getEncrypted('pushover_app_token', '')->data;
$userToken = (string) app('fireflyconfig')->getEncrypted('pushover_user_token', '')->data;
- if (property_exists($notification, 'type') && $notification->type === 'owner') {
+ if (property_exists($notification, 'type') && 'owner' === $notification->type) {
return PushoverReceiver::withUserKey($userToken)
- ->withApplicationToken($appToken);
+ ->withApplicationToken($appToken)
+ ;
}
throw new FireflyException('No pushover token found.');
-// return PushoverReceiver::withUserKey((string) config('services.pushover.user_token'))
-// ->withApplicationToken((string) config('services.pushover.token'));
- //return (string) config('services.pushover.token');
+ // return PushoverReceiver::withUserKey((string) config('services.pushover.user_token'))
+ // ->withApplicationToken((string) config('services.pushover.token'));
+ // return (string) config('services.pushover.token');
}
-
/**
* Route notifications for the Slack channel.
*/
public function routeNotificationForSlack(Notification $notification): ?string
{
// this check does not validate if the user is owner, Should be done by notification itself.
- $res = app('fireflyconfig')->getEncrypted('slack_webhook_url', '')->data;
+ $res = app('fireflyconfig')->getEncrypted('slack_webhook_url', '')->data;
if (is_array($res)) {
$res = '';
}
- $res = (string) $res;
+ $res = (string) $res;
- if (property_exists($notification, 'type') && $notification->type === 'owner') {
+ if (property_exists($notification, 'type') && 'owner' === $notification->type) {
return $res;
}
// not the best way to do this, but alas.
- if ($notification instanceof UserRegistration) {
+ if ($notification instanceof UserRegistration) {
return $res;
}
if ($notification instanceof VersionCheckResult) {
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index 136bc2f9a5..88e746bdb7 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -813,14 +813,15 @@ class FireflyValidator extends Validator
public function validateUniquePiggyBankForUser($attribute, $value, $parameters): bool
{
$exclude = $parameters[0] ?? null;
- $query = PiggyBank
- ::leftJoin('account_piggy_bank','account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+ $query = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
- ->where('accounts.user_id', auth()->user()->id);
+ ->where('accounts.user_id', auth()->user()->id)
+ ;
if (null !== $exclude) {
$query->where('piggy_banks.id', '!=', (int) $exclude);
}
$query->where('piggy_banks.name', $value);
+
return 0 === $query->get(['piggy_banks.*'])->count();
}
diff --git a/config/firefly.php b/config/firefly.php
index 17253ada99..6363d68e6e 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -428,7 +428,7 @@ return [
'transfers' => 'fa-exchange',
],
- 'bindables' => [
+ 'bindables' => [
// models
'account' => Account::class,
'attachment' => Attachment::class,
@@ -486,7 +486,7 @@ return [
'userGroupBill' => UserGroupBill::class,
'userGroup' => UserGroup::class,
],
- 'rule-actions' => [
+ 'rule-actions' => [
'set_category' => SetCategory::class,
'clear_category' => ClearCategory::class,
'set_budget' => SetBudget::class,
@@ -520,7 +520,7 @@ return [
// 'set_foreign_amount' => SetForeignAmount::class,
// 'set_foreign_currency' => SetForeignCurrency::class,
],
- 'context-rule-actions' => [
+ 'context-rule-actions' => [
'set_category',
'set_budget',
'add_tag',
@@ -539,16 +539,16 @@ return [
'convert_transfer',
],
- 'test-triggers' => [
+ 'test-triggers' => [
'limit' => 10,
'range' => 200,
],
// expected source types for each transaction type, in order of preference.
- 'expected_source_types' => [
+ 'expected_source_types' => [
'source' => [
TransactionTypeEnum::WITHDRAWAL->value => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
- TransactionTypeEnum::DEPOSIT->value => [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::CASH->value],
+ TransactionTypeEnum::DEPOSIT->value => [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::CASH->value],
TransactionTypeEnum::TRANSFER->value => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
TransactionTypeEnum::OPENING_BALANCE->value => [
AccountTypeEnum::INITIAL_BALANCE->value,
@@ -560,7 +560,7 @@ return [
TransactionTypeEnum::RECONCILIATION->value => [AccountTypeEnum::RECONCILIATION->value, AccountTypeEnum::ASSET->value],
TransactionTypeEnum::LIABILITY_CREDIT->value => [AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
// in case no transaction type is known yet, it could be anything.
- 'none' => [
+ 'none' => [
AccountTypeEnum::ASSET->value,
AccountTypeEnum::EXPENSE->value,
AccountTypeEnum::REVENUE->value,
@@ -577,7 +577,7 @@ return [
AccountTypeEnum::EXPENSE->value,
AccountTypeEnum::CASH->value,
],
- TransactionTypeEnum::DEPOSIT->value => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
+ TransactionTypeEnum::DEPOSIT->value => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
TransactionTypeEnum::TRANSFER->value => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
TransactionTypeEnum::OPENING_BALANCE->value => [
AccountTypeEnum::INITIAL_BALANCE->value,
@@ -590,7 +590,7 @@ return [
TransactionTypeEnum::LIABILITY_CREDIT->value => [AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
],
],
- 'allowed_opposing_types' => [
+ 'allowed_opposing_types' => [
'source' => [
AccountTypeEnum::ASSET->value => [
AccountTypeEnum::ASSET->value,
@@ -680,7 +680,7 @@ return [
],
],
// depending on the account type, return the allowed transaction types:
- 'allowed_transaction_types' => [
+ 'allowed_transaction_types' => [
'source' => [
AccountTypeEnum::ASSET->value => [
TransactionTypeEnum::WITHDRAWAL->value,
@@ -749,7 +749,7 @@ return [
],
// having the source + dest will tell you the transaction type.
- 'account_to_transaction' => [
+ 'account_to_transaction' => [
AccountTypeEnum::ASSET->value => [
AccountTypeEnum::ASSET->value => TransactionTypeEnum::TRANSFER->value,
AccountTypeEnum::CASH->value => TransactionTypeEnum::WITHDRAWAL->value,
@@ -814,14 +814,14 @@ return [
],
// allowed source -> destination accounts.
- 'source_dests' => [
+ 'source_dests' => [
TransactionTypeEnum::WITHDRAWAL->value => [
AccountTypeEnum::ASSET->value => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CASH->value],
AccountTypeEnum::LOAN->value => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value],
AccountTypeEnum::DEBT->value => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value],
AccountTypeEnum::MORTGAGE->value => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value],
],
- TransactionTypeEnum::DEPOSIT->value => [
+ TransactionTypeEnum::DEPOSIT->value => [
AccountTypeEnum::REVENUE->value => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
AccountTypeEnum::CASH->value => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
AccountTypeEnum::LOAN->value => [AccountTypeEnum::ASSET->value],
@@ -853,7 +853,7 @@ return [
],
],
// if you add fields to this array, don't forget to update the export routine (ExportDataGenerator).
- 'journal_meta_fields' => [
+ 'journal_meta_fields' => [
// sepa
'sepa_cc',
'sepa_ct_op',
@@ -887,31 +887,31 @@ return [
'recurrence_count',
'recurrence_date',
],
- 'webhooks' => [
+ 'webhooks' => [
'max_attempts' => env('WEBHOOK_MAX_ATTEMPTS', 3),
],
- 'can_have_virtual_amounts' => [AccountTypeEnum::ASSET->value],
- 'can_have_opening_balance' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
- 'dynamic_creation_allowed' => [
+ 'can_have_virtual_amounts' => [AccountTypeEnum::ASSET->value],
+ 'can_have_opening_balance' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
+ 'dynamic_creation_allowed' => [
AccountTypeEnum::EXPENSE->value,
AccountTypeEnum::REVENUE->value,
AccountTypeEnum::INITIAL_BALANCE->value,
AccountTypeEnum::RECONCILIATION->value,
AccountTypeEnum::LIABILITY_CREDIT->value,
],
- 'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
- 'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
- 'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],
+ 'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
+ 'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
+ 'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],
// dynamic date ranges are as follows:
- 'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],
+ 'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],
// only used in v1
- 'allowed_sort_parameters' => ['order', 'name', 'iban'],
+ 'allowed_sort_parameters' => ['order', 'name', 'iban'],
// preselected account lists possibilities:
- 'preselected_accounts' => ['all', 'assets', 'liabilities'],
+ 'preselected_accounts' => ['all', 'assets', 'liabilities'],
// allowed to store a piggy bank in:
- 'piggy_bank_account_types' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
+ 'piggy_bank_account_types' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],
];
diff --git a/config/notifications.php b/config/notifications.php
index 1a7e4840ae..cc137cc174 100644
--- a/config/notifications.php
+++ b/config/notifications.php
@@ -1,4 +1,5 @@
[
- 'email' => ['enabled' => true, 'ui_configurable' => 0,],
- 'slack' => ['enabled' => true, 'ui_configurable' => 1,],
- 'ntfy' => ['enabled' => true, 'ui_configurable' => 1,],
- 'pushover' => ['enabled' => true, 'ui_configurable' => 1,],
- 'gotify' => ['enabled' => false, 'ui_configurable' => 0,],
- 'pushbullet' => ['enabled' => false, 'ui_configurable' => 0,],
+ 'email' => ['enabled' => true, 'ui_configurable' => 0],
+ 'slack' => ['enabled' => true, 'ui_configurable' => 1],
+ 'ntfy' => ['enabled' => true, 'ui_configurable' => 1],
+ 'pushover' => ['enabled' => true, 'ui_configurable' => 1],
+ 'gotify' => ['enabled' => false, 'ui_configurable' => 0],
+ 'pushbullet' => ['enabled' => false, 'ui_configurable' => 0],
],
'notifications' => [
'user' => [
@@ -49,13 +51,13 @@ return [
'new_backup_codes' => ['enabled' => true, 'configurable' => false],
],
'owner' => [
- //'invitation_created' => ['enabled' => true],
+ // 'invitation_created' => ['enabled' => true],
// 'some_notification' => ['enabled' => true],
- 'admin_new_reg' => ['enabled' => true],
- 'user_new_reg' => ['enabled' => true],
- 'new_version' => ['enabled' => true],
- 'invite_created' => ['enabled' => true],
- 'invite_redeemed' => ['enabled' => true],
+ 'admin_new_reg' => ['enabled' => true],
+ 'user_new_reg' => ['enabled' => true],
+ 'new_version' => ['enabled' => true],
+ 'invite_created' => ['enabled' => true],
+ 'invite_redeemed' => ['enabled' => true],
'unknown_user_attempt' => ['enabled' => true],
],
],
diff --git a/config/ntfy-notification-channel.php b/config/ntfy-notification-channel.php
index b65d4c35b0..0b2725f073 100644
--- a/config/ntfy-notification-channel.php
+++ b/config/ntfy-notification-channel.php
@@ -1,12 +1,14 @@
'https://ntfy.sh',
- 'topic' => '',
+ 'server' => 'https://ntfy.sh',
+ 'topic' => '',
'authentication' => [
- 'enabled' => false,
+ 'enabled' => false,
'username' => '',
'password' => '',
],
diff --git a/config/services.php b/config/services.php
index 7925115627..77b81cef34 100644
--- a/config/services.php
+++ b/config/services.php
@@ -61,8 +61,8 @@ return [
'mandrill' => [
'secret' => env('MANDRILL_SECRET'),
],
- 'pushover' => [
- 'token' => 'fake_token',
+ 'pushover' => [
+ 'token' => 'fake_token',
'user_token' => 'fake_token',
],
];
diff --git a/database/migrations/2024_11_30_075826_multi_piggy.php b/database/migrations/2024_11_30_075826_multi_piggy.php
index d1675663f2..2018252dc8 100644
--- a/database/migrations/2024_11_30_075826_multi_piggy.php
+++ b/database/migrations/2024_11_30_075826_multi_piggy.php
@@ -1,31 +1,32 @@
dropForeign('piggy_banks_account_id_foreign');
});
- Schema::table('piggy_banks', static function (Blueprint $table) {
+ Schema::table('piggy_banks', static function (Blueprint $table): void {
// 2. make column nullable.
$table->unsignedInteger('account_id')->nullable()->change();
});
- Schema::table('piggy_banks', static function (Blueprint $table) {
+ Schema::table('piggy_banks', static function (Blueprint $table): void {
// 3. add currency
$table->integer('transaction_currency_id', false, true)->after('account_id');
- $table->foreign('transaction_currency_id','unique_currency')->references('id')->on('transaction_currencies')->onDelete('cascade');
+ $table->foreign('transaction_currency_id', 'unique_currency')->references('id')->on('transaction_currencies')->onDelete('cascade');
});
- Schema::table('piggy_banks', static function (Blueprint $table) {
+ Schema::table('piggy_banks', static function (Blueprint $table): void {
// 4. rename columns
$table->renameColumn('targetamount', 'target_amount');
$table->renameColumn('startdate', 'start_date');
@@ -33,13 +34,13 @@ return new class extends Migration
$table->renameColumn('startdate_tz', 'start_date_tz');
$table->renameColumn('targetdate_tz', 'target_date_tz');
});
- Schema::table('piggy_banks', static function (Blueprint $table) {
+ Schema::table('piggy_banks', static function (Blueprint $table): void {
// 5. add new index
$table->foreign('account_id')->references('id')->on('accounts')->onDelete('set null');
});
// rename some fields in piggy bank reps.
- Schema::table('piggy_bank_repetitions', static function (Blueprint $table) {
+ Schema::table('piggy_bank_repetitions', static function (Blueprint $table): void {
// 6. rename columns
$table->renameColumn('currentamount', 'current_amount');
$table->renameColumn('startdate', 'start_date');
@@ -49,14 +50,14 @@ return new class extends Migration
});
// create table account_piggy_bank
- Schema::create('account_piggy_bank', static function (Blueprint $table) {
+ Schema::create('account_piggy_bank', static function (Blueprint $table): void {
$table->id();
$table->integer('account_id', false, true);
- $table->integer('piggy_bank_id',false, true);
+ $table->integer('piggy_bank_id', false, true);
$table->decimal('current_amount', 32, 12)->default('0');
$table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
$table->foreign('piggy_bank_id')->references('id')->on('piggy_banks')->onDelete('cascade');
- $table->unique(['account_id', 'piggy_bank_id'],'unique_piggy_save');
+ $table->unique(['account_id', 'piggy_bank_id'], 'unique_piggy_save');
});
}
@@ -66,7 +67,7 @@ return new class extends Migration
*/
public function down(): void
{
- Schema::table('piggy_banks', static function (Blueprint $table) {
+ Schema::table('piggy_banks', static function (Blueprint $table): void {
// 1. drop account index again.
$table->dropForeign('piggy_banks_account_id_foreign');
@@ -89,7 +90,7 @@ return new class extends Migration
});
// rename some fields in piggy bank reps.
- Schema::table('piggy_bank_repetitions', static function (Blueprint $table) {
+ Schema::table('piggy_bank_repetitions', static function (Blueprint $table): void {
// 6. rename columns
$table->renameColumn('current_amount', 'currentamount');
$table->renameColumn('start_date', 'startdate');
diff --git a/resources/lang/en_US/breadcrumbs.php b/resources/lang/en_US/breadcrumbs.php
index a2ed05e525..5a89a6b9b3 100644
--- a/resources/lang/en_US/breadcrumbs.php
+++ b/resources/lang/en_US/breadcrumbs.php
@@ -88,5 +88,5 @@ return [
'mfa_disableMFA' => 'Disable multi-factor authentication',
// notifications
- 'notification_index' => 'Owner notifications',
+ 'notification_index' => 'Owner notifications',
];
diff --git a/resources/lang/en_US/email.php b/resources/lang/en_US/email.php
index d6a92270cd..087b24c9a5 100644
--- a/resources/lang/en_US/email.php
+++ b/resources/lang/en_US/email.php
@@ -26,160 +26,160 @@ declare(strict_types=1);
return [
// common items
- 'greeting' => 'Hi there,',
- 'closing' => 'Beep boop,',
- 'signature' => 'The Firefly III Mail Robot',
- 'footer_ps' => 'PS: This message was sent because a request from IP :ipAddress triggered it.',
+ 'greeting' => 'Hi there,',
+ 'closing' => 'Beep boop,',
+ 'signature' => 'The Firefly III Mail Robot',
+ 'footer_ps' => 'PS: This message was sent because a request from IP :ipAddress triggered it.',
// admin test
- 'admin_test_subject' => 'A test message from your Firefly III installation',
- 'admin_test_body' => 'This is a test message from your Firefly III instance. It was sent to :email.',
+ 'admin_test_subject' => 'A test message from your Firefly III installation',
+ 'admin_test_body' => 'This is a test message from your Firefly III instance. It was sent to :email.',
'admin_test_message' => 'This is a test message from your Firefly III instance over channel ":channel".',
// Ignore this comment
// invite
- 'invitation_created_subject' => 'An invitation has been created',
- 'invitation_created_body' => 'Admin user ":email" created a user invitation which can be used by whoever is behind email address ":invitee". The invite will be valid for 48hrs.',
- 'invite_user_subject' => 'You\'ve been invited to create a Firefly III account.',
- 'invitation_introduction' => 'You\'ve been invited to create a Firefly III account on **:host**. Firefly III is a personal, self-hosted, private personal finance manager. All the cool kids are using it.',
- 'invitation_invited_by' => 'You\'ve been invited by ":admin" and this invitation was sent to ":invitee". That\'s you, right?',
- 'invitation_url' => 'The invitation is valid for 48 hours and can be redeemed by surfing to [Firefly III](:url). Enjoy!',
+ 'invitation_created_subject' => 'An invitation has been created',
+ 'invitation_created_body' => 'Admin user ":email" created a user invitation which can be used by whoever is behind email address ":invitee". The invite will be valid for 48hrs.',
+ 'invite_user_subject' => 'You\'ve been invited to create a Firefly III account.',
+ 'invitation_introduction' => 'You\'ve been invited to create a Firefly III account on **:host**. Firefly III is a personal, self-hosted, private personal finance manager. All the cool kids are using it.',
+ 'invitation_invited_by' => 'You\'ve been invited by ":admin" and this invitation was sent to ":invitee". That\'s you, right?',
+ 'invitation_url' => 'The invitation is valid for 48 hours and can be redeemed by surfing to [Firefly III](:url). Enjoy!',
// new IP
- 'login_from_new_ip' => 'New login on Firefly III',
- 'slack_login_from_new_ip' => 'New Firefly III login from IP :ip (:host)',
- 'new_ip_body' => 'Firefly III detected a new login on your account from an unknown IP address. If you never logged in from the IP address below, or it has been more than six months ago, Firefly III will warn you.',
- 'new_ip_warning' => 'If you recognize this IP address or the login, you can ignore this message. If you didn\'t login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!',
- 'ip_address' => 'IP address',
- 'host_name' => 'Host',
- 'date_time' => 'Date + time',
+ 'login_from_new_ip' => 'New login on Firefly III',
+ 'slack_login_from_new_ip' => 'New Firefly III login from IP :ip (:host)',
+ 'new_ip_body' => 'Firefly III detected a new login on your account from an unknown IP address. If you never logged in from the IP address below, or it has been more than six months ago, Firefly III will warn you.',
+ 'new_ip_warning' => 'If you recognize this IP address or the login, you can ignore this message. If you didn\'t login, of if you have no idea what this is about, verify your password security, change it, and log out all other sessions. To do this, go to your profile page. Of course you have 2FA enabled already, right? Stay safe!',
+ 'ip_address' => 'IP address',
+ 'host_name' => 'Host',
+ 'date_time' => 'Date + time',
// access token created
- 'access_token_created_subject' => 'A new access token was created',
- 'access_token_created_body' => 'Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.',
- 'access_token_created_explanation' => 'With this token, they can access **all** of your financial records through the Firefly III API.',
- 'access_token_created_revoke' => 'If this wasn\'t you, please revoke this token as soon as possible at :url',
+ 'access_token_created_subject' => 'A new access token was created',
+ 'access_token_created_body' => 'Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.',
+ 'access_token_created_explanation' => 'With this token, they can access **all** of your financial records through the Firefly III API.',
+ 'access_token_created_revoke' => 'If this wasn\'t you, please revoke this token as soon as possible at :url',
// unknown user login attempt
- 'unknown_user_subject' => 'An unknown user tried to log in',
- 'unknown_user_body' => 'An unknown user tried to log in to Firefly III. The email address they used was ":address".',
- 'unknown_user_message' => 'The email address they used was ":address".',
+ 'unknown_user_subject' => 'An unknown user tried to log in',
+ 'unknown_user_body' => 'An unknown user tried to log in to Firefly III. The email address they used was ":address".',
+ 'unknown_user_message' => 'The email address they used was ":address".',
// registered
- 'registered_subject' => 'Welcome to Firefly III!',
- 'registered_subject_admin' => 'A new user has registered',
- 'admin_new_user_registered' => 'A new user has registered. User **:email** was given user ID #:id.',
- 'registered_welcome' => 'Welcome to [Firefly III](:address). Your registration has made it, and this email is here to confirm it. Yay!',
- 'registered_pw' => 'If you have forgotten your password already, please reset it using [the password reset tool](:address/password/reset).',
- 'registered_help' => 'There is a help-icon in the top right corner of each page. If you need help, click it!',
- 'registered_closing' => 'Enjoy!',
- 'registered_firefly_iii_link' => 'Firefly III:',
- 'registered_pw_reset_link' => 'Password reset:',
- 'registered_doc_link' => 'Documentation:',
+ 'registered_subject' => 'Welcome to Firefly III!',
+ 'registered_subject_admin' => 'A new user has registered',
+ 'admin_new_user_registered' => 'A new user has registered. User **:email** was given user ID #:id.',
+ 'registered_welcome' => 'Welcome to [Firefly III](:address). Your registration has made it, and this email is here to confirm it. Yay!',
+ 'registered_pw' => 'If you have forgotten your password already, please reset it using [the password reset tool](:address/password/reset).',
+ 'registered_help' => 'There is a help-icon in the top right corner of each page. If you need help, click it!',
+ 'registered_closing' => 'Enjoy!',
+ 'registered_firefly_iii_link' => 'Firefly III:',
+ 'registered_pw_reset_link' => 'Password reset:',
+ 'registered_doc_link' => 'Documentation:',
// Ignore this comment
// new version
- 'new_version_email_subject' => 'A new Firefly III version is available',
+ 'new_version_email_subject' => 'A new Firefly III version is available',
// email change
- 'email_change_subject' => 'Your Firefly III email address has changed',
- 'email_change_body_to_new' => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.',
- 'email_change_body_to_old' => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you **must** follow the "undo"-link below to protect your account!',
- 'email_change_ignore' => 'If you initiated this change, you may safely ignore this message.',
- 'email_change_old' => 'The old email address was: :email',
- 'email_change_old_strong' => 'The old email address was: **:email**',
- 'email_change_new' => 'The new email address is: :email',
- 'email_change_new_strong' => 'The new email address is: **:email**',
- 'email_change_instructions' => 'You cannot use Firefly III until you confirm this change. Please follow the link below to do so.',
- 'email_change_undo_link' => 'To undo the change, follow this link:',
+ 'email_change_subject' => 'Your Firefly III email address has changed',
+ 'email_change_body_to_new' => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.',
+ 'email_change_body_to_old' => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you **must** follow the "undo"-link below to protect your account!',
+ 'email_change_ignore' => 'If you initiated this change, you may safely ignore this message.',
+ 'email_change_old' => 'The old email address was: :email',
+ 'email_change_old_strong' => 'The old email address was: **:email**',
+ 'email_change_new' => 'The new email address is: :email',
+ 'email_change_new_strong' => 'The new email address is: **:email**',
+ 'email_change_instructions' => 'You cannot use Firefly III until you confirm this change. Please follow the link below to do so.',
+ 'email_change_undo_link' => 'To undo the change, follow this link:',
// OAuth token created
- 'oauth_created_subject' => 'A new OAuth client has been created',
- 'oauth_created_body' => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL `:url`.',
- 'oauth_created_explanation' => 'With this client, they can access **all** of your financial records through the Firefly III API.',
- 'oauth_created_undo' => 'If this wasn\'t you, please revoke this client as soon as possible at `:url`',
+ 'oauth_created_subject' => 'A new OAuth client has been created',
+ 'oauth_created_body' => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL `:url`.',
+ 'oauth_created_explanation' => 'With this client, they can access **all** of your financial records through the Firefly III API.',
+ 'oauth_created_undo' => 'If this wasn\'t you, please revoke this client as soon as possible at `:url`',
// reset password
- 'reset_pw_subject' => 'Your password reset request',
- 'reset_pw_instructions' => 'Somebody tried to reset your password. If it was you, please follow the link below to do so.',
- 'reset_pw_warning' => '**PLEASE** verify that the link actually goes to the Firefly III you expect it to go!',
+ 'reset_pw_subject' => 'Your password reset request',
+ 'reset_pw_instructions' => 'Somebody tried to reset your password. If it was you, please follow the link below to do so.',
+ 'reset_pw_warning' => '**PLEASE** verify that the link actually goes to the Firefly III you expect it to go!',
// error
- 'error_subject' => 'Caught an error in Firefly III',
- 'error_intro' => 'Firefly III v:version ran into an error: :errorMessage.',
- 'error_type' => 'The error was of type ":class".',
- 'error_timestamp' => 'The error occurred on/at: :time.',
- 'error_location' => 'This error occurred in file ":file" on line :line with code :code.',
- 'error_user' => 'The error was encountered by user #:id, :email.',
- 'error_no_user' => 'There was no user logged in for this error or no user was detected.',
- 'error_ip' => 'The IP address related to this error is: :ip',
- 'error_url' => 'URL is: :url',
- 'error_user_agent' => 'User agent: :userAgent',
- 'error_stacktrace' => 'The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to james@firefly-iii.org. This can help fix the bug you just encountered.',
- 'error_github_html' => 'If you prefer, you can also open a new issue on GitHub.',
- 'error_github_text' => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.',
- 'error_stacktrace_below' => 'The full stacktrace is below:',
- 'error_headers' => 'The following headers may also be relevant:',
- 'error_post' => 'This was submitted by the user:',
+ 'error_subject' => 'Caught an error in Firefly III',
+ 'error_intro' => 'Firefly III v:version ran into an error: :errorMessage.',
+ 'error_type' => 'The error was of type ":class".',
+ 'error_timestamp' => 'The error occurred on/at: :time.',
+ 'error_location' => 'This error occurred in file ":file" on line :line with code :code.',
+ 'error_user' => 'The error was encountered by user #:id, :email.',
+ 'error_no_user' => 'There was no user logged in for this error or no user was detected.',
+ 'error_ip' => 'The IP address related to this error is: :ip',
+ 'error_url' => 'URL is: :url',
+ 'error_user_agent' => 'User agent: :userAgent',
+ 'error_stacktrace' => 'The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to james@firefly-iii.org. This can help fix the bug you just encountered.',
+ 'error_github_html' => 'If you prefer, you can also open a new issue on GitHub.',
+ 'error_github_text' => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.',
+ 'error_stacktrace_below' => 'The full stacktrace is below:',
+ 'error_headers' => 'The following headers may also be relevant:',
+ 'error_post' => 'This was submitted by the user:',
// Ignore this comment
// report new journals
- 'new_journals_subject' => 'Firefly III has created a new transaction|Firefly III has created :count new transactions',
- 'new_journals_header' => 'Firefly III has created a transaction for you. You can find it in your Firefly III installation:|Firefly III has created :count transactions for you. You can find them in your Firefly III installation:',
+ 'new_journals_subject' => 'Firefly III has created a new transaction|Firefly III has created :count new transactions',
+ 'new_journals_header' => 'Firefly III has created a transaction for you. You can find it in your Firefly III installation:|Firefly III has created :count transactions for you. You can find them in your Firefly III installation:',
// bill warning
- 'bill_warning_subject_end_date' => 'Your bill ":name" is due to end in :diff days',
- 'bill_warning_subject_now_end_date' => 'Your bill ":name" is due to end TODAY',
- 'bill_warning_subject_extension_date' => 'Your bill ":name" is due to be extended or cancelled in :diff days',
- 'bill_warning_subject_now_extension_date' => 'Your bill ":name" is due to be extended or cancelled TODAY',
- 'bill_warning_end_date' => 'Your bill **":name"** is due to end on :date. This moment will pass in about **:diff days**.',
- 'bill_warning_extension_date' => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass in about **:diff days**.',
- 'bill_warning_end_date_zero' => 'Your bill **":name"** is due to end on :date. This moment will pass **TODAY!**',
- 'bill_warning_extension_date_zero' => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass **TODAY!**',
- 'bill_warning_please_action' => 'Please take the appropriate action.',
+ 'bill_warning_subject_end_date' => 'Your bill ":name" is due to end in :diff days',
+ 'bill_warning_subject_now_end_date' => 'Your bill ":name" is due to end TODAY',
+ 'bill_warning_subject_extension_date' => 'Your bill ":name" is due to be extended or cancelled in :diff days',
+ 'bill_warning_subject_now_extension_date' => 'Your bill ":name" is due to be extended or cancelled TODAY',
+ 'bill_warning_end_date' => 'Your bill **":name"** is due to end on :date. This moment will pass in about **:diff days**.',
+ 'bill_warning_extension_date' => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass in about **:diff days**.',
+ 'bill_warning_end_date_zero' => 'Your bill **":name"** is due to end on :date. This moment will pass **TODAY!**',
+ 'bill_warning_extension_date_zero' => 'Your bill **":name"** is due to be extended or cancelled on :date. This moment will pass **TODAY!**',
+ 'bill_warning_please_action' => 'Please take the appropriate action.',
// user has enabled MFA
- 'enabled_mfa_subject' => 'You have enabled multi-factor authentication',
- 'enabled_mfa_slack' => 'You (:email) have enabled multi-factor authentication. Is this not correct? Check your settings!',
- 'have_enabled_mfa' => 'You have enabled multi-factor authentication on your Firefly III account ":email". This means that you will need to use an authenticator app to log in from now on.',
- 'enabled_mfa_warning' => 'If you did not enable this, please contact your administrator immediately or check out the Firefly III documentation.',
+ 'enabled_mfa_subject' => 'You have enabled multi-factor authentication',
+ 'enabled_mfa_slack' => 'You (:email) have enabled multi-factor authentication. Is this not correct? Check your settings!',
+ 'have_enabled_mfa' => 'You have enabled multi-factor authentication on your Firefly III account ":email". This means that you will need to use an authenticator app to log in from now on.',
+ 'enabled_mfa_warning' => 'If you did not enable this, please contact your administrator immediately or check out the Firefly III documentation.',
- 'disabled_mfa_subject' => 'You have disabled multi-factor authentication!',
- 'disabled_mfa_slack' => 'You (:email) have disabled multi-factor authentication. Is this not correct? Check your settings!',
- 'have_disabled_mfa' => 'You have disabled multi-factor authentication on your Firefly III account ":email".',
- 'disabled_mfa_warning' => 'If you did not disable this, please contact your administrator immediately or check out the Firefly III documentation.',
+ 'disabled_mfa_subject' => 'You have disabled multi-factor authentication!',
+ 'disabled_mfa_slack' => 'You (:email) have disabled multi-factor authentication. Is this not correct? Check your settings!',
+ 'have_disabled_mfa' => 'You have disabled multi-factor authentication on your Firefly III account ":email".',
+ 'disabled_mfa_warning' => 'If you did not disable this, please contact your administrator immediately or check out the Firefly III documentation.',
- 'new_backup_codes_subject' => 'You have generated new back-up codes',
- 'new_backup_codes_slack' => 'You (:email) have generated new back-up codes. These can be used to login to Firefly III. Is this not correct? Check your settings!',
- 'new_backup_codes_intro' => 'You (:email) have generated new back-up codes. These can be used to login to Firefly III if you lose access to your authenticator app.',
- 'new_backup_codes_warning' => 'Please store these codes in a safe place. If you lose them, you will not be able to log in to Firefly III. If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
+ 'new_backup_codes_subject' => 'You have generated new back-up codes',
+ 'new_backup_codes_slack' => 'You (:email) have generated new back-up codes. These can be used to login to Firefly III. Is this not correct? Check your settings!',
+ 'new_backup_codes_intro' => 'You (:email) have generated new back-up codes. These can be used to login to Firefly III if you lose access to your authenticator app.',
+ 'new_backup_codes_warning' => 'Please store these codes in a safe place. If you lose them, you will not be able to log in to Firefly III. If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
- 'used_backup_code_subject' => 'You have used a back-up code to login',
- 'used_backup_code_slack' => 'You (:email) have used a back-up code to login',
+ 'used_backup_code_subject' => 'You have used a back-up code to login',
+ 'used_backup_code_slack' => 'You (:email) have used a back-up code to login',
- 'used_backup_code_intro' => 'You (:email) have used a back-up code to login to Firefly III. You now have one less back-up code to login with. Please remove it from your list.',
- 'used_backup_code_warning' => 'If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
+ 'used_backup_code_intro' => 'You (:email) have used a back-up code to login to Firefly III. You now have one less back-up code to login with. Please remove it from your list.',
+ 'used_backup_code_warning' => 'If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
// few left:
- 'mfa_few_backups_left_subject' => 'You have only :count backup code(s) left!',
- 'mfa_few_backups_left_slack' => 'You (:email) have only :count backup code(s) left!',
- 'few_backup_codes_intro' => 'You (:email) have used most of your backup codes, and now have only :count left. Please generate new ones as soon as possible.',
- 'few_backup_codes_warning' => 'Without backup codes, you cannot recover your MFA login if you lose access to your code generator.',
+ 'mfa_few_backups_left_subject' => 'You have only :count backup code(s) left!',
+ 'mfa_few_backups_left_slack' => 'You (:email) have only :count backup code(s) left!',
+ 'few_backup_codes_intro' => 'You (:email) have used most of your backup codes, and now have only :count left. Please generate new ones as soon as possible.',
+ 'few_backup_codes_warning' => 'Without backup codes, you cannot recover your MFA login if you lose access to your code generator.',
// NO left:
- 'mfa_no_backups_left_subject' => 'You have NO backup codes left!',
- 'mfa_no_backups_left_slack' => 'You (:email) NO backup codes left!',
- 'no_backup_codes_intro' => 'You (:email) have used ALL of your backup codes. Please generate new ones as soon as possible.',
- 'no_backup_codes_warning' => 'Without backup codes, you cannot recover your MFA login if you lose access to your code generator.',
+ 'mfa_no_backups_left_subject' => 'You have NO backup codes left!',
+ 'mfa_no_backups_left_slack' => 'You (:email) NO backup codes left!',
+ 'no_backup_codes_intro' => 'You (:email) have used ALL of your backup codes. Please generate new ones as soon as possible.',
+ 'no_backup_codes_warning' => 'Without backup codes, you cannot recover your MFA login if you lose access to your code generator.',
// many failed MFA attempts
- 'mfa_many_failed_subject' => 'You have tried and failed to use multi-factor authentication :count times now!',
- 'mfa_many_failed_slack' => 'You (:email) have tried and failed to use multi-factor authentication :count times now. Is this not correct? Check your settings!',
- 'mfa_many_failed_attempts_intro' => 'You (:email) have tried :count times to use a multi-factor authentication code, but these login attempts have failed. Are you sure you are using the right MFA code? Are you sure the time on the server is correct?',
- 'mfa_many_failed_attempts_warning' => 'If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
+ 'mfa_many_failed_subject' => 'You have tried and failed to use multi-factor authentication :count times now!',
+ 'mfa_many_failed_slack' => 'You (:email) have tried and failed to use multi-factor authentication :count times now. Is this not correct? Check your settings!',
+ 'mfa_many_failed_attempts_intro' => 'You (:email) have tried :count times to use a multi-factor authentication code, but these login attempts have failed. Are you sure you are using the right MFA code? Are you sure the time on the server is correct?',
+ 'mfa_many_failed_attempts_warning' => 'If you did not do this, please contact your administrator immediately or check out the Firefly III documentation.',
];
// Ignore this comment
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 9e83b37296..ed47e648b3 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -26,311 +26,311 @@ declare(strict_types=1);
return [
// general stuff:
- 'stored_in_tz' => 'stored in ":timezone"',
- 'displayed_in_tz' => 'displayed in ":timezone"',
- 'close' => 'Close',
- 'actions' => 'Actions',
- 'edit' => 'Edit',
- 'delete' => 'Delete',
- 'split' => 'Split',
- 'single_split' => 'Split',
- 'clone' => 'Clone',
- 'clone_and_edit' => 'Clone and edit',
- 'confirm_action' => 'Confirm action',
- 'last_seven_days' => 'Last seven days',
- 'last_thirty_days' => 'Last thirty days',
- 'last_180_days' => 'Last 180 days',
- 'month_to_date' => 'Month to date',
- 'year_to_date' => 'Year to date',
- 'YTD' => 'YTD',
- 'welcome_back' => 'What\'s playing?',
- 'main_dashboard_page_title' => 'Home',
- 'everything' => 'Everything',
- 'today' => 'today',
- 'customRange' => 'Custom range',
- 'date_range' => 'Date range',
- 'apply' => 'Apply',
- 'select_date' => 'Select date..',
- 'cancel' => 'Cancel',
- 'from' => 'From',
- 'to' => 'To',
- 'structure' => 'Structure',
- 'help_translating' => 'This help text is not yet available in your language. Will you help translate?',
- 'showEverything' => 'Show everything',
- 'never' => 'Never',
- 'no_results_for_empty_search' => 'Your search was empty, so nothing was found.',
- 'removed_amount' => 'Removed :amount',
- 'added_amount' => 'Added :amount',
- 'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',
- 'Opening balance' => 'Opening balance',
- 'create_new_stuff' => 'Create new stuff',
- 'new_withdrawal' => 'New withdrawal',
- 'create_new_transaction' => 'Create a new transaction',
- 'sidebar_frontpage_create' => 'Create',
- 'new_transaction' => 'New transaction',
- 'no_rules_for_bill' => 'This bill has no rules associated to it.',
- 'go_to_asset_accounts' => 'View your asset accounts',
- 'go_to_budgets' => 'Go to your budgets',
- 'go_to_withdrawals' => 'Go to your withdrawals',
- 'clones_journal_x' => 'This transaction is a clone of ":description" (#:id)',
- 'go_to_categories' => 'Go to your categories',
- 'go_to_bills' => 'Go to your bills',
- 'go_to_expense_accounts' => 'See your expense accounts',
- 'go_to_revenue_accounts' => 'See your revenue accounts',
- 'go_to_piggies' => 'Go to your piggy banks',
- 'new_deposit' => 'New deposit',
- 'new_transfer' => 'New transfer',
- 'new_transfers' => 'New transfer',
- 'new_asset_account' => 'New asset account',
- 'new_expense_account' => 'New expense account',
- 'new_revenue_account' => 'New revenue account',
- 'new_liabilities_account' => 'New liability',
- 'new_budget' => 'New budget',
- 'new_bill' => 'New bill',
- 'block_account_logout' => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
- 'flash_success' => 'Success!',
- 'flash_info' => 'Message',
- 'flash_warning' => 'Warning!',
- 'flash_error' => 'Error!',
- 'flash_danger' => 'Danger!',
- 'flash_info_multiple' => 'There is one message|There are :count messages',
- 'flash_error_multiple' => 'There is one error|There are :count errors',
- 'net_worth' => 'Net worth',
- 'help_for_this_page' => 'Help for this page',
- 'help_for_this_page_body' => 'You can find more information about this page in the documentation.',
- 'two_factor_welcome' => 'Hello!',
- 'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
- 'two_factor_code_here' => 'Enter code here',
- 'two_factor_title' => 'Two factor authentication',
- 'authenticate' => 'Authenticate',
- 'two_factor_forgot_title' => 'Lost two factor authentication',
- 'two_factor_forgot' => 'I forgot my two-factor thing.',
- 'two_factor_lost_header' => 'Lost your two factor authentication?',
- 'two_factor_lost_intro' => 'If you lost your backup codes as well, you have bad luck. This is not something you can fix from the web interface. You have two choices.',
- 'two_factor_lost_fix_self' => 'If you run your own instance of Firefly III, read this entry in the FAQ for instructions.',
- 'two_factor_lost_fix_owner' => 'Otherwise, email the site owner, :site_owner and ask them to reset your two factor authentication.',
- 'mfa_backup_code' => 'You have used a backup code to login to Firefly III. It can\'t be used again, so cross it from your list.',
- 'pref_two_factor_new_backup_codes' => 'Get new backup codes',
- 'pref_two_factor_backup_code_count' => 'You have :count valid backup code.|You have :count valid backup codes.',
- '2fa_i_have_them' => 'I stored them!',
- 'warning_much_data' => ':days days of data may take a while to load.',
- 'registered' => 'You have registered successfully!',
- 'Default asset account' => 'Default asset account',
- 'no_budget_pointer' => 'You seem to have no budgets yet. You should create some on the budgets-page. Budgets can help you keep track of expenses.',
- 'no_bill_pointer' => 'You seem to have no bills yet. You should create some on the bills-page. Bills can help you keep track of expenses.',
- 'Savings account' => 'Savings account',
- 'Credit card' => 'Credit card',
- 'source_accounts' => 'Source account|Source accounts',
- 'destination_accounts' => 'Destination account|Destination accounts',
- 'user_id_is' => 'Your user id is :user',
- 'field_supports_markdown' => 'This field supports Markdown.',
- 'need_more_help' => 'If you need more help using Firefly III, please open a ticket on Github.',
- 'reenable_intro_text' => 'You can also re-enable the introduction guidance.',
- 'intro_boxes_after_refresh' => 'The introduction boxes will reappear when you refresh the page.',
- 'show_all_no_filter' => 'Show all transactions without grouping them by date.',
- 'expenses_by_category' => 'Expenses by category',
- 'expenses_by_budget' => 'Expenses by budget',
- 'income_by_category' => 'Income by category',
- 'expenses_by_asset_account' => 'Expenses by asset account',
- 'expenses_by_expense_account' => 'Expenses by expense account',
- 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.',
- 'sum_of_expenses' => 'Sum of expenses',
- 'sum_of_income' => 'Sum of income',
- 'liabilities' => 'Liabilities',
- 'spent_in_specific_budget' => 'Spent in budget ":budget"',
- 'spent_in_specific_double' => 'Spent in account ":account"',
- 'earned_in_specific_double' => 'Earned in account ":account"',
- 'source_account' => 'Source account',
- 'source_account_reconciliation' => 'You can\'t edit the source account of a reconciliation transaction.',
- 'destination_account' => 'Destination account',
- 'destination_account_reconciliation' => 'You can\'t edit the destination account of a reconciliation transaction.',
- 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"',
- 'left_in_budget_limit' => 'Left to spend according to budgeting',
- 'current_period' => 'Current period',
- 'show_the_current_period_and_overview' => 'Show the current period and overview',
- 'pref_languages_locale' => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
- 'budget_in_period' => 'All transactions for budget ":name" between :start and :end in :currency',
- 'chart_budget_in_period' => 'Chart for all transactions for budget ":name" between :start and :end in :currency',
- 'chart_budget_in_period_only_currency' => 'The amount you budgeted was in :currency, so this chart will only show transactions in :currency.',
- 'chart_account_in_period' => 'Chart for all transactions for account ":name" (:balance) between :start and :end',
- 'chart_category_in_period' => 'Chart for all transactions for category ":name" between :start and :end',
- 'chart_category_all' => 'Chart for all transactions for category ":name"',
- 'clone_withdrawal' => 'Clone this withdrawal',
- 'clone_deposit' => 'Clone this deposit',
- 'clone_transfer' => 'Clone this transfer',
- 'multi_select_no_selection' => 'None selected',
- 'multi_select_select_all' => 'Select all',
- 'multi_select_n_selected' => 'selected',
- 'multi_select_all_selected' => 'All selected',
- 'multi_select_filter_placeholder' => 'Find..',
- 'intro_next_label' => 'Next',
- 'intro_prev_label' => 'Previous',
- 'intro_skip_label' => 'Skip',
- 'intro_done_label' => 'Done',
- 'between_dates_breadcrumb' => 'Between :start and :end',
- 'all_journals_without_budget' => 'All transactions without a budget',
- 'journals_without_budget' => 'Transactions without a budget',
- 'all_journals_without_category' => 'All transactions without a category',
- 'journals_without_category' => 'Transactions without a category',
- 'all_journals_for_account' => 'All transactions for account :name',
- 'chart_all_journals_for_account' => 'Chart of all transactions for account :name',
- 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end',
- 'journals_in_period_for_account_js' => 'All transactions for account {title} between {start} and {end}',
- 'transferred' => 'Transferred',
- 'all_withdrawal' => 'All expenses',
- 'all_transactions' => 'All transactions',
- 'title_withdrawal_between' => 'All expenses between :start and :end',
- 'all_deposit' => 'All revenue',
- 'title_deposit_between' => 'All revenue between :start and :end',
- 'all_transfers' => 'All transfers',
- 'title_transfers_between' => 'All transfers between :start and :end',
- 'all_transfer' => 'All transfers',
- 'all_journals_for_tag' => 'All transactions for tag ":tag"',
- 'title_transfer_between' => 'All transfers between :start and :end',
- 'all_journals_for_category' => 'All transactions for category :name',
- 'all_journals_for_budget' => 'All transactions for budget :name',
- 'chart_all_journals_for_budget' => 'Chart of all transactions for budget :name',
- 'journals_in_period_for_category' => 'All transactions for category :name between :start and :end',
- 'journals_in_period_for_tag' => 'All transactions for tag :tag between :start and :end',
- 'not_available_demo_user' => 'The feature you try to access is not available to demo users.',
- 'exchange_rate_instructions' => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
- 'transfer_exchange_rate_instructions' => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
- 'transaction_data' => 'Transaction data',
- 'invalid_server_configuration' => 'Invalid server configuration',
- 'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this.',
- 'quickswitch' => 'Quickswitch',
- 'sign_in_to_start' => 'Sign in to start your session',
- 'sign_in' => 'Sign in',
- 'register_new_account' => 'Register a new account',
- 'forgot_my_password' => 'I forgot my password',
- 'problems_with_input' => 'There were some problems with your input.',
- 'reset_password' => 'Reset your password',
- 'button_reset_password' => 'Reset password',
- 'reset_button' => 'Reset',
- 'want_to_login' => 'I want to login',
- 'login_page_title' => 'Login to Firefly III',
- 'register_page_title' => 'Register at Firefly III',
- 'forgot_pw_page_title' => 'Forgot your password for Firefly III',
- 'reset_pw_page_title' => 'Reset your password for Firefly III',
- 'cannot_reset_demo_user' => 'You cannot reset the password of the demo user.',
- 'no_att_demo_user' => 'The demo user can\'t upload attachments.',
- 'button_register' => 'Register',
- 'authorization' => 'Authorization',
- 'active_bills_only' => 'active bills only',
- 'active_bills_only_total' => 'all active bills',
- 'active_exp_bills_only' => 'active and expected bills only',
- 'active_exp_bills_only_total' => 'all active expected bills only',
- 'per_period_sum_1D' => 'Expected daily costs',
- 'per_period_sum_1W' => 'Expected weekly costs',
- 'per_period_sum_1M' => 'Expected monthly costs',
- 'per_period_sum_3M' => 'Expected quarterly costs',
- 'per_period_sum_6M' => 'Expected half-yearly costs',
- 'per_period_sum_1Y' => 'Expected yearly costs',
- 'average_per_bill' => 'average per bill',
- 'expected_total' => 'expected total',
- 'reconciliation_account_name' => ':name reconciliation (:currency)',
- 'saved' => 'Saved',
- 'advanced_options' => 'Advanced options',
- 'advanced_options_explain' => 'Some pages in Firefly III have advanced options hidden behind this button. This page doesn\'t have anything fancy here, but do check out the others!',
- 'here_be_dragons' => 'Hic sunt dracones',
+ 'stored_in_tz' => 'stored in ":timezone"',
+ 'displayed_in_tz' => 'displayed in ":timezone"',
+ 'close' => 'Close',
+ 'actions' => 'Actions',
+ 'edit' => 'Edit',
+ 'delete' => 'Delete',
+ 'split' => 'Split',
+ 'single_split' => 'Split',
+ 'clone' => 'Clone',
+ 'clone_and_edit' => 'Clone and edit',
+ 'confirm_action' => 'Confirm action',
+ 'last_seven_days' => 'Last seven days',
+ 'last_thirty_days' => 'Last thirty days',
+ 'last_180_days' => 'Last 180 days',
+ 'month_to_date' => 'Month to date',
+ 'year_to_date' => 'Year to date',
+ 'YTD' => 'YTD',
+ 'welcome_back' => 'What\'s playing?',
+ 'main_dashboard_page_title' => 'Home',
+ 'everything' => 'Everything',
+ 'today' => 'today',
+ 'customRange' => 'Custom range',
+ 'date_range' => 'Date range',
+ 'apply' => 'Apply',
+ 'select_date' => 'Select date..',
+ 'cancel' => 'Cancel',
+ 'from' => 'From',
+ 'to' => 'To',
+ 'structure' => 'Structure',
+ 'help_translating' => 'This help text is not yet available in your language. Will you help translate?',
+ 'showEverything' => 'Show everything',
+ 'never' => 'Never',
+ 'no_results_for_empty_search' => 'Your search was empty, so nothing was found.',
+ 'removed_amount' => 'Removed :amount',
+ 'added_amount' => 'Added :amount',
+ 'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',
+ 'Opening balance' => 'Opening balance',
+ 'create_new_stuff' => 'Create new stuff',
+ 'new_withdrawal' => 'New withdrawal',
+ 'create_new_transaction' => 'Create a new transaction',
+ 'sidebar_frontpage_create' => 'Create',
+ 'new_transaction' => 'New transaction',
+ 'no_rules_for_bill' => 'This bill has no rules associated to it.',
+ 'go_to_asset_accounts' => 'View your asset accounts',
+ 'go_to_budgets' => 'Go to your budgets',
+ 'go_to_withdrawals' => 'Go to your withdrawals',
+ 'clones_journal_x' => 'This transaction is a clone of ":description" (#:id)',
+ 'go_to_categories' => 'Go to your categories',
+ 'go_to_bills' => 'Go to your bills',
+ 'go_to_expense_accounts' => 'See your expense accounts',
+ 'go_to_revenue_accounts' => 'See your revenue accounts',
+ 'go_to_piggies' => 'Go to your piggy banks',
+ 'new_deposit' => 'New deposit',
+ 'new_transfer' => 'New transfer',
+ 'new_transfers' => 'New transfer',
+ 'new_asset_account' => 'New asset account',
+ 'new_expense_account' => 'New expense account',
+ 'new_revenue_account' => 'New revenue account',
+ 'new_liabilities_account' => 'New liability',
+ 'new_budget' => 'New budget',
+ 'new_bill' => 'New bill',
+ 'block_account_logout' => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
+ 'flash_success' => 'Success!',
+ 'flash_info' => 'Message',
+ 'flash_warning' => 'Warning!',
+ 'flash_error' => 'Error!',
+ 'flash_danger' => 'Danger!',
+ 'flash_info_multiple' => 'There is one message|There are :count messages',
+ 'flash_error_multiple' => 'There is one error|There are :count errors',
+ 'net_worth' => 'Net worth',
+ 'help_for_this_page' => 'Help for this page',
+ 'help_for_this_page_body' => 'You can find more information about this page in the documentation.',
+ 'two_factor_welcome' => 'Hello!',
+ 'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
+ 'two_factor_code_here' => 'Enter code here',
+ 'two_factor_title' => 'Two factor authentication',
+ 'authenticate' => 'Authenticate',
+ 'two_factor_forgot_title' => 'Lost two factor authentication',
+ 'two_factor_forgot' => 'I forgot my two-factor thing.',
+ 'two_factor_lost_header' => 'Lost your two factor authentication?',
+ 'two_factor_lost_intro' => 'If you lost your backup codes as well, you have bad luck. This is not something you can fix from the web interface. You have two choices.',
+ 'two_factor_lost_fix_self' => 'If you run your own instance of Firefly III, read this entry in the FAQ for instructions.',
+ 'two_factor_lost_fix_owner' => 'Otherwise, email the site owner, :site_owner and ask them to reset your two factor authentication.',
+ 'mfa_backup_code' => 'You have used a backup code to login to Firefly III. It can\'t be used again, so cross it from your list.',
+ 'pref_two_factor_new_backup_codes' => 'Get new backup codes',
+ 'pref_two_factor_backup_code_count' => 'You have :count valid backup code.|You have :count valid backup codes.',
+ '2fa_i_have_them' => 'I stored them!',
+ 'warning_much_data' => ':days days of data may take a while to load.',
+ 'registered' => 'You have registered successfully!',
+ 'Default asset account' => 'Default asset account',
+ 'no_budget_pointer' => 'You seem to have no budgets yet. You should create some on the budgets-page. Budgets can help you keep track of expenses.',
+ 'no_bill_pointer' => 'You seem to have no bills yet. You should create some on the bills-page. Bills can help you keep track of expenses.',
+ 'Savings account' => 'Savings account',
+ 'Credit card' => 'Credit card',
+ 'source_accounts' => 'Source account|Source accounts',
+ 'destination_accounts' => 'Destination account|Destination accounts',
+ 'user_id_is' => 'Your user id is :user',
+ 'field_supports_markdown' => 'This field supports Markdown.',
+ 'need_more_help' => 'If you need more help using Firefly III, please open a ticket on Github.',
+ 'reenable_intro_text' => 'You can also re-enable the introduction guidance.',
+ 'intro_boxes_after_refresh' => 'The introduction boxes will reappear when you refresh the page.',
+ 'show_all_no_filter' => 'Show all transactions without grouping them by date.',
+ 'expenses_by_category' => 'Expenses by category',
+ 'expenses_by_budget' => 'Expenses by budget',
+ 'income_by_category' => 'Income by category',
+ 'expenses_by_asset_account' => 'Expenses by asset account',
+ 'expenses_by_expense_account' => 'Expenses by expense account',
+ 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.',
+ 'sum_of_expenses' => 'Sum of expenses',
+ 'sum_of_income' => 'Sum of income',
+ 'liabilities' => 'Liabilities',
+ 'spent_in_specific_budget' => 'Spent in budget ":budget"',
+ 'spent_in_specific_double' => 'Spent in account ":account"',
+ 'earned_in_specific_double' => 'Earned in account ":account"',
+ 'source_account' => 'Source account',
+ 'source_account_reconciliation' => 'You can\'t edit the source account of a reconciliation transaction.',
+ 'destination_account' => 'Destination account',
+ 'destination_account_reconciliation' => 'You can\'t edit the destination account of a reconciliation transaction.',
+ 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"',
+ 'left_in_budget_limit' => 'Left to spend according to budgeting',
+ 'current_period' => 'Current period',
+ 'show_the_current_period_and_overview' => 'Show the current period and overview',
+ 'pref_languages_locale' => 'For a language other than English to work properly, your operating system must be equipped with the correct locale-information. If these are not present, currency data, dates and amounts may be formatted wrong.',
+ 'budget_in_period' => 'All transactions for budget ":name" between :start and :end in :currency',
+ 'chart_budget_in_period' => 'Chart for all transactions for budget ":name" between :start and :end in :currency',
+ 'chart_budget_in_period_only_currency' => 'The amount you budgeted was in :currency, so this chart will only show transactions in :currency.',
+ 'chart_account_in_period' => 'Chart for all transactions for account ":name" (:balance) between :start and :end',
+ 'chart_category_in_period' => 'Chart for all transactions for category ":name" between :start and :end',
+ 'chart_category_all' => 'Chart for all transactions for category ":name"',
+ 'clone_withdrawal' => 'Clone this withdrawal',
+ 'clone_deposit' => 'Clone this deposit',
+ 'clone_transfer' => 'Clone this transfer',
+ 'multi_select_no_selection' => 'None selected',
+ 'multi_select_select_all' => 'Select all',
+ 'multi_select_n_selected' => 'selected',
+ 'multi_select_all_selected' => 'All selected',
+ 'multi_select_filter_placeholder' => 'Find..',
+ 'intro_next_label' => 'Next',
+ 'intro_prev_label' => 'Previous',
+ 'intro_skip_label' => 'Skip',
+ 'intro_done_label' => 'Done',
+ 'between_dates_breadcrumb' => 'Between :start and :end',
+ 'all_journals_without_budget' => 'All transactions without a budget',
+ 'journals_without_budget' => 'Transactions without a budget',
+ 'all_journals_without_category' => 'All transactions without a category',
+ 'journals_without_category' => 'Transactions without a category',
+ 'all_journals_for_account' => 'All transactions for account :name',
+ 'chart_all_journals_for_account' => 'Chart of all transactions for account :name',
+ 'journals_in_period_for_account' => 'All transactions for account :name between :start and :end',
+ 'journals_in_period_for_account_js' => 'All transactions for account {title} between {start} and {end}',
+ 'transferred' => 'Transferred',
+ 'all_withdrawal' => 'All expenses',
+ 'all_transactions' => 'All transactions',
+ 'title_withdrawal_between' => 'All expenses between :start and :end',
+ 'all_deposit' => 'All revenue',
+ 'title_deposit_between' => 'All revenue between :start and :end',
+ 'all_transfers' => 'All transfers',
+ 'title_transfers_between' => 'All transfers between :start and :end',
+ 'all_transfer' => 'All transfers',
+ 'all_journals_for_tag' => 'All transactions for tag ":tag"',
+ 'title_transfer_between' => 'All transfers between :start and :end',
+ 'all_journals_for_category' => 'All transactions for category :name',
+ 'all_journals_for_budget' => 'All transactions for budget :name',
+ 'chart_all_journals_for_budget' => 'Chart of all transactions for budget :name',
+ 'journals_in_period_for_category' => 'All transactions for category :name between :start and :end',
+ 'journals_in_period_for_tag' => 'All transactions for tag :tag between :start and :end',
+ 'not_available_demo_user' => 'The feature you try to access is not available to demo users.',
+ 'exchange_rate_instructions' => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:',
+ 'transfer_exchange_rate_instructions' => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.',
+ 'transaction_data' => 'Transaction data',
+ 'invalid_server_configuration' => 'Invalid server configuration',
+ 'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this.',
+ 'quickswitch' => 'Quickswitch',
+ 'sign_in_to_start' => 'Sign in to start your session',
+ 'sign_in' => 'Sign in',
+ 'register_new_account' => 'Register a new account',
+ 'forgot_my_password' => 'I forgot my password',
+ 'problems_with_input' => 'There were some problems with your input.',
+ 'reset_password' => 'Reset your password',
+ 'button_reset_password' => 'Reset password',
+ 'reset_button' => 'Reset',
+ 'want_to_login' => 'I want to login',
+ 'login_page_title' => 'Login to Firefly III',
+ 'register_page_title' => 'Register at Firefly III',
+ 'forgot_pw_page_title' => 'Forgot your password for Firefly III',
+ 'reset_pw_page_title' => 'Reset your password for Firefly III',
+ 'cannot_reset_demo_user' => 'You cannot reset the password of the demo user.',
+ 'no_att_demo_user' => 'The demo user can\'t upload attachments.',
+ 'button_register' => 'Register',
+ 'authorization' => 'Authorization',
+ 'active_bills_only' => 'active bills only',
+ 'active_bills_only_total' => 'all active bills',
+ 'active_exp_bills_only' => 'active and expected bills only',
+ 'active_exp_bills_only_total' => 'all active expected bills only',
+ 'per_period_sum_1D' => 'Expected daily costs',
+ 'per_period_sum_1W' => 'Expected weekly costs',
+ 'per_period_sum_1M' => 'Expected monthly costs',
+ 'per_period_sum_3M' => 'Expected quarterly costs',
+ 'per_period_sum_6M' => 'Expected half-yearly costs',
+ 'per_period_sum_1Y' => 'Expected yearly costs',
+ 'average_per_bill' => 'average per bill',
+ 'expected_total' => 'expected total',
+ 'reconciliation_account_name' => ':name reconciliation (:currency)',
+ 'saved' => 'Saved',
+ 'advanced_options' => 'Advanced options',
+ 'advanced_options_explain' => 'Some pages in Firefly III have advanced options hidden behind this button. This page doesn\'t have anything fancy here, but do check out the others!',
+ 'here_be_dragons' => 'Hic sunt dracones',
// Webhooks
- 'webhooks' => 'Webhooks',
- 'webhooks_breadcrumb' => 'Webhooks',
- 'webhooks_menu_disabled' => 'disabled',
- 'no_webhook_messages' => 'There are no webhook messages',
- 'webhook_trigger_STORE_TRANSACTION' => 'After transaction creation',
- 'webhook_trigger_UPDATE_TRANSACTION' => 'After transaction update',
- 'webhook_trigger_DESTROY_TRANSACTION' => 'After transaction delete',
- 'webhook_response_TRANSACTIONS' => 'Transaction details',
- 'webhook_response_ACCOUNTS' => 'Account details',
- 'webhook_response_none_NONE' => 'No details',
- 'webhook_delivery_JSON' => 'JSON',
- 'inspect' => 'Inspect',
- 'create_new_webhook' => 'Create new webhook',
- 'webhooks_create_breadcrumb' => 'Create new webhook',
- 'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
- 'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
- 'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
- 'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
- 'stored_new_webhook' => 'Stored new webhook ":title"',
- 'delete_webhook' => 'Delete webhook',
- 'deleted_webhook' => 'Deleted webhook ":title"',
- 'edit_webhook' => 'Edit webhook ":title"',
- 'updated_webhook' => 'Updated webhook ":title"',
- 'edit_webhook_js' => 'Edit webhook "{title}"',
- 'show_webhook' => 'Webhook ":title"',
- 'webhook_was_triggered' => 'The webhook was triggered on the indicated transaction. Please wait for results to appear.',
- 'webhook_messages' => 'Webhook message',
- 'view_message' => 'View message',
- 'view_attempts' => 'View failed attempts',
- 'message_content_title' => 'Webhook message content',
- 'message_content_help' => 'This is the content of the message that was sent (or tried) using this webhook.',
- 'attempt_content_title' => 'Webhook attempts',
- 'attempt_content_help' => 'These are all the unsuccessful attempts of this webhook message to submit to the configured URL. After some time, Firefly III will stop trying.',
- 'no_attempts' => 'There are no unsuccessful attempts. That\'s a good thing!',
- 'webhook_attempt_at' => 'Attempt at {moment}',
- 'logs' => 'Logs',
- 'response' => 'Response',
- 'visit_webhook_url' => 'Visit webhook URL',
- 'reset_webhook_secret' => 'Reset webhook secret',
- 'webhook_stored_link' => 'Webhook #{ID} ("{title}") has been stored.',
- 'webhook_updated_link' => 'Webhook #{ID} ("{title}") has been updated.',
+ 'webhooks' => 'Webhooks',
+ 'webhooks_breadcrumb' => 'Webhooks',
+ 'webhooks_menu_disabled' => 'disabled',
+ 'no_webhook_messages' => 'There are no webhook messages',
+ 'webhook_trigger_STORE_TRANSACTION' => 'After transaction creation',
+ 'webhook_trigger_UPDATE_TRANSACTION' => 'After transaction update',
+ 'webhook_trigger_DESTROY_TRANSACTION' => 'After transaction delete',
+ 'webhook_response_TRANSACTIONS' => 'Transaction details',
+ 'webhook_response_ACCOUNTS' => 'Account details',
+ 'webhook_response_none_NONE' => 'No details',
+ 'webhook_delivery_JSON' => 'JSON',
+ 'inspect' => 'Inspect',
+ 'create_new_webhook' => 'Create new webhook',
+ 'webhooks_create_breadcrumb' => 'Create new webhook',
+ 'webhook_trigger_form_help' => 'Indicate on what event the webhook will trigger',
+ 'webhook_response_form_help' => 'Indicate what the webhook must submit to the URL.',
+ 'webhook_delivery_form_help' => 'Which format the webhook must deliver data in.',
+ 'webhook_active_form_help' => 'The webhook must be active or it won\'t be called.',
+ 'stored_new_webhook' => 'Stored new webhook ":title"',
+ 'delete_webhook' => 'Delete webhook',
+ 'deleted_webhook' => 'Deleted webhook ":title"',
+ 'edit_webhook' => 'Edit webhook ":title"',
+ 'updated_webhook' => 'Updated webhook ":title"',
+ 'edit_webhook_js' => 'Edit webhook "{title}"',
+ 'show_webhook' => 'Webhook ":title"',
+ 'webhook_was_triggered' => 'The webhook was triggered on the indicated transaction. Please wait for results to appear.',
+ 'webhook_messages' => 'Webhook message',
+ 'view_message' => 'View message',
+ 'view_attempts' => 'View failed attempts',
+ 'message_content_title' => 'Webhook message content',
+ 'message_content_help' => 'This is the content of the message that was sent (or tried) using this webhook.',
+ 'attempt_content_title' => 'Webhook attempts',
+ 'attempt_content_help' => 'These are all the unsuccessful attempts of this webhook message to submit to the configured URL. After some time, Firefly III will stop trying.',
+ 'no_attempts' => 'There are no unsuccessful attempts. That\'s a good thing!',
+ 'webhook_attempt_at' => 'Attempt at {moment}',
+ 'logs' => 'Logs',
+ 'response' => 'Response',
+ 'visit_webhook_url' => 'Visit webhook URL',
+ 'reset_webhook_secret' => 'Reset webhook secret',
+ 'webhook_stored_link' => 'Webhook #{ID} ("{title}") has been stored.',
+ 'webhook_updated_link' => 'Webhook #{ID} ("{title}") has been updated.',
// API access
- 'authorization_request' => 'Firefly III v:version Authorization Request',
- 'authorization_request_intro' => 'Application ":client" is requesting permission to access your financial administration. Would you like to authorize :client to access these records?',
- 'authorization_request_site' => 'You will be redirected to :url which will then be able to access your Firefly III data.',
- 'authorization_request_invalid' => 'This access request is invalid. Please never follow this link again.',
- 'scopes_will_be_able' => 'This application will be able to:',
- 'button_authorize' => 'Authorize',
- 'none_in_select_list' => '(none)',
- 'no_piggy_bank' => '(no piggy bank)',
- 'name_in_currency' => ':name in :currency',
- 'paid_in_currency' => 'Paid in :currency',
- 'unpaid_in_currency' => 'Unpaid in :currency',
- 'is_alpha_warning' => 'You are running an ALPHA version. Be wary of bugs and issues.',
- 'is_beta_warning' => 'You are running an BETA version. Be wary of bugs and issues.',
- 'all_destination_accounts' => 'Destination accounts',
- 'all_source_accounts' => 'Source accounts',
- 'back_to_index' => 'Back to the index',
- 'cant_logout_guard' => 'Firefly III can\'t log you out.',
- 'internal_reference' => 'Internal reference',
+ 'authorization_request' => 'Firefly III v:version Authorization Request',
+ 'authorization_request_intro' => 'Application ":client" is requesting permission to access your financial administration. Would you like to authorize :client to access these records?',
+ 'authorization_request_site' => 'You will be redirected to :url which will then be able to access your Firefly III data.',
+ 'authorization_request_invalid' => 'This access request is invalid. Please never follow this link again.',
+ 'scopes_will_be_able' => 'This application will be able to:',
+ 'button_authorize' => 'Authorize',
+ 'none_in_select_list' => '(none)',
+ 'no_piggy_bank' => '(no piggy bank)',
+ 'name_in_currency' => ':name in :currency',
+ 'paid_in_currency' => 'Paid in :currency',
+ 'unpaid_in_currency' => 'Unpaid in :currency',
+ 'is_alpha_warning' => 'You are running an ALPHA version. Be wary of bugs and issues.',
+ 'is_beta_warning' => 'You are running an BETA version. Be wary of bugs and issues.',
+ 'all_destination_accounts' => 'Destination accounts',
+ 'all_source_accounts' => 'Source accounts',
+ 'back_to_index' => 'Back to the index',
+ 'cant_logout_guard' => 'Firefly III can\'t log you out.',
+ 'internal_reference' => 'Internal reference',
// check for updates:
- 'update_check_title' => 'Check for updates',
- 'admin_update_check_title' => 'Automatically check for update',
- 'admin_update_check_explain' => 'Firefly III can check for updates automatically. When you enable this setting, it will contact the Firefly III update server to see if a new version of Firefly III is available. When it is, you will get a notification. You can test this notification using the button on the right. Please indicate below if you want Firefly III to check for updates.',
- 'check_for_updates_permission' => 'Firefly III can check for updates, but it needs your permission to do so. Please go to the administration to indicate if you would like this feature to be enabled.',
- 'updates_ask_me_later' => 'Ask me later',
- 'updates_do_not_check' => 'Do not check for updates',
- 'updates_enable_check' => 'Enable the check for updates',
- 'admin_update_check_now_title' => 'Check for updates now',
- 'admin_update_check_now_explain' => 'If you press the button, Firefly III will see if your current version is the latest.',
- 'check_for_updates_button' => 'Check now!',
- 'update_new_version_alert' => 'A new version of Firefly III is available. You are running :your_version, the latest version is :new_version which was released on :date.',
- 'update_version_beta' => 'This version is a BETA version. You may run into issues.',
- 'update_version_alpha' => 'This version is a ALPHA version. You may run into issues.',
- 'update_current_dev_older' => 'You are running development release ":version", which is older than the latest release :new_version. Please update!',
- 'update_current_dev_newer' => 'You are running development release ":version", which is newer than the latest release :new_version.',
- 'update_current_version_alert' => 'You are running :version, which is the latest available release.',
- 'update_newer_version_alert' => 'You are running :your_version, which is newer than the latest release, :new_version.',
- 'update_check_error' => 'An error occurred while checking for updates: :error',
- 'unknown_error' => 'Unknown error. Sorry about that.',
- 'disabled_but_check' => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
- 'admin_update_channel_title' => 'Update channel',
- 'admin_update_channel_explain' => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
- 'update_channel_stable' => 'Stable. Everything should work as expected.',
- 'update_channel_beta' => 'Beta. New features but things may be broken.',
- 'update_channel_alpha' => 'Alpha. We throw stuff in, and use whatever sticks.',
+ 'update_check_title' => 'Check for updates',
+ 'admin_update_check_title' => 'Automatically check for update',
+ 'admin_update_check_explain' => 'Firefly III can check for updates automatically. When you enable this setting, it will contact the Firefly III update server to see if a new version of Firefly III is available. When it is, you will get a notification. You can test this notification using the button on the right. Please indicate below if you want Firefly III to check for updates.',
+ 'check_for_updates_permission' => 'Firefly III can check for updates, but it needs your permission to do so. Please go to the administration to indicate if you would like this feature to be enabled.',
+ 'updates_ask_me_later' => 'Ask me later',
+ 'updates_do_not_check' => 'Do not check for updates',
+ 'updates_enable_check' => 'Enable the check for updates',
+ 'admin_update_check_now_title' => 'Check for updates now',
+ 'admin_update_check_now_explain' => 'If you press the button, Firefly III will see if your current version is the latest.',
+ 'check_for_updates_button' => 'Check now!',
+ 'update_new_version_alert' => 'A new version of Firefly III is available. You are running :your_version, the latest version is :new_version which was released on :date.',
+ 'update_version_beta' => 'This version is a BETA version. You may run into issues.',
+ 'update_version_alpha' => 'This version is a ALPHA version. You may run into issues.',
+ 'update_current_dev_older' => 'You are running development release ":version", which is older than the latest release :new_version. Please update!',
+ 'update_current_dev_newer' => 'You are running development release ":version", which is newer than the latest release :new_version.',
+ 'update_current_version_alert' => 'You are running :version, which is the latest available release.',
+ 'update_newer_version_alert' => 'You are running :your_version, which is newer than the latest release, :new_version.',
+ 'update_check_error' => 'An error occurred while checking for updates: :error',
+ 'unknown_error' => 'Unknown error. Sorry about that.',
+ 'disabled_but_check' => 'You disabled update checking. So don\'t forget to check for updates yourself every now and then. Thank you!',
+ 'admin_update_channel_title' => 'Update channel',
+ 'admin_update_channel_explain' => 'Firefly III has three update "channels" which determine how ahead of the curve you are in terms of features, enhancements and bugs. Use the "beta" channel if you\'re adventurous and the "alpha" when you like to live life dangerously.',
+ 'update_channel_stable' => 'Stable. Everything should work as expected.',
+ 'update_channel_beta' => 'Beta. New features but things may be broken.',
+ 'update_channel_alpha' => 'Alpha. We throw stuff in, and use whatever sticks.',
// search
- 'search' => 'Search',
- 'search_query' => 'Query',
- 'search_found_transactions' => 'Firefly III found :count transaction in :time seconds.|Firefly III found :count transactions in :time seconds.',
- 'search_found_more_transactions' => 'Firefly III found more than :count transactions in :time seconds.',
- 'search_for_query' => 'Firefly III is searching for transactions with all of these words in them: :query',
- 'invalid_operators_list' => 'These search parameters are not valid and have been ignored.',
+ 'search' => 'Search',
+ 'search_query' => 'Query',
+ 'search_found_transactions' => 'Firefly III found :count transaction in :time seconds.|Firefly III found :count transactions in :time seconds.',
+ 'search_found_more_transactions' => 'Firefly III found more than :count transactions in :time seconds.',
+ 'search_for_query' => 'Firefly III is searching for transactions with all of these words in them: :query',
+ 'invalid_operators_list' => 'These search parameters are not valid and have been ignored.',
// old
@@ -1266,1544 +1266,1544 @@ return [
'new_rule_for_bill_title' => 'Rule for bill ":name"',
'new_rule_for_bill_description' => 'This rule marks transactions for bill ":name".',
- 'new_rule_for_journal_title' => 'Rule based on transaction ":description"',
- 'new_rule_for_journal_description' => 'This rule is based on transaction ":description". It will match transactions that are exactly the same.',
+ 'new_rule_for_journal_title' => 'Rule based on transaction ":description"',
+ 'new_rule_for_journal_description' => 'This rule is based on transaction ":description". It will match transactions that are exactly the same.',
// tags
- 'store_new_tag' => 'Store new tag',
- 'update_tag' => 'Update tag',
- 'no_location_set' => 'No location set.',
- 'meta_data' => 'Meta data',
- 'location' => 'Location',
- 'location_first_split' => 'The location for this transaction can be set on the first split of this transaction.',
- 'without_date' => 'Without date',
- 'result' => 'Result',
- 'sums_apply_to_range' => 'All sums apply to the selected range',
- 'mapbox_api_key' => 'To use map, get an API key from Mapbox. Open your .env file and enter this code after MAPBOX_API_KEY=.',
- 'press_object_location' => 'Right click or long press to set the object\'s location.',
- 'click_tap_location' => 'Click or tap the map to add a location',
- 'clear_location' => 'Clear location',
- 'delete_all_selected_tags' => 'Delete all selected tags',
- 'select_tags_to_delete' => 'Don\'t forget to select some tags.',
- 'deleted_x_tags' => 'Deleted :count tag.|Deleted :count tags.',
- 'create_rule_from_transaction' => 'Create rule based on transaction',
- 'create_recurring_from_transaction' => 'Create recurring transaction based on transaction',
+ 'store_new_tag' => 'Store new tag',
+ 'update_tag' => 'Update tag',
+ 'no_location_set' => 'No location set.',
+ 'meta_data' => 'Meta data',
+ 'location' => 'Location',
+ 'location_first_split' => 'The location for this transaction can be set on the first split of this transaction.',
+ 'without_date' => 'Without date',
+ 'result' => 'Result',
+ 'sums_apply_to_range' => 'All sums apply to the selected range',
+ 'mapbox_api_key' => 'To use map, get an API key from Mapbox. Open your .env file and enter this code after MAPBOX_API_KEY=.',
+ 'press_object_location' => 'Right click or long press to set the object\'s location.',
+ 'click_tap_location' => 'Click or tap the map to add a location',
+ 'clear_location' => 'Clear location',
+ 'delete_all_selected_tags' => 'Delete all selected tags',
+ 'select_tags_to_delete' => 'Don\'t forget to select some tags.',
+ 'deleted_x_tags' => 'Deleted :count tag.|Deleted :count tags.',
+ 'create_rule_from_transaction' => 'Create rule based on transaction',
+ 'create_recurring_from_transaction' => 'Create recurring transaction based on transaction',
// preferences
- 'dark_mode_option_browser' => 'Let your browser decide',
- 'dark_mode_option_light' => 'Always light',
- 'dark_mode_option_dark' => 'Always dark',
- 'equal_to_language' => '(equal to language)',
- 'dark_mode_preference' => 'Dark mode',
- 'dark_mode_preference_help' => 'Tell Firefly III when to use dark mode.',
- 'pref_home_screen_accounts' => 'Home screen accounts',
- 'pref_home_screen_accounts_help' => 'Which accounts should be displayed on the home page?',
- 'pref_view_range' => 'View range',
- 'pref_view_range_help' => 'Some charts are automatically grouped in periods. Your budgets will also be grouped in periods. What period would you prefer?',
- 'pref_1D' => 'One day',
- 'pref_1W' => 'One week',
- 'pref_1M' => 'One month',
- 'pref_3M' => 'Three months (quarter)',
- 'pref_6M' => 'Six months',
- 'pref_1Y' => 'One year',
- 'pref_last365' => 'Last year',
- 'pref_last90' => 'Last 90 days',
- 'pref_last30' => 'Last 30 days',
- 'pref_last7' => 'Last 7 days',
- 'pref_YTD' => 'Year to date',
- 'pref_QTD' => 'Quarter to date',
- 'pref_MTD' => 'Month to date',
- 'pref_languages' => 'Languages',
- 'pref_locale' => 'Locale settings',
- 'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
- 'pref_locale_help' => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
- 'pref_locale_no_demo' => 'This feature won\'t work for the demo user.',
- 'pref_custom_fiscal_year' => 'Fiscal year settings',
- 'pref_custom_fiscal_year_label' => 'Enabled',
- 'pref_custom_fiscal_year_help' => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
- 'pref_fiscal_year_start_label' => 'Fiscal year start date',
- 'pref_two_factor_auth' => 'Multi-factor authentication',
- 'pref_two_factor_auth_help' => 'When you enable multi-factor authentication (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
- 'pref_enable_two_factor_auth' => 'Enable multi-factor authentication',
- 'pref_two_factor_auth_disabled' => 'Multi-factor authentication verification code removed and disabled',
- 'pref_two_factor_auth_remove_it' => 'Don\'t forget to remove the account from your authentication app!',
- 'pref_two_factor_auth_code' => 'Verify code',
- 'pref_two_factor_auth_code_help' => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code. The QR code changes every time you visit this page. Make sure you use the most recent one.',
- 'pref_two_factor_auth_reset_code' => 'Reset verification code',
- 'pref_two_factor_auth_disable_2fa' => 'Disable MFA',
- '2fa_use_secret_instead' => 'If you cannot scan the QR code, feel free to use the secret instead: :secret.',
- '2fa_backup_codes' => 'Store these backup codes for access in case you lose your device.',
- '2fa_already_enabled' => 'Multi-factor authentication verification is already enabled.',
- 'wrong_mfa_code' => 'This MFA code is not valid.',
- 'pref_save_settings' => 'Save settings',
- 'saved_preferences' => 'Preferences saved!',
- 'preferences_general' => 'General',
- 'preferences_frontpage' => 'Home screen',
- 'preferences_security' => 'Security',
- 'preferences_layout' => 'Layout',
- 'preferences_notifications' => 'Notifications',
- 'pref_home_show_deposits' => 'Show deposits on the home screen',
- 'pref_home_show_deposits_info' => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
- 'pref_home_do_show_deposits' => 'Yes, show them',
- 'successful_count' => 'of which :count successful',
- 'list_page_size_title' => 'Page size',
- 'list_page_size_help' => 'Any list of things (accounts, transactions, etc) shows at most this many per page.',
- 'list_page_size_label' => 'Page size',
- 'between_dates' => '(:start and :end)',
- 'pref_optional_fields_transaction' => 'Optional fields for transactions',
- 'pref_optional_fields_transaction_help' => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
- 'optional_tj_date_fields' => 'Date fields',
- 'optional_tj_other_fields' => 'Other fields',
- 'optional_tj_attachment_fields' => 'Attachment fields',
- 'pref_optional_tj_interest_date' => 'Interest date',
- 'pref_optional_tj_book_date' => 'Book date',
- 'pref_optional_tj_process_date' => 'Processing date',
- 'pref_optional_tj_due_date' => 'Due date',
- 'pref_optional_tj_payment_date' => 'Payment date',
- 'pref_optional_tj_invoice_date' => 'Invoice date',
- 'pref_optional_tj_internal_reference' => 'Internal reference',
- 'pref_optional_tj_notes' => 'Notes',
- 'pref_optional_tj_attachments' => 'Attachments',
- 'pref_optional_tj_external_url' => 'External URL',
- 'pref_optional_tj_location' => 'Location',
- 'pref_optional_tj_links' => 'Transaction links',
- 'optional_field_meta_dates' => 'Dates',
- 'optional_field_meta_business' => 'Business',
- 'optional_field_attachments' => 'Attachments',
- 'optional_field_meta_data' => 'Optional meta data',
- 'external_url' => 'External URL',
- 'pref_notification_login_failure' => 'Login failure',
- 'pref_notification_bill_reminder' => 'Reminder about expiring bills',
- 'pref_notification_new_access_token' => 'Alert when a new API access token is created',
- 'pref_notification_transaction_creation' => 'Alert when a transaction is created automatically',
- 'pref_notification_user_login' => 'Alert when you login from a new location',
- 'pref_notification_rule_action_failures' => 'Alert when rule actions fail to execute (not over email)',
- 'pref_notification_new_password' => 'Your password changed',
- 'pref_notification_enabled_mfa' => 'Multi factor authentication is enabled',
- 'pref_notification_disabled_mfa' => 'Multi factor authentication is disabled',
- 'pref_notification_few_left_mfa' => 'You have just a few backup codes left',
- 'pref_notification_no_left_mfa' => 'You have no backup codes left',
- 'pref_notification_many_failed_mfa' => 'The multi factor authentication check keeps failing',
- 'pref_notification_new_backup_codes' => 'New backup codes have been generated',
- 'pref_notifications' => 'Notifications',
- 'pref_notifications_help' => 'Indicate if these are notifications you would like to get. Some notifications may contain sensitive financial information.',
+ 'dark_mode_option_browser' => 'Let your browser decide',
+ 'dark_mode_option_light' => 'Always light',
+ 'dark_mode_option_dark' => 'Always dark',
+ 'equal_to_language' => '(equal to language)',
+ 'dark_mode_preference' => 'Dark mode',
+ 'dark_mode_preference_help' => 'Tell Firefly III when to use dark mode.',
+ 'pref_home_screen_accounts' => 'Home screen accounts',
+ 'pref_home_screen_accounts_help' => 'Which accounts should be displayed on the home page?',
+ 'pref_view_range' => 'View range',
+ 'pref_view_range_help' => 'Some charts are automatically grouped in periods. Your budgets will also be grouped in periods. What period would you prefer?',
+ 'pref_1D' => 'One day',
+ 'pref_1W' => 'One week',
+ 'pref_1M' => 'One month',
+ 'pref_3M' => 'Three months (quarter)',
+ 'pref_6M' => 'Six months',
+ 'pref_1Y' => 'One year',
+ 'pref_last365' => 'Last year',
+ 'pref_last90' => 'Last 90 days',
+ 'pref_last30' => 'Last 30 days',
+ 'pref_last7' => 'Last 7 days',
+ 'pref_YTD' => 'Year to date',
+ 'pref_QTD' => 'Quarter to date',
+ 'pref_MTD' => 'Month to date',
+ 'pref_languages' => 'Languages',
+ 'pref_locale' => 'Locale settings',
+ 'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
+ 'pref_locale_help' => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
+ 'pref_locale_no_demo' => 'This feature won\'t work for the demo user.',
+ 'pref_custom_fiscal_year' => 'Fiscal year settings',
+ 'pref_custom_fiscal_year_label' => 'Enabled',
+ 'pref_custom_fiscal_year_help' => 'In countries that use a financial year other than January 1 to December 31, you can switch this on and specify start / end days of the fiscal year',
+ 'pref_fiscal_year_start_label' => 'Fiscal year start date',
+ 'pref_two_factor_auth' => 'Multi-factor authentication',
+ 'pref_two_factor_auth_help' => 'When you enable multi-factor authentication (also known as two-factor authentication), you add an extra layer of security to your account. You sign in with something you know (your password) and something you have (a verification code). Verification codes are generated by an application on your phone, such as Authy or Google Authenticator.',
+ 'pref_enable_two_factor_auth' => 'Enable multi-factor authentication',
+ 'pref_two_factor_auth_disabled' => 'Multi-factor authentication verification code removed and disabled',
+ 'pref_two_factor_auth_remove_it' => 'Don\'t forget to remove the account from your authentication app!',
+ 'pref_two_factor_auth_code' => 'Verify code',
+ 'pref_two_factor_auth_code_help' => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code. The QR code changes every time you visit this page. Make sure you use the most recent one.',
+ 'pref_two_factor_auth_reset_code' => 'Reset verification code',
+ 'pref_two_factor_auth_disable_2fa' => 'Disable MFA',
+ '2fa_use_secret_instead' => 'If you cannot scan the QR code, feel free to use the secret instead: :secret.',
+ '2fa_backup_codes' => 'Store these backup codes for access in case you lose your device.',
+ '2fa_already_enabled' => 'Multi-factor authentication verification is already enabled.',
+ 'wrong_mfa_code' => 'This MFA code is not valid.',
+ 'pref_save_settings' => 'Save settings',
+ 'saved_preferences' => 'Preferences saved!',
+ 'preferences_general' => 'General',
+ 'preferences_frontpage' => 'Home screen',
+ 'preferences_security' => 'Security',
+ 'preferences_layout' => 'Layout',
+ 'preferences_notifications' => 'Notifications',
+ 'pref_home_show_deposits' => 'Show deposits on the home screen',
+ 'pref_home_show_deposits_info' => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
+ 'pref_home_do_show_deposits' => 'Yes, show them',
+ 'successful_count' => 'of which :count successful',
+ 'list_page_size_title' => 'Page size',
+ 'list_page_size_help' => 'Any list of things (accounts, transactions, etc) shows at most this many per page.',
+ 'list_page_size_label' => 'Page size',
+ 'between_dates' => '(:start and :end)',
+ 'pref_optional_fields_transaction' => 'Optional fields for transactions',
+ 'pref_optional_fields_transaction_help' => 'By default not all fields are enabled when creating a new transaction (because of the clutter). Below, you can enable these fields if you think they could be useful for you. Of course, any field that is disabled, but already filled in, will be visible regardless of the setting.',
+ 'optional_tj_date_fields' => 'Date fields',
+ 'optional_tj_other_fields' => 'Other fields',
+ 'optional_tj_attachment_fields' => 'Attachment fields',
+ 'pref_optional_tj_interest_date' => 'Interest date',
+ 'pref_optional_tj_book_date' => 'Book date',
+ 'pref_optional_tj_process_date' => 'Processing date',
+ 'pref_optional_tj_due_date' => 'Due date',
+ 'pref_optional_tj_payment_date' => 'Payment date',
+ 'pref_optional_tj_invoice_date' => 'Invoice date',
+ 'pref_optional_tj_internal_reference' => 'Internal reference',
+ 'pref_optional_tj_notes' => 'Notes',
+ 'pref_optional_tj_attachments' => 'Attachments',
+ 'pref_optional_tj_external_url' => 'External URL',
+ 'pref_optional_tj_location' => 'Location',
+ 'pref_optional_tj_links' => 'Transaction links',
+ 'optional_field_meta_dates' => 'Dates',
+ 'optional_field_meta_business' => 'Business',
+ 'optional_field_attachments' => 'Attachments',
+ 'optional_field_meta_data' => 'Optional meta data',
+ 'external_url' => 'External URL',
+ 'pref_notification_login_failure' => 'Login failure',
+ 'pref_notification_bill_reminder' => 'Reminder about expiring bills',
+ 'pref_notification_new_access_token' => 'Alert when a new API access token is created',
+ 'pref_notification_transaction_creation' => 'Alert when a transaction is created automatically',
+ 'pref_notification_user_login' => 'Alert when you login from a new location',
+ 'pref_notification_rule_action_failures' => 'Alert when rule actions fail to execute (not over email)',
+ 'pref_notification_new_password' => 'Your password changed',
+ 'pref_notification_enabled_mfa' => 'Multi factor authentication is enabled',
+ 'pref_notification_disabled_mfa' => 'Multi factor authentication is disabled',
+ 'pref_notification_few_left_mfa' => 'You have just a few backup codes left',
+ 'pref_notification_no_left_mfa' => 'You have no backup codes left',
+ 'pref_notification_many_failed_mfa' => 'The multi factor authentication check keeps failing',
+ 'pref_notification_new_backup_codes' => 'New backup codes have been generated',
+ 'pref_notifications' => 'Notifications',
+ 'pref_notifications_help' => 'Indicate if these are notifications you would like to get. Some notifications may contain sensitive financial information.',
'pref_notifications_settings' => 'Notifications settings',
'pref_notifications_settings_help' => 'Use these settings to configure your notification channels. Please note that notifications will be sent to ALL channels.',
- 'slack_url_label' => 'Slack "incoming webhook" URL',
- 'discord_url_label' => 'Discord webhook URL',
+ 'slack_url_label' => 'Slack "incoming webhook" URL',
+ 'discord_url_label' => 'Discord webhook URL',
// Financial administrations
- 'administration_index' => 'Financial administration',
- 'administrations_index_menu' => 'Financial administration(s)',
- '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"',
+ 'administration_index' => 'Financial administration',
+ 'administrations_index_menu' => 'Financial administration(s)',
+ '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"',
// 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' => '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',
// mfa
- 'enable_mfa' => 'Enable multi-factor authentication',
- 'mfa_index_title' => 'Multi-factor authentication',
- 'mfa_index_intro' => 'Firefly III supports multi-factor authentication (MFA). You can enable MFA for your account to add an extra layer of security. Applications like Authy, Google Authenticator and FreeOTP can be used to generate the codes you need to log in. Security keys are not supported by Firefly III but you can use a security key as a storage device for your MFA secret.',
- 'mfa_index_enabled' => 'Multi-factor authentication is enabled for your account.',
- 'mfa_index_disabled' => 'Multi-factor authentication is not enabled for your account.',
- 'mfa_index_owner' => 'The owner of this instance will always be able to disable multi-factor authentication for your account.',
- 'current_password_confirm_mfa' => 'Enter your current password',
- 'mfa_warning_code_changes' => 'You may get a MFA dialog after you entered your password and a MFA code. In that case, please wait for your application to generate a new MFA code, and do not recycle the one you just used.',
- 'mfa_already_disabled' => 'Multi-factor authentication is not enabled, so you cannot disable it.',
- 'disable_mfa_page' => 'Disable multi-factor authentication',
- 'disable_mfa_intro' => 'You can disable multi-factor authentication. To do so, please enter your password and a multi-factor authentication code. If you want to disable multi-factor authentication because you have lost access to your code generator, please refer to the documentation instead.',
- 'pref_disable_mfa' => 'Disable multi-factor authentication',
- 'mfa_not_enabled' => 'Multi-factor authentication is not enabled.',
- 'mfa_backup_codes_intro' => 'Firefly III can generate backup codes for you. These codes can be used to log in when you cannot use your code generator. You can generate a new set of codes at any time. If you generate a new set, the old set will be invalidated.',
- 'mfa_backup_codes_quick' => 'If you are very fast coming from the setup page of multi-factor authentication, your app may not have generated a new code yet. Please know that MFA codes can only be used once. Make sure you use a different code from the previous one.',
- 'mfa_backup_codes_title' => 'Multi-factor authentication backup codes',
- 'mfa_backup_codes_post_title' => 'Multi-factor authentication backup codes',
+ 'enable_mfa' => 'Enable multi-factor authentication',
+ 'mfa_index_title' => 'Multi-factor authentication',
+ 'mfa_index_intro' => 'Firefly III supports multi-factor authentication (MFA). You can enable MFA for your account to add an extra layer of security. Applications like Authy, Google Authenticator and FreeOTP can be used to generate the codes you need to log in. Security keys are not supported by Firefly III but you can use a security key as a storage device for your MFA secret.',
+ 'mfa_index_enabled' => 'Multi-factor authentication is enabled for your account.',
+ 'mfa_index_disabled' => 'Multi-factor authentication is not enabled for your account.',
+ 'mfa_index_owner' => 'The owner of this instance will always be able to disable multi-factor authentication for your account.',
+ 'current_password_confirm_mfa' => 'Enter your current password',
+ 'mfa_warning_code_changes' => 'You may get a MFA dialog after you entered your password and a MFA code. In that case, please wait for your application to generate a new MFA code, and do not recycle the one you just used.',
+ 'mfa_already_disabled' => 'Multi-factor authentication is not enabled, so you cannot disable it.',
+ 'disable_mfa_page' => 'Disable multi-factor authentication',
+ 'disable_mfa_intro' => 'You can disable multi-factor authentication. To do so, please enter your password and a multi-factor authentication code. If you want to disable multi-factor authentication because you have lost access to your code generator, please refer to the documentation instead.',
+ 'pref_disable_mfa' => 'Disable multi-factor authentication',
+ 'mfa_not_enabled' => 'Multi-factor authentication is not enabled.',
+ 'mfa_backup_codes_intro' => 'Firefly III can generate backup codes for you. These codes can be used to log in when you cannot use your code generator. You can generate a new set of codes at any time. If you generate a new set, the old set will be invalidated.',
+ 'mfa_backup_codes_quick' => 'If you are very fast coming from the setup page of multi-factor authentication, your app may not have generated a new code yet. Please know that MFA codes can only be used once. Make sure you use a different code from the previous one.',
+ 'mfa_backup_codes_title' => 'Multi-factor authentication backup codes',
+ 'mfa_backup_codes_post_title' => 'Multi-factor authentication backup codes',
// profile:
- 'manage_mfa_settings' => 'Manage multi-factor authentication settings',
- 'purge_data_title' => 'Purge data from Firefly III',
- 'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
- 'delete_stuff_header' => 'Delete and purge data',
- 'purge_all_data' => 'Purge all deleted records',
- 'purge_data' => 'Purge data',
- 'purged_all_records' => 'All deleted records have been purged.',
- 'delete_data_title' => 'Delete data from Firefly III',
- 'permanent_delete_stuff' => 'You can delete stuff from Firefly III. Using the buttons below means that your items will be removed from view and hidden. There is no undo-button for this, but the items may remain in the database where you can salvage them if necessary.',
- 'other_sessions_logged_out' => 'All your other sessions have been logged out.',
- 'delete_unused_accounts' => 'Deleting unused accounts will clean your auto-complete lists.',
- 'delete_all_unused_accounts' => 'Delete unused accounts',
- 'deleted_all_unused_accounts' => 'All unused accounts are deleted',
- 'delete_all_budgets' => 'Delete ALL your budgets',
- 'delete_all_categories' => 'Delete ALL your categories',
- 'delete_all_tags' => 'Delete ALL your tags',
- 'delete_all_bills' => 'Delete ALL your bills',
- 'delete_all_piggy_banks' => 'Delete ALL your piggy banks',
- 'delete_all_rules' => 'Delete ALL your rules',
- 'delete_all_recurring' => 'Delete ALL your recurring transactions',
- 'delete_all_object_groups' => 'Delete ALL your object groups',
- 'delete_all_accounts' => 'Delete ALL your accounts',
- 'delete_all_asset_accounts' => 'Delete ALL your asset accounts',
- 'delete_all_expense_accounts' => 'Delete ALL your expense accounts',
- 'delete_all_revenue_accounts' => 'Delete ALL your revenue accounts',
- 'delete_all_liabilities' => 'Delete ALL your liabilities',
- 'delete_all_transactions' => 'Delete ALL your transactions',
- 'delete_all_withdrawals' => 'Delete ALL your withdrawals',
- 'delete_all_deposits' => 'Delete ALL your deposits',
- 'delete_all_transfers' => 'Delete ALL your transfers',
- 'also_delete_transactions' => 'Deleting accounts will also delete ALL associated withdrawals, deposits and transfers!',
- 'deleted_all_budgets' => 'All budgets have been deleted',
- 'deleted_all_categories' => 'All categories have been deleted',
- 'deleted_all_tags' => 'All tags have been deleted',
- 'deleted_all_bills' => 'All bills have been deleted',
- 'deleted_all_piggy_banks' => 'All piggy banks have been deleted',
- 'deleted_all_rules' => 'All rules and rule groups have been deleted',
- 'deleted_all_object_groups' => 'All groups have been deleted',
- 'deleted_all_accounts' => 'All accounts have been deleted',
- 'deleted_all_asset_accounts' => 'All asset accounts have been deleted',
- 'deleted_all_expense_accounts' => 'All expense accounts have been deleted',
- 'deleted_all_revenue_accounts' => 'All revenue accounts have been deleted',
- 'deleted_all_liabilities' => 'All liabilities have been deleted',
- 'deleted_all_transactions' => 'All transactions have been deleted',
- 'deleted_all_withdrawals' => 'All withdrawals have been deleted',
- 'deleted_all_deposits' => 'All deposits have been deleted',
- 'deleted_all_transfers' => 'All transfers have been deleted',
- 'deleted_all_recurring' => 'All recurring transactions have been deleted',
- 'change_your_password' => 'Change your password',
- 'delete_account' => 'Delete account',
- 'current_password' => 'Current password',
- 'new_password' => 'New password',
- 'new_password_again' => 'New password (again)',
- 'delete_your_account' => 'Delete your account',
- 'delete_your_account_help' => 'Deleting your account will also delete any accounts, transactions, anything you might have saved into Firefly III. It\'ll be GONE.',
- 'delete_your_account_password' => 'Enter your password to continue.',
- 'password' => 'Password',
- 'are_you_sure' => 'Are you sure? You cannot undo this.',
- 'are_you_sure_confirm' => 'Are you sure?',
- 'delete_account_button' => 'DELETE your account',
- 'invalid_current_password' => 'Invalid current password!',
- 'password_changed' => 'Password changed!',
- 'should_change' => 'The idea is to change your password.',
- 'invalid_password' => 'Invalid password!',
- 'what_is_pw_security' => 'What is "verify password security"?',
- 'secure_pw_title' => 'How to choose a secure password',
- 'forgot_password_response' => 'Thank you. If an account exists with this email address, you will find instructions in your inbox.',
- 'secure_pw_history' => 'Not a week goes by that you read in the news about a site losing the passwords of its users. Hackers and thieves use these passwords to try to steal your private information. This information is valuable.',
- 'secure_pw_ff' => 'Do you use the same password all over the internet? If one site loses your password, hackers have access to all your data. Firefly III relies on you to choose a strong and unique password to protect your financial records.',
- 'secure_pw_check_box' => 'To help you do that Firefly III can check if the password you want to use has been stolen in the past. If this is the case, Firefly III advises you NOT to use that password.',
- 'secure_pw_working_title' => 'How does it work?',
- 'secure_pw_working' => 'By checking the box, Firefly III will send the first five characters of the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.',
- 'secure_pw_should' => 'Should I check the box?',
- 'secure_pw_long_password' => 'Yes. Always verify your password is safe.',
- 'command_line_token' => 'Command line token',
- 'explain_command_line_token' => 'You need this token to perform command line options, such as exporting data. Without it, that sensitive command will not work. Do not share your command line token. Nobody will ask you for this token, not even me. If you fear you lost this, or when you\'re paranoid, regenerate this token using the button.',
- 'regenerate_command_line_token' => 'Regenerate command line token',
- 'token_regenerated' => 'A new command line token was generated',
- 'change_your_email' => 'Change your email address',
- 'email_verification' => 'An email message will be sent to your old AND new email address. For security purposes, you will not be able to login until you verify your new email address. If you are unsure if your Firefly III installation is capable of sending email, please do not use this feature. If you are an administrator, you can test this in the Administration.',
- 'email_changed_logout' => 'Until you verify your email address, you cannot login.',
- 'login_with_new_email' => 'You can now login with your new email address.',
- 'login_with_old_email' => 'You can now login with your old email address again.',
- 'login_provider_local_only' => 'This action is not available when authenticating through ":login_provider".',
- 'external_user_mgt_disabled' => 'This action is not available when Firefly III isn\'t responsible for user management or authentication handling.',
- 'external_auth_disabled' => 'This action is not available when Firefly III isn\'t responsible for authentication handling.',
- 'delete_local_info_only' => "Because Firefly III isn't responsible for user management or authentication handling, this function will only delete local Firefly III information.",
- 'oauth' => 'OAuth',
- 'profile_oauth_clients' => 'OAuth Clients',
- 'profile_oauth_no_clients' => 'You have not created any OAuth clients.',
- 'profile_oauth_clients_external_auth' => 'If you\'re using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.',
- 'profile_oauth_clients_header' => 'Clients',
- 'profile_oauth_client_id' => 'Client ID',
- 'profile_oauth_client_name' => 'Name',
- 'profile_oauth_client_secret' => 'Secret',
- 'profile_oauth_create_new_client' => 'Create New Client',
- 'profile_oauth_create_client' => 'Create Client',
- 'profile_oauth_edit_client' => 'Edit Client',
- 'profile_oauth_name_help' => 'Something your users will recognize and trust.',
- 'profile_oauth_redirect_url' => 'Redirect URL',
- 'profile_oauth_redirect_url_help' => 'Your application\'s authorization callback URL.',
- 'profile_authorized_apps' => 'Authorized applications',
- 'profile_authorized_clients' => 'Authorized clients',
- 'profile_scopes' => 'Scopes',
- 'profile_revoke' => 'Revoke',
- 'profile_oauth_client_secret_title' => 'Client Secret',
- 'profile_oauth_client_secret_expl' => 'Here is your new client secret. This is the only time it will be shown so don\'t lose it! You may now use this secret to make API requests.',
- 'profile_personal_access_tokens' => 'Personal Access Tokens',
- 'profile_personal_access_token' => 'Personal Access Token',
- 'profile_oauth_confidential' => 'Confidential',
- '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.',
- 'profile_personal_access_token_explanation' => 'Here is your new personal access token. This is the only time it will be shown so don\'t lose it! You may now use this token to make API requests.',
- 'profile_no_personal_access_token' => 'You have not created any personal access tokens.',
- 'profile_create_new_token' => 'Create new token',
- 'profile_create_token' => 'Create token',
- 'profile_create' => 'Create',
- 'profile_save_changes' => 'Save changes',
- 'profile_whoops' => 'Whoops!',
- 'profile_something_wrong' => 'Something went wrong!',
- 'profile_try_again' => 'Something went wrong. Please try again.',
- 'amounts' => 'Amounts',
- 'multi_account_warning_unknown' => 'Depending on the type of transaction you create, the source and/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.',
- 'multi_account_warning_withdrawal' => 'Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.',
- 'multi_account_warning_deposit' => 'Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.',
- 'multi_account_warning_transfer' => 'Keep in mind that the source + destination account of subsequent splits will be overruled by whatever is defined in the first split of the transfer.',
+ 'manage_mfa_settings' => 'Manage multi-factor authentication settings',
+ 'purge_data_title' => 'Purge data from Firefly III',
+ 'purge_data_expl' => '"Purging" means "deleting that which is already deleted". In normal circumstances, Firefly III deletes nothing permanently. It just hides it. The button below deletes all of these previously "deleted" records FOREVER.',
+ 'delete_stuff_header' => 'Delete and purge data',
+ 'purge_all_data' => 'Purge all deleted records',
+ 'purge_data' => 'Purge data',
+ 'purged_all_records' => 'All deleted records have been purged.',
+ 'delete_data_title' => 'Delete data from Firefly III',
+ 'permanent_delete_stuff' => 'You can delete stuff from Firefly III. Using the buttons below means that your items will be removed from view and hidden. There is no undo-button for this, but the items may remain in the database where you can salvage them if necessary.',
+ 'other_sessions_logged_out' => 'All your other sessions have been logged out.',
+ 'delete_unused_accounts' => 'Deleting unused accounts will clean your auto-complete lists.',
+ 'delete_all_unused_accounts' => 'Delete unused accounts',
+ 'deleted_all_unused_accounts' => 'All unused accounts are deleted',
+ 'delete_all_budgets' => 'Delete ALL your budgets',
+ 'delete_all_categories' => 'Delete ALL your categories',
+ 'delete_all_tags' => 'Delete ALL your tags',
+ 'delete_all_bills' => 'Delete ALL your bills',
+ 'delete_all_piggy_banks' => 'Delete ALL your piggy banks',
+ 'delete_all_rules' => 'Delete ALL your rules',
+ 'delete_all_recurring' => 'Delete ALL your recurring transactions',
+ 'delete_all_object_groups' => 'Delete ALL your object groups',
+ 'delete_all_accounts' => 'Delete ALL your accounts',
+ 'delete_all_asset_accounts' => 'Delete ALL your asset accounts',
+ 'delete_all_expense_accounts' => 'Delete ALL your expense accounts',
+ 'delete_all_revenue_accounts' => 'Delete ALL your revenue accounts',
+ 'delete_all_liabilities' => 'Delete ALL your liabilities',
+ 'delete_all_transactions' => 'Delete ALL your transactions',
+ 'delete_all_withdrawals' => 'Delete ALL your withdrawals',
+ 'delete_all_deposits' => 'Delete ALL your deposits',
+ 'delete_all_transfers' => 'Delete ALL your transfers',
+ 'also_delete_transactions' => 'Deleting accounts will also delete ALL associated withdrawals, deposits and transfers!',
+ 'deleted_all_budgets' => 'All budgets have been deleted',
+ 'deleted_all_categories' => 'All categories have been deleted',
+ 'deleted_all_tags' => 'All tags have been deleted',
+ 'deleted_all_bills' => 'All bills have been deleted',
+ 'deleted_all_piggy_banks' => 'All piggy banks have been deleted',
+ 'deleted_all_rules' => 'All rules and rule groups have been deleted',
+ 'deleted_all_object_groups' => 'All groups have been deleted',
+ 'deleted_all_accounts' => 'All accounts have been deleted',
+ 'deleted_all_asset_accounts' => 'All asset accounts have been deleted',
+ 'deleted_all_expense_accounts' => 'All expense accounts have been deleted',
+ 'deleted_all_revenue_accounts' => 'All revenue accounts have been deleted',
+ 'deleted_all_liabilities' => 'All liabilities have been deleted',
+ 'deleted_all_transactions' => 'All transactions have been deleted',
+ 'deleted_all_withdrawals' => 'All withdrawals have been deleted',
+ 'deleted_all_deposits' => 'All deposits have been deleted',
+ 'deleted_all_transfers' => 'All transfers have been deleted',
+ 'deleted_all_recurring' => 'All recurring transactions have been deleted',
+ 'change_your_password' => 'Change your password',
+ 'delete_account' => 'Delete account',
+ 'current_password' => 'Current password',
+ 'new_password' => 'New password',
+ 'new_password_again' => 'New password (again)',
+ 'delete_your_account' => 'Delete your account',
+ 'delete_your_account_help' => 'Deleting your account will also delete any accounts, transactions, anything you might have saved into Firefly III. It\'ll be GONE.',
+ 'delete_your_account_password' => 'Enter your password to continue.',
+ 'password' => 'Password',
+ 'are_you_sure' => 'Are you sure? You cannot undo this.',
+ 'are_you_sure_confirm' => 'Are you sure?',
+ 'delete_account_button' => 'DELETE your account',
+ 'invalid_current_password' => 'Invalid current password!',
+ 'password_changed' => 'Password changed!',
+ 'should_change' => 'The idea is to change your password.',
+ 'invalid_password' => 'Invalid password!',
+ 'what_is_pw_security' => 'What is "verify password security"?',
+ 'secure_pw_title' => 'How to choose a secure password',
+ 'forgot_password_response' => 'Thank you. If an account exists with this email address, you will find instructions in your inbox.',
+ 'secure_pw_history' => 'Not a week goes by that you read in the news about a site losing the passwords of its users. Hackers and thieves use these passwords to try to steal your private information. This information is valuable.',
+ 'secure_pw_ff' => 'Do you use the same password all over the internet? If one site loses your password, hackers have access to all your data. Firefly III relies on you to choose a strong and unique password to protect your financial records.',
+ 'secure_pw_check_box' => 'To help you do that Firefly III can check if the password you want to use has been stolen in the past. If this is the case, Firefly III advises you NOT to use that password.',
+ 'secure_pw_working_title' => 'How does it work?',
+ 'secure_pw_working' => 'By checking the box, Firefly III will send the first five characters of the SHA1 hash of your password to the website of Troy Hunt to see if it is on the list. This will stop you from using unsafe passwords as is recommended in the latest NIST Special Publication on this subject.',
+ 'secure_pw_should' => 'Should I check the box?',
+ 'secure_pw_long_password' => 'Yes. Always verify your password is safe.',
+ 'command_line_token' => 'Command line token',
+ 'explain_command_line_token' => 'You need this token to perform command line options, such as exporting data. Without it, that sensitive command will not work. Do not share your command line token. Nobody will ask you for this token, not even me. If you fear you lost this, or when you\'re paranoid, regenerate this token using the button.',
+ 'regenerate_command_line_token' => 'Regenerate command line token',
+ 'token_regenerated' => 'A new command line token was generated',
+ 'change_your_email' => 'Change your email address',
+ 'email_verification' => 'An email message will be sent to your old AND new email address. For security purposes, you will not be able to login until you verify your new email address. If you are unsure if your Firefly III installation is capable of sending email, please do not use this feature. If you are an administrator, you can test this in the Administration.',
+ 'email_changed_logout' => 'Until you verify your email address, you cannot login.',
+ 'login_with_new_email' => 'You can now login with your new email address.',
+ 'login_with_old_email' => 'You can now login with your old email address again.',
+ 'login_provider_local_only' => 'This action is not available when authenticating through ":login_provider".',
+ 'external_user_mgt_disabled' => 'This action is not available when Firefly III isn\'t responsible for user management or authentication handling.',
+ 'external_auth_disabled' => 'This action is not available when Firefly III isn\'t responsible for authentication handling.',
+ 'delete_local_info_only' => "Because Firefly III isn't responsible for user management or authentication handling, this function will only delete local Firefly III information.",
+ 'oauth' => 'OAuth',
+ 'profile_oauth_clients' => 'OAuth Clients',
+ 'profile_oauth_no_clients' => 'You have not created any OAuth clients.',
+ 'profile_oauth_clients_external_auth' => 'If you\'re using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.',
+ 'profile_oauth_clients_header' => 'Clients',
+ 'profile_oauth_client_id' => 'Client ID',
+ 'profile_oauth_client_name' => 'Name',
+ 'profile_oauth_client_secret' => 'Secret',
+ 'profile_oauth_create_new_client' => 'Create New Client',
+ 'profile_oauth_create_client' => 'Create Client',
+ 'profile_oauth_edit_client' => 'Edit Client',
+ 'profile_oauth_name_help' => 'Something your users will recognize and trust.',
+ 'profile_oauth_redirect_url' => 'Redirect URL',
+ 'profile_oauth_redirect_url_help' => 'Your application\'s authorization callback URL.',
+ 'profile_authorized_apps' => 'Authorized applications',
+ 'profile_authorized_clients' => 'Authorized clients',
+ 'profile_scopes' => 'Scopes',
+ 'profile_revoke' => 'Revoke',
+ 'profile_oauth_client_secret_title' => 'Client Secret',
+ 'profile_oauth_client_secret_expl' => 'Here is your new client secret. This is the only time it will be shown so don\'t lose it! You may now use this secret to make API requests.',
+ 'profile_personal_access_tokens' => 'Personal Access Tokens',
+ 'profile_personal_access_token' => 'Personal Access Token',
+ 'profile_oauth_confidential' => 'Confidential',
+ '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.',
+ 'profile_personal_access_token_explanation' => 'Here is your new personal access token. This is the only time it will be shown so don\'t lose it! You may now use this token to make API requests.',
+ 'profile_no_personal_access_token' => 'You have not created any personal access tokens.',
+ 'profile_create_new_token' => 'Create new token',
+ 'profile_create_token' => 'Create token',
+ 'profile_create' => 'Create',
+ 'profile_save_changes' => 'Save changes',
+ 'profile_whoops' => 'Whoops!',
+ 'profile_something_wrong' => 'Something went wrong!',
+ 'profile_try_again' => 'Something went wrong. Please try again.',
+ 'amounts' => 'Amounts',
+ 'multi_account_warning_unknown' => 'Depending on the type of transaction you create, the source and/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.',
+ 'multi_account_warning_withdrawal' => 'Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.',
+ 'multi_account_warning_deposit' => 'Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.',
+ 'multi_account_warning_transfer' => 'Keep in mind that the source + destination account of subsequent splits will be overruled by whatever is defined in the first split of the transfer.',
// Ignore this comment
// export data:
- 'export_data_title' => 'Export data from Firefly III',
- 'export_data_menu' => 'Export data',
- 'export_data_bc' => 'Export data from Firefly III',
- 'export_data_main_title' => 'Export data from Firefly III',
- 'export_data_expl' => 'This link allows you to export all transactions + meta data from Firefly III. Please refer to the help (top right (?)-icon) for more information about the process.',
- 'export_data_all_transactions' => 'Export all transactions',
- 'export_data_advanced_expl' => 'If you need a more advanced or specific type of export, read the help on how to use the console command php artisan help firefly-iii:export-data.',
+ 'export_data_title' => 'Export data from Firefly III',
+ 'export_data_menu' => 'Export data',
+ 'export_data_bc' => 'Export data from Firefly III',
+ 'export_data_main_title' => 'Export data from Firefly III',
+ 'export_data_expl' => 'This link allows you to export all transactions + meta data from Firefly III. Please refer to the help (top right (?)-icon) for more information about the process.',
+ 'export_data_all_transactions' => 'Export all transactions',
+ 'export_data_advanced_expl' => 'If you need a more advanced or specific type of export, read the help on how to use the console command php artisan help firefly-iii:export-data.',
// attachments
- 'nr_of_attachments' => 'One attachment|:count attachments',
- 'attachments' => 'Attachments',
- 'edit_attachment' => 'Edit attachment ":name"',
- 'update_attachment' => 'Update attachment',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'attachment_deleted' => 'Deleted attachment ":name"',
- 'liabilities_deleted' => 'Deleted liability ":name"',
- 'attachment_updated' => 'Updated attachment ":name"',
- 'upload_max_file_size' => 'Maximum file size: :size',
- 'list_all_attachments' => 'List of all attachments',
+ 'nr_of_attachments' => 'One attachment|:count attachments',
+ 'attachments' => 'Attachments',
+ 'edit_attachment' => 'Edit attachment ":name"',
+ 'update_attachment' => 'Update attachment',
+ 'delete_attachment' => 'Delete attachment ":name"',
+ 'attachment_deleted' => 'Deleted attachment ":name"',
+ 'liabilities_deleted' => 'Deleted liability ":name"',
+ 'attachment_updated' => 'Updated attachment ":name"',
+ 'upload_max_file_size' => 'Maximum file size: :size',
+ 'list_all_attachments' => 'List of all attachments',
// transaction index
- 'is_reconciled_fields_dropped' => 'Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).',
- 'title_expenses' => 'Expenses',
- 'title_withdrawal' => 'Expenses',
- 'title_revenue' => 'Revenue / income',
- 'title_deposit' => 'Revenue / income',
- 'title_transfer' => 'Transfers',
- 'title_transfers' => 'Transfers',
- 'submission_options' => 'Submission options',
- 'apply_rules_checkbox' => 'Apply rules',
- 'fire_webhooks_checkbox' => 'Fire webhooks',
- 'select_source_account' => 'Please select or type a valid source account name',
- 'select_dest_account' => 'Please select or type a valid destination account name',
+ 'is_reconciled_fields_dropped' => 'Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).',
+ 'title_expenses' => 'Expenses',
+ 'title_withdrawal' => 'Expenses',
+ 'title_revenue' => 'Revenue / income',
+ 'title_deposit' => 'Revenue / income',
+ 'title_transfer' => 'Transfers',
+ 'title_transfers' => 'Transfers',
+ 'submission_options' => 'Submission options',
+ 'apply_rules_checkbox' => 'Apply rules',
+ 'fire_webhooks_checkbox' => 'Fire webhooks',
+ 'select_source_account' => 'Please select or type a valid source account name',
+ 'select_dest_account' => 'Please select or type a valid destination account name',
// convert stuff:
- 'convert_is_already_type_Withdrawal' => 'This transaction is already a withdrawal',
- 'convert_is_already_type_Deposit' => 'This transaction is already a deposit',
- 'convert_is_already_type_Transfer' => 'This transaction is already a transfer',
- 'convert_to_Withdrawal' => 'Convert ":description" to a withdrawal',
- 'convert_to_Deposit' => 'Convert ":description" to a deposit',
- 'convert_to_Transfer' => 'Convert ":description" to a transfer',
- 'convert_options_WithdrawalDeposit' => 'Convert a withdrawal into a deposit',
- 'convert_options_WithdrawalTransfer' => 'Convert a withdrawal into a transfer',
- 'convert_options_DepositTransfer' => 'Convert a deposit into a transfer',
- 'convert_options_DepositWithdrawal' => 'Convert a deposit into a withdrawal',
- 'convert_options_TransferWithdrawal' => 'Convert a transfer into a withdrawal',
- 'convert_options_TransferDeposit' => 'Convert a transfer into a deposit',
- 'convert_Withdrawal_to_deposit' => 'Convert this withdrawal to a deposit',
- 'convert_Withdrawal_to_transfer' => 'Convert this withdrawal to a transfer',
- 'convert_Deposit_to_withdrawal' => 'Convert this deposit to a withdrawal',
- 'convert_Deposit_to_transfer' => 'Convert this deposit to a transfer',
- 'convert_Transfer_to_deposit' => 'Convert this transfer to a deposit',
- 'convert_Transfer_to_withdrawal' => 'Convert this transfer to a withdrawal',
- 'convert_please_set_revenue_source' => 'Please pick the revenue account where the money will come from.',
- 'convert_please_set_asset_destination' => 'Please pick the asset account where the money will go to.',
- 'convert_please_set_expense_destination' => 'Please pick the expense account where the money will go to.',
- 'convert_please_set_asset_source' => 'Please pick the asset account where the money will come from.',
- 'convert_expl_w_d' => 'When converting from a withdrawal to a deposit, the money will be deposited into the displayed destination account, instead of being withdrawn from it.|When converting from a withdrawal to a deposit, the money will be deposited into the displayed destination accounts, instead of being withdrawn from them.',
- 'convert_expl_w_t' => 'When converting a withdrawal into a transfer, the money will be transferred away from the source account into other asset or liability account instead of being spent on the original expense account.|When converting a withdrawal into a transfer, the money will be transferred away from the source accounts into other asset or liability accounts instead of being spent on the original expense accounts.',
- 'convert_expl_d_w' => 'When converting a deposit into a withdrawal, the money will be withdrawn from the displayed source account, instead of being deposited into it.|When converting a deposit into a withdrawal, the money will be withdrawn from the displayed source accounts, instead of being deposited into them.',
- 'convert_expl_d_t' => 'When you convert a deposit into a transfer, the money will be deposited into the listed destination account from any of your asset or liability account.|When you convert a deposit into a transfer, the money will be deposited into the listed destination accounts from any of your asset or liability accounts.',
- 'convert_expl_t_w' => 'When you convert a transfer into a withdrawal, the money will be spent on the destination account you set here, instead of being transferred away.|When you convert a transfer into a withdrawal, the money will be spent on the destination accounts you set here, instead of being transferred away.',
- 'convert_expl_t_d' => 'When you convert a transfer into a deposit, the money will be deposited into the destination account you see here, instead of being transferred into it.|When you convert a transfer into a deposit, the money will be deposited into the destination accounts you see here, instead of being transferred into them.',
- 'convert_select_sources' => 'To complete the conversion, please set the new source account below.|To complete the conversion, please set the new source accounts below.',
- 'convert_select_destinations' => 'To complete the conversion, please select the new destination account below.|To complete the conversion, please select the new destination accounts below.',
- 'converted_to_Withdrawal' => 'The transaction has been converted to a withdrawal',
- 'converted_to_Deposit' => 'The transaction has been converted to a deposit',
- 'converted_to_Transfer' => 'The transaction has been converted to a transfer',
- 'invalid_convert_selection' => 'The account you have selected is already used in this transaction or does not exist.',
- 'source_or_dest_invalid' => 'Cannot find the correct transaction details. Conversion is not possible.',
- 'convert_to_withdrawal' => 'Convert to a withdrawal',
- 'convert_to_deposit' => 'Convert to a deposit',
- 'convert_to_transfer' => 'Convert to a transfer',
+ 'convert_is_already_type_Withdrawal' => 'This transaction is already a withdrawal',
+ 'convert_is_already_type_Deposit' => 'This transaction is already a deposit',
+ 'convert_is_already_type_Transfer' => 'This transaction is already a transfer',
+ 'convert_to_Withdrawal' => 'Convert ":description" to a withdrawal',
+ 'convert_to_Deposit' => 'Convert ":description" to a deposit',
+ 'convert_to_Transfer' => 'Convert ":description" to a transfer',
+ 'convert_options_WithdrawalDeposit' => 'Convert a withdrawal into a deposit',
+ 'convert_options_WithdrawalTransfer' => 'Convert a withdrawal into a transfer',
+ 'convert_options_DepositTransfer' => 'Convert a deposit into a transfer',
+ 'convert_options_DepositWithdrawal' => 'Convert a deposit into a withdrawal',
+ 'convert_options_TransferWithdrawal' => 'Convert a transfer into a withdrawal',
+ 'convert_options_TransferDeposit' => 'Convert a transfer into a deposit',
+ 'convert_Withdrawal_to_deposit' => 'Convert this withdrawal to a deposit',
+ 'convert_Withdrawal_to_transfer' => 'Convert this withdrawal to a transfer',
+ 'convert_Deposit_to_withdrawal' => 'Convert this deposit to a withdrawal',
+ 'convert_Deposit_to_transfer' => 'Convert this deposit to a transfer',
+ 'convert_Transfer_to_deposit' => 'Convert this transfer to a deposit',
+ 'convert_Transfer_to_withdrawal' => 'Convert this transfer to a withdrawal',
+ 'convert_please_set_revenue_source' => 'Please pick the revenue account where the money will come from.',
+ 'convert_please_set_asset_destination' => 'Please pick the asset account where the money will go to.',
+ 'convert_please_set_expense_destination' => 'Please pick the expense account where the money will go to.',
+ 'convert_please_set_asset_source' => 'Please pick the asset account where the money will come from.',
+ 'convert_expl_w_d' => 'When converting from a withdrawal to a deposit, the money will be deposited into the displayed destination account, instead of being withdrawn from it.|When converting from a withdrawal to a deposit, the money will be deposited into the displayed destination accounts, instead of being withdrawn from them.',
+ 'convert_expl_w_t' => 'When converting a withdrawal into a transfer, the money will be transferred away from the source account into other asset or liability account instead of being spent on the original expense account.|When converting a withdrawal into a transfer, the money will be transferred away from the source accounts into other asset or liability accounts instead of being spent on the original expense accounts.',
+ 'convert_expl_d_w' => 'When converting a deposit into a withdrawal, the money will be withdrawn from the displayed source account, instead of being deposited into it.|When converting a deposit into a withdrawal, the money will be withdrawn from the displayed source accounts, instead of being deposited into them.',
+ 'convert_expl_d_t' => 'When you convert a deposit into a transfer, the money will be deposited into the listed destination account from any of your asset or liability account.|When you convert a deposit into a transfer, the money will be deposited into the listed destination accounts from any of your asset or liability accounts.',
+ 'convert_expl_t_w' => 'When you convert a transfer into a withdrawal, the money will be spent on the destination account you set here, instead of being transferred away.|When you convert a transfer into a withdrawal, the money will be spent on the destination accounts you set here, instead of being transferred away.',
+ 'convert_expl_t_d' => 'When you convert a transfer into a deposit, the money will be deposited into the destination account you see here, instead of being transferred into it.|When you convert a transfer into a deposit, the money will be deposited into the destination accounts you see here, instead of being transferred into them.',
+ 'convert_select_sources' => 'To complete the conversion, please set the new source account below.|To complete the conversion, please set the new source accounts below.',
+ 'convert_select_destinations' => 'To complete the conversion, please select the new destination account below.|To complete the conversion, please select the new destination accounts below.',
+ 'converted_to_Withdrawal' => 'The transaction has been converted to a withdrawal',
+ 'converted_to_Deposit' => 'The transaction has been converted to a deposit',
+ 'converted_to_Transfer' => 'The transaction has been converted to a transfer',
+ 'invalid_convert_selection' => 'The account you have selected is already used in this transaction or does not exist.',
+ 'source_or_dest_invalid' => 'Cannot find the correct transaction details. Conversion is not possible.',
+ 'convert_to_withdrawal' => 'Convert to a withdrawal',
+ 'convert_to_deposit' => 'Convert to a deposit',
+ 'convert_to_transfer' => 'Convert to a transfer',
// create new stuff:
- 'create_new_withdrawal' => 'Create new withdrawal',
- 'create_new_deposit' => 'Create new deposit',
- 'create_new_transfer' => 'Create new transfer',
- 'create_new_asset' => 'Create new asset account',
- 'create_new_liabilities' => 'Create new liability',
- 'create_new_expense' => 'Create new expense account',
- 'create_new_revenue' => 'Create new revenue account',
- 'create_new_piggy_bank' => 'Create new piggy bank',
- 'create_new_bill' => 'Create new bill',
- 'create_new_subscription' => 'Create new subscription',
- 'create_new_rule' => 'Create new rule',
+ 'create_new_withdrawal' => 'Create new withdrawal',
+ 'create_new_deposit' => 'Create new deposit',
+ 'create_new_transfer' => 'Create new transfer',
+ 'create_new_asset' => 'Create new asset account',
+ 'create_new_liabilities' => 'Create new liability',
+ 'create_new_expense' => 'Create new expense account',
+ 'create_new_revenue' => 'Create new revenue account',
+ 'create_new_piggy_bank' => 'Create new piggy bank',
+ 'create_new_bill' => 'Create new bill',
+ 'create_new_subscription' => 'Create new subscription',
+ 'create_new_rule' => 'Create new rule',
// currencies:
- 'create_currency' => 'Create a new currency',
- 'store_currency' => 'Store new currency',
- 'update_currency' => 'Update currency',
- 'new_default_currency' => '":name" is now the default currency.',
- 'default_currency_failed' => 'Could not make ":name" the default currency. Please check the logs.',
- 'cannot_delete_currency' => 'Cannot delete :name because it is still in use.',
- 'cannot_delete_fallback_currency' => ':name is the system fallback currency and can\'t be deleted.',
- 'cannot_disable_currency_journals' => 'Cannot disable :name because transactions are still using it.',
- 'cannot_disable_currency_last_left' => 'Cannot disable :name because it is the last enabled currency.',
- 'cannot_disable_currency_account_meta' => 'Cannot disable :name because it is used in asset accounts.',
- 'cannot_disable_currency_bills' => 'Cannot disable :name because it is used in bills.',
- 'cannot_disable_currency_recurring' => 'Cannot disable :name because it is used in recurring transactions.',
- 'cannot_disable_currency_available_budgets' => 'Cannot disable :name because it is used in available budgets.',
- 'cannot_disable_currency_budget_limits' => 'Cannot disable :name because it is used in budget limits.',
- 'cannot_disable_currency_current_default' => 'Cannot disable :name because it is the current default currency.',
- 'cannot_disable_currency_system_fallback' => 'Cannot disable :name because it is the system default currency.',
- 'disable_EUR_side_effects' => 'The Euro is the system\'s emergency fallback currency. Disabling it may have unintended side-effects and may void your warranty.',
- 'deleted_currency' => 'Currency :name deleted',
- 'created_currency' => 'Currency :name created',
- 'could_not_store_currency' => 'Could not store the new currency.',
- 'updated_currency' => 'Currency :name updated',
- 'ask_site_owner' => 'Please ask :owner to add, remove or edit currencies.',
- 'currencies_intro' => 'Firefly III supports various currencies which you can set and enable here.',
- 'make_default_currency' => 'Make default',
- 'default_currency' => 'default',
- 'currency_is_disabled' => 'Disabled',
- 'enable_currency' => 'Enable',
- 'disable_currency' => 'Disable',
- 'currencies_default_disabled' => 'Most of these currencies are disabled by default. To use them, you must enable them first.',
- 'currency_is_now_enabled' => 'Currency ":name" has been enabled',
- 'could_not_enable_currency' => 'Could not enable currency ":name". Please review the logs.',
- 'currency_is_now_disabled' => 'Currency ":name" has been disabled',
- 'could_not_disable_currency' => 'Could not disable currency ":name". Perhaps it is still in use?',
+ 'create_currency' => 'Create a new currency',
+ 'store_currency' => 'Store new currency',
+ 'update_currency' => 'Update currency',
+ 'new_default_currency' => '":name" is now the default currency.',
+ 'default_currency_failed' => 'Could not make ":name" the default currency. Please check the logs.',
+ 'cannot_delete_currency' => 'Cannot delete :name because it is still in use.',
+ 'cannot_delete_fallback_currency' => ':name is the system fallback currency and can\'t be deleted.',
+ 'cannot_disable_currency_journals' => 'Cannot disable :name because transactions are still using it.',
+ 'cannot_disable_currency_last_left' => 'Cannot disable :name because it is the last enabled currency.',
+ 'cannot_disable_currency_account_meta' => 'Cannot disable :name because it is used in asset accounts.',
+ 'cannot_disable_currency_bills' => 'Cannot disable :name because it is used in bills.',
+ 'cannot_disable_currency_recurring' => 'Cannot disable :name because it is used in recurring transactions.',
+ 'cannot_disable_currency_available_budgets' => 'Cannot disable :name because it is used in available budgets.',
+ 'cannot_disable_currency_budget_limits' => 'Cannot disable :name because it is used in budget limits.',
+ 'cannot_disable_currency_current_default' => 'Cannot disable :name because it is the current default currency.',
+ 'cannot_disable_currency_system_fallback' => 'Cannot disable :name because it is the system default currency.',
+ 'disable_EUR_side_effects' => 'The Euro is the system\'s emergency fallback currency. Disabling it may have unintended side-effects and may void your warranty.',
+ 'deleted_currency' => 'Currency :name deleted',
+ 'created_currency' => 'Currency :name created',
+ 'could_not_store_currency' => 'Could not store the new currency.',
+ 'updated_currency' => 'Currency :name updated',
+ 'ask_site_owner' => 'Please ask :owner to add, remove or edit currencies.',
+ 'currencies_intro' => 'Firefly III supports various currencies which you can set and enable here.',
+ 'make_default_currency' => 'Make default',
+ 'default_currency' => 'default',
+ 'currency_is_disabled' => 'Disabled',
+ 'enable_currency' => 'Enable',
+ 'disable_currency' => 'Disable',
+ 'currencies_default_disabled' => 'Most of these currencies are disabled by default. To use them, you must enable them first.',
+ 'currency_is_now_enabled' => 'Currency ":name" has been enabled',
+ 'could_not_enable_currency' => 'Could not enable currency ":name". Please review the logs.',
+ 'currency_is_now_disabled' => 'Currency ":name" has been disabled',
+ 'could_not_disable_currency' => 'Could not disable currency ":name". Perhaps it is still in use?',
// forms:
- 'mandatoryFields' => 'Mandatory fields',
- 'optionalFields' => 'Optional fields',
- 'options' => 'Options',
+ 'mandatoryFields' => 'Mandatory fields',
+ 'optionalFields' => 'Optional fields',
+ 'options' => 'Options',
// budgets:
- 'daily_budgets' => 'Daily budgets',
- 'weekly_budgets' => 'Weekly budgets',
- 'monthly_budgets' => 'Monthly budgets',
- 'quarterly_budgets' => 'Quarterly budgets',
- 'half_year_budgets' => 'Half-yearly budgets',
- 'yearly_budgets' => 'Yearly budgets',
- 'other_budgets' => 'Custom timed budgets',
- 'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
- 'total_available_budget' => 'Total available budget (between :start and :end)',
- 'total_available_budget_in_currency' => 'Total available budget in :currency',
- 'see_below' => 'see below',
- 'create_new_budget' => 'Create a new budget',
- 'store_new_budget' => 'Store new budget',
- 'stored_new_budget' => 'Stored new budget ":name"',
- 'available_between' => 'Available between :start and :end',
- 'transactionsWithoutBudget' => 'Expenses without budget',
- 'transactions_no_budget' => 'Expenses without budget between :start and :end',
- 'spent_between' => 'Already spent between :start and :end',
- 'spent_between_left' => 'Spent :spent between :start and :end, leaving :left.',
- 'set_available_amount' => 'Set available amount',
- 'update_available_amount' => 'Update available amount',
- 'ab_basic_modal_explain' => 'Use this form to indicate how much you expect to be able to budget (in total, in :currency) in the indicated period.',
- 'createBudget' => 'New budget',
- 'invalid_currency' => 'This is an invalid currency',
- 'invalid_amount' => 'Please enter an amount',
- 'set_ab' => 'The available budget amount has been set',
- 'updated_ab' => 'The available budget amount has been updated',
- 'deleted_ab' => 'The available budget amount has been deleted',
- 'deleted_bl' => 'The budgeted amount has been removed',
- 'alt_currency_ab_create' => 'Set the available budget in another currency',
- 'bl_create_btn' => 'Set budget in another currency',
- 'inactiveBudgets' => 'Inactive budgets',
- 'without_budget_between' => 'Transactions without a budget between :start and :end',
- 'delete_budget' => 'Delete budget ":name"',
- 'deleted_budget' => 'Deleted budget ":name"',
- 'edit_budget' => 'Edit budget ":name"',
- 'updated_budget' => 'Updated budget ":name"',
- 'update_amount' => 'Update amount',
- 'update_budget' => 'Update budget',
- 'update_budget_amount_range' => 'Update (expected) available amount between :start and :end',
- 'set_budget_limit_title' => 'Set budgeted amount for budget :budget between :start and :end',
- 'set_budget_limit' => 'Set budgeted amount',
- 'budget_period_navigator' => 'Period navigator',
- 'info_on_available_amount' => 'What do I have available?',
- 'available_amount_indication' => 'Use these amounts to get an indication of what your total budget could be.',
- 'suggested' => 'Suggested',
- 'average_between' => 'Average between :start and :end',
- 'transferred_in' => 'Transferred (in)',
- 'transferred_away' => 'Transferred (away)',
- 'auto_budget_none' => 'No auto-budget',
- 'auto_budget_reset' => 'Set a fixed amount every period',
- 'auto_budget_rollover' => 'Add an amount every period',
- 'auto_budget_adjusted' => 'Add an amount every period and correct for overspending',
- 'auto_budget_period_daily' => 'Daily',
- 'auto_budget_period_weekly' => 'Weekly',
- 'auto_budget_period_monthly' => 'Monthly',
- 'auto_budget_period_quarterly' => 'Quarterly',
- 'auto_budget_period_half_year' => 'Every half year',
- 'auto_budget_period_yearly' => 'Yearly',
- 'auto_budget_help' => 'You can read more about this feature in the help. Click the top-right (?) icon.',
- 'auto_budget_reset_icon' => 'This budget will be set periodically',
- 'auto_budget_rollover_icon' => 'The budget amount will increase periodically',
- 'auto_budget_adjusted_icon' => 'The budget amount will increase periodically and will correct for overspending',
- 'remove_budgeted_amount' => 'Remove budgeted amount in :currency',
+ 'daily_budgets' => 'Daily budgets',
+ 'weekly_budgets' => 'Weekly budgets',
+ 'monthly_budgets' => 'Monthly budgets',
+ 'quarterly_budgets' => 'Quarterly budgets',
+ 'half_year_budgets' => 'Half-yearly budgets',
+ 'yearly_budgets' => 'Yearly budgets',
+ 'other_budgets' => 'Custom timed budgets',
+ 'budget_limit_not_in_range' => 'This amount applies from :start to :end:',
+ 'total_available_budget' => 'Total available budget (between :start and :end)',
+ 'total_available_budget_in_currency' => 'Total available budget in :currency',
+ 'see_below' => 'see below',
+ 'create_new_budget' => 'Create a new budget',
+ 'store_new_budget' => 'Store new budget',
+ 'stored_new_budget' => 'Stored new budget ":name"',
+ 'available_between' => 'Available between :start and :end',
+ 'transactionsWithoutBudget' => 'Expenses without budget',
+ 'transactions_no_budget' => 'Expenses without budget between :start and :end',
+ 'spent_between' => 'Already spent between :start and :end',
+ 'spent_between_left' => 'Spent :spent between :start and :end, leaving :left.',
+ 'set_available_amount' => 'Set available amount',
+ 'update_available_amount' => 'Update available amount',
+ 'ab_basic_modal_explain' => 'Use this form to indicate how much you expect to be able to budget (in total, in :currency) in the indicated period.',
+ 'createBudget' => 'New budget',
+ 'invalid_currency' => 'This is an invalid currency',
+ 'invalid_amount' => 'Please enter an amount',
+ 'set_ab' => 'The available budget amount has been set',
+ 'updated_ab' => 'The available budget amount has been updated',
+ 'deleted_ab' => 'The available budget amount has been deleted',
+ 'deleted_bl' => 'The budgeted amount has been removed',
+ 'alt_currency_ab_create' => 'Set the available budget in another currency',
+ 'bl_create_btn' => 'Set budget in another currency',
+ 'inactiveBudgets' => 'Inactive budgets',
+ 'without_budget_between' => 'Transactions without a budget between :start and :end',
+ 'delete_budget' => 'Delete budget ":name"',
+ 'deleted_budget' => 'Deleted budget ":name"',
+ 'edit_budget' => 'Edit budget ":name"',
+ 'updated_budget' => 'Updated budget ":name"',
+ 'update_amount' => 'Update amount',
+ 'update_budget' => 'Update budget',
+ 'update_budget_amount_range' => 'Update (expected) available amount between :start and :end',
+ 'set_budget_limit_title' => 'Set budgeted amount for budget :budget between :start and :end',
+ 'set_budget_limit' => 'Set budgeted amount',
+ 'budget_period_navigator' => 'Period navigator',
+ 'info_on_available_amount' => 'What do I have available?',
+ 'available_amount_indication' => 'Use these amounts to get an indication of what your total budget could be.',
+ 'suggested' => 'Suggested',
+ 'average_between' => 'Average between :start and :end',
+ 'transferred_in' => 'Transferred (in)',
+ 'transferred_away' => 'Transferred (away)',
+ 'auto_budget_none' => 'No auto-budget',
+ 'auto_budget_reset' => 'Set a fixed amount every period',
+ 'auto_budget_rollover' => 'Add an amount every period',
+ 'auto_budget_adjusted' => 'Add an amount every period and correct for overspending',
+ 'auto_budget_period_daily' => 'Daily',
+ 'auto_budget_period_weekly' => 'Weekly',
+ 'auto_budget_period_monthly' => 'Monthly',
+ 'auto_budget_period_quarterly' => 'Quarterly',
+ 'auto_budget_period_half_year' => 'Every half year',
+ 'auto_budget_period_yearly' => 'Yearly',
+ 'auto_budget_help' => 'You can read more about this feature in the help. Click the top-right (?) icon.',
+ 'auto_budget_reset_icon' => 'This budget will be set periodically',
+ 'auto_budget_rollover_icon' => 'The budget amount will increase periodically',
+ 'auto_budget_adjusted_icon' => 'The budget amount will increase periodically and will correct for overspending',
+ 'remove_budgeted_amount' => 'Remove budgeted amount in :currency',
// bills:
- 'subscription' => 'Subscription',
- 'not_expected_period' => 'Not expected this period',
- 'subscriptions_in_group' => 'Subscriptions in group "%{title}"',
- 'subscr_expected_x_times' => 'Expect to pay %{amount} %{times} times this period',
- 'not_or_not_yet' => 'Not (yet)',
- 'visit_bill' => 'Visit bill ":name" at Firefly III',
- 'match_between_amounts' => 'Bill matches transactions between :low and :high.',
- 'running_again_loss' => 'Previously linked transactions to this bill may lose their connection, if they (no longer) match the rule(s).',
- 'bill_related_rules' => 'Rules related to this bill',
- 'repeats' => 'Repeats',
- 'bill_end_date_help' => 'Optional field. The bill is expected to end on this date.',
- 'bill_extension_date_help' => 'Optional field. The bill must be extended (or cancelled) on or before this date.',
- 'bill_end_index_line' => 'This bill ends on :date',
- 'bill_extension_index_line' => 'This bill must be extended or cancelled on :date',
- 'connected_journals' => 'Connected transactions',
- 'auto_match_on' => 'Automatically matched by Firefly III',
- 'auto_match_off' => 'Not automatically matched by Firefly III',
- 'next_expected_match' => 'Next expected match',
- 'delete_bill' => 'Delete bill ":name"',
- 'deleted_bill' => 'Deleted bill ":name"',
- 'edit_bill' => 'Edit bill ":name"',
- 'more' => 'More',
- 'rescan_old' => 'Run rules again, on all transactions',
- 'update_bill' => 'Update bill',
- 'updated_bill' => 'Updated bill ":name"',
- 'store_new_bill' => 'Store new bill',
- 'stored_new_bill' => 'Stored new bill ":name"',
- 'cannot_scan_inactive_bill' => 'Inactive bills cannot be scanned.',
- 'rescanned_bill' => 'Rescanned everything, and linked :count transaction to the bill.|Rescanned everything, and linked :count transactions to the bill.',
- 'average_bill_amount_year' => 'Average bill amount (:year)',
- 'average_bill_amount_overall' => 'Average bill amount (overall)',
- 'bill_is_active' => 'Bill is active',
- 'bill_expected_between' => 'Expected between :start and :end',
- 'bill_will_automatch' => 'Bill will automatically linked to matching transactions',
- 'skips_over' => 'skips over',
- 'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files',
- 'list_inactive_rule' => 'inactive rule',
- 'bill_edit_rules' => 'Firefly III will attempt to edit the rule related to this bill as well. If you\'ve edited this rule yourself however, Firefly III won\'t change anything.|Firefly III will attempt to edit the :count rules related to this bill as well. If you\'ve edited these rules yourself however, Firefly III won\'t change anything.',
- 'bill_expected_date' => 'Expected :date',
- 'bill_expected_date_js' => 'Expected {date}',
- 'expected_amount' => '(Expected) amount',
- 'bill_paid_on' => 'Paid on {date}',
- 'bill_repeats_weekly' => 'Repeats weekly',
- 'bill_repeats_monthly' => 'Repeats monthly',
- 'bill_repeats_quarterly' => 'Repeats quarterly',
- 'bill_repeats_half-year' => 'Repeats every half year',
- 'bill_repeats_yearly' => 'Repeats yearly',
- 'bill_repeats_weekly_other' => 'Repeats every other week',
- 'bill_repeats_monthly_other' => 'Repeats every other month',
- 'bill_repeats_quarterly_other' => 'Repeats every other quarter',
- 'bill_repeats_half-year_other' => 'Repeats yearly',
- 'bill_repeats_yearly_other' => 'Repeats every other year',
- 'bill_repeats_weekly_skip' => 'Repeats every {skip} weeks',
- 'bill_repeats_monthly_skip' => 'Repeats every {skip} months',
- 'bill_repeats_quarterly_skip' => 'Repeats every {skip} quarters',
- 'bill_repeats_half-year_skip' => 'Repeats every {skip} half years',
- 'bill_repeats_yearly_skip' => 'Repeats every {skip} years',
- 'subscriptions' => 'Subscriptions',
- 'go_to_subscriptions' => 'Go to your subscriptions',
- 'forever' => 'Forever',
- 'extension_date_is' => 'Extension date is {date}',
+ 'subscription' => 'Subscription',
+ 'not_expected_period' => 'Not expected this period',
+ 'subscriptions_in_group' => 'Subscriptions in group "%{title}"',
+ 'subscr_expected_x_times' => 'Expect to pay %{amount} %{times} times this period',
+ 'not_or_not_yet' => 'Not (yet)',
+ 'visit_bill' => 'Visit bill ":name" at Firefly III',
+ 'match_between_amounts' => 'Bill matches transactions between :low and :high.',
+ 'running_again_loss' => 'Previously linked transactions to this bill may lose their connection, if they (no longer) match the rule(s).',
+ 'bill_related_rules' => 'Rules related to this bill',
+ 'repeats' => 'Repeats',
+ 'bill_end_date_help' => 'Optional field. The bill is expected to end on this date.',
+ 'bill_extension_date_help' => 'Optional field. The bill must be extended (or cancelled) on or before this date.',
+ 'bill_end_index_line' => 'This bill ends on :date',
+ 'bill_extension_index_line' => 'This bill must be extended or cancelled on :date',
+ 'connected_journals' => 'Connected transactions',
+ 'auto_match_on' => 'Automatically matched by Firefly III',
+ 'auto_match_off' => 'Not automatically matched by Firefly III',
+ 'next_expected_match' => 'Next expected match',
+ 'delete_bill' => 'Delete bill ":name"',
+ 'deleted_bill' => 'Deleted bill ":name"',
+ 'edit_bill' => 'Edit bill ":name"',
+ 'more' => 'More',
+ 'rescan_old' => 'Run rules again, on all transactions',
+ 'update_bill' => 'Update bill',
+ 'updated_bill' => 'Updated bill ":name"',
+ 'store_new_bill' => 'Store new bill',
+ 'stored_new_bill' => 'Stored new bill ":name"',
+ 'cannot_scan_inactive_bill' => 'Inactive bills cannot be scanned.',
+ 'rescanned_bill' => 'Rescanned everything, and linked :count transaction to the bill.|Rescanned everything, and linked :count transactions to the bill.',
+ 'average_bill_amount_year' => 'Average bill amount (:year)',
+ 'average_bill_amount_overall' => 'Average bill amount (overall)',
+ 'bill_is_active' => 'Bill is active',
+ 'bill_expected_between' => 'Expected between :start and :end',
+ 'bill_will_automatch' => 'Bill will automatically linked to matching transactions',
+ 'skips_over' => 'skips over',
+ 'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files',
+ 'list_inactive_rule' => 'inactive rule',
+ 'bill_edit_rules' => 'Firefly III will attempt to edit the rule related to this bill as well. If you\'ve edited this rule yourself however, Firefly III won\'t change anything.|Firefly III will attempt to edit the :count rules related to this bill as well. If you\'ve edited these rules yourself however, Firefly III won\'t change anything.',
+ 'bill_expected_date' => 'Expected :date',
+ 'bill_expected_date_js' => 'Expected {date}',
+ 'expected_amount' => '(Expected) amount',
+ 'bill_paid_on' => 'Paid on {date}',
+ 'bill_repeats_weekly' => 'Repeats weekly',
+ 'bill_repeats_monthly' => 'Repeats monthly',
+ 'bill_repeats_quarterly' => 'Repeats quarterly',
+ 'bill_repeats_half-year' => 'Repeats every half year',
+ 'bill_repeats_yearly' => 'Repeats yearly',
+ 'bill_repeats_weekly_other' => 'Repeats every other week',
+ 'bill_repeats_monthly_other' => 'Repeats every other month',
+ 'bill_repeats_quarterly_other' => 'Repeats every other quarter',
+ 'bill_repeats_half-year_other' => 'Repeats yearly',
+ 'bill_repeats_yearly_other' => 'Repeats every other year',
+ 'bill_repeats_weekly_skip' => 'Repeats every {skip} weeks',
+ 'bill_repeats_monthly_skip' => 'Repeats every {skip} months',
+ 'bill_repeats_quarterly_skip' => 'Repeats every {skip} quarters',
+ 'bill_repeats_half-year_skip' => 'Repeats every {skip} half years',
+ 'bill_repeats_yearly_skip' => 'Repeats every {skip} years',
+ 'subscriptions' => 'Subscriptions',
+ 'go_to_subscriptions' => 'Go to your subscriptions',
+ 'forever' => 'Forever',
+ 'extension_date_is' => 'Extension date is {date}',
// accounts:
- 'i_am_owed_amount' => 'I am owed amount',
- 'i_owe_amount' => 'I owe amount',
- 'inactive_account_link' => 'You have :count inactive (archived) account, which you can view on this separate page.|You have :count inactive (archived) accounts, which you can view on this separate page.',
- 'all_accounts_inactive' => 'These are your inactive accounts.',
- 'active_account_link' => 'This link goes back to your active accounts.',
- 'account_missing_transaction' => 'Account #:id (":name") cannot be viewed directly, but Firefly is missing redirect information.',
- 'cc_monthly_payment_date_help' => 'Select any year and any month, it will be ignored anyway. Only the day of the month is relevant.',
- 'details_for_asset' => 'Details for asset account ":name"',
- 'details_for_expense' => 'Details for expense account ":name"',
- 'details_for_revenue' => 'Details for revenue account ":name"',
- 'details_for_cash' => 'Details for cash account ":name"',
- 'store_new_asset_account' => 'Store new asset account',
- 'store_new_expense_account' => 'Store new expense account',
- 'store_new_revenue_account' => 'Store new revenue account',
- 'edit_asset_account' => 'Edit asset account ":name"',
- 'edit_expense_account' => 'Edit expense account ":name"',
- 'edit_revenue_account' => 'Edit revenue account ":name"',
- 'delete_asset_account' => 'Delete asset account ":name"',
- 'delete_expense_account' => 'Delete expense account ":name"',
- 'delete_revenue_account' => 'Delete revenue account ":name"',
- 'delete_liabilities_account' => 'Delete liability ":name"',
- 'asset_deleted' => 'Successfully deleted asset account ":name"',
- 'account_deleted' => 'Successfully deleted account ":name"',
- 'expense_deleted' => 'Successfully deleted expense account ":name"',
- 'revenue_deleted' => 'Successfully deleted revenue account ":name"',
- 'update_asset_account' => 'Update asset account',
- 'update_undefined_account' => 'Update account',
- 'update_liabilities_account' => 'Update liability',
- 'update_expense_account' => 'Update expense account',
- 'update_revenue_account' => 'Update revenue account',
- 'make_new_asset_account' => 'Create a new asset account',
- 'make_new_expense_account' => 'Create a new expense account',
- 'make_new_revenue_account' => 'Create a new revenue account',
- 'make_new_liabilities_account' => 'Create a new liability',
- 'asset_accounts' => 'Asset accounts',
- 'undefined_accounts' => 'Accounts',
- 'asset_accounts_inactive' => 'Asset accounts (inactive)',
- 'expense_account' => 'Expense account',
- 'expense_accounts' => 'Expense accounts',
- 'expense_accounts_inactive' => 'Expense accounts (inactive)',
- 'revenue_account' => 'Revenue account',
- 'revenue_accounts' => 'Revenue accounts',
- 'revenue_accounts_inactive' => 'Revenue accounts (inactive)',
- 'cash_accounts' => 'Cash accounts',
- 'Cash account' => 'Cash account',
- 'liabilities_accounts' => 'Liabilities',
- 'liabilities_accounts_inactive' => 'Liabilities (inactive)',
- 'reconcile_account' => 'Reconcile account ":account"',
- 'overview_of_reconcile_modal' => 'Overview of reconciliation',
- 'delete_reconciliation' => 'Delete reconciliation',
- 'update_reconciliation' => 'Update reconciliation',
- 'amount_cannot_be_zero' => 'The amount cannot be zero',
- 'end_of_reconcile_period' => 'End of reconcile period: :period',
- 'start_of_reconcile_period' => 'Start of reconcile period: :period',
- 'start_balance' => 'Start balance',
- 'end_balance' => 'End balance',
- 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
- 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
- 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
- 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
- 'update_selection' => 'Update selection',
- 'store_reconcile' => 'Store reconciliation',
- 'reconciliation_transaction' => 'Reconciliation transaction',
- 'Reconciliation' => 'Reconciliation',
- 'reconciliation' => 'Reconciliation',
- 'reconcile_options' => 'Reconciliation options',
- 'reconcile_range' => 'Reconciliation range',
- 'start_reconcile' => 'Start reconciling',
- 'cash_account_type' => 'Cash',
- 'cash' => 'cash',
- 'cant_find_redirect_account' => 'Firefly III tried to redirect you but couldn\'t. Sorry about that. Back to the index.',
- 'account_type' => 'Account type',
- 'save_transactions_by_moving' => 'Save this transaction by moving it to another account:|Save these transactions by moving them to another account:',
- 'save_transactions_by_moving_js' => 'No transactions|Save this transaction by moving it to another account. |Save these transactions by moving them to another account.',
- 'stored_new_account' => 'New account ":name" stored!',
- 'stored_new_account_js' => 'New account "{name}" stored!',
- 'updated_account' => 'Updated account ":name"',
- 'updated_account_js' => 'Updated account "{title}".',
- 'credit_card_options' => 'Credit card options',
- 'no_transactions_account' => 'There are no transactions (in this period) for asset account ":name".',
- 'no_transactions_period' => 'There are no transactions (in this period).',
- 'no_data_for_chart' => 'There is not enough information (yet) to generate this chart.',
- 'select_at_least_one_account' => 'Please select at least one asset account',
- 'select_at_least_one_category' => 'Please select at least one category',
- 'select_at_least_one_budget' => 'Please select at least one budget',
- 'select_at_least_one_tag' => 'Please select at least one tag',
- 'select_at_least_one_expense' => 'Please select at least one combination of expense/revenue accounts. If you have none (the list is empty) this report is not available.',
- 'account_default_currency' => 'This will be the default currency associated with this account.',
- 'piggy_default_currency' => 'Piggy banks can only save money in a single currency.',
- 'piggy_account_currency_match' => 'Only accounts that use the previously selected currency will be accepted.',
- 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
- 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
- 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
- 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
- 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
- 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
- 'reconcile_go_back' => 'You can always edit or delete a correction later.',
- 'must_be_asset_account' => 'You can only reconcile asset accounts',
- 'reconciliation_stored' => 'Reconciliation stored',
- 'reconciliation_error' => 'Due to an error the transactions were marked as reconciled but the correction has not been stored: :error.',
- 'reconciliation_transaction_title' => 'Reconciliation (:from to :to)',
- 'sum_of_reconciliation' => 'Sum of reconciliation',
- 'reconcile_this_account' => 'Reconcile this account',
- 'reconcile' => 'Reconcile',
- 'show' => 'Show',
- 'confirm_reconciliation' => 'Confirm reconciliation',
- 'submitted_start_balance' => 'Submitted start balance',
- 'selected_transactions' => 'Selected transactions (:count)',
- 'already_cleared_transactions' => 'Already cleared transactions (:count)',
- 'submitted_end_balance' => 'Submitted end balance',
- 'initial_balance_description' => 'Initial balance for ":account"',
- 'liability_credit_description' => 'Liability credit for ":account"',
- 'interest_calc_' => 'unknown',
- 'interest_calc_daily' => 'Per day',
- 'interest_calc_monthly' => 'Per month',
- 'interest_calc_yearly' => 'Per year',
- 'interest_calc_weekly' => 'Per week',
- 'interest_calc_half-year' => 'Per half year',
- 'interest_calc_quarterly' => 'Per quarter',
- 'initial_balance_account' => 'Initial balance account of :account',
- 'list_options' => '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',
+ 'i_am_owed_amount' => 'I am owed amount',
+ 'i_owe_amount' => 'I owe amount',
+ 'inactive_account_link' => 'You have :count inactive (archived) account, which you can view on this separate page.|You have :count inactive (archived) accounts, which you can view on this separate page.',
+ 'all_accounts_inactive' => 'These are your inactive accounts.',
+ 'active_account_link' => 'This link goes back to your active accounts.',
+ 'account_missing_transaction' => 'Account #:id (":name") cannot be viewed directly, but Firefly is missing redirect information.',
+ 'cc_monthly_payment_date_help' => 'Select any year and any month, it will be ignored anyway. Only the day of the month is relevant.',
+ 'details_for_asset' => 'Details for asset account ":name"',
+ 'details_for_expense' => 'Details for expense account ":name"',
+ 'details_for_revenue' => 'Details for revenue account ":name"',
+ 'details_for_cash' => 'Details for cash account ":name"',
+ 'store_new_asset_account' => 'Store new asset account',
+ 'store_new_expense_account' => 'Store new expense account',
+ 'store_new_revenue_account' => 'Store new revenue account',
+ 'edit_asset_account' => 'Edit asset account ":name"',
+ 'edit_expense_account' => 'Edit expense account ":name"',
+ 'edit_revenue_account' => 'Edit revenue account ":name"',
+ 'delete_asset_account' => 'Delete asset account ":name"',
+ 'delete_expense_account' => 'Delete expense account ":name"',
+ 'delete_revenue_account' => 'Delete revenue account ":name"',
+ 'delete_liabilities_account' => 'Delete liability ":name"',
+ 'asset_deleted' => 'Successfully deleted asset account ":name"',
+ 'account_deleted' => 'Successfully deleted account ":name"',
+ 'expense_deleted' => 'Successfully deleted expense account ":name"',
+ 'revenue_deleted' => 'Successfully deleted revenue account ":name"',
+ 'update_asset_account' => 'Update asset account',
+ 'update_undefined_account' => 'Update account',
+ 'update_liabilities_account' => 'Update liability',
+ 'update_expense_account' => 'Update expense account',
+ 'update_revenue_account' => 'Update revenue account',
+ 'make_new_asset_account' => 'Create a new asset account',
+ 'make_new_expense_account' => 'Create a new expense account',
+ 'make_new_revenue_account' => 'Create a new revenue account',
+ 'make_new_liabilities_account' => 'Create a new liability',
+ 'asset_accounts' => 'Asset accounts',
+ 'undefined_accounts' => 'Accounts',
+ 'asset_accounts_inactive' => 'Asset accounts (inactive)',
+ 'expense_account' => 'Expense account',
+ 'expense_accounts' => 'Expense accounts',
+ 'expense_accounts_inactive' => 'Expense accounts (inactive)',
+ 'revenue_account' => 'Revenue account',
+ 'revenue_accounts' => 'Revenue accounts',
+ 'revenue_accounts_inactive' => 'Revenue accounts (inactive)',
+ 'cash_accounts' => 'Cash accounts',
+ 'Cash account' => 'Cash account',
+ 'liabilities_accounts' => 'Liabilities',
+ 'liabilities_accounts_inactive' => 'Liabilities (inactive)',
+ 'reconcile_account' => 'Reconcile account ":account"',
+ 'overview_of_reconcile_modal' => 'Overview of reconciliation',
+ 'delete_reconciliation' => 'Delete reconciliation',
+ 'update_reconciliation' => 'Update reconciliation',
+ 'amount_cannot_be_zero' => 'The amount cannot be zero',
+ 'end_of_reconcile_period' => 'End of reconcile period: :period',
+ 'start_of_reconcile_period' => 'Start of reconcile period: :period',
+ 'start_balance' => 'Start balance',
+ 'end_balance' => 'End balance',
+ 'update_balance_dates_instruction' => 'Match the amounts and dates above to your bank statement, and press "Start reconciling"',
+ 'select_transactions_instruction' => 'Select the transactions that appear on your bank statement.',
+ 'select_range_and_balance' => 'First verify the date-range and balances. Then press "Start reconciling"',
+ 'date_change_instruction' => 'If you change the date range now, any progress will be lost.',
+ 'update_selection' => 'Update selection',
+ 'store_reconcile' => 'Store reconciliation',
+ 'reconciliation_transaction' => 'Reconciliation transaction',
+ 'Reconciliation' => 'Reconciliation',
+ 'reconciliation' => 'Reconciliation',
+ 'reconcile_options' => 'Reconciliation options',
+ 'reconcile_range' => 'Reconciliation range',
+ 'start_reconcile' => 'Start reconciling',
+ 'cash_account_type' => 'Cash',
+ 'cash' => 'cash',
+ 'cant_find_redirect_account' => 'Firefly III tried to redirect you but couldn\'t. Sorry about that. Back to the index.',
+ 'account_type' => 'Account type',
+ 'save_transactions_by_moving' => 'Save this transaction by moving it to another account:|Save these transactions by moving them to another account:',
+ 'save_transactions_by_moving_js' => 'No transactions|Save this transaction by moving it to another account. |Save these transactions by moving them to another account.',
+ 'stored_new_account' => 'New account ":name" stored!',
+ 'stored_new_account_js' => 'New account "{name}" stored!',
+ 'updated_account' => 'Updated account ":name"',
+ 'updated_account_js' => 'Updated account "{title}".',
+ 'credit_card_options' => 'Credit card options',
+ 'no_transactions_account' => 'There are no transactions (in this period) for asset account ":name".',
+ 'no_transactions_period' => 'There are no transactions (in this period).',
+ 'no_data_for_chart' => 'There is not enough information (yet) to generate this chart.',
+ 'select_at_least_one_account' => 'Please select at least one asset account',
+ 'select_at_least_one_category' => 'Please select at least one category',
+ 'select_at_least_one_budget' => 'Please select at least one budget',
+ 'select_at_least_one_tag' => 'Please select at least one tag',
+ 'select_at_least_one_expense' => 'Please select at least one combination of expense/revenue accounts. If you have none (the list is empty) this report is not available.',
+ 'account_default_currency' => 'This will be the default currency associated with this account.',
+ 'piggy_default_currency' => 'Piggy banks can only save money in a single currency.',
+ 'piggy_account_currency_match' => 'Only accounts that use the previously selected currency will be accepted.',
+ 'reconcile_has_more' => 'Your Firefly III ledger has more money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_has_less' => 'Your Firefly III ledger has less money in it than your bank claims you should have. There are several options. Please choose what to do. Then, press "Confirm reconciliation".',
+ 'reconcile_is_equal' => 'Your Firefly III ledger and your bank statements match. There is nothing to do. Please press "Confirm reconciliation" to confirm your input.',
+ 'create_pos_reconcile_transaction' => 'Clear the selected transactions, and create a correction adding :amount to this asset account.',
+ 'create_neg_reconcile_transaction' => 'Clear the selected transactions, and create a correction removing :amount from this asset account.',
+ 'reconcile_do_nothing' => 'Clear the selected transactions, but do not correct.',
+ 'reconcile_go_back' => 'You can always edit or delete a correction later.',
+ 'must_be_asset_account' => 'You can only reconcile asset accounts',
+ 'reconciliation_stored' => 'Reconciliation stored',
+ 'reconciliation_error' => 'Due to an error the transactions were marked as reconciled but the correction has not been stored: :error.',
+ 'reconciliation_transaction_title' => 'Reconciliation (:from to :to)',
+ 'sum_of_reconciliation' => 'Sum of reconciliation',
+ 'reconcile_this_account' => 'Reconcile this account',
+ 'reconcile' => 'Reconcile',
+ 'show' => 'Show',
+ 'confirm_reconciliation' => 'Confirm reconciliation',
+ 'submitted_start_balance' => 'Submitted start balance',
+ 'selected_transactions' => 'Selected transactions (:count)',
+ 'already_cleared_transactions' => 'Already cleared transactions (:count)',
+ 'submitted_end_balance' => 'Submitted end balance',
+ 'initial_balance_description' => 'Initial balance for ":account"',
+ 'liability_credit_description' => 'Liability credit for ":account"',
+ 'interest_calc_' => 'unknown',
+ 'interest_calc_daily' => 'Per day',
+ 'interest_calc_monthly' => 'Per month',
+ 'interest_calc_yearly' => 'Per year',
+ 'interest_calc_weekly' => 'Per week',
+ 'interest_calc_half-year' => 'Per half year',
+ 'interest_calc_quarterly' => 'Per quarter',
+ 'initial_balance_account' => 'Initial balance account of :account',
+ 'list_options' => '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',
// categories:
- 'new_category' => 'New category',
- 'create_new_category' => 'Create a new category',
- 'without_category' => 'Without a category',
- 'update_category' => 'Update category',
- 'updated_category' => 'Updated category ":name"',
- 'categories' => 'Categories',
- 'edit_category' => 'Edit category ":name"',
- 'no_category' => '(no category)',
- 'unknown_category_plain' => 'No category',
- 'category' => 'Category',
- 'delete_category' => 'Delete category ":name"',
- 'deleted_category' => 'Deleted category ":name"',
- 'store_category' => 'Store new category',
- 'stored_category' => 'Stored new category ":name"',
- 'without_category_between' => 'Without category between :start and :end',
+ 'new_category' => 'New category',
+ 'create_new_category' => 'Create a new category',
+ 'without_category' => 'Without a category',
+ 'update_category' => 'Update category',
+ 'updated_category' => 'Updated category ":name"',
+ 'categories' => 'Categories',
+ 'edit_category' => 'Edit category ":name"',
+ 'no_category' => '(no category)',
+ 'unknown_category_plain' => 'No category',
+ 'category' => 'Category',
+ 'delete_category' => 'Delete category ":name"',
+ 'deleted_category' => 'Deleted category ":name"',
+ 'store_category' => 'Store new category',
+ 'stored_category' => 'Stored new category ":name"',
+ 'without_category_between' => 'Without category between :start and :end',
// Ignore this comment
// transactions:
- 'wait_loading_transaction' => 'Please wait for the form to load',
- 'wait_loading_data' => 'Please wait for your information to load...',
- 'wait_attachments' => 'Please wait for the attachments to upload.',
- 'errors_upload' => 'The upload has failed. Please check your browser console for the error.',
- 'amount_foreign_if' => 'Amount in foreign currency, if any',
- 'amount_destination_account' => 'Amount in the currency of the destination account',
- 'edit_transaction_title' => 'Edit transaction ":description"',
- 'unreconcile' => 'Undo reconciliation',
- 'update_withdrawal' => 'Update withdrawal',
- 'update_deposit' => 'Update deposit',
- 'update_transaction' => 'Update transaction',
- 'update_transfer' => 'Update transfer',
- 'updated_withdrawal' => 'Updated withdrawal ":description"',
- 'updated_deposit' => 'Updated deposit ":description"',
- 'updated_transfer' => 'Updated transfer ":description"',
- 'no_changes_withdrawal' => 'Withdrawal ":description" was not changed.',
- 'no_changes_deposit' => 'Deposit ":description" was not changed.',
- 'no_changes_transfer' => 'Transfer ":description" was not changed.',
- 'delete_withdrawal' => 'Delete withdrawal ":description"',
- 'delete_deposit' => 'Delete deposit ":description"',
- 'delete_transfer' => 'Delete transfer ":description"',
- 'deleted_withdrawal' => 'Successfully deleted withdrawal ":description"',
- 'deleted_deposit' => 'Successfully deleted deposit ":description"',
- 'deleted_transfer' => 'Successfully deleted transfer ":description"',
- 'deleted_reconciliation' => 'Successfully deleted reconciliation transaction ":description"',
- 'stored_journal' => 'Successfully created new transaction ":description"',
- 'stored_journal_js' => 'Successfully created new transaction "{{description}}"',
- 'stored_journal_no_descr' => 'Successfully created your new transaction',
- 'updated_journal_no_descr' => 'Successfully updated your transaction',
- 'select_transactions' => 'Select transactions',
- 'rule_group_select_transactions' => 'Apply ":title" to transactions',
- 'rule_select_transactions' => 'Apply ":title" to transactions',
- 'stop_selection' => 'Stop selecting transactions',
- 'reconcile_selected' => 'Reconcile',
- 'mass_delete_journals' => 'Delete a number of transactions',
- 'mass_edit_journals' => 'Edit a number of transactions',
- 'mass_bulk_journals' => 'Bulk edit a number of transactions',
- 'mass_bulk_journals_explain' => 'This form allows you to change properties of the transactions listed below in one sweeping update. All the transactions in the table will be updated when you change the parameters you see here.',
- 'part_of_split' => 'This transaction is part of a split transaction. If you have not selected all the splits, you may end up with changing only half the transaction.',
- 'bulk_set_new_values' => 'Use the inputs below to set new values. If you leave them empty, they will be made empty for all. Also, note that only withdrawals will be given a budget.',
- 'no_bulk_category' => 'Don\'t update category',
- 'no_bulk_budget' => 'Don\'t update budget',
- 'no_bulk_tags' => 'Don\'t update tag(s)',
- 'replace_with_these_tags' => 'Replace with these tags',
- 'append_these_tags' => 'Add these tags',
- 'mass_edit' => 'Edit selected individually',
- 'bulk_edit' => 'Edit selected in bulk',
- 'mass_delete' => 'Delete selected',
- 'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
- 'cannot_change_amount_reconciled' => 'You can\'t change the amount of reconciled transactions.',
- 'no_budget' => '(no budget)',
- 'no_bill' => '(no bill)',
- 'account_per_budget' => 'Account per budget',
- 'account_per_category' => 'Account per category',
- 'create_new_object' => 'Create',
- 'empty' => '(empty)',
- 'all_other_budgets' => '(all other budgets)',
- 'all_other_accounts' => '(all other accounts)',
- 'expense_per_source_account' => 'Expenses per source account',
- 'expense_per_destination_account' => 'Expenses per destination account',
- 'income_per_destination_account' => 'Income per destination account',
- 'spent_in_specific_category' => 'Spent in category ":category"',
- 'earned_in_specific_category' => 'Earned in category ":category"',
- 'spent_in_specific_tag' => 'Spent in tag ":tag"',
- 'earned_in_specific_tag' => 'Earned in tag ":tag"',
- 'income_per_source_account' => 'Income per source account',
- 'average_spending_per_destination' => 'Average expense per destination account',
- 'average_spending_per_source' => 'Average expense per source account',
- 'average_earning_per_source' => 'Average earning per source account',
- 'average_earning_per_destination' => 'Average earning per destination account',
- 'account_per_tag' => 'Account per tag',
- 'tag_report_expenses_listed_once' => 'Expenses and income are never listed twice. If a transaction has multiple tags, it may only show up under one of its tags. This list may appear to be missing data, but the amounts will be correct.',
- 'double_report_expenses_charted_once' => 'Expenses and income are never displayed twice. If a transaction has multiple tags, it may only show up under one of its tags. This chart may appear to be missing data, but the amounts will be correct.',
- 'tag_report_chart_single_tag' => 'This chart applies to a single tag. If a transaction has multiple tags, what you see here may be reflected in the charts of other tags as well.',
- 'tag' => 'Tag',
- 'no_budget_squared' => '(no budget)',
- 'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious. You can delete part of a split transaction from this page, so take care.',
- 'mass_deleted_transactions_success' => 'Deleted :count transaction.|Deleted :count transactions.',
- 'mass_edited_transactions_success' => 'Updated :count transaction.|Updated :count transactions.',
- 'opt_group_' => '(no account type)',
- 'opt_group_no_account_type' => '(no account type)',
- 'opt_group_defaultAsset' => 'Default asset accounts',
- 'opt_group_savingAsset' => 'Savings accounts',
- 'opt_group_sharedAsset' => 'Shared asset accounts',
- 'opt_group_ccAsset' => 'Credit cards',
- 'opt_group_cashWalletAsset' => 'Cash wallets',
- 'opt_group_expense_account' => 'Expense accounts',
- 'opt_group_revenue_account' => 'Revenue accounts',
- 'opt_group_l_Loan' => 'Liability: Loan',
- 'opt_group_cash_account' => 'Cash account',
- 'opt_group_l_Debt' => 'Liability: Debt',
- 'opt_group_l_Mortgage' => 'Liability: Mortgage',
- 'opt_group_l_Credit card' => 'Liability: Credit card',
- 'notes' => 'Notes',
- 'view_notes' => 'View notes',
- 'set_budget_limit_notes' => 'View the notes for this budgeted amount',
- 'edit_bl_notes' => 'Edit notes',
- 'update_bl_notes' => 'Update notes',
- 'unknown_journal_error' => 'Could not store the transaction. Please check the log files.',
- 'attachment_not_found' => 'This attachment could not be found.',
- 'journal_link_bill' => 'This transaction is linked to bill :name. To remove the connection, uncheck the checkbox. Use rules to connect it to another bill.',
- 'transaction_stored_link' => 'Transaction #{ID} ("{title}") has been stored.',
- 'transaction_new_stored_link' => 'Transaction #{ID} has been stored.',
- 'transaction_updated_link' => 'Transaction #{ID} ("{title}") has been updated.',
- 'transaction_updated_no_changes' => 'Transaction #{ID} ("{title}") did not receive any changes.',
- 'first_split_decides' => 'The first split determines the value of this field',
- 'first_split_overrules_source' => 'The first split may overrule the source account',
- 'first_split_overrules_destination' => 'The first split may overrule the destination account',
- 'spent_x_of_y' => 'Spent {amount} of {total}',
+ 'wait_loading_transaction' => 'Please wait for the form to load',
+ 'wait_loading_data' => 'Please wait for your information to load...',
+ 'wait_attachments' => 'Please wait for the attachments to upload.',
+ 'errors_upload' => 'The upload has failed. Please check your browser console for the error.',
+ 'amount_foreign_if' => 'Amount in foreign currency, if any',
+ 'amount_destination_account' => 'Amount in the currency of the destination account',
+ 'edit_transaction_title' => 'Edit transaction ":description"',
+ 'unreconcile' => 'Undo reconciliation',
+ 'update_withdrawal' => 'Update withdrawal',
+ 'update_deposit' => 'Update deposit',
+ 'update_transaction' => 'Update transaction',
+ 'update_transfer' => 'Update transfer',
+ 'updated_withdrawal' => 'Updated withdrawal ":description"',
+ 'updated_deposit' => 'Updated deposit ":description"',
+ 'updated_transfer' => 'Updated transfer ":description"',
+ 'no_changes_withdrawal' => 'Withdrawal ":description" was not changed.',
+ 'no_changes_deposit' => 'Deposit ":description" was not changed.',
+ 'no_changes_transfer' => 'Transfer ":description" was not changed.',
+ 'delete_withdrawal' => 'Delete withdrawal ":description"',
+ 'delete_deposit' => 'Delete deposit ":description"',
+ 'delete_transfer' => 'Delete transfer ":description"',
+ 'deleted_withdrawal' => 'Successfully deleted withdrawal ":description"',
+ 'deleted_deposit' => 'Successfully deleted deposit ":description"',
+ 'deleted_transfer' => 'Successfully deleted transfer ":description"',
+ 'deleted_reconciliation' => 'Successfully deleted reconciliation transaction ":description"',
+ 'stored_journal' => 'Successfully created new transaction ":description"',
+ 'stored_journal_js' => 'Successfully created new transaction "{{description}}"',
+ 'stored_journal_no_descr' => 'Successfully created your new transaction',
+ 'updated_journal_no_descr' => 'Successfully updated your transaction',
+ 'select_transactions' => 'Select transactions',
+ 'rule_group_select_transactions' => 'Apply ":title" to transactions',
+ 'rule_select_transactions' => 'Apply ":title" to transactions',
+ 'stop_selection' => 'Stop selecting transactions',
+ 'reconcile_selected' => 'Reconcile',
+ 'mass_delete_journals' => 'Delete a number of transactions',
+ 'mass_edit_journals' => 'Edit a number of transactions',
+ 'mass_bulk_journals' => 'Bulk edit a number of transactions',
+ 'mass_bulk_journals_explain' => 'This form allows you to change properties of the transactions listed below in one sweeping update. All the transactions in the table will be updated when you change the parameters you see here.',
+ 'part_of_split' => 'This transaction is part of a split transaction. If you have not selected all the splits, you may end up with changing only half the transaction.',
+ 'bulk_set_new_values' => 'Use the inputs below to set new values. If you leave them empty, they will be made empty for all. Also, note that only withdrawals will be given a budget.',
+ 'no_bulk_category' => 'Don\'t update category',
+ 'no_bulk_budget' => 'Don\'t update budget',
+ 'no_bulk_tags' => 'Don\'t update tag(s)',
+ 'replace_with_these_tags' => 'Replace with these tags',
+ 'append_these_tags' => 'Add these tags',
+ 'mass_edit' => 'Edit selected individually',
+ 'bulk_edit' => 'Edit selected in bulk',
+ 'mass_delete' => 'Delete selected',
+ 'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.',
+ 'cannot_change_amount_reconciled' => 'You can\'t change the amount of reconciled transactions.',
+ 'no_budget' => '(no budget)',
+ 'no_bill' => '(no bill)',
+ 'account_per_budget' => 'Account per budget',
+ 'account_per_category' => 'Account per category',
+ 'create_new_object' => 'Create',
+ 'empty' => '(empty)',
+ 'all_other_budgets' => '(all other budgets)',
+ 'all_other_accounts' => '(all other accounts)',
+ 'expense_per_source_account' => 'Expenses per source account',
+ 'expense_per_destination_account' => 'Expenses per destination account',
+ 'income_per_destination_account' => 'Income per destination account',
+ 'spent_in_specific_category' => 'Spent in category ":category"',
+ 'earned_in_specific_category' => 'Earned in category ":category"',
+ 'spent_in_specific_tag' => 'Spent in tag ":tag"',
+ 'earned_in_specific_tag' => 'Earned in tag ":tag"',
+ 'income_per_source_account' => 'Income per source account',
+ 'average_spending_per_destination' => 'Average expense per destination account',
+ 'average_spending_per_source' => 'Average expense per source account',
+ 'average_earning_per_source' => 'Average earning per source account',
+ 'average_earning_per_destination' => 'Average earning per destination account',
+ 'account_per_tag' => 'Account per tag',
+ 'tag_report_expenses_listed_once' => 'Expenses and income are never listed twice. If a transaction has multiple tags, it may only show up under one of its tags. This list may appear to be missing data, but the amounts will be correct.',
+ 'double_report_expenses_charted_once' => 'Expenses and income are never displayed twice. If a transaction has multiple tags, it may only show up under one of its tags. This chart may appear to be missing data, but the amounts will be correct.',
+ 'tag_report_chart_single_tag' => 'This chart applies to a single tag. If a transaction has multiple tags, what you see here may be reflected in the charts of other tags as well.',
+ 'tag' => 'Tag',
+ 'no_budget_squared' => '(no budget)',
+ 'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious. You can delete part of a split transaction from this page, so take care.',
+ 'mass_deleted_transactions_success' => 'Deleted :count transaction.|Deleted :count transactions.',
+ 'mass_edited_transactions_success' => 'Updated :count transaction.|Updated :count transactions.',
+ 'opt_group_' => '(no account type)',
+ 'opt_group_no_account_type' => '(no account type)',
+ 'opt_group_defaultAsset' => 'Default asset accounts',
+ 'opt_group_savingAsset' => 'Savings accounts',
+ 'opt_group_sharedAsset' => 'Shared asset accounts',
+ 'opt_group_ccAsset' => 'Credit cards',
+ 'opt_group_cashWalletAsset' => 'Cash wallets',
+ 'opt_group_expense_account' => 'Expense accounts',
+ 'opt_group_revenue_account' => 'Revenue accounts',
+ 'opt_group_l_Loan' => 'Liability: Loan',
+ 'opt_group_cash_account' => 'Cash account',
+ 'opt_group_l_Debt' => 'Liability: Debt',
+ 'opt_group_l_Mortgage' => 'Liability: Mortgage',
+ 'opt_group_l_Credit card' => 'Liability: Credit card',
+ 'notes' => 'Notes',
+ 'view_notes' => 'View notes',
+ 'set_budget_limit_notes' => 'View the notes for this budgeted amount',
+ 'edit_bl_notes' => 'Edit notes',
+ 'update_bl_notes' => 'Update notes',
+ 'unknown_journal_error' => 'Could not store the transaction. Please check the log files.',
+ 'attachment_not_found' => 'This attachment could not be found.',
+ 'journal_link_bill' => 'This transaction is linked to bill :name. To remove the connection, uncheck the checkbox. Use rules to connect it to another bill.',
+ 'transaction_stored_link' => 'Transaction #{ID} ("{title}") has been stored.',
+ 'transaction_new_stored_link' => 'Transaction #{ID} has been stored.',
+ 'transaction_updated_link' => 'Transaction #{ID} ("{title}") has been updated.',
+ 'transaction_updated_no_changes' => 'Transaction #{ID} ("{title}") did not receive any changes.',
+ 'first_split_decides' => 'The first split determines the value of this field',
+ 'first_split_overrules_source' => 'The first split may overrule the source account',
+ 'first_split_overrules_destination' => 'The first split may overrule the destination account',
+ 'spent_x_of_y' => 'Spent {amount} of {total}',
// new user:
- 'welcome' => 'Welcome to Firefly III!',
- 'submit' => 'Submit',
- 'submission' => 'Submission',
- 'submit_yes_really' => 'Submit (I know what I\'m doing)',
- 'getting_started' => 'Getting started',
- 'to_get_started' => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
- 'savings_balance_text' => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
- 'finish_up_new_user' => 'That\'s it! You can continue by pressing Submit. You will be taken to the index of Firefly III.',
- 'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
- 'set_preferred_language' => 'If you prefer to use Firefly III in another language, please indicate so here.',
- 'language' => 'Language',
- 'new_savings_account' => ':bank_name savings account',
- 'cash_wallet' => 'Cash wallet',
- 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.',
+ 'welcome' => 'Welcome to Firefly III!',
+ 'submit' => 'Submit',
+ 'submission' => 'Submission',
+ 'submit_yes_really' => 'Submit (I know what I\'m doing)',
+ 'getting_started' => 'Getting started',
+ 'to_get_started' => 'It is good to see you have successfully installed Firefly III. To get started with this tool please enter your bank\'s name and the balance of your main checking account. Do not worry yet if you have multiple accounts. You can add those later. It\'s just that Firefly III needs something to start with.',
+ 'savings_balance_text' => 'Firefly III will automatically create a savings account for you. By default, there will be no money in your savings account, but if you tell Firefly III the balance it will be stored as such.',
+ 'finish_up_new_user' => 'That\'s it! You can continue by pressing Submit. You will be taken to the index of Firefly III.',
+ 'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
+ 'set_preferred_language' => 'If you prefer to use Firefly III in another language, please indicate so here.',
+ 'language' => 'Language',
+ 'new_savings_account' => ':bank_name savings account',
+ 'cash_wallet' => 'Cash wallet',
+ 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.',
// home page:
- 'transaction_table_description' => 'A table containing your transactions',
- 'opposing_account' => 'Opposing account',
- 'yourAccounts' => 'Your accounts',
- 'your_accounts' => 'Your account overview',
- 'category_overview' => 'Category overview',
- 'expense_overview' => 'Expense account overview',
- 'revenue_overview' => 'Revenue account overview',
- 'budgetsAndSpending' => 'Budgets and spending',
- 'budgets_and_spending' => 'Budgets and spending',
- 'go_to_budget' => 'Go to budget "{budget}"',
- 'go_to_deposits' => 'Go to deposits',
- 'go_to_expenses' => 'Go to expenses',
- 'savings' => 'Savings',
- 'newWithdrawal' => 'New expense',
- 'newDeposit' => 'New deposit',
- 'newTransfer' => 'New transfer',
- 'bills_to_pay' => 'Bills to pay',
- 'per_day' => 'Per day',
- 'left_to_spend_per_day' => 'Left to spend per day',
- 'bills_paid' => 'Bills paid',
- 'custom_period' => 'Custom period',
- 'reset_to_current' => 'Reset to current period',
- 'select_period' => 'Select a period',
+ 'transaction_table_description' => 'A table containing your transactions',
+ 'opposing_account' => 'Opposing account',
+ 'yourAccounts' => 'Your accounts',
+ 'your_accounts' => 'Your account overview',
+ 'category_overview' => 'Category overview',
+ 'expense_overview' => 'Expense account overview',
+ 'revenue_overview' => 'Revenue account overview',
+ 'budgetsAndSpending' => 'Budgets and spending',
+ 'budgets_and_spending' => 'Budgets and spending',
+ 'go_to_budget' => 'Go to budget "{budget}"',
+ 'go_to_deposits' => 'Go to deposits',
+ 'go_to_expenses' => 'Go to expenses',
+ 'savings' => 'Savings',
+ 'newWithdrawal' => 'New expense',
+ 'newDeposit' => 'New deposit',
+ 'newTransfer' => 'New transfer',
+ 'bills_to_pay' => 'Bills to pay',
+ 'per_day' => 'Per day',
+ 'left_to_spend_per_day' => 'Left to spend per day',
+ 'bills_paid' => 'Bills paid',
+ 'custom_period' => 'Custom period',
+ 'reset_to_current' => 'Reset to current period',
+ 'select_period' => 'Select a period',
// menu and titles, should be recycled as often as possible:
- 'currency' => 'Currency',
- 'preferences' => 'Preferences',
- 'logout' => 'Logout',
- 'logout_other_sessions' => 'Logout all other sessions',
- 'toggleNavigation' => 'Toggle navigation',
- 'toggle_dropdown' => 'Toggle dropdown',
- 'searchPlaceholder' => 'Search...',
- 'version' => 'Version',
- 'dashboard' => 'Dashboard',
- 'income_and_expense' => 'Income and expense',
- 'all_money' => 'All your money',
- 'unknown_source_plain' => 'Unknown source account',
- 'unknown_dest_plain' => 'Unknown destination account',
- 'unknown_any_plain' => 'Unknown account',
- 'unknown_budget_plain' => 'No budget',
- 'available_budget' => 'Available budget ({currency})',
- 'currencies' => 'Currencies',
- 'activity' => 'Activity',
- 'usage' => 'Usage',
- 'accounts' => 'Accounts',
- 'Asset account' => 'Asset account',
- 'Default account' => 'Asset account',
- 'Expense account' => 'Expense account',
- 'Revenue account' => 'Revenue account',
- 'Initial balance account' => 'Initial balance account',
- 'account_type_Asset account' => 'Asset account',
- 'account_type_Expense account' => 'Expense account',
- 'account_type_Revenue account' => 'Revenue account',
- 'account_type_Debt' => 'Debt',
- 'account_type_Loan' => 'Loan',
- 'account_type_Mortgage' => 'Mortgage',
- 'account_type_debt' => 'Debt',
- 'account_type_loan' => 'Loan',
- 'account_type_mortgage' => 'Mortgage',
- 'account_type_Credit card' => 'Credit card',
- 'credit_card_type_monthlyFull' => 'Full payment every month',
- 'liability_direction_credit' => 'I am owed this debt',
- 'liability_direction_debit' => 'I owe this debt to somebody else',
- 'liability_direction_credit_short' => 'Owed this debt',
- 'liability_direction_debit_short' => 'Owe this debt',
- 'liability_direction__short' => 'Unknown',
- 'liability_direction_null_short' => 'Unknown',
- 'Liability credit' => 'Liability credit',
- 'budgets' => 'Budgets',
- 'tags' => 'Tags',
- 'reports' => 'Reports',
- 'transactions' => 'Transactions',
- 'expenses' => 'Expenses',
- 'income' => 'Revenue / income',
- 'transfers' => 'Transfers',
- 'moneyManagement' => 'Money management',
- 'money_management' => 'Money management',
- 'tools' => 'Tools',
- 'piggyBanks' => 'Piggy banks',
- 'piggy_banks' => 'Piggy banks',
- 'amount_x_of_y' => '{current} of {total}',
- 'bills' => 'Bills',
- 'withdrawal' => 'Withdrawal',
- 'opening_balance' => 'Opening balance',
- 'deposit' => 'Deposit',
- 'account' => 'Account',
- 'transfer' => 'Transfer',
- 'Withdrawal' => 'Withdrawal',
- 'Deposit' => 'Deposit',
- 'Transfer' => 'Transfer',
- 'bill' => 'Bill',
- 'yes' => 'Yes',
- 'no' => 'No',
- 'amount' => 'Amount',
- 'overview' => 'Overview',
- 'saveOnAccount' => 'Save on account',
- 'saveOnAccounts' => 'Save on account(s)',
- 'unknown' => 'Unknown',
- 'monthly' => 'Monthly',
- 'profile' => 'Profile',
- 'errors' => 'Errors',
- 'debt_start_date' => 'Start date of debt',
- 'debt_start_amount' => 'Start amount of debt',
- 'debt_start_amount_help' => 'It\'s always best to set this value to a negative amount. Read the help pages (top right (?)-icon) for more information.',
- 'interest_period_help' => 'This field is purely cosmetic and won\'t be calculated for you. As it turns out banks are very sneaky so Firefly III never gets it right.',
- 'store_new_liabilities_account' => 'Store new liability',
- 'edit_liabilities_account' => 'Edit liability ":name"',
- 'financial_control' => 'Financial control',
- 'accounting' => 'Accounting',
- 'automation' => 'Automation',
- 'others' => 'Others',
- 'classification' => 'Classification',
- 'store_transaction' => 'Store transaction',
+ 'currency' => 'Currency',
+ 'preferences' => 'Preferences',
+ 'logout' => 'Logout',
+ 'logout_other_sessions' => 'Logout all other sessions',
+ 'toggleNavigation' => 'Toggle navigation',
+ 'toggle_dropdown' => 'Toggle dropdown',
+ 'searchPlaceholder' => 'Search...',
+ 'version' => 'Version',
+ 'dashboard' => 'Dashboard',
+ 'income_and_expense' => 'Income and expense',
+ 'all_money' => 'All your money',
+ 'unknown_source_plain' => 'Unknown source account',
+ 'unknown_dest_plain' => 'Unknown destination account',
+ 'unknown_any_plain' => 'Unknown account',
+ 'unknown_budget_plain' => 'No budget',
+ 'available_budget' => 'Available budget ({currency})',
+ 'currencies' => 'Currencies',
+ 'activity' => 'Activity',
+ 'usage' => 'Usage',
+ 'accounts' => 'Accounts',
+ 'Asset account' => 'Asset account',
+ 'Default account' => 'Asset account',
+ 'Expense account' => 'Expense account',
+ 'Revenue account' => 'Revenue account',
+ 'Initial balance account' => 'Initial balance account',
+ 'account_type_Asset account' => 'Asset account',
+ 'account_type_Expense account' => 'Expense account',
+ 'account_type_Revenue account' => 'Revenue account',
+ 'account_type_Debt' => 'Debt',
+ 'account_type_Loan' => 'Loan',
+ 'account_type_Mortgage' => 'Mortgage',
+ 'account_type_debt' => 'Debt',
+ 'account_type_loan' => 'Loan',
+ 'account_type_mortgage' => 'Mortgage',
+ 'account_type_Credit card' => 'Credit card',
+ 'credit_card_type_monthlyFull' => 'Full payment every month',
+ 'liability_direction_credit' => 'I am owed this debt',
+ 'liability_direction_debit' => 'I owe this debt to somebody else',
+ 'liability_direction_credit_short' => 'Owed this debt',
+ 'liability_direction_debit_short' => 'Owe this debt',
+ 'liability_direction__short' => 'Unknown',
+ 'liability_direction_null_short' => 'Unknown',
+ 'Liability credit' => 'Liability credit',
+ 'budgets' => 'Budgets',
+ 'tags' => 'Tags',
+ 'reports' => 'Reports',
+ 'transactions' => 'Transactions',
+ 'expenses' => 'Expenses',
+ 'income' => 'Revenue / income',
+ 'transfers' => 'Transfers',
+ 'moneyManagement' => 'Money management',
+ 'money_management' => 'Money management',
+ 'tools' => 'Tools',
+ 'piggyBanks' => 'Piggy banks',
+ 'piggy_banks' => 'Piggy banks',
+ 'amount_x_of_y' => '{current} of {total}',
+ 'bills' => 'Bills',
+ 'withdrawal' => 'Withdrawal',
+ 'opening_balance' => 'Opening balance',
+ 'deposit' => 'Deposit',
+ 'account' => 'Account',
+ 'transfer' => 'Transfer',
+ 'Withdrawal' => 'Withdrawal',
+ 'Deposit' => 'Deposit',
+ 'Transfer' => 'Transfer',
+ 'bill' => 'Bill',
+ 'yes' => 'Yes',
+ 'no' => 'No',
+ 'amount' => 'Amount',
+ 'overview' => 'Overview',
+ 'saveOnAccount' => 'Save on account',
+ 'saveOnAccounts' => 'Save on account(s)',
+ 'unknown' => 'Unknown',
+ 'monthly' => 'Monthly',
+ 'profile' => 'Profile',
+ 'errors' => 'Errors',
+ 'debt_start_date' => 'Start date of debt',
+ 'debt_start_amount' => 'Start amount of debt',
+ 'debt_start_amount_help' => 'It\'s always best to set this value to a negative amount. Read the help pages (top right (?)-icon) for more information.',
+ 'interest_period_help' => 'This field is purely cosmetic and won\'t be calculated for you. As it turns out banks are very sneaky so Firefly III never gets it right.',
+ 'store_new_liabilities_account' => 'Store new liability',
+ 'edit_liabilities_account' => 'Edit liability ":name"',
+ 'financial_control' => 'Financial control',
+ 'accounting' => 'Accounting',
+ 'automation' => 'Automation',
+ 'others' => 'Others',
+ 'classification' => 'Classification',
+ 'store_transaction' => 'Store transaction',
// Ignore this comment
// reports:
- 'report_default' => 'Default financial report between :start and :end',
- 'report_audit' => 'Transaction history overview between :start and :end',
- 'report_category' => 'Category report between :start and :end',
- 'report_double' => 'Expense/revenue account report between :start and :end',
- 'report_budget' => 'Budget report between :start and :end',
- 'report_tag' => 'Tag report between :start and :end',
- 'quick_link_reports' => 'Quick links',
- 'quick_link_examples' => 'These are just some example links to get you started. Check out the help pages under the (?)-button for information on all reports and the magic words you can use.',
- 'quick_link_default_report' => 'Default financial report',
- 'quick_link_audit_report' => 'Transaction history overview',
- 'report_this_month_quick' => 'Current month, all accounts',
- 'report_last_month_quick' => 'Last month, all accounts',
- 'report_this_year_quick' => 'Current year, all accounts',
- 'report_this_fiscal_year_quick' => 'Current fiscal year, all accounts',
- 'report_all_time_quick' => 'All-time, all accounts',
- 'reports_can_bookmark' => 'Remember that reports can be bookmarked.',
- 'incomeVsExpenses' => 'Income vs. expenses',
- 'accountBalances' => 'Account balances',
- 'balanceStart' => 'Balance at start of period',
- 'balanceEnd' => 'Balance at end of period',
- 'splitByAccount' => 'Split by account',
- 'coveredWithTags' => 'Covered with tags',
- 'leftInBudget' => 'Left in budget',
- 'left_in_debt' => 'Amount due',
- 'sumOfSums' => 'Sum of sums',
- 'noCategory' => '(no category)',
- 'notCharged' => 'Not charged (yet)',
- 'inactive' => 'Inactive',
- 'active' => 'Active',
- 'difference' => 'Difference',
- 'money_flowing_in' => 'In',
- 'money_flowing_out' => 'Out',
- 'topX' => 'top :number',
- 'show_full_list' => 'Show entire list',
- 'show_only_top' => 'Show only top :number',
- 'report_type' => 'Report type',
- 'report_type_default' => 'Default financial report',
- 'report_type_audit' => 'Transaction history overview (audit)',
- 'report_type_category' => 'Category report',
- 'report_type_budget' => 'Budget report',
- 'report_type_tag' => 'Tag report',
- 'report_type_double' => 'Expense/revenue account report',
- 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
- 'report_included_accounts' => 'Included accounts',
- 'report_date_range' => 'Date range',
- 'report_preset_ranges' => 'Pre-set ranges',
- 'shared' => 'Shared',
- 'fiscal_year' => 'Fiscal year',
- 'income_entry' => 'Income from account ":name" between :start and :end',
- 'expense_entry' => 'Expenses to account ":name" between :start and :end',
- 'category_entry' => 'Expenses and income in category ":name" between :start and :end',
- 'budget_spent_amount' => 'Expenses in budget ":budget" between :start and :end',
- 'balance_amount' => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
- 'no_audit_activity' => 'No activity was recorded on account :account_name between :start and :end.',
- 'audit_end_balance' => 'Account balance of :account_name at the end of :end was: :balance',
- 'reports_extra_options' => 'Extra options',
- 'report_has_no_extra_options' => 'This report has no extra options',
- 'reports_submit' => 'View report',
- 'end_after_start_date' => 'End date of report must be after start date.',
- 'select_category' => 'Select category(ies)',
- 'select_budget' => 'Select budget(s).',
- 'select_tag' => 'Select tag(s).',
- 'income_per_category' => 'Income per category',
- 'expense_per_category' => 'Expense per category',
- 'expense_per_budget' => 'Expense per budget',
- 'income_per_account' => 'Income per account',
- 'expense_per_account' => 'Expense per account',
- 'expense_per_tag' => 'Expense per tag',
- 'income_per_tag' => 'Income per tag',
- 'include_expense_not_in_budget' => 'Included expenses not in the selected budget(s)',
- 'include_expense_not_in_account' => 'Included expenses not in the selected account(s)',
- 'include_expense_not_in_category' => 'Included expenses not in the selected category(ies)',
- 'include_income_not_in_category' => 'Included income not in the selected category(ies)',
- 'include_income_not_in_account' => 'Included income not in the selected account(s)',
- 'include_income_not_in_tags' => 'Included income not in the selected tag(s)',
- 'include_expense_not_in_tags' => 'Included expenses not in the selected tag(s)',
- 'everything_else' => 'Everything else',
- 'income_and_expenses' => 'Income and expenses',
- 'spent_average' => 'Spent (average)',
- 'income_average' => 'Income (average)',
- 'transaction_count' => 'Transaction count',
- 'average_spending_per_account' => 'Average spending per account',
- 'average_income_per_account' => 'Average income per account',
- 'total' => 'Total',
- 'description' => 'Description',
- 'sum_of_period' => 'Sum of period',
- 'average_in_period' => 'Average in period',
- 'no_account_role' => '(no role)',
- 'account_role_defaultAsset' => 'Default asset account',
- 'account_role_sharedAsset' => 'Shared asset account',
- 'account_role_savingAsset' => 'Savings account',
- 'account_role_ccAsset' => 'Credit card',
- 'account_role_cashWalletAsset' => 'Cash wallet',
- 'budget_chart_click' => 'Please click on a budget name in the table above to see a chart.',
- 'category_chart_click' => 'Please click on a category name in the table above to see a chart.',
- 'in_out_accounts' => 'Earned and spent per combination',
- 'in_out_accounts_per_asset' => 'Earned and spent (per asset account)',
- 'in_out_per_category' => 'Earned and spent per category',
- 'out_per_budget' => 'Spent per budget',
- 'select_expense_revenue' => 'Select expense/revenue account',
- 'multi_currency_report_sum' => 'Because this list contains accounts with multiple currencies, the sum(s) you see may not make sense. The report will always fall back to your default currency.',
- 'sum_in_default_currency' => 'The sum will always be in your default currency.',
- 'net_filtered_prefs' => 'This chart will never include accounts that have the "Include in net worth"-option unchecked.',
+ 'report_default' => 'Default financial report between :start and :end',
+ 'report_audit' => 'Transaction history overview between :start and :end',
+ 'report_category' => 'Category report between :start and :end',
+ 'report_double' => 'Expense/revenue account report between :start and :end',
+ 'report_budget' => 'Budget report between :start and :end',
+ 'report_tag' => 'Tag report between :start and :end',
+ 'quick_link_reports' => 'Quick links',
+ 'quick_link_examples' => 'These are just some example links to get you started. Check out the help pages under the (?)-button for information on all reports and the magic words you can use.',
+ 'quick_link_default_report' => 'Default financial report',
+ 'quick_link_audit_report' => 'Transaction history overview',
+ 'report_this_month_quick' => 'Current month, all accounts',
+ 'report_last_month_quick' => 'Last month, all accounts',
+ 'report_this_year_quick' => 'Current year, all accounts',
+ 'report_this_fiscal_year_quick' => 'Current fiscal year, all accounts',
+ 'report_all_time_quick' => 'All-time, all accounts',
+ 'reports_can_bookmark' => 'Remember that reports can be bookmarked.',
+ 'incomeVsExpenses' => 'Income vs. expenses',
+ 'accountBalances' => 'Account balances',
+ 'balanceStart' => 'Balance at start of period',
+ 'balanceEnd' => 'Balance at end of period',
+ 'splitByAccount' => 'Split by account',
+ 'coveredWithTags' => 'Covered with tags',
+ 'leftInBudget' => 'Left in budget',
+ 'left_in_debt' => 'Amount due',
+ 'sumOfSums' => 'Sum of sums',
+ 'noCategory' => '(no category)',
+ 'notCharged' => 'Not charged (yet)',
+ 'inactive' => 'Inactive',
+ 'active' => 'Active',
+ 'difference' => 'Difference',
+ 'money_flowing_in' => 'In',
+ 'money_flowing_out' => 'Out',
+ 'topX' => 'top :number',
+ 'show_full_list' => 'Show entire list',
+ 'show_only_top' => 'Show only top :number',
+ 'report_type' => 'Report type',
+ 'report_type_default' => 'Default financial report',
+ 'report_type_audit' => 'Transaction history overview (audit)',
+ 'report_type_category' => 'Category report',
+ 'report_type_budget' => 'Budget report',
+ 'report_type_tag' => 'Tag report',
+ 'report_type_double' => 'Expense/revenue account report',
+ 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.',
+ 'report_included_accounts' => 'Included accounts',
+ 'report_date_range' => 'Date range',
+ 'report_preset_ranges' => 'Pre-set ranges',
+ 'shared' => 'Shared',
+ 'fiscal_year' => 'Fiscal year',
+ 'income_entry' => 'Income from account ":name" between :start and :end',
+ 'expense_entry' => 'Expenses to account ":name" between :start and :end',
+ 'category_entry' => 'Expenses and income in category ":name" between :start and :end',
+ 'budget_spent_amount' => 'Expenses in budget ":budget" between :start and :end',
+ 'balance_amount' => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
+ 'no_audit_activity' => 'No activity was recorded on account :account_name between :start and :end.',
+ 'audit_end_balance' => 'Account balance of :account_name at the end of :end was: :balance',
+ 'reports_extra_options' => 'Extra options',
+ 'report_has_no_extra_options' => 'This report has no extra options',
+ 'reports_submit' => 'View report',
+ 'end_after_start_date' => 'End date of report must be after start date.',
+ 'select_category' => 'Select category(ies)',
+ 'select_budget' => 'Select budget(s).',
+ 'select_tag' => 'Select tag(s).',
+ 'income_per_category' => 'Income per category',
+ 'expense_per_category' => 'Expense per category',
+ 'expense_per_budget' => 'Expense per budget',
+ 'income_per_account' => 'Income per account',
+ 'expense_per_account' => 'Expense per account',
+ 'expense_per_tag' => 'Expense per tag',
+ 'income_per_tag' => 'Income per tag',
+ 'include_expense_not_in_budget' => 'Included expenses not in the selected budget(s)',
+ 'include_expense_not_in_account' => 'Included expenses not in the selected account(s)',
+ 'include_expense_not_in_category' => 'Included expenses not in the selected category(ies)',
+ 'include_income_not_in_category' => 'Included income not in the selected category(ies)',
+ 'include_income_not_in_account' => 'Included income not in the selected account(s)',
+ 'include_income_not_in_tags' => 'Included income not in the selected tag(s)',
+ 'include_expense_not_in_tags' => 'Included expenses not in the selected tag(s)',
+ 'everything_else' => 'Everything else',
+ 'income_and_expenses' => 'Income and expenses',
+ 'spent_average' => 'Spent (average)',
+ 'income_average' => 'Income (average)',
+ 'transaction_count' => 'Transaction count',
+ 'average_spending_per_account' => 'Average spending per account',
+ 'average_income_per_account' => 'Average income per account',
+ 'total' => 'Total',
+ 'description' => 'Description',
+ 'sum_of_period' => 'Sum of period',
+ 'average_in_period' => 'Average in period',
+ 'no_account_role' => '(no role)',
+ 'account_role_defaultAsset' => 'Default asset account',
+ 'account_role_sharedAsset' => 'Shared asset account',
+ 'account_role_savingAsset' => 'Savings account',
+ 'account_role_ccAsset' => 'Credit card',
+ 'account_role_cashWalletAsset' => 'Cash wallet',
+ 'budget_chart_click' => 'Please click on a budget name in the table above to see a chart.',
+ 'category_chart_click' => 'Please click on a category name in the table above to see a chart.',
+ 'in_out_accounts' => 'Earned and spent per combination',
+ 'in_out_accounts_per_asset' => 'Earned and spent (per asset account)',
+ 'in_out_per_category' => 'Earned and spent per category',
+ 'out_per_budget' => 'Spent per budget',
+ 'select_expense_revenue' => 'Select expense/revenue account',
+ 'multi_currency_report_sum' => 'Because this list contains accounts with multiple currencies, the sum(s) you see may not make sense. The report will always fall back to your default currency.',
+ 'sum_in_default_currency' => 'The sum will always be in your default currency.',
+ 'net_filtered_prefs' => 'This chart will never include accounts that have the "Include in net worth"-option unchecked.',
// Ignore this comment
// charts:
- 'chart' => 'Chart',
- 'month' => 'Month',
- 'budget' => 'Budget',
- 'spent' => 'Spent',
- 'spent_capped' => 'Spent (capped)',
- 'spent_in_budget' => 'Spent in budget',
- 'left_to_spend' => 'Left to spend',
- 'earned' => 'Earned',
- 'overspent' => 'Overspent',
- 'left' => 'Left',
- 'max-amount' => 'Maximum amount',
- 'min-amount' => 'Minimum amount',
- 'journal-amount' => 'Current bill entry',
- 'name' => 'Name',
- 'date' => 'Date',
- 'date_and_time' => 'Date and time',
- 'time' => 'Time',
- 'paid' => 'Paid',
- 'unpaid' => 'Unpaid',
- 'day' => 'Day',
- 'budgeted' => 'Budgeted',
- 'period' => 'Period',
- 'balance' => 'Balance',
- 'in_out_period' => 'In + out this period',
- 'sum' => 'Sum',
- 'summary' => 'Summary',
- 'average' => 'Average',
- 'balanceFor' => 'Balance for :name',
- 'no_tags' => '(no tags)',
- 'nothing_found' => '(nothing found)',
+ 'chart' => 'Chart',
+ 'month' => 'Month',
+ 'budget' => 'Budget',
+ 'spent' => 'Spent',
+ 'spent_capped' => 'Spent (capped)',
+ 'spent_in_budget' => 'Spent in budget',
+ 'left_to_spend' => 'Left to spend',
+ 'earned' => 'Earned',
+ 'overspent' => 'Overspent',
+ 'left' => 'Left',
+ 'max-amount' => 'Maximum amount',
+ 'min-amount' => 'Minimum amount',
+ 'journal-amount' => 'Current bill entry',
+ 'name' => 'Name',
+ 'date' => 'Date',
+ 'date_and_time' => 'Date and time',
+ 'time' => 'Time',
+ 'paid' => 'Paid',
+ 'unpaid' => 'Unpaid',
+ 'day' => 'Day',
+ 'budgeted' => 'Budgeted',
+ 'period' => 'Period',
+ 'balance' => 'Balance',
+ 'in_out_period' => 'In + out this period',
+ 'sum' => 'Sum',
+ 'summary' => 'Summary',
+ 'average' => 'Average',
+ 'balanceFor' => 'Balance for :name',
+ 'no_tags' => '(no tags)',
+ 'nothing_found' => '(nothing found)',
// page settings and wizard dialogs
- 'page_settings_header' => 'Page settings',
- 'visible_columns' => 'Visible columns',
- 'accounts_to_show' => 'Accounts to show',
- 'active_accounts_only' => 'Active accounts only',
- 'in_active_accounts_only' => 'Inactive accounts only',
- 'show_all_accounts' => 'Show all accounts',
- 'group_accounts' => 'Group accounts',
+ 'page_settings_header' => 'Page settings',
+ 'visible_columns' => 'Visible columns',
+ 'accounts_to_show' => 'Accounts to show',
+ 'active_accounts_only' => 'Active accounts only',
+ 'in_active_accounts_only' => 'Inactive accounts only',
+ 'show_all_accounts' => 'Show all accounts',
+ 'group_accounts' => 'Group accounts',
// piggy banks:
- 'event_history' => 'Event history',
- 'add_money_to_piggy' => 'Add money to piggy bank ":name"',
- 'piggy_bank' => 'Piggy bank',
- 'new_piggy_bank' => 'New piggy bank',
- 'store_piggy_bank' => 'Store new piggy bank',
- 'stored_piggy_bank' => 'Store new piggy bank ":name"',
- 'account_status' => 'Account status',
- 'left_for_piggy_banks' => 'Left for piggy banks',
- 'sum_of_piggy_banks' => 'Sum of piggy banks',
- 'saved_so_far' => 'Saved so far',
- 'left_to_save' => 'Left to save',
- 'suggested_amount' => 'Suggested monthly amount to save',
- 'add_money_to_piggy_title' => 'Add money to piggy bank ":name"',
- 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"',
- 'add' => 'Add',
- 'no_money_for_piggy' => 'You have no money to put in this piggy bank.',
- 'suggested_savings_per_month' => 'Suggested per month',
+ 'event_history' => 'Event history',
+ 'add_money_to_piggy' => 'Add money to piggy bank ":name"',
+ 'piggy_bank' => 'Piggy bank',
+ 'new_piggy_bank' => 'New piggy bank',
+ 'store_piggy_bank' => 'Store new piggy bank',
+ 'stored_piggy_bank' => 'Store new piggy bank ":name"',
+ 'account_status' => 'Account status',
+ 'left_for_piggy_banks' => 'Left for piggy banks',
+ 'sum_of_piggy_banks' => 'Sum of piggy banks',
+ 'saved_so_far' => 'Saved so far',
+ 'left_to_save' => 'Left to save',
+ 'suggested_amount' => 'Suggested monthly amount to save',
+ 'add_money_to_piggy_title' => 'Add money to piggy bank ":name"',
+ 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"',
+ 'add' => 'Add',
+ 'no_money_for_piggy' => 'You have no money to put in this piggy bank.',
+ 'suggested_savings_per_month' => 'Suggested per month',
- 'remove' => 'Remove',
- 'max_amount_add' => 'The maximum amount you can add is',
- 'max_amount_remove' => 'The maximum amount you can remove is',
- 'update_piggy_button' => 'Update piggy bank',
- 'update_piggy_title' => 'Update piggy bank ":name"',
- 'updated_piggy_bank' => 'Updated piggy bank ":name"',
- 'details' => 'Details',
- 'events' => 'Events',
- 'target_amount' => 'Target amount',
- 'start_date' => 'Start date',
- 'no_start_date' => 'No start date',
- 'target_date' => 'Target date',
- 'no_target_date' => 'No target date',
- 'table' => 'Table',
- 'delete_piggy_bank' => 'Delete piggy bank ":name"',
- 'cannot_add_amount_piggy' => 'Could not add :amount to ":name".',
- 'cannot_remove_from_piggy' => 'Could not remove :amount from ":name".',
- 'deleted_piggy_bank' => 'Deleted piggy bank ":name"',
- 'added_amount_to_piggy' => 'Added :amount to ":name"',
- 'removed_amount_from_piggy' => 'Removed :amount from ":name"',
- 'piggy_events' => 'Related piggy banks',
+ 'remove' => 'Remove',
+ 'max_amount_add' => 'The maximum amount you can add is',
+ 'max_amount_remove' => 'The maximum amount you can remove is',
+ 'update_piggy_button' => 'Update piggy bank',
+ 'update_piggy_title' => 'Update piggy bank ":name"',
+ 'updated_piggy_bank' => 'Updated piggy bank ":name"',
+ 'details' => 'Details',
+ 'events' => 'Events',
+ 'target_amount' => 'Target amount',
+ 'start_date' => 'Start date',
+ 'no_start_date' => 'No start date',
+ 'target_date' => 'Target date',
+ 'no_target_date' => 'No target date',
+ 'table' => 'Table',
+ 'delete_piggy_bank' => 'Delete piggy bank ":name"',
+ 'cannot_add_amount_piggy' => 'Could not add :amount to ":name".',
+ 'cannot_remove_from_piggy' => 'Could not remove :amount from ":name".',
+ 'deleted_piggy_bank' => 'Deleted piggy bank ":name"',
+ 'added_amount_to_piggy' => 'Added :amount to ":name"',
+ 'removed_amount_from_piggy' => 'Removed :amount from ":name"',
+ 'piggy_events' => 'Related piggy banks',
// tags
- 'delete_tag' => 'Delete tag ":tag"',
- 'deleted_tag' => 'Deleted tag ":tag"',
- 'new_tag' => 'Make new tag',
- 'edit_tag' => 'Edit tag ":tag"',
- 'updated_tag' => 'Updated tag ":tag"',
- 'created_tag' => 'Tag ":tag" has been created!',
+ 'delete_tag' => 'Delete tag ":tag"',
+ 'deleted_tag' => 'Deleted tag ":tag"',
+ 'new_tag' => 'Make new tag',
+ 'edit_tag' => 'Edit tag ":tag"',
+ 'updated_tag' => 'Updated tag ":tag"',
+ 'created_tag' => 'Tag ":tag" has been created!',
- 'transaction_journal_information' => 'Transaction information',
- 'transaction_journal_amount' => 'Amount information',
- 'transaction_journal_meta' => 'Meta information',
- 'transaction_journal_more' => 'More information',
- 'basic_journal_information' => 'Basic transaction information',
- 'transaction_journal_extra' => 'Extra information',
- 'att_part_of_journal' => 'Stored under ":journal"',
- 'total_amount' => 'Total amount',
- 'number_of_decimals' => 'Number of decimals',
+ 'transaction_journal_information' => 'Transaction information',
+ 'transaction_journal_amount' => 'Amount information',
+ 'transaction_journal_meta' => 'Meta information',
+ 'transaction_journal_more' => 'More information',
+ 'basic_journal_information' => 'Basic transaction information',
+ 'transaction_journal_extra' => 'Extra information',
+ 'att_part_of_journal' => 'Stored under ":journal"',
+ 'total_amount' => 'Total amount',
+ 'number_of_decimals' => 'Number of decimals',
// Ignore this comment
// administration
- 'invite_is_already_redeemed' => 'The invite to ":address" has already been redeemed.',
- 'invite_is_deleted' => 'The invite to ":address" has been deleted.',
- 'invite_new_user_title' => 'Invite new user',
- 'invite_new_user_text' => 'As an administrator, you can invite users to register on your Firefly III administration. Using the direct link you can share with them, they will be able to register an account. The invited user and their invite link will appear in the table below. You are free to share the invitation link with them.',
- 'invited_user_mail' => 'Email address',
- 'invite_user' => 'Invite user',
- 'user_is_invited' => 'Email address ":address" was invited to Firefly III',
- 'administration' => 'Administration',
- 'system_settings' => 'System settings',
- 'code_already_used' => 'Invite code has been used',
- 'user_administration' => 'User administration',
- 'list_all_users' => 'All users',
- 'all_users' => 'All users',
- 'instance_configuration' => 'Configuration',
- 'firefly_instance_configuration' => 'Configuration options for Firefly III',
- 'setting_single_user_mode' => 'Single user mode',
- 'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as well, assuming they can reach it (when it is connected to the internet).',
- 'store_configuration' => 'Store configuration',
- 'single_user_administration' => 'User administration for :email',
- 'edit_user' => 'Edit user :email',
- 'hidden_fields_preferences' => 'You can enable more transaction options in your preferences.',
- 'user_data_information' => 'User data',
- 'user_information' => 'User information',
- 'total_size' => 'total size',
- 'budget_or_budgets' => ':count budget|:count budgets',
- 'budgets_with_limits' => ':count budget with configured amount|:count budgets with configured amount',
- 'nr_of_rules_in_total_groups' => ':count_rules rule(s) in :count_groups rule group(s)',
- 'tag_or_tags' => ':count tag|:count tags',
- 'configuration_updated' => 'The configuration has been updated',
- 'setting_is_demo_site' => 'Demo site',
- 'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
- 'block_code_bounced' => 'Email message(s) bounced',
- 'block_code_expired' => 'Demo account expired',
- 'no_block_code' => 'No reason for block or user not blocked',
- 'demo_user_export' => 'The demo user cannot export data',
- 'block_code_email_changed' => 'User has not yet confirmed new email address',
- 'admin_update_email' => 'Contrary to the profile page, the user will NOT be notified their email address has changed!',
- 'update_user' => 'Update user',
- 'updated_user' => 'User data has been changed.',
- 'delete_user' => 'Delete user :email',
- 'user_deleted' => 'The user has been deleted',
- 'send_test_email' => 'Send test email message',
- 'send_test_email_text' => 'To see if your installation is capable of sending email or posting Slack messages, please press this button. You will not see an error here (if any), the log files will reflect any errors. You can press this button as many times as you like. There is no spam control. The message will be sent to :email and should arrive shortly.',
- 'send_message' => 'Send message',
- 'send_test_triggered' => 'Test was triggered. Check your inbox and the log files.',
- 'give_admin_careful' => 'Users who are given admin rights can take away yours. Be careful.',
- 'admin_maintanance_title' => 'Maintenance',
- 'admin_maintanance_expl' => 'Some nifty buttons for Firefly III maintenance',
- 'admin_maintenance_clear_cache' => 'Clear cache',
- 'owner_notifications' => 'Admin notifications',
- 'owner_notifications_expl' => 'The following notifications can be enabled or disabled by the administrator. It will be sent over ALL configured channels. Some channels are configured in your environment variables, others can be set here.',
- 'channel_settings' => 'Settings for notification channels',
- 'notification_test_failed' => 'Notification test for channel ":channel" failed. The logs will have more details.',
- 'notification_test_executed' => 'Notification test for channel ":channel" executed. Check your logs for details.',
- 'settings_notifications' => 'Settings for notifications',
- 'title_owner_notifications' => 'Owner notifications',
- 'owner_notification_check_user_new_reg' => 'User gets post-registration welcome message',
- 'owner_notification_check_admin_new_reg' => 'Administrator(s) get new user registration notification',
- 'owner_notification_check_new_version' => 'A new version is available',
- 'owner_notification_check_invite_created' => 'A user is invited to Firefly III',
- 'owner_notification_check_invite_redeemed' => 'A user invitation is redeemed',
- 'owner_notification_check_unknown_user_attempt' => 'An unknown user tries to login',
- 'all_invited_users' => 'All invited users',
- 'save_notification_settings' => 'Save settings',
- 'notification_settings' => 'Settings for notifications',
- 'notification_settings_saved' => 'The notification settings have been saved',
- 'available_channels_title' => 'Available channels',
- 'available_channels_expl' => 'These channels are available to send notifications over. To test your configuration, use the buttons below. Please note that the buttons have no spam control.',
- 'notification_channel_name_email' => 'Email',
- 'slack_discord_double' => 'The Slack notification channel can also send notifications to Discord.',
- 'notification_channel_name_slack' => 'Slack',
- 'notification_channel_name_ntfy' => 'Ntfy.sh',
- 'notification_channel_name_pushover' => 'Pushover',
- 'notification_channel_name_gotify' => 'Gotify',
- 'notification_channel_name_pushbullet' => 'Pushbullet',
- 'channel_not_available' => 'not available yet',
- 'configure_channel_in_env' => 'needs environment variables',
- 'test_notification_channel_name_email' => 'Test email',
- 'test_notification_channel_name_slack' => 'Test Slack',
- 'test_notification_channel_name_ntfy' => 'Test Ntfy.sh',
- 'test_notification_channel_name_pushover' => 'Test Pushover',
- 'test_notification_channel_name_gotify' => 'Test Gotify',
- 'test_notification_channel_name_pushbullet' => 'Test Pushbullet',
+ 'invite_is_already_redeemed' => 'The invite to ":address" has already been redeemed.',
+ 'invite_is_deleted' => 'The invite to ":address" has been deleted.',
+ 'invite_new_user_title' => 'Invite new user',
+ 'invite_new_user_text' => 'As an administrator, you can invite users to register on your Firefly III administration. Using the direct link you can share with them, they will be able to register an account. The invited user and their invite link will appear in the table below. You are free to share the invitation link with them.',
+ 'invited_user_mail' => 'Email address',
+ 'invite_user' => 'Invite user',
+ 'user_is_invited' => 'Email address ":address" was invited to Firefly III',
+ 'administration' => 'Administration',
+ 'system_settings' => 'System settings',
+ 'code_already_used' => 'Invite code has been used',
+ 'user_administration' => 'User administration',
+ 'list_all_users' => 'All users',
+ 'all_users' => 'All users',
+ 'instance_configuration' => 'Configuration',
+ 'firefly_instance_configuration' => 'Configuration options for Firefly III',
+ 'setting_single_user_mode' => 'Single user mode',
+ 'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as well, assuming they can reach it (when it is connected to the internet).',
+ 'store_configuration' => 'Store configuration',
+ 'single_user_administration' => 'User administration for :email',
+ 'edit_user' => 'Edit user :email',
+ 'hidden_fields_preferences' => 'You can enable more transaction options in your preferences.',
+ 'user_data_information' => 'User data',
+ 'user_information' => 'User information',
+ 'total_size' => 'total size',
+ 'budget_or_budgets' => ':count budget|:count budgets',
+ 'budgets_with_limits' => ':count budget with configured amount|:count budgets with configured amount',
+ 'nr_of_rules_in_total_groups' => ':count_rules rule(s) in :count_groups rule group(s)',
+ 'tag_or_tags' => ':count tag|:count tags',
+ 'configuration_updated' => 'The configuration has been updated',
+ 'setting_is_demo_site' => 'Demo site',
+ 'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+ 'block_code_bounced' => 'Email message(s) bounced',
+ 'block_code_expired' => 'Demo account expired',
+ 'no_block_code' => 'No reason for block or user not blocked',
+ 'demo_user_export' => 'The demo user cannot export data',
+ 'block_code_email_changed' => 'User has not yet confirmed new email address',
+ 'admin_update_email' => 'Contrary to the profile page, the user will NOT be notified their email address has changed!',
+ 'update_user' => 'Update user',
+ 'updated_user' => 'User data has been changed.',
+ 'delete_user' => 'Delete user :email',
+ 'user_deleted' => 'The user has been deleted',
+ 'send_test_email' => 'Send test email message',
+ 'send_test_email_text' => 'To see if your installation is capable of sending email or posting Slack messages, please press this button. You will not see an error here (if any), the log files will reflect any errors. You can press this button as many times as you like. There is no spam control. The message will be sent to :email and should arrive shortly.',
+ 'send_message' => 'Send message',
+ 'send_test_triggered' => 'Test was triggered. Check your inbox and the log files.',
+ 'give_admin_careful' => 'Users who are given admin rights can take away yours. Be careful.',
+ 'admin_maintanance_title' => 'Maintenance',
+ 'admin_maintanance_expl' => 'Some nifty buttons for Firefly III maintenance',
+ 'admin_maintenance_clear_cache' => 'Clear cache',
+ 'owner_notifications' => 'Admin notifications',
+ 'owner_notifications_expl' => 'The following notifications can be enabled or disabled by the administrator. It will be sent over ALL configured channels. Some channels are configured in your environment variables, others can be set here.',
+ 'channel_settings' => 'Settings for notification channels',
+ 'notification_test_failed' => 'Notification test for channel ":channel" failed. The logs will have more details.',
+ 'notification_test_executed' => 'Notification test for channel ":channel" executed. Check your logs for details.',
+ 'settings_notifications' => 'Settings for notifications',
+ 'title_owner_notifications' => 'Owner notifications',
+ 'owner_notification_check_user_new_reg' => 'User gets post-registration welcome message',
+ 'owner_notification_check_admin_new_reg' => 'Administrator(s) get new user registration notification',
+ 'owner_notification_check_new_version' => 'A new version is available',
+ 'owner_notification_check_invite_created' => 'A user is invited to Firefly III',
+ 'owner_notification_check_invite_redeemed' => 'A user invitation is redeemed',
+ 'owner_notification_check_unknown_user_attempt' => 'An unknown user tries to login',
+ 'all_invited_users' => 'All invited users',
+ 'save_notification_settings' => 'Save settings',
+ 'notification_settings' => 'Settings for notifications',
+ 'notification_settings_saved' => 'The notification settings have been saved',
+ 'available_channels_title' => 'Available channels',
+ 'available_channels_expl' => 'These channels are available to send notifications over. To test your configuration, use the buttons below. Please note that the buttons have no spam control.',
+ 'notification_channel_name_email' => 'Email',
+ 'slack_discord_double' => 'The Slack notification channel can also send notifications to Discord.',
+ 'notification_channel_name_slack' => 'Slack',
+ 'notification_channel_name_ntfy' => 'Ntfy.sh',
+ 'notification_channel_name_pushover' => 'Pushover',
+ 'notification_channel_name_gotify' => 'Gotify',
+ 'notification_channel_name_pushbullet' => 'Pushbullet',
+ 'channel_not_available' => 'not available yet',
+ 'configure_channel_in_env' => 'needs environment variables',
+ 'test_notification_channel_name_email' => 'Test email',
+ 'test_notification_channel_name_slack' => 'Test Slack',
+ 'test_notification_channel_name_ntfy' => 'Test Ntfy.sh',
+ 'test_notification_channel_name_pushover' => 'Test Pushover',
+ 'test_notification_channel_name_gotify' => 'Test Gotify',
+ 'test_notification_channel_name_pushbullet' => 'Test Pushbullet',
- 'split_transaction_title' => 'Description of the split transaction',
- 'split_transaction_title_help' => 'If you create a split transaction, there must be a global description for all splits of the transaction.',
- 'split_title_help' => 'If you create a split transaction, there must be a global description for all splits of the transaction.',
- 'you_create_transfer' => 'You\'re creating a transfer.',
- 'you_create_withdrawal' => 'You\'re creating a withdrawal.',
- 'you_create_deposit' => 'You\'re creating a deposit.',
+ 'split_transaction_title' => 'Description of the split transaction',
+ 'split_transaction_title_help' => 'If you create a split transaction, there must be a global description for all splits of the transaction.',
+ 'split_title_help' => 'If you create a split transaction, there must be a global description for all splits of the transaction.',
+ 'you_create_transfer' => 'You\'re creating a transfer.',
+ 'you_create_withdrawal' => 'You\'re creating a withdrawal.',
+ 'you_create_deposit' => 'You\'re creating a deposit.',
// links
- 'journal_link_configuration' => 'Transaction links configuration',
- 'create_new_link_type' => 'Create new link type',
- 'store_new_link_type' => 'Store new link type',
- 'update_link_type' => 'Update link type',
- 'edit_link_type' => 'Edit link type ":name"',
- 'updated_link_type' => 'Updated link type ":name"',
- 'delete_link_type' => 'Delete link type ":name"',
- 'deleted_link_type' => 'Deleted link type ":name"',
- 'stored_new_link_type' => 'Store new link type ":name"',
- 'cannot_edit_link_type' => 'Cannot edit link type ":name"',
- 'link_type_help_name' => 'Ie. "Duplicates"',
- 'link_type_help_inward' => 'Ie. "duplicates"',
- 'link_type_help_outward' => 'Ie. "is duplicated by"',
- 'save_connections_by_moving' => 'Save the link between these transactions by moving them to another link type:',
- 'do_not_save_connection' => '(do not save connection)',
- 'link_transaction' => 'Link transaction',
- 'link_to_other_transaction' => 'Link this transaction to another transaction',
- 'select_transaction_to_link' => 'Select a transaction to link this transaction to. The links are currently unused in Firefly III (apart from being shown), but I plan to change this in the future. Use the search box to select a transaction either by title or by ID. If you want to add custom link types, check out the administration section.',
- 'this_transaction' => 'This transaction',
- 'transaction' => 'Transaction',
- 'comments' => 'Comments',
- 'link_notes' => 'Any notes you wish to store with the link.',
- 'invalid_link_selection' => 'Cannot link these transactions',
- 'selected_transaction' => 'Selected transaction',
- 'journals_linked' => 'Transactions are linked.',
- 'journals_error_linked' => 'These transactions are already linked.',
- 'journals_link_to_self' => 'You cannot link a transaction to itself',
- 'journal_links' => 'Transaction links',
- 'this_withdrawal' => 'This withdrawal',
- 'this_deposit' => 'This deposit',
- 'this_transfer' => 'This transfer',
- 'overview_for_link' => 'Overview for link type ":name"',
- 'source_transaction' => 'Source transaction',
- 'link_description' => 'Link description',
- 'destination_transaction' => 'Destination transaction',
- 'delete_journal_link' => 'Delete the link between :source and :destination',
- 'deleted_link' => 'Deleted link',
+ 'journal_link_configuration' => 'Transaction links configuration',
+ 'create_new_link_type' => 'Create new link type',
+ 'store_new_link_type' => 'Store new link type',
+ 'update_link_type' => 'Update link type',
+ 'edit_link_type' => 'Edit link type ":name"',
+ 'updated_link_type' => 'Updated link type ":name"',
+ 'delete_link_type' => 'Delete link type ":name"',
+ 'deleted_link_type' => 'Deleted link type ":name"',
+ 'stored_new_link_type' => 'Store new link type ":name"',
+ 'cannot_edit_link_type' => 'Cannot edit link type ":name"',
+ 'link_type_help_name' => 'Ie. "Duplicates"',
+ 'link_type_help_inward' => 'Ie. "duplicates"',
+ 'link_type_help_outward' => 'Ie. "is duplicated by"',
+ 'save_connections_by_moving' => 'Save the link between these transactions by moving them to another link type:',
+ 'do_not_save_connection' => '(do not save connection)',
+ 'link_transaction' => 'Link transaction',
+ 'link_to_other_transaction' => 'Link this transaction to another transaction',
+ 'select_transaction_to_link' => 'Select a transaction to link this transaction to. The links are currently unused in Firefly III (apart from being shown), but I plan to change this in the future. Use the search box to select a transaction either by title or by ID. If you want to add custom link types, check out the administration section.',
+ 'this_transaction' => 'This transaction',
+ 'transaction' => 'Transaction',
+ 'comments' => 'Comments',
+ 'link_notes' => 'Any notes you wish to store with the link.',
+ 'invalid_link_selection' => 'Cannot link these transactions',
+ 'selected_transaction' => 'Selected transaction',
+ 'journals_linked' => 'Transactions are linked.',
+ 'journals_error_linked' => 'These transactions are already linked.',
+ 'journals_link_to_self' => 'You cannot link a transaction to itself',
+ 'journal_links' => 'Transaction links',
+ 'this_withdrawal' => 'This withdrawal',
+ 'this_deposit' => 'This deposit',
+ 'this_transfer' => 'This transfer',
+ 'overview_for_link' => 'Overview for link type ":name"',
+ 'source_transaction' => 'Source transaction',
+ 'link_description' => 'Link description',
+ 'destination_transaction' => 'Destination transaction',
+ 'delete_journal_link' => 'Delete the link between :source and :destination',
+ 'deleted_link' => 'Deleted link',
// link translations:
- 'Paid_name' => 'Paid',
- 'Refund_name' => 'Refund',
- 'Reimbursement_name' => 'Reimbursement',
- 'Related_name' => 'Related',
- 'relates to_inward' => 'relates to',
- 'is (partially) refunded by_inward' => 'is (partially) refunded by',
- 'is (partially) paid for by_inward' => 'is (partially) paid for by',
- 'is (partially) reimbursed by_inward' => 'is (partially) reimbursed by',
- 'inward_transaction' => 'Inward transaction',
- 'outward_transaction' => 'Outward transaction',
- 'relates to_outward' => 'relates to',
- '(partially) refunds_outward' => '(partially) refunds',
- '(partially) pays for_outward' => '(partially) pays for',
- '(partially) reimburses_outward' => '(partially) reimburses',
- 'is (partially) refunded by' => 'is (partially) refunded by',
- 'is (partially) paid for by' => 'is (partially) paid for by',
- 'is (partially) reimbursed by' => 'is (partially) reimbursed by',
- 'relates to' => 'relates to',
- '(partially) refunds' => '(partially) refunds',
- '(partially) pays for' => '(partially) pays for',
- '(partially) reimburses' => '(partially) reimburses',
+ 'Paid_name' => 'Paid',
+ 'Refund_name' => 'Refund',
+ 'Reimbursement_name' => 'Reimbursement',
+ 'Related_name' => 'Related',
+ 'relates to_inward' => 'relates to',
+ 'is (partially) refunded by_inward' => 'is (partially) refunded by',
+ 'is (partially) paid for by_inward' => 'is (partially) paid for by',
+ 'is (partially) reimbursed by_inward' => 'is (partially) reimbursed by',
+ 'inward_transaction' => 'Inward transaction',
+ 'outward_transaction' => 'Outward transaction',
+ 'relates to_outward' => 'relates to',
+ '(partially) refunds_outward' => '(partially) refunds',
+ '(partially) pays for_outward' => '(partially) pays for',
+ '(partially) reimburses_outward' => '(partially) reimburses',
+ 'is (partially) refunded by' => 'is (partially) refunded by',
+ 'is (partially) paid for by' => 'is (partially) paid for by',
+ 'is (partially) reimbursed by' => 'is (partially) reimbursed by',
+ 'relates to' => 'relates to',
+ '(partially) refunds' => '(partially) refunds',
+ '(partially) pays for' => '(partially) pays for',
+ '(partially) reimburses' => '(partially) reimburses',
// split a transaction:
- 'splits' => 'Splits',
- 'add_another_split' => 'Add another split',
- 'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
- 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
- 'breadcrumb_convert_group' => 'Convert transaction',
- 'convert_invalid_source' => 'Source information is invalid for transaction #%d.',
- 'convert_invalid_destination' => 'Destination information is invalid for transaction #%d.',
- 'create_another' => 'After storing, return here to create another one.',
- 'after_update_create_another' => 'After updating, return here to continue editing.',
- 'store_as_new' => 'Store as a new transaction instead of updating.',
- 'reset_after' => 'Reset form after submission',
- 'errors_submission' => 'There was something wrong with your submission. Please check out the errors below.',
- 'errors_submission_v2' => 'There was something wrong with your submission. Please check out the errors below: {{errorMessage}}',
- 'transaction_expand_split' => 'Expand split',
- 'transaction_remove_split' => 'Remove split',
- 'transaction_collapse_split' => 'Collapse split',
+ 'splits' => 'Splits',
+ 'add_another_split' => 'Add another split',
+ 'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
+ 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
+ 'breadcrumb_convert_group' => 'Convert transaction',
+ 'convert_invalid_source' => 'Source information is invalid for transaction #%d.',
+ 'convert_invalid_destination' => 'Destination information is invalid for transaction #%d.',
+ 'create_another' => 'After storing, return here to create another one.',
+ 'after_update_create_another' => 'After updating, return here to continue editing.',
+ 'store_as_new' => 'Store as a new transaction instead of updating.',
+ 'reset_after' => 'Reset form after submission',
+ 'errors_submission' => 'There was something wrong with your submission. Please check out the errors below.',
+ 'errors_submission_v2' => 'There was something wrong with your submission. Please check out the errors below: {{errorMessage}}',
+ 'transaction_expand_split' => 'Expand split',
+ 'transaction_remove_split' => 'Remove split',
+ 'transaction_collapse_split' => 'Collapse split',
// object groups
- 'default_group_title_name' => '(ungrouped)',
- 'default_group_title_name_plain' => 'ungrouped',
+ 'default_group_title_name' => '(ungrouped)',
+ 'default_group_title_name_plain' => 'ungrouped',
// empty lists? no objects? instructions:
- 'no_accounts_title_asset' => 'Let\'s create an asset account!',
- 'no_accounts_intro_asset' => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
- 'no_accounts_imperative_asset' => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
- 'no_accounts_create_asset' => 'Create an asset account',
- 'no_accounts_title_expense' => 'Let\'s create an expense account!',
- 'no_accounts_intro_expense' => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
- 'no_accounts_imperative_expense' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_expense' => 'Create an expense account',
- 'no_accounts_title_revenue' => 'Let\'s create a revenue account!',
- 'no_accounts_intro_revenue' => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
- 'no_accounts_imperative_revenue' => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
- 'no_accounts_create_revenue' => 'Create a revenue account',
- 'no_accounts_title_liabilities' => 'Let\'s create a liability!',
- 'no_accounts_intro_liabilities' => 'You have no liabilities yet. Liabilities are the accounts that register your (student) loans and other debts.',
- 'no_accounts_imperative_liabilities' => 'You don\'t have to use this feature, but it can be useful if you want to keep track of these things.',
- 'no_accounts_create_liabilities' => 'Create a liability',
- 'no_budgets_title_default' => 'Let\'s create a budget',
- 'no_rules_title_default' => 'Let\'s create a rule',
- 'no_budgets_intro_default' => 'You have no budgets yet. Budgets are used to organize your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
- 'no_rules_intro_default' => 'You have no rules yet. Rules are powerful automations that can handle transactions for you.',
- 'no_rules_imperative_default' => 'Rules can be very useful when you\'re managing transactions. Let\'s create one now:',
- 'no_budgets_imperative_default' => 'Budgets are the basic tools of financial management. Let\'s create one now:',
- 'no_budgets_create_default' => 'Create a budget',
- 'no_rules_create_default' => 'Create a rule',
- 'no_categories_title_default' => 'Let\'s create a category!',
- 'no_categories_intro_default' => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
- 'no_categories_imperative_default' => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_categories_create_default' => 'Create a category',
- 'no_tags_title_default' => 'Let\'s create a tag!',
- 'no_tags_intro_default' => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
- 'no_tags_imperative_default' => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
- 'no_tags_create_default' => 'Create a tag',
- 'no_transactions_title_withdrawal' => 'Let\'s create an expense!',
- 'no_transactions_intro_withdrawal' => 'You have no expenses yet. You should create expenses to start managing your finances.',
- 'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
- 'no_transactions_create_withdrawal' => 'Create an expense',
- 'no_transactions_title_deposit' => 'Let\'s create some income!',
- 'no_transactions_intro_deposit' => 'You have no recorded income yet. You should create income entries to start managing your finances.',
- 'no_transactions_imperative_deposit' => 'Have you received some money? Then you should write it down:',
- 'no_transactions_create_deposit' => 'Create a deposit',
- 'no_transactions_title_transfers' => 'Let\'s create a transfer!',
- 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
- 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:',
- 'no_transactions_create_transfers' => 'Create a transfer',
- 'no_piggies_title_default' => 'Let\'s create a piggy bank!',
- 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
- 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
- 'no_piggies_create_default' => 'Create a new piggy bank',
- 'no_bills_title_default' => 'Let\'s create a bill!',
- 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
- 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
- 'no_bills_create_default' => 'Create a bill',
+ 'no_accounts_title_asset' => 'Let\'s create an asset account!',
+ 'no_accounts_intro_asset' => 'You have no asset accounts yet. Asset accounts are your main accounts: your checking account, savings account, shared account or even your credit card.',
+ 'no_accounts_imperative_asset' => 'To start using Firefly III you must create at least one asset account. Let\'s do so now:',
+ 'no_accounts_create_asset' => 'Create an asset account',
+ 'no_accounts_title_expense' => 'Let\'s create an expense account!',
+ 'no_accounts_intro_expense' => 'You have no expense accounts yet. Expense accounts are the places where you spend money, such as shops and supermarkets.',
+ 'no_accounts_imperative_expense' => 'Expense accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+ 'no_accounts_create_expense' => 'Create an expense account',
+ 'no_accounts_title_revenue' => 'Let\'s create a revenue account!',
+ 'no_accounts_intro_revenue' => 'You have no revenue accounts yet. Revenue accounts are the places where you receive money from, such as your employer.',
+ 'no_accounts_imperative_revenue' => 'Revenue accounts are created automatically when you create transactions, but you can create one manually too, if you want. Let\'s create one now:',
+ 'no_accounts_create_revenue' => 'Create a revenue account',
+ 'no_accounts_title_liabilities' => 'Let\'s create a liability!',
+ 'no_accounts_intro_liabilities' => 'You have no liabilities yet. Liabilities are the accounts that register your (student) loans and other debts.',
+ 'no_accounts_imperative_liabilities' => 'You don\'t have to use this feature, but it can be useful if you want to keep track of these things.',
+ 'no_accounts_create_liabilities' => 'Create a liability',
+ 'no_budgets_title_default' => 'Let\'s create a budget',
+ 'no_rules_title_default' => 'Let\'s create a rule',
+ 'no_budgets_intro_default' => 'You have no budgets yet. Budgets are used to organize your expenses into logical groups, which you can give a soft-cap to limit your expenses.',
+ 'no_rules_intro_default' => 'You have no rules yet. Rules are powerful automations that can handle transactions for you.',
+ 'no_rules_imperative_default' => 'Rules can be very useful when you\'re managing transactions. Let\'s create one now:',
+ 'no_budgets_imperative_default' => 'Budgets are the basic tools of financial management. Let\'s create one now:',
+ 'no_budgets_create_default' => 'Create a budget',
+ 'no_rules_create_default' => 'Create a rule',
+ 'no_categories_title_default' => 'Let\'s create a category!',
+ 'no_categories_intro_default' => 'You have no categories yet. Categories are used to fine tune your transactions and label them with their designated category.',
+ 'no_categories_imperative_default' => 'Categories are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+ 'no_categories_create_default' => 'Create a category',
+ 'no_tags_title_default' => 'Let\'s create a tag!',
+ 'no_tags_intro_default' => 'You have no tags yet. Tags are used to fine tune your transactions and label them with specific keywords.',
+ 'no_tags_imperative_default' => 'Tags are created automatically when you create transactions, but you can create one manually too. Let\'s create one now:',
+ 'no_tags_create_default' => 'Create a tag',
+ 'no_transactions_title_withdrawal' => 'Let\'s create an expense!',
+ 'no_transactions_intro_withdrawal' => 'You have no expenses yet. You should create expenses to start managing your finances.',
+ 'no_transactions_imperative_withdrawal' => 'Have you spent some money? Then you should write it down:',
+ 'no_transactions_create_withdrawal' => 'Create an expense',
+ 'no_transactions_title_deposit' => 'Let\'s create some income!',
+ 'no_transactions_intro_deposit' => 'You have no recorded income yet. You should create income entries to start managing your finances.',
+ 'no_transactions_imperative_deposit' => 'Have you received some money? Then you should write it down:',
+ 'no_transactions_create_deposit' => 'Create a deposit',
+ 'no_transactions_title_transfers' => 'Let\'s create a transfer!',
+ 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
+ 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:',
+ 'no_transactions_create_transfers' => 'Create a transfer',
+ 'no_piggies_title_default' => 'Let\'s create a piggy bank!',
+ 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
+ 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
+ 'no_piggies_create_default' => 'Create a new piggy bank',
+ 'no_bills_title_default' => 'Let\'s create a bill!',
+ 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent or insurance.',
+ 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
+ 'no_bills_create_default' => 'Create a bill',
// recurring transactions
- 'recurrence_max_count' => 'This recurring transactions will be created at most :max time(s), and has been created :count time(s) already.',
- 'create_right_now' => 'Create right now',
- 'no_new_transaction_in_recurrence' => 'No new transaction was created. Perhaps it was already fired for this date?',
- 'recurrences' => 'Recurring transactions',
- 'repeat_until_in_past' => 'This recurring transaction stopped repeating on :date.',
- 'recurring_calendar_view' => 'Calendar',
- 'no_recurring_title_default' => 'Let\'s create a recurring transaction!',
- 'no_recurring_intro_default' => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.',
- 'no_recurring_imperative_default' => 'This is a pretty advanced feature but it can be extremely useful. Make sure you read the documentation (?)-icon in the top right corner) before you continue.',
- 'no_recurring_create_default' => 'Create a recurring transaction',
- 'make_new_recurring' => 'Create a recurring transaction',
- 'recurring_daily' => 'Every day',
- 'recurring_weekly' => 'Every week on :weekday',
- 'recurring_weekly_skip' => 'Every :skip(st/nd/rd/th) week on :weekday',
- 'recurring_monthly' => 'Every month on the :dayOfMonth(st/nd/rd/th) day',
- 'recurring_monthly_skip' => 'Every :skip(st/nd/rd/th) month on the :dayOfMonth(st/nd/rd/th) day',
- 'recurring_ndom' => 'Every month on the :dayOfMonth(st/nd/rd/th) :weekday',
- 'recurring_yearly' => 'Every year on :date',
- 'overview_for_recurrence' => 'Overview for recurring transaction ":title"',
- 'warning_duplicates_repetitions' => 'In rare instances, dates appear twice in this list. This can happen when multiple repetitions collide. Firefly III will always generate one transaction per day.',
- 'created_transactions' => 'Related transactions',
- 'expected_withdrawals' => 'Expected withdrawals',
- 'expected_deposits' => 'Expected deposits',
- 'expected_transfers' => 'Expected transfers',
- 'created_withdrawals' => 'Created withdrawals',
- 'created_deposits' => 'Created deposits',
- 'created_transfers' => 'Created transfers',
- 'recurring_info' => 'Recurring transaction :count / :total',
- 'created_from_recurrence' => 'Created from recurring transaction ":title" (#:id)',
- 'recurring_never_cron' => 'It seems the cron job that is necessary to support recurring transactions has never run. This is of course normal when you have just installed Firefly III, but this should be something to set up as soon as possible. Please check out the help-pages using the (?)-icon in the top right corner of the page.',
- 'recurring_cron_long_ago' => 'It looks like it has been more than 36 hours since the cron job to support recurring transactions has fired for the last time. Are you sure it has been set up correctly? Please check out the help-pages using the (?)-icon in the top right corner of the page.',
+ 'recurrence_max_count' => 'This recurring transactions will be created at most :max time(s), and has been created :count time(s) already.',
+ 'create_right_now' => 'Create right now',
+ 'no_new_transaction_in_recurrence' => 'No new transaction was created. Perhaps it was already fired for this date?',
+ 'recurrences' => 'Recurring transactions',
+ 'repeat_until_in_past' => 'This recurring transaction stopped repeating on :date.',
+ 'recurring_calendar_view' => 'Calendar',
+ 'no_recurring_title_default' => 'Let\'s create a recurring transaction!',
+ 'no_recurring_intro_default' => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.',
+ 'no_recurring_imperative_default' => 'This is a pretty advanced feature but it can be extremely useful. Make sure you read the documentation (?)-icon in the top right corner) before you continue.',
+ 'no_recurring_create_default' => 'Create a recurring transaction',
+ 'make_new_recurring' => 'Create a recurring transaction',
+ 'recurring_daily' => 'Every day',
+ 'recurring_weekly' => 'Every week on :weekday',
+ 'recurring_weekly_skip' => 'Every :skip(st/nd/rd/th) week on :weekday',
+ 'recurring_monthly' => 'Every month on the :dayOfMonth(st/nd/rd/th) day',
+ 'recurring_monthly_skip' => 'Every :skip(st/nd/rd/th) month on the :dayOfMonth(st/nd/rd/th) day',
+ 'recurring_ndom' => 'Every month on the :dayOfMonth(st/nd/rd/th) :weekday',
+ 'recurring_yearly' => 'Every year on :date',
+ 'overview_for_recurrence' => 'Overview for recurring transaction ":title"',
+ 'warning_duplicates_repetitions' => 'In rare instances, dates appear twice in this list. This can happen when multiple repetitions collide. Firefly III will always generate one transaction per day.',
+ 'created_transactions' => 'Related transactions',
+ 'expected_withdrawals' => 'Expected withdrawals',
+ 'expected_deposits' => 'Expected deposits',
+ 'expected_transfers' => 'Expected transfers',
+ 'created_withdrawals' => 'Created withdrawals',
+ 'created_deposits' => 'Created deposits',
+ 'created_transfers' => 'Created transfers',
+ 'recurring_info' => 'Recurring transaction :count / :total',
+ 'created_from_recurrence' => 'Created from recurring transaction ":title" (#:id)',
+ 'recurring_never_cron' => 'It seems the cron job that is necessary to support recurring transactions has never run. This is of course normal when you have just installed Firefly III, but this should be something to set up as soon as possible. Please check out the help-pages using the (?)-icon in the top right corner of the page.',
+ 'recurring_cron_long_ago' => 'It looks like it has been more than 36 hours since the cron job to support recurring transactions has fired for the last time. Are you sure it has been set up correctly? Please check out the help-pages using the (?)-icon in the top right corner of the page.',
- 'create_new_recurrence' => 'Create new recurring transaction',
- 'help_first_date' => 'Indicate the first expected recurrence. This must be in the future.',
- 'help_first_date_no_past' => 'Indicate the first expected recurrence. Firefly III will not create transactions in the past.',
- 'no_currency' => '(no currency)',
- 'mandatory_for_recurring' => 'Mandatory recurrence information',
- 'mandatory_for_transaction' => 'Mandatory transaction information',
- 'optional_for_recurring' => 'Optional recurrence information',
- 'optional_for_transaction' => 'Optional transaction information',
- 'change_date_other_options' => 'Change the "first date" to see more options.',
- 'mandatory_fields_for_tranaction' => 'The values here will end up in the transaction(s) being created',
- 'click_for_calendar' => 'Click here for a calendar that shows you when the transaction would repeat.',
- 'repeat_forever' => 'Repeat forever',
- 'repeat_until_date' => 'Repeat until date',
- 'repeat_times' => 'Repeat a number of times',
- 'recurring_skips_one' => 'Every other',
- 'recurring_skips_more' => 'Skips :count occurrences',
- 'store_new_recurrence' => 'Store recurring transaction',
- 'stored_new_recurrence' => 'Recurring transaction ":title" stored successfully.',
- 'edit_recurrence' => 'Edit recurring transaction ":title"',
- 'recurring_repeats_until' => 'Repeats until :date',
- 'recurring_repeats_forever' => 'Repeats forever',
- 'recurring_repeats_x_times' => 'Repeats :count time|Repeats :count times',
- 'update_recurrence' => 'Update recurring transaction',
- 'updated_recurrence' => 'Updated recurring transaction ":title"',
- 'recurrence_is_inactive' => 'This recurring transaction is not active and will not generate new transactions.',
- 'delete_recurring' => 'Delete recurring transaction ":title"',
- 'new_recurring_transaction' => 'New recurring transaction',
- 'help_weekend' => 'What should Firefly III do when the recurring transaction falls on a Saturday or Sunday?',
- 'do_nothing' => 'Just create the transaction',
- 'skip_transaction' => 'Skip the occurrence',
- 'jump_to_friday' => 'Create the transaction on the previous Friday instead',
- 'jump_to_monday' => 'Create the transaction on the next Monday instead',
- 'will_jump_friday' => 'Will be created on Friday instead of the weekends.',
- 'will_jump_monday' => 'Will be created on Monday instead of the weekends.',
- 'except_weekends' => 'Except weekends',
- 'recurrence_deleted' => 'Recurring transaction ":title" deleted',
+ 'create_new_recurrence' => 'Create new recurring transaction',
+ 'help_first_date' => 'Indicate the first expected recurrence. This must be in the future.',
+ 'help_first_date_no_past' => 'Indicate the first expected recurrence. Firefly III will not create transactions in the past.',
+ 'no_currency' => '(no currency)',
+ 'mandatory_for_recurring' => 'Mandatory recurrence information',
+ 'mandatory_for_transaction' => 'Mandatory transaction information',
+ 'optional_for_recurring' => 'Optional recurrence information',
+ 'optional_for_transaction' => 'Optional transaction information',
+ 'change_date_other_options' => 'Change the "first date" to see more options.',
+ 'mandatory_fields_for_tranaction' => 'The values here will end up in the transaction(s) being created',
+ 'click_for_calendar' => 'Click here for a calendar that shows you when the transaction would repeat.',
+ 'repeat_forever' => 'Repeat forever',
+ 'repeat_until_date' => 'Repeat until date',
+ 'repeat_times' => 'Repeat a number of times',
+ 'recurring_skips_one' => 'Every other',
+ 'recurring_skips_more' => 'Skips :count occurrences',
+ 'store_new_recurrence' => 'Store recurring transaction',
+ 'stored_new_recurrence' => 'Recurring transaction ":title" stored successfully.',
+ 'edit_recurrence' => 'Edit recurring transaction ":title"',
+ 'recurring_repeats_until' => 'Repeats until :date',
+ 'recurring_repeats_forever' => 'Repeats forever',
+ 'recurring_repeats_x_times' => 'Repeats :count time|Repeats :count times',
+ 'update_recurrence' => 'Update recurring transaction',
+ 'updated_recurrence' => 'Updated recurring transaction ":title"',
+ 'recurrence_is_inactive' => 'This recurring transaction is not active and will not generate new transactions.',
+ 'delete_recurring' => 'Delete recurring transaction ":title"',
+ 'new_recurring_transaction' => 'New recurring transaction',
+ 'help_weekend' => 'What should Firefly III do when the recurring transaction falls on a Saturday or Sunday?',
+ 'do_nothing' => 'Just create the transaction',
+ 'skip_transaction' => 'Skip the occurrence',
+ 'jump_to_friday' => 'Create the transaction on the previous Friday instead',
+ 'jump_to_monday' => 'Create the transaction on the next Monday instead',
+ 'will_jump_friday' => 'Will be created on Friday instead of the weekends.',
+ 'will_jump_monday' => 'Will be created on Monday instead of the weekends.',
+ 'except_weekends' => 'Except weekends',
+ 'recurrence_deleted' => 'Recurring transaction ":title" deleted',
// Ignore this comment
// new lines for summary controller.
- 'box_balance_in_currency' => 'Balance (:currency)',
- 'box_spent_in_currency' => 'Spent (:currency)',
- 'box_earned_in_currency' => 'Earned (:currency)',
- 'box_budgeted_in_currency' => 'Budgeted (:currency)',
- 'box_bill_paid_in_currency' => 'Bills paid (:currency)',
- 'box_bill_unpaid_in_currency' => 'Bills unpaid (:currency)',
- 'box_left_to_spend_in_currency' => 'Left to spend (:currency)',
- 'box_net_worth_in_currency' => 'Net worth (:currency)',
- 'box_spend_per_day' => 'Left to spend per day: :amount',
+ 'box_balance_in_currency' => 'Balance (:currency)',
+ 'box_spent_in_currency' => 'Spent (:currency)',
+ 'box_earned_in_currency' => 'Earned (:currency)',
+ 'box_budgeted_in_currency' => 'Budgeted (:currency)',
+ 'box_bill_paid_in_currency' => 'Bills paid (:currency)',
+ 'box_bill_unpaid_in_currency' => 'Bills unpaid (:currency)',
+ 'box_left_to_spend_in_currency' => 'Left to spend (:currency)',
+ 'box_net_worth_in_currency' => 'Net worth (:currency)',
+ 'box_spend_per_day' => 'Left to spend per day: :amount',
// debug page
- 'debug_page' => 'Debug page',
- 'debug_submit_instructions' => 'If you are running into problems, you can use the information in this box as debug information. Please copy-and-paste into a new or existing GitHub issue. It will generate a beautiful table that can be used to quickly diagnose your problem.',
- 'debug_pretty_table' => 'If you copy/paste the box below into a GitHub issue it will generate a table. Please do not surround this text with backticks or quotes.',
- 'debug_additional_data' => 'You may also share the content of the box below. You can also copy-and-paste this into a new or existing GitHub issue. However, the content of this box may contain private information such as account names, transaction details or email addresses.',
+ 'debug_page' => 'Debug page',
+ 'debug_submit_instructions' => 'If you are running into problems, you can use the information in this box as debug information. Please copy-and-paste into a new or existing GitHub issue. It will generate a beautiful table that can be used to quickly diagnose your problem.',
+ 'debug_pretty_table' => 'If you copy/paste the box below into a GitHub issue it will generate a table. Please do not surround this text with backticks or quotes.',
+ 'debug_additional_data' => 'You may also share the content of the box below. You can also copy-and-paste this into a new or existing GitHub issue. However, the content of this box may contain private information such as account names, transaction details or email addresses.',
// object groups
- 'object_groups_menu_bar' => 'Groups',
- 'object_groups_page_title' => 'Groups',
- 'object_groups_breadcrumb' => 'Groups',
- 'object_groups_index' => 'Overview',
- 'object_groups' => 'Groups',
- 'object_groups_empty_explain' => 'Some things in Firefly III can be divided into groups. Piggy banks for example, feature a "Group" field in the edit and create screens. When you set this field, you can edit the names and the order of the groups on this page. For more information, check out the help-pages in the top right corner, under the (?)-icon.',
- 'object_group_title' => 'Title',
- 'edit_object_group' => 'Edit group ":title"',
- 'delete_object_group' => 'Delete group ":title"',
- 'update_object_group' => 'Update group',
- 'updated_object_group' => 'Successfully updated group ":title"',
- 'deleted_object_group' => 'Successfully deleted group ":title"',
- 'object_group' => 'Group',
+ 'object_groups_menu_bar' => 'Groups',
+ 'object_groups_page_title' => 'Groups',
+ 'object_groups_breadcrumb' => 'Groups',
+ 'object_groups_index' => 'Overview',
+ 'object_groups' => 'Groups',
+ 'object_groups_empty_explain' => 'Some things in Firefly III can be divided into groups. Piggy banks for example, feature a "Group" field in the edit and create screens. When you set this field, you can edit the names and the order of the groups on this page. For more information, check out the help-pages in the top right corner, under the (?)-icon.',
+ 'object_group_title' => 'Title',
+ 'edit_object_group' => 'Edit group ":title"',
+ 'delete_object_group' => 'Delete group ":title"',
+ 'update_object_group' => 'Update group',
+ 'updated_object_group' => 'Successfully updated group ":title"',
+ 'deleted_object_group' => 'Successfully deleted group ":title"',
+ 'object_group' => 'Group',
// other stuff
- 'placeholder' => '[Placeholder]',
+ 'placeholder' => '[Placeholder]',
// audit log entries
- 'audit_log_entries' => 'Audit log entries',
- 'ale_action_log_add' => 'Added :amount to piggy bank ":name"',
- 'ale_action_log_remove' => 'Removed :amount from piggy bank ":name"',
- 'ale_action_clear_budget' => 'Removed from budget',
- 'ale_action_update_group_title' => 'Updated transaction group title',
- 'ale_action_update_date' => 'Updated transaction date',
- 'ale_action_update_order' => 'Updated transaction order',
- 'ale_action_clear_category' => 'Removed from category',
- 'ale_action_clear_notes' => 'Removed notes',
- 'ale_action_clear_tag' => 'Cleared tag',
- 'ale_action_clear_all_tags' => 'Cleared all tags',
- 'ale_action_set_bill' => 'Linked to bill',
- 'ale_action_switch_accounts' => 'Switched source and destination account',
- 'ale_action_set_budget' => 'Set budget',
- 'ale_action_set_category' => 'Set category',
- 'ale_action_set_source' => 'Set source account',
- 'ale_action_set_destination' => 'Set destination account',
- 'ale_action_update_transaction_type' => 'Changed transaction type',
- 'ale_action_update_notes' => 'Changed notes',
- 'ale_action_update_description' => 'Changed description',
- 'ale_action_add_to_piggy' => 'Piggy bank',
- 'ale_action_remove_from_piggy' => 'Piggy bank',
- 'ale_action_add_tag' => 'Added tag',
- 'ale_action_update_amount' => 'Updated amount',
+ 'audit_log_entries' => 'Audit log entries',
+ 'ale_action_log_add' => 'Added :amount to piggy bank ":name"',
+ 'ale_action_log_remove' => 'Removed :amount from piggy bank ":name"',
+ 'ale_action_clear_budget' => 'Removed from budget',
+ 'ale_action_update_group_title' => 'Updated transaction group title',
+ 'ale_action_update_date' => 'Updated transaction date',
+ 'ale_action_update_order' => 'Updated transaction order',
+ 'ale_action_clear_category' => 'Removed from category',
+ 'ale_action_clear_notes' => 'Removed notes',
+ 'ale_action_clear_tag' => 'Cleared tag',
+ 'ale_action_clear_all_tags' => 'Cleared all tags',
+ 'ale_action_set_bill' => 'Linked to bill',
+ 'ale_action_switch_accounts' => 'Switched source and destination account',
+ 'ale_action_set_budget' => 'Set budget',
+ 'ale_action_set_category' => 'Set category',
+ 'ale_action_set_source' => 'Set source account',
+ 'ale_action_set_destination' => 'Set destination account',
+ 'ale_action_update_transaction_type' => 'Changed transaction type',
+ 'ale_action_update_notes' => 'Changed notes',
+ 'ale_action_update_description' => 'Changed description',
+ 'ale_action_add_to_piggy' => 'Piggy bank',
+ 'ale_action_remove_from_piggy' => 'Piggy bank',
+ 'ale_action_add_tag' => 'Added tag',
+ 'ale_action_update_amount' => 'Updated amount',
// dashboard
- 'enable_auto_convert' => 'Enable currency conversion',
- 'disable_auto_convert' => 'Disable currency conversion',
+ 'enable_auto_convert' => 'Enable currency conversion',
+ 'disable_auto_convert' => 'Disable currency conversion',
];
// Ignore this comment
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index 41778b2239..7a50aaae2f 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -26,250 +26,250 @@ declare(strict_types=1);
return [
// new user:
- 'bank_name' => 'Bank name',
- 'bank_balance' => 'Balance',
- 'current_balance' => 'Current balance',
- 'savings_balance' => 'Savings balance',
- 'credit_card_limit' => 'Credit card limit',
- 'automatch' => 'Match automatically',
- 'skip' => 'Skip',
- 'enabled' => 'Enabled',
- 'name' => 'Name',
- 'active' => 'Active',
- 'amount_min' => 'Minimum amount',
- 'amount_max' => 'Maximum amount',
- 'match' => 'Matches on',
- 'strict' => 'Strict mode',
- 'repeat_freq' => 'Repeats',
- 'object_group' => 'Group',
- 'location' => 'Location',
- 'update_channel' => 'Update channel',
- 'currency_id' => 'Currency',
- 'transaction_currency_id' => 'Currency',
- 'auto_budget_currency_id' => 'Currency',
- 'external_ip' => 'Your server\'s external IP',
- 'attachments' => 'Attachments',
- 'BIC' => 'BIC',
- 'verify_password' => 'Verify password security',
- 'source_account' => 'Source account',
- 'destination_account' => 'Destination account',
- 'asset_destination_account' => 'Destination account',
- 'include_net_worth' => 'Include in net worth',
- 'asset_source_account' => 'Source account',
- 'journal_description' => 'Description',
- 'note' => 'Notes',
- 'currency' => 'Currency',
- 'account_id' => 'Asset account',
- 'budget_id' => 'Budget',
- 'bill_id' => 'Bill',
- 'opening_balance' => 'Opening balance',
- 'tagMode' => 'Tag mode',
- 'virtual_balance' => 'Virtual balance',
+ 'bank_name' => 'Bank name',
+ 'bank_balance' => 'Balance',
+ 'current_balance' => 'Current balance',
+ 'savings_balance' => 'Savings balance',
+ 'credit_card_limit' => 'Credit card limit',
+ 'automatch' => 'Match automatically',
+ 'skip' => 'Skip',
+ 'enabled' => 'Enabled',
+ 'name' => 'Name',
+ 'active' => 'Active',
+ 'amount_min' => 'Minimum amount',
+ 'amount_max' => 'Maximum amount',
+ 'match' => 'Matches on',
+ 'strict' => 'Strict mode',
+ 'repeat_freq' => 'Repeats',
+ 'object_group' => 'Group',
+ 'location' => 'Location',
+ 'update_channel' => 'Update channel',
+ 'currency_id' => 'Currency',
+ 'transaction_currency_id' => 'Currency',
+ 'auto_budget_currency_id' => 'Currency',
+ 'external_ip' => 'Your server\'s external IP',
+ 'attachments' => 'Attachments',
+ 'BIC' => 'BIC',
+ 'verify_password' => 'Verify password security',
+ 'source_account' => 'Source account',
+ 'destination_account' => 'Destination account',
+ 'asset_destination_account' => 'Destination account',
+ 'include_net_worth' => 'Include in net worth',
+ 'asset_source_account' => 'Source account',
+ 'journal_description' => 'Description',
+ 'note' => 'Notes',
+ 'currency' => 'Currency',
+ 'account_id' => 'Asset account',
+ 'budget_id' => 'Budget',
+ 'bill_id' => 'Bill',
+ 'opening_balance' => 'Opening balance',
+ 'tagMode' => 'Tag mode',
+ 'virtual_balance' => 'Virtual balance',
// Ignore this comment
- 'targetamount' => 'Target amount',
+ 'targetamount' => 'Target amount',
'target_amount' => 'Target amount',
- 'account_role' => 'Account role',
- 'opening_balance_date' => 'Opening balance date',
- 'cc_type' => 'Credit card payment plan',
- 'cc_monthly_payment_date' => 'Credit card monthly payment date',
- 'piggy_bank_id' => 'Piggy bank',
- 'returnHere' => 'Return here',
- 'returnHereExplanation' => 'After storing, return here to create another one.',
- 'returnHereUpdateExplanation' => 'After updating, return here.',
- 'description' => 'Description',
- 'expense_account' => 'Expense account',
- 'revenue_account' => 'Revenue account',
- 'decimal_places' => 'Decimal places',
- 'destination_amount' => 'Amount (destination)',
- 'new_email_address' => 'New email address',
- 'verification' => 'Verification',
- 'api_key' => 'API key',
- 'remember_me' => 'Remember me',
- 'liability_type_id' => 'Liability type',
- 'liability_type' => 'Liability type',
- 'interest' => 'Interest',
- 'interest_period' => 'Interest period',
- 'extension_date' => 'Extension date',
- 'type' => 'Type',
- 'convert_Withdrawal' => 'Convert withdrawal',
- 'convert_Deposit' => 'Convert deposit',
- 'convert_Transfer' => 'Convert transfer',
- 'amount' => 'Amount',
- 'foreign_amount' => 'Foreign amount',
- 'date' => 'Date',
- 'interest_date' => 'Interest date',
- 'book_date' => 'Book date',
- 'process_date' => 'Processing date',
- 'category' => 'Category',
- 'tags' => 'Tags',
- 'deletePermanently' => 'Delete permanently',
- 'cancel' => 'Cancel',
- 'targetdate' => 'Target date',
+ 'account_role' => 'Account role',
+ 'opening_balance_date' => 'Opening balance date',
+ 'cc_type' => 'Credit card payment plan',
+ 'cc_monthly_payment_date' => 'Credit card monthly payment date',
+ 'piggy_bank_id' => 'Piggy bank',
+ 'returnHere' => 'Return here',
+ 'returnHereExplanation' => 'After storing, return here to create another one.',
+ 'returnHereUpdateExplanation' => 'After updating, return here.',
+ 'description' => 'Description',
+ 'expense_account' => 'Expense account',
+ 'revenue_account' => 'Revenue account',
+ 'decimal_places' => 'Decimal places',
+ 'destination_amount' => 'Amount (destination)',
+ 'new_email_address' => 'New email address',
+ 'verification' => 'Verification',
+ 'api_key' => 'API key',
+ 'remember_me' => 'Remember me',
+ 'liability_type_id' => 'Liability type',
+ 'liability_type' => 'Liability type',
+ 'interest' => 'Interest',
+ 'interest_period' => 'Interest period',
+ 'extension_date' => 'Extension date',
+ 'type' => 'Type',
+ 'convert_Withdrawal' => 'Convert withdrawal',
+ 'convert_Deposit' => 'Convert deposit',
+ 'convert_Transfer' => 'Convert transfer',
+ 'amount' => 'Amount',
+ 'foreign_amount' => 'Foreign amount',
+ 'date' => 'Date',
+ 'interest_date' => 'Interest date',
+ 'book_date' => 'Book date',
+ 'process_date' => 'Processing date',
+ 'category' => 'Category',
+ 'tags' => 'Tags',
+ 'deletePermanently' => 'Delete permanently',
+ 'cancel' => 'Cancel',
+ 'targetdate' => 'Target date',
'target_date' => 'Target date',
- 'startdate' => 'Start date',
+ 'startdate' => 'Start date',
'start_date' => 'Start date',
- 'tag' => 'Tag',
- 'under' => 'Under',
- 'symbol' => 'Symbol',
- 'code' => 'Code',
- 'iban' => 'IBAN',
- 'account_number' => 'Account number',
- 'creditCardNumber' => 'Credit card number',
- 'has_headers' => 'Headers',
- 'date_format' => 'Date format',
- 'attachments[]' => 'Attachments',
- 'title' => 'Title',
- 'notes' => 'Notes',
- 'filename' => 'File name',
- 'mime' => 'Mime type',
- 'size' => 'Size',
- 'trigger' => 'Trigger',
- 'stop_processing' => 'Stop processing',
- 'end_date' => 'End date',
- 'enddate' => 'End date',
- 'move_rules_before_delete' => 'Rule group',
- 'start' => 'Start of range',
- 'end' => 'End of range',
- 'delete_account' => 'Delete account ":name"',
- 'delete_webhook' => 'Delete webhook ":title"',
- 'delete_bill' => 'Delete bill ":name"',
- 'delete_budget' => 'Delete budget ":name"',
- 'delete_category' => 'Delete category ":name"',
- 'delete_currency' => 'Delete currency ":name"',
- 'delete_journal' => 'Delete transaction with description ":description"',
- 'delete_attachment' => 'Delete attachment ":name"',
- 'delete_rule' => 'Delete rule ":title"',
- 'delete_rule_group' => 'Delete rule group ":title"',
- 'delete_link_type' => 'Delete link type ":name"',
- 'delete_user' => 'Delete user ":email"',
- 'delete_recurring' => 'Delete recurring transaction ":title"',
- 'user_areYouSure' => 'If you delete user ":email", everything will be gone. There is no undo, undelete or anything. If you delete yourself, you will lose access to this instance of Firefly III.',
- 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?',
- 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?',
- 'account_areYouSure_js' => 'Are you sure you want to delete the account named "{name}"?',
- 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?',
- 'rule_areYouSure' => 'Are you sure you want to delete the rule titled ":title"?',
- 'object_group_areYouSure' => 'Are you sure you want to delete the group titled ":title"?',
- 'ruleGroup_areYouSure' => 'Are you sure you want to delete the rule group titled ":title"?',
- 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?',
- 'webhook_areYouSure' => 'Are you sure you want to delete the webhook named ":title"?',
- 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?',
- 'recurring_areYouSure' => 'Are you sure you want to delete the recurring transaction titled ":title"?',
- 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?',
- 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?',
- 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?',
- 'mass_journal_are_you_sure' => 'Are you sure you want to delete these transactions?',
+ 'tag' => 'Tag',
+ 'under' => 'Under',
+ 'symbol' => 'Symbol',
+ 'code' => 'Code',
+ 'iban' => 'IBAN',
+ 'account_number' => 'Account number',
+ 'creditCardNumber' => 'Credit card number',
+ 'has_headers' => 'Headers',
+ 'date_format' => 'Date format',
+ 'attachments[]' => 'Attachments',
+ 'title' => 'Title',
+ 'notes' => 'Notes',
+ 'filename' => 'File name',
+ 'mime' => 'Mime type',
+ 'size' => 'Size',
+ 'trigger' => 'Trigger',
+ 'stop_processing' => 'Stop processing',
+ 'end_date' => 'End date',
+ 'enddate' => 'End date',
+ 'move_rules_before_delete' => 'Rule group',
+ 'start' => 'Start of range',
+ 'end' => 'End of range',
+ 'delete_account' => 'Delete account ":name"',
+ 'delete_webhook' => 'Delete webhook ":title"',
+ 'delete_bill' => 'Delete bill ":name"',
+ 'delete_budget' => 'Delete budget ":name"',
+ 'delete_category' => 'Delete category ":name"',
+ 'delete_currency' => 'Delete currency ":name"',
+ 'delete_journal' => 'Delete transaction with description ":description"',
+ 'delete_attachment' => 'Delete attachment ":name"',
+ 'delete_rule' => 'Delete rule ":title"',
+ 'delete_rule_group' => 'Delete rule group ":title"',
+ 'delete_link_type' => 'Delete link type ":name"',
+ 'delete_user' => 'Delete user ":email"',
+ 'delete_recurring' => 'Delete recurring transaction ":title"',
+ 'user_areYouSure' => 'If you delete user ":email", everything will be gone. There is no undo, undelete or anything. If you delete yourself, you will lose access to this instance of Firefly III.',
+ 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?',
+ 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?',
+ 'account_areYouSure_js' => 'Are you sure you want to delete the account named "{name}"?',
+ 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?',
+ 'rule_areYouSure' => 'Are you sure you want to delete the rule titled ":title"?',
+ 'object_group_areYouSure' => 'Are you sure you want to delete the group titled ":title"?',
+ 'ruleGroup_areYouSure' => 'Are you sure you want to delete the rule group titled ":title"?',
+ 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?',
+ 'webhook_areYouSure' => 'Are you sure you want to delete the webhook named ":title"?',
+ 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?',
+ 'recurring_areYouSure' => 'Are you sure you want to delete the recurring transaction titled ":title"?',
+ 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?',
+ 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?',
+ 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?',
+ 'mass_journal_are_you_sure' => 'Are you sure you want to delete these transactions?',
// Ignore this comment
- 'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?',
- 'journal_link_areYouSure' => 'Are you sure you want to delete the link between :source and :destination?',
- 'linkType_areYouSure' => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
- 'permDeleteWarning' => 'Deleting stuff from Firefly III is permanent and cannot be undone.',
- 'mass_make_selection' => 'You can still prevent items from being deleted by removing the checkbox.',
- 'delete_all_permanently' => 'Delete selected permanently',
- 'update_all_journals' => 'Update these transactions',
- 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
- 'also_delete_transactions_js' => 'No transactions|The only transaction connected to this account will be deleted as well.|All {count} transactions connected to this account will be deleted as well.',
- 'also_delete_connections' => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
- 'also_delete_rules' => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
- 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
- 'also_delete_piggyBanks_js' => 'No piggy banks|The only piggy bank connected to this account will be deleted as well.|All {count} piggy banks connected to this account will be deleted as well.',
- 'not_delete_piggy_banks' => 'The piggy bank connected to this group will not be deleted.|The :count piggy banks connected to this group will not be deleted.',
- 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will be spared deletion.',
- 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will be spared deletion.',
- 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will be spared deletion.',
- 'recurring_keep_transactions' => 'The only transaction created by this recurring transaction will not be deleted.|All :count transactions created by this recurring transaction will be spared deletion.',
- 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will be spared deletion.',
- 'check_for_updates' => 'Check for updates',
- 'liability_direction' => 'Liability in/out',
- 'delete_object_group' => 'Delete group ":title"',
- 'email' => 'Email address',
- 'password' => 'Password',
- 'password_confirmation' => 'Password (again)',
- 'blocked' => 'Is blocked?',
- 'blocked_code' => 'Reason for block',
- 'login_name' => 'Login',
- 'is_owner' => 'Is admin?',
- 'url' => 'URL',
- 'bill_end_date' => 'End date',
+ 'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?',
+ 'journal_link_areYouSure' => 'Are you sure you want to delete the link between :source and :destination?',
+ 'linkType_areYouSure' => 'Are you sure you want to delete the link type ":name" (":inward" / ":outward")?',
+ 'permDeleteWarning' => 'Deleting stuff from Firefly III is permanent and cannot be undone.',
+ 'mass_make_selection' => 'You can still prevent items from being deleted by removing the checkbox.',
+ 'delete_all_permanently' => 'Delete selected permanently',
+ 'update_all_journals' => 'Update these transactions',
+ 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.|All :count transactions connected to this account will be deleted as well.',
+ 'also_delete_transactions_js' => 'No transactions|The only transaction connected to this account will be deleted as well.|All {count} transactions connected to this account will be deleted as well.',
+ 'also_delete_connections' => 'The only transaction linked with this link type will lose this connection.|All :count transactions linked with this link type will lose their connection.',
+ 'also_delete_rules' => 'The only rule connected to this rule group will be deleted as well.|All :count rules connected to this rule group will be deleted as well.',
+ 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.|All :count piggy bank connected to this account will be deleted as well.',
+ 'also_delete_piggyBanks_js' => 'No piggy banks|The only piggy bank connected to this account will be deleted as well.|All {count} piggy banks connected to this account will be deleted as well.',
+ 'not_delete_piggy_banks' => 'The piggy bank connected to this group will not be deleted.|The :count piggy banks connected to this group will not be deleted.',
+ 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.|All :count transactions connected to this bill will be spared deletion.',
+ 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.|All :count transactions connected to this budget will be spared deletion.',
+ 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will be spared deletion.',
+ 'recurring_keep_transactions' => 'The only transaction created by this recurring transaction will not be deleted.|All :count transactions created by this recurring transaction will be spared deletion.',
+ 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will be spared deletion.',
+ 'check_for_updates' => 'Check for updates',
+ 'liability_direction' => 'Liability in/out',
+ 'delete_object_group' => 'Delete group ":title"',
+ 'email' => 'Email address',
+ 'password' => 'Password',
+ 'password_confirmation' => 'Password (again)',
+ 'blocked' => 'Is blocked?',
+ 'blocked_code' => 'Reason for block',
+ 'login_name' => 'Login',
+ 'is_owner' => 'Is admin?',
+ 'url' => 'URL',
+ 'bill_end_date' => 'End date',
// import
- 'apply_rules' => 'Apply rules',
- 'artist' => 'Artist',
- 'album' => 'Album',
- 'song' => 'Song',
+ 'apply_rules' => 'Apply rules',
+ 'artist' => 'Artist',
+ 'album' => 'Album',
+ 'song' => 'Song',
// admin
- 'domain' => 'Domain',
- 'single_user_mode' => 'Disable user registration',
- 'is_demo_site' => 'Is demo site',
+ 'domain' => 'Domain',
+ 'single_user_mode' => 'Disable user registration',
+ 'is_demo_site' => 'Is demo site',
// import
- 'configuration_file' => 'Configuration file',
- 'csv_comma' => 'A comma (,)',
- 'csv_semicolon' => 'A semicolon (;)',
- 'csv_tab' => 'A tab (invisible)',
- 'csv_delimiter' => 'CSV field delimiter',
- 'client_id' => 'Client ID',
- 'app_id' => 'App ID',
- 'secret' => 'Secret',
- 'public_key' => 'Public key',
- 'country_code' => 'Country code',
- 'provider_code' => 'Bank or data-provider',
- 'fints_url' => 'FinTS API URL',
- 'fints_port' => 'Port',
- 'fints_bank_code' => 'Bank code',
- 'fints_username' => 'Username',
- 'fints_password' => 'PIN / Password',
- 'fints_account' => 'FinTS account',
- 'local_account' => 'Firefly III account',
+ 'configuration_file' => 'Configuration file',
+ 'csv_comma' => 'A comma (,)',
+ 'csv_semicolon' => 'A semicolon (;)',
+ 'csv_tab' => 'A tab (invisible)',
+ 'csv_delimiter' => 'CSV field delimiter',
+ 'client_id' => 'Client ID',
+ 'app_id' => 'App ID',
+ 'secret' => 'Secret',
+ 'public_key' => 'Public key',
+ 'country_code' => 'Country code',
+ 'provider_code' => 'Bank or data-provider',
+ 'fints_url' => 'FinTS API URL',
+ 'fints_port' => 'Port',
+ 'fints_bank_code' => 'Bank code',
+ 'fints_username' => 'Username',
+ 'fints_password' => 'PIN / Password',
+ 'fints_account' => 'FinTS account',
+ 'local_account' => 'Firefly III account',
// Ignore this comment
- 'from_date' => 'Date from',
- 'to_date' => 'Date to',
- 'due_date' => 'Due date',
- 'payment_date' => 'Payment date',
- 'invoice_date' => 'Invoice date',
- 'internal_reference' => 'Internal reference',
- 'inward' => 'Inward description',
- 'outward' => 'Outward description',
- 'rule_group_id' => 'Rule group',
- 'transaction_description' => 'Transaction description',
- 'first_date' => 'First date',
- 'transaction_type' => 'Transaction type',
- 'repeat_until' => 'Repeat until',
- 'recurring_description' => 'Recurring transaction description',
- 'repetition_type' => 'Type of repetition',
- 'foreign_currency_id' => 'Foreign currency',
- 'repetition_end' => 'Repetition ends',
- 'repetitions' => 'Repetitions',
- 'calendar' => 'Calendar',
- 'weekend' => 'Weekend',
- 'client_secret' => 'Client secret',
- 'withdrawal_destination_id' => 'Destination account',
- 'deposit_source_id' => 'Source account',
- 'expected_on' => 'Expected on',
- 'paid' => 'Paid',
- 'auto_budget_type' => 'Auto-budget',
- 'auto_budget_amount' => 'Auto-budget amount',
- 'auto_budget_period' => 'Auto-budget period',
- 'collected' => 'Collected',
- 'submitted' => 'Submitted',
- 'key' => 'Key',
- 'value' => 'Content of record',
- 'webhook_delivery' => 'Delivery',
- 'webhook_response' => 'Response',
- 'webhook_trigger' => 'Trigger',
- 'pushover_app_token' => 'Pushover app token',
- 'pushover_user_token' => 'Pushover user token',
- 'ntfy_server' => 'Ntfy server',
- 'ntfy_topic' => 'Ntfy topic',
- 'ntfy_auth' => 'Ntfy authentication enabled',
- 'ntfy_user' => 'Ntfy username',
- 'ntfy_pass' => 'Ntfy password',
+ 'from_date' => 'Date from',
+ 'to_date' => 'Date to',
+ 'due_date' => 'Due date',
+ 'payment_date' => 'Payment date',
+ 'invoice_date' => 'Invoice date',
+ 'internal_reference' => 'Internal reference',
+ 'inward' => 'Inward description',
+ 'outward' => 'Outward description',
+ 'rule_group_id' => 'Rule group',
+ 'transaction_description' => 'Transaction description',
+ 'first_date' => 'First date',
+ 'transaction_type' => 'Transaction type',
+ 'repeat_until' => 'Repeat until',
+ 'recurring_description' => 'Recurring transaction description',
+ 'repetition_type' => 'Type of repetition',
+ 'foreign_currency_id' => 'Foreign currency',
+ 'repetition_end' => 'Repetition ends',
+ 'repetitions' => 'Repetitions',
+ 'calendar' => 'Calendar',
+ 'weekend' => 'Weekend',
+ 'client_secret' => 'Client secret',
+ 'withdrawal_destination_id' => 'Destination account',
+ 'deposit_source_id' => 'Source account',
+ 'expected_on' => 'Expected on',
+ 'paid' => 'Paid',
+ 'auto_budget_type' => 'Auto-budget',
+ 'auto_budget_amount' => 'Auto-budget amount',
+ 'auto_budget_period' => 'Auto-budget period',
+ 'collected' => 'Collected',
+ 'submitted' => 'Submitted',
+ 'key' => 'Key',
+ 'value' => 'Content of record',
+ 'webhook_delivery' => 'Delivery',
+ 'webhook_response' => 'Response',
+ 'webhook_trigger' => 'Trigger',
+ 'pushover_app_token' => 'Pushover app token',
+ 'pushover_user_token' => 'Pushover user token',
+ 'ntfy_server' => 'Ntfy server',
+ 'ntfy_topic' => 'Ntfy topic',
+ 'ntfy_auth' => 'Ntfy authentication enabled',
+ 'ntfy_user' => 'Ntfy username',
+ 'ntfy_pass' => 'Ntfy password',
];
// Ignore this comment
diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php
index 587db8cb29..30b7a26a89 100644
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -25,9 +25,9 @@
declare(strict_types=1);
return [
- 'invalid_account_type' => 'A piggy bank can only be linked to asset accounts and liabilities',
- 'invalid_account_currency' => 'This account does not use the currency you have selected',
- 'current_amount_too_much' => 'The combined amount in "current_amount" cannot exceed the "target_amount".',
+ 'invalid_account_type' => 'A piggy bank can only be linked to asset accounts and liabilities',
+ 'invalid_account_currency' => 'This account does not use the currency you have selected',
+ 'current_amount_too_much' => 'The combined amount in "current_amount" cannot exceed the "target_amount".',
'filter_must_be_in' => 'Filter ":filter" must be one of: :values',
'filter_not_string' => 'Filter ":filter" is expected to be a string of text',
'bad_api_filter' => 'This API endpoint does not support ":filter" as a filter.',