Cleanup and translations.

This commit is contained in:
James Cole
2015-12-12 12:29:54 +01:00
parent 6426d1df06
commit 152d0eb1d0
3 changed files with 219 additions and 255 deletions

View File

@@ -250,227 +250,226 @@ return [
'details_for_expense' => 'Details for expense account ":name"', 'details_for_expense' => 'Details for expense account ":name"',
'details_for_revenue' => 'Details for revenue account ":name"', 'details_for_revenue' => 'Details for revenue account ":name"',
'details_for_cash' => 'Details for cash account ":name"', 'details_for_cash' => 'Details for cash account ":name"',
'store_new_asset_account' => 'Store new asset account',
'store_new_asset_account' => 'Store new asset account', 'store_new_expense_account' => 'Store new expense account',
'store_new_expense_account' => 'Store new expense account', 'store_new_revenue_account' => 'Store new revenue account',
'store_new_revenue_account' => 'Store new revenue account', 'edit_asset_account' => 'Edit asset account ":name"',
'edit_expense_account' => 'Edit expense account ":name"',
'edit_asset_account' => 'Edit asset account ":name"', 'edit_revenue_account' => 'Edit revenue account ":name"',
'edit_expense_account' => 'Edit expense account ":name"', 'delete_asset_account' => 'Delete asset account ":name"',
'edit_revenue_account' => 'Edit revenue account ":name"', 'delete_expense_account' => 'Delete expense account ":name"',
'delete_revenue_account' => 'Delete revenue account ":name"',
'delete_asset_account' => 'Delete asset account ":name"', 'asset_deleted' => 'Successfully deleted asset account ":name"',
'delete_expense_account' => 'Delete expense account ":name"', 'expense_deleted' => 'Successfully deleted expense account ":name"',
'delete_revenue_account' => 'Delete revenue account ":name"', 'revenue_deleted' => 'Successfully deleted revenue account ":name"',
'update_asset_account' => 'Update asset account',
'asset_deleted' => 'Successfully deleted asset account ":name"', 'update_expense_account' => 'Update expense account',
'expense_deleted' => 'Successfully deleted expense account ":name"', 'update_revenue_account' => 'Update revenue account',
'revenue_deleted' => 'Successfully deleted revenue account ":name"', 'make_new_asset_account' => 'Create a new asset account',
'make_new_expense_account' => 'Create a new expense account',
'update_asset_account' => 'Update asset account', 'make_new_revenue_account' => 'Create a new revenue account',
'update_expense_account' => 'Update expense account', 'asset_accounts' => 'Asset accounts',
'update_revenue_account' => 'Update revenue account', 'expense_accounts' => 'Expense accounts',
'revenue_accounts' => 'Revenue accounts',
'make_new_asset_account' => 'Create a new asset account', 'accountExtraHelp_asset' => '',
'make_new_expense_account' => 'Create a new expense account', 'accountExtraHelp_expense' => '',
'make_new_revenue_account' => 'Create a new revenue account', 'accountExtraHelp_revenue' => '',
'account_type' => 'Account type',
'asset_accounts' => 'Asset accounts', 'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
'expense_accounts' => 'Expense accounts',
'revenue_accounts' => 'Revenue accounts',
'accountExtraHelp_asset' => '',
'accountExtraHelp_expense' => '',
'accountExtraHelp_revenue' => '',
'account_type' => 'Account type',
'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:',
// categories: // categories:
'new_category' => 'New category', 'new_category' => 'New category',
'create_new_category' => 'Create a new category', 'create_new_category' => 'Create a new category',
'without_category' => 'Without a category', 'without_category' => 'Without a category',
'update_category' => 'Wijzig categorie', 'update_category' => 'Wijzig categorie',
'categories' => 'Categories', 'categories' => 'Categories',
'edit_category' => 'Edit category ":name"', 'edit_category' => 'Edit category ":name"',
'no_category' => '(no category)', 'no_category' => '(no category)',
'category' => 'Category', 'category' => 'Category',
'delete_category' => 'Delete category ":name"', 'delete_category' => 'Delete category ":name"',
'store_category' => 'Store new category', 'store_category' => 'Store new category',
// transactions: // transactions:
'update_withdrawal' => 'Update withdrawal', 'update_withdrawal' => 'Update withdrawal',
'update_deposit' => 'Update deposit', 'update_deposit' => 'Update deposit',
'update_transfer' => 'Update transfer', 'update_transfer' => 'Update transfer',
'delete_withdrawal' => 'Delete withdrawal ":description"', 'delete_withdrawal' => 'Delete withdrawal ":description"',
'delete_deposit' => 'Delete deposit ":description"', 'delete_deposit' => 'Delete deposit ":description"',
'delete_transfer' => 'Delete transfer ":description"', 'delete_transfer' => 'Delete transfer ":description"',
// new user: // new user:
'welcome' => 'Welcome to Firefly!', 'welcome' => 'Welcome to Firefly!',
'createNewAsset' => 'Create a new asset account to get started. ' . 'createNewAsset' => 'Create a new asset account to get started. ' .
'This will allow you to create transactions and start your financial management', 'This will allow you to create transactions and start your financial management',
'createNewAssetButton' => 'Create new asset account', 'createNewAssetButton' => 'Create new asset account',
// home page: // home page:
'yourAccounts' => 'Your accounts', 'yourAccounts' => 'Your accounts',
'budgetsAndSpending' => 'Budgets and spending', 'budgetsAndSpending' => 'Budgets and spending',
'savings' => 'Savings', 'savings' => 'Savings',
'markAsSavingsToContinue' => 'Mark your asset accounts as "Savings account" to fill this panel', 'markAsSavingsToContinue' => 'Mark your asset accounts as "Savings account" to fill this panel',
'createPiggyToContinue' => 'Create piggy banks to fill this panel.', 'createPiggyToContinue' => 'Create piggy banks to fill this panel.',
'newWithdrawal' => 'New expense', 'newWithdrawal' => 'New expense',
'newDeposit' => 'New deposit', 'newDeposit' => 'New deposit',
'newTransfer' => 'New transfer', 'newTransfer' => 'New transfer',
'moneyIn' => 'Money in', 'moneyIn' => 'Money in',
'moneyOut' => 'Money out', 'moneyOut' => 'Money out',
'billsToPay' => 'Bills to pay', 'billsToPay' => 'Bills to pay',
'billsPaid' => 'Bills paid', 'billsPaid' => 'Bills paid',
'viewDetails' => 'View details', 'viewDetails' => 'View details',
'divided' => 'divided', 'divided' => 'divided',
'toDivide' => 'left to divide', 'toDivide' => 'left to divide',
// menu and titles, should be recycled as often as possible: // menu and titles, should be recycled as often as possible:
'toggleNavigation' => 'Toggle navigation', 'toggleNavigation' => 'Toggle navigation',
'currency' => 'Currency', 'currency' => 'Currency',
'preferences' => 'Preferences', 'preferences' => 'Preferences',
'logout' => 'Logout', 'logout' => 'Logout',
'searchPlaceholder' => 'Search...', 'searchPlaceholder' => 'Search...',
'dashboard' => 'Dashboard', 'dashboard' => 'Dashboard',
'currencies' => 'Currencies', 'currencies' => 'Currencies',
'accounts' => 'Accounts', 'accounts' => 'Accounts',
'Asset account' => 'Asset account', 'Asset account' => 'Asset account',
'Default account' => 'Asset account', 'Default account' => 'Asset account',
'Expense account' => 'Expense account', 'Expense account' => 'Expense account',
'Revenue account' => 'Revenue account', 'Revenue account' => 'Revenue account',
'Initial balance account' => 'Initial balance account', 'Initial balance account' => 'Initial balance account',
'budgets' => 'Budgets', 'budgets' => 'Budgets',
'tags' => 'Tags', 'tags' => 'Tags',
'reports' => 'Reports', 'reports' => 'Reports',
'transactions' => 'Transactions', 'transactions' => 'Transactions',
'expenses' => 'Expenses', 'expenses' => 'Expenses',
'income' => 'Revenue / income', 'income' => 'Revenue / income',
'transfers' => 'Transfers', 'transfers' => 'Transfers',
'moneyManagement' => 'Money management', 'moneyManagement' => 'Money management',
'piggyBanks' => 'Piggy banks', 'piggyBanks' => 'Piggy banks',
'bills' => 'Bills', 'bills' => 'Bills',
'createNew' => 'Create new', 'createNew' => 'Create new',
'withdrawal' => 'Withdrawal', 'withdrawal' => 'Withdrawal',
'deposit' => 'Deposit', 'deposit' => 'Deposit',
'account' => 'Account', 'account' => 'Account',
'transfer' => 'Transfer', 'transfer' => 'Transfer',
'Withdrawal' => 'Withdrawal', 'Withdrawal' => 'Withdrawal',
'Deposit' => 'Deposit', 'Deposit' => 'Deposit',
'Transfer' => 'Transfer', 'Transfer' => 'Transfer',
'bill' => 'Bill', 'bill' => 'Bill',
'yes' => 'Yes', 'yes' => 'Yes',
'no' => 'No', 'no' => 'No',
'amount' => 'Amount', 'amount' => 'Amount',
'newBalance' => 'New balance', 'newBalance' => 'New balance',
'overview' => 'Overview', 'overview' => 'Overview',
'saveOnAccount' => 'Save on account', 'saveOnAccount' => 'Save on account',
'unknown' => 'Unknown', 'unknown' => 'Unknown',
'daily' => 'Daily', 'daily' => 'Daily',
'weekly' => 'Weekly', 'weekly' => 'Weekly',
'monthly' => 'Monthly', 'monthly' => 'Monthly',
'quarterly' => 'Quarterly', 'quarterly' => 'Quarterly',
'half-year' => 'Every six months', 'half-year' => 'Every six months',
'yearly' => 'Yearly', 'yearly' => 'Yearly',
'profile' => 'Profile', 'profile' => 'Profile',
// reports: // reports:
'reportForYear' => 'Yearly report for :year', 'reportForYear' => 'Yearly report for :year',
'reportForYearShared' => 'Yearly report for :year (including shared accounts)', 'reportForYearShared' => 'Yearly report for :year (including shared accounts)',
'reportForMonth' => 'Montly report for :month', 'reportForMonth' => 'Montly report for :month',
'reportForMonthShared' => 'Montly report for :month (including shared accounts)', 'reportForMonthShared' => 'Montly report for :month (including shared accounts)',
'incomeVsExpenses' => 'Income vs. expenses', 'incomeVsExpenses' => 'Income vs. expenses',
'accountBalances' => 'Account balances', 'accountBalances' => 'Account balances',
'balanceStartOfYear' => 'Balance at start of year', 'balanceStartOfYear' => 'Balance at start of year',
'balanceEndOfYear' => 'Balance at end of year', 'balanceEndOfYear' => 'Balance at end of year',
'balanceStartOfMonth' => 'Balance at start of month', 'balanceStartOfMonth' => 'Balance at start of month',
'balanceEndOfMonth' => 'Balance at end of month', 'balanceEndOfMonth' => 'Balance at end of month',
'balanceStart' => 'Balance at start of period', 'balanceStart' => 'Balance at start of period',
'balanceEnd' => 'Balance at end of period', 'balanceEnd' => 'Balance at end of period',
'reportsOwnAccounts' => 'Reports for your own accounts', 'reportsOwnAccounts' => 'Reports for your own accounts',
'reportsOwnAccountsAndShared' => 'Reports for your own accounts and shared accounts', 'reportsOwnAccountsAndShared' => 'Reports for your own accounts and shared accounts',
'splitByAccount' => 'Split by account', 'splitByAccount' => 'Split by account',
'balancedByTransfersAndTags' => 'Balanced by transfers and tags', 'balancedByTransfersAndTags' => 'Balanced by transfers and tags',
'coveredWithTags' => 'Covered with tags', 'coveredWithTags' => 'Covered with tags',
'leftUnbalanced' => 'Left unbalanced', 'leftUnbalanced' => 'Left unbalanced',
'expectedBalance' => 'Expected balance', 'expectedBalance' => 'Expected balance',
'outsideOfBudgets' => 'Outside of budgets', 'outsideOfBudgets' => 'Outside of budgets',
'leftInBudget' => 'Left in budget', 'leftInBudget' => 'Left in budget',
'sumOfSums' => 'Sum of sums', 'sumOfSums' => 'Sum of sums',
'notCharged' => 'Not charged (yet)', 'notCharged' => 'Not charged (yet)',
'inactive' => 'Inactive', 'inactive' => 'Inactive',
'difference' => 'Difference', 'difference' => 'Difference',
'in' => 'In', 'in' => 'In',
'out' => 'Out', 'out' => 'Out',
'topX' => 'top :number', 'topX' => 'top :number',
'showTheRest' => 'Show everything', 'showTheRest' => 'Show everything',
'hideTheRest' => 'Show only the top :number', 'hideTheRest' => 'Show only the top :number',
'sum_of_year' => 'Sum of year', 'sum_of_year' => 'Sum of year',
'average_of_year' => 'Average of year', 'average_of_year' => 'Average of year',
'categories_earned_in_year' => 'Categories (by earnings)', 'categories_earned_in_year' => 'Categories (by earnings)',
'categories_spent_in_year' => 'Categories (by spendings)', 'categories_spent_in_year' => 'Categories (by spendings)',
'report_type' => 'Report type',
'report_type_default' => 'Default financial report',
'report_included_accounts' => 'Included accounts',
'report_date_range' => 'Date range',
'report_include_help' => 'In all cases, transfers to shared accounts count as expenses, and transfers from shared accounts count as income.',
'report_preset_ranges' => 'Pre-set ranges',
'shared' => 'Shared',
// charts: // charts:
'dayOfMonth' => 'Day of the month', 'dayOfMonth' => 'Day of the month',
'month' => 'Month', 'month' => 'Month',
'budget' => 'Budget', 'budget' => 'Budget',
'spent' => 'Spent', 'spent' => 'Spent',
'earned' => 'Earned', 'earned' => 'Earned',
'overspent' => 'Overspent', 'overspent' => 'Overspent',
'left' => 'Left', 'left' => 'Left',
'noBudget' => '(no budget)', 'noBudget' => '(no budget)',
'maxAmount' => 'Maximum amount', 'maxAmount' => 'Maximum amount',
'minAmount' => 'Minumum amount', 'minAmount' => 'Minumum amount',
'billEntry' => 'Current bill entry', 'billEntry' => 'Current bill entry',
'name' => 'Name', 'name' => 'Name',
'date' => 'Date', 'date' => 'Date',
'paid' => 'Paid', 'paid' => 'Paid',
'unpaid' => 'Unpaid', 'unpaid' => 'Unpaid',
'day' => 'Day', 'day' => 'Day',
'budgeted' => 'Budgeted', 'budgeted' => 'Budgeted',
'period' => 'Period', 'period' => 'Period',
'balance' => 'Balance', 'balance' => 'Balance',
'summary' => 'Summary', 'summary' => 'Summary',
'sum' => 'Sum', 'sum' => 'Sum',
'average' => 'Average', 'average' => 'Average',
'balanceFor' => 'Balance for :name', 'balanceFor' => 'Balance for :name',
// piggy banks: // piggy banks:
'piggy_bank' => 'Piggy bank', 'piggy_bank' => 'Piggy bank',
'new_piggy_bank' => 'Create new piggy bank', 'new_piggy_bank' => 'Create new piggy bank',
'store_piggy_bank' => 'Store new piggy bank', 'store_piggy_bank' => 'Store new piggy bank',
'account_status' => 'Account status', 'account_status' => 'Account status',
'left_for_piggy_banks' => 'Left for piggy banks', 'left_for_piggy_banks' => 'Left for piggy banks',
'sum_of_piggy_banks' => 'Sum of piggy banks', 'sum_of_piggy_banks' => 'Sum of piggy banks',
'saved_so_far' => 'Saved so far', 'saved_so_far' => 'Saved so far',
'left_to_save' => 'Left to save', 'left_to_save' => 'Left to save',
'add_money_to_piggy_title' => 'Add money to piggy bank ":name"', 'add_money_to_piggy_title' => 'Add money to piggy bank ":name"',
'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"', 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"',
'add' => 'Add', 'add' => 'Add',
'remove' => 'Remove', 'remove' => 'Remove',
'max_amount_add' => 'The maximum amount you can add is', 'max_amount_add' => 'The maximum amount you can add is',
'max_amount_remove' => 'The maximum amount you can remove is', 'max_amount_remove' => 'The maximum amount you can remove is',
'update_piggy_button' => 'Update piggy bank', 'update_piggy_button' => 'Update piggy bank',
'update_piggy_title' => 'Update piggy bank ":name"', 'update_piggy_title' => 'Update piggy bank ":name"',
'details' => 'Details', 'details' => 'Details',
'events' => 'Events', 'events' => 'Events',
'target_amount' => 'Target amount', 'target_amount' => 'Target amount',
'start_date' => 'Start date', 'start_date' => 'Start date',
'target_date' => 'Target date', 'target_date' => 'Target date',
'no_target_date' => 'No target date', 'no_target_date' => 'No target date',
'todo' => 'to do', 'todo' => 'to do',
'table' => 'Table', 'table' => 'Table',
'piggy_bank_not_exists' => 'Piggy bank no longer exists.', 'piggy_bank_not_exists' => 'Piggy bank no longer exists.',
'add_any_amount_to_piggy' => 'Add money to this piggy bank to reach your target of :amount.', 'add_any_amount_to_piggy' => 'Add money to this piggy bank to reach your target of :amount.',
'add_set_amount_to_piggy' => 'Add :amount to fill this piggy bank on :date', 'add_set_amount_to_piggy' => 'Add :amount to fill this piggy bank on :date',
'delete_piggy_bank' => 'Delete piggy bank ":name"', 'delete_piggy_bank' => 'Delete piggy bank ":name"',
// tags // tags
'regular_tag' => 'Just a regular tag.', 'regular_tag' => 'Just a regular tag.',
'balancing_act' => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.', 'balancing_act' => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
'advance_payment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.', 'advance_payment' => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
'delete_tag' => 'Delete tag ":tag"', 'delete_tag' => 'Delete tag ":tag"',
'new_tag' => 'Make new tag', 'new_tag' => 'Make new tag',

View File

@@ -422,6 +422,14 @@ return [
'hideTheRest' => 'Laat alleen de top :number zien', 'hideTheRest' => 'Laat alleen de top :number zien',
'categories_earned_in_year' => 'Categorieën (inkomsten)', 'categories_earned_in_year' => 'Categorieën (inkomsten)',
'categories_spent_in_year' => 'Categorieën (uitgaven)', 'categories_spent_in_year' => 'Categorieën (uitgaven)',
'report_type' => 'Rapporttype',
'report_type_default' => 'Standard financieel rapport',
'report_included_accounts' => 'Accounts in rapport',
'report_date_range' => 'Datumbereik',
'report_include_help' => 'Overboekingen naar gedeelde rekeningen tellen als uitgave. Overboekingen van gedeelde rekeningen tellen als inkomsten.',
'report_preset_ranges' => 'Standaardbereik',
'shared' => 'Gedeeld',
// charts: // charts:
'dayOfMonth' => 'Dag vd maand', 'dayOfMonth' => 'Dag vd maand',

View File

@@ -5,69 +5,27 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'reportsOwnAccounts'|_ }}</h3>
</div>
<div class="box-body">
{% for year, data in months %}
<h4><a href="{{ route('reports.year',year) }}">{{ year }}</a></h4>
<ul class="list-inline">
{% for month in data.months %}
<li>
<a href="{{ route('reports.month',[month.year, month.month]) }}">{{ month.formatted }}</a>
</li>
{% endfor %}
</ul>
{% endfor %}
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'reportsOwnAccountsAndShared'|_ }}</h3>
</div>
<div class="box-body">
{% for year, data in months %}
<h4><a href="{{ route('reports.year',[year, 'shared']) }}">{{ year }}</a></h4>
<ul class="list-inline">
{% for month in data.months %}
<li>
<a href="{{ route('reports.month',[month.year, month.month,'shared']) }}">{{ month.formatted }}</a>
</li>
{% endfor %}
</ul>
{% endfor %}
</div>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Some new reports.</h3> <h3 class="box-title">{{ 'reports'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<form class="form-horizontal" id="report-form" action="{{ route('reports.select') }}" method="post"> <form class="form-horizontal" id="report-form" action="{{ route('reports.select') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}" /> <input type="hidden" name="_token" value="{{ csrf_token() }}" />
<div class="form-group"> <div class="form-group">
<label for="inputReportType" class="col-sm-3 control-label">Report type</label> <label for="inputReportType" class="col-sm-3 control-label">{{ 'report_type'|_ }}</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select name="report_type" class="form-control" id="inputReportType"> <select name="report_type" class="form-control" id="inputReportType">
<option label="Default financial report" value="default">Default financial report</option> <option label="{{ 'report_type_default'|_ }}" value="default">{{ 'report_type_default'|_ }}</option>
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="inputAccounts" class="col-sm-3 control-label">Included accounts</label> <label for="inputAccounts" class="col-sm-3 control-label">{{ 'report_included_accounts'|_ }}</label>
<div class="col-sm-9"> <div class="col-sm-9">
{% for account in accounts %} {% for account in accounts %}
@@ -76,22 +34,21 @@
<input type="checkbox" class="account-checkbox" name="accounts[]" value="{{ account.id }}"> <input type="checkbox" class="account-checkbox" name="accounts[]" value="{{ account.id }}">
{{ account.name }} {{ account.name }}
{% if account.getMeta('accountRole') == 'sharedAsset' %} {% if account.getMeta('accountRole') == 'sharedAsset' %}
(shared) ({{ 'shared'|_|lower }})
{% endif %} {% endif %}
</label> </label>
</div> </div>
{% endfor %} {% endfor %}
<p class="help-block"> <p class="help-block">
In all cases, transfers to shared accounts count as expenses, and transfers {{ 'report_include_help'|_ }}
from shared accounts count as income.
</p> </p>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="inputDateRange" class="col-sm-3 control-label">Report date range</label> <label for="inputDateRange" class="col-sm-3 control-label">{{ 'report_date_range'|_ }}</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input type="text" class="form-control" id="inputDateRange" name="daterange" <input type="text" class="form-control" id="inputDateRange" name="daterange"
@@ -99,7 +56,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="__none__" class="col-sm-3 control-label">Pre-set ranges</label> <label for="__none__" class="col-sm-3 control-label">{{ 'report_preset_ranges'|_ }}</label>
<div class="col-sm-9"> <div class="col-sm-9">
{% for year, data in months %} {% for year, data in months %}
@@ -117,7 +74,7 @@
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-3 col-sm-9"> <div class="col-sm-offset-3 col-sm-9">
<button type="submit" class="btn btn-default">Submit</button> <button type="submit" class="btn btn-default">{{ 'submit'|_ }}</button>
</div> </div>
</div> </div>
</form> </form>