diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php
index 517feaf1f6..05532e9071 100644
--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -113,9 +113,9 @@ class NewUserController extends Controller
$count++;
}
if ($count == 1) {
- Session::flash('success', strval(trans('firefly.stored_new_account')));
+ Session::flash('success', strval(trans('firefly.stored_new_account_new_user')));
} else {
- Session::flash('success', strval(trans('firefly.stored_new_accounts')));
+ Session::flash('success', strval(trans('firefly.stored_new_accounts_new_user')));
}
Preferences::mark();
diff --git a/app/Support/Amount.php b/app/Support/Amount.php
index 2b2807f8d6..dbc4bcfe10 100644
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -47,7 +47,7 @@ class Amount
$result = $formatter->formatCurrency($float, $format->code);
if ($coloured === true) {
- if ($amount == 0) {
+ if ($amount === 0.00) {
return '' . $result . '';
}
if ($amount > 0) {
@@ -76,7 +76,7 @@ class Amount
$currencyCode = $journal->transaction_currency_code ?? $journal->transactionCurrency->code;
$result = $formatter->formatCurrency($float, $currencyCode);
- if ($coloured === true && $float == 0) {
+ if ($coloured === true && $float === 0.00) {
return '' . $result . ''; // always grey.
}
if (!$coloured) {
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index bc4064ba9e..19b494051a 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -415,8 +415,8 @@ return [
'to_get_started' => 'To get started with Firefly, please enter your current bank\'s name, and the balance of your checking account:',
'savings_balance_text' => 'If you have a savings account, please enter the current balance of your savings account:',
'cc_balance_text' => 'If you have a credit card, please enter your credit card\'s limit.',
- 'stored_new_account' => 'Yay! Your new account has been stored.',
- 'stored_new_accounts' => 'Yay! Your new accounts have been stored.',
+ 'stored_new_account_new_user' => 'Yay! Your new account has been stored.',
+ 'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
// forms:
'mandatoryFields' => 'Mandatory fields',
@@ -479,6 +479,8 @@ return [
'asset_accounts' => 'Asset accounts',
'expense_accounts' => 'Expense accounts',
'revenue_accounts' => 'Revenue accounts',
+ 'cash_accounts' => 'Cash accounts',
+ 'Cash account' => 'Cash account',
'accountExtraHelp_asset' => '',
'accountExtraHelp_expense' => '',
'accountExtraHelp_revenue' => '',
@@ -650,7 +652,7 @@ return [
'earned' => 'Earned',
'overspent' => 'Overspent',
'left' => 'Left',
- 'no_budget' => '(no budget)',
+ 'no_budget' => '(no budget)',
'maxAmount' => 'Maximum amount',
'minAmount' => 'Minumum amount',
'billEntry' => 'Current bill entry',