kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Small various fixes.

Browse Source
This commit is contained in:
James Cole
2016-03-21 19:22:37 +01:00
parent 189d969ee6
commit c1b8d44209
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/NewUserController.php
View File

@@ -113,9 +113,9 @@ class NewUserController extends Controller
$count++; $count++;
} }
if ($count == 1) { if ($count == 1) {
Session::flash('success', strval(trans('firefly.stored_new_account'))); Session::flash('success', strval(trans('firefly.stored_new_account_new_user')));
} else { } else {
Session::flash('success', strval(trans('firefly.stored_new_accounts'))); Session::flash('success', strval(trans('firefly.stored_new_accounts_new_user')));
} }
Preferences::mark(); Preferences::mark();

4
app/Support/Amount.php
View File

@@ -47,7 +47,7 @@ class Amount
$result = $formatter->formatCurrency($float, $format->code); $result = $formatter->formatCurrency($float, $format->code);
if ($coloured === true) { if ($coloured === true) {
if ($amount == 0) { if ($amount === 0.00) {
return '<span style="color:#999">' . $result . '</span>'; return '<span style="color:#999">' . $result . '</span>';
} }
if ($amount > 0) { if ($amount > 0) {
@@ -76,7 +76,7 @@ class Amount
$currencyCode = $journal->transaction_currency_code ?? $journal->transactionCurrency->code; $currencyCode = $journal->transaction_currency_code ?? $journal->transactionCurrency->code;
$result = $formatter->formatCurrency($float, $currencyCode); $result = $formatter->formatCurrency($float, $currencyCode);
if ($coloured === true && $float == 0) { if ($coloured === true && $float === 0.00) {
return '<span style="color:#999">' . $result . '</span>'; // always grey. return '<span style="color:#999">' . $result . '</span>'; // always grey.
} }
if (!$coloured) { if (!$coloured) {

8
resources/lang/en_US/firefly.php
View File

@@ -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:', '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:', '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.', '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_account_new_user' => 'Yay! Your new account has been stored.',
'stored_new_accounts' => 'Yay! Your new accounts have been stored.', 'stored_new_accounts_new_user' => 'Yay! Your new accounts have been stored.',
// forms: // forms:
'mandatoryFields' => 'Mandatory fields', 'mandatoryFields' => 'Mandatory fields',
@@ -479,6 +479,8 @@ return [
'asset_accounts' => 'Asset accounts', 'asset_accounts' => 'Asset accounts',
'expense_accounts' => 'Expense accounts', 'expense_accounts' => 'Expense accounts',
'revenue_accounts' => 'Revenue accounts', 'revenue_accounts' => 'Revenue accounts',
'cash_accounts' => 'Cash accounts',
'Cash account' => 'Cash account',
'accountExtraHelp_asset' => '', 'accountExtraHelp_asset' => '',
'accountExtraHelp_expense' => '', 'accountExtraHelp_expense' => '',
'accountExtraHelp_revenue' => '', 'accountExtraHelp_revenue' => '',
@@ -650,7 +652,7 @@ return [
'earned' => 'Earned', 'earned' => 'Earned',
'overspent' => 'Overspent', 'overspent' => 'Overspent',
'left' => 'Left', 'left' => 'Left',
'no_budget' => '(no budget)', 'no_budget' => '(no budget)',
'maxAmount' => 'Maximum amount', 'maxAmount' => 'Maximum amount',
'minAmount' => 'Minumum amount', 'minAmount' => 'Minumum amount',
'billEntry' => 'Current bill entry', 'billEntry' => 'Current bill entry',