Some new translations.

This commit is contained in:
James Cole 2015-05-14 17:52:50 +02:00
parent 5b19263720
commit 9f5058e81a
10 changed files with 235 additions and 195 deletions

View File

@ -137,7 +137,7 @@ class AccountController extends Controller
*/ */
public function index(AccountRepositoryInterface $repository, $what) public function index(AccountRepositoryInterface $repository, $what)
{ {
$subTitle = Config::get('firefly.subTitlesByIdentifier.' . $what); $subTitle = trans('firefly.' . $what.'_accounts');
$subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what); $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
$types = Config::get('firefly.accountTypesByIdentifier.' . $what); $types = Config::get('firefly.accountTypesByIdentifier.' . $what);
$accounts = $repository->getAccounts($types); $accounts = $repository->getAccounts($types);

View File

@ -2,105 +2,115 @@
// general fields and things. // general fields and things.
return [ return [
'test' => 'You have selected English.', 'test' => 'You have selected English.',
'close' => 'Close', 'close' => 'Close',
'pleaseHold' => 'Please hold...', 'pleaseHold' => 'Please hold...',
'mandatoryFields' => 'Mandatory fields', 'mandatoryFields' => 'Mandatory fields',
'optionalFields' => 'Optional fields', 'optionalFields' => 'Optional fields',
'options' => 'Options', 'options' => 'Options',
'something' => 'Something!', 'something' => 'Something!',
'actions' => 'Actions', 'actions' => 'Actions',
'edit' => 'Edit', 'edit' => 'Edit',
'delete' => 'Delete', 'delete' => 'Delete',
'welcomeBack' => 'What\'s playing?', 'welcomeBack' => 'What\'s playing?',
// new user: // new user:
'welcome' => 'Welcome to Firefly!', 'welcome' => 'Welcome to Firefly!',
'createNewAsset' => 'Create a new asset account to get started. This will allow you to create transactions and start your financial management', 'createNewAsset' => 'Create a new asset account to get started. 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',
'seeAllReminders' => 'See all reminders', 'seeAllReminders' => 'See all reminders',
'reminders' => 'Reminders', 'reminders' => 'Reminders',
'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',
'assetAccounts' => 'Asset accounts', 'assetAccounts' => 'Asset accounts',
'expenseAccounts' => 'Expense accounts', 'expenseAccounts' => 'Expense accounts',
'revenueAccounts' => 'Revenue accounts', 'revenueAccounts' => 'Revenue accounts',
'Asset account' => 'Asset account', 'Asset account' => 'Asset account',
'Expense account' => 'Expense account', 'Expense account' => 'Expense account',
'Revenue Account' => 'Revenue account', 'Revenue Account' => 'Revenue account',
'budgets' => 'Budgets', 'budgets' => 'Budgets',
'categories' => 'Categories', 'categories' => 'Categories',
'tags' => 'Tags', 'tags' => 'Tags',
'reports' => 'Reports', 'reports' => 'Reports',
'transactions' => 'Transactions', 'transactions' => 'Transactions',
'expenses' => 'Expenses', 'expenses' => 'Expenses',
'income' => 'Revenue / income', 'income' => 'Revenue / income',
'transfers' => 'Transfer', 'transfers' => 'Transfer',
'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',
'transfer' => 'Transfer', 'transfer' => 'Transfer',
'Withdrawal' => 'Withdrawal', 'Withdrawal' => 'Withdrawal',
'Deposit' => 'Deposit', 'Deposit' => 'Deposit',
'Transfer' => 'Transfer', 'Transfer' => 'Transfer',
'bill' => 'Rekening', 'bill' => 'Rekening',
'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',
// charts: // charts:
'dayOfMonth' => 'Day of the month', 'dayOfMonth' => 'Day of the month',
'month' => 'Month', 'month' => 'Month',
'budget' => 'Budget', 'budget' => 'Budget',
'spent' => 'Spent', 'spent' => 'Spent',
'overspent' => 'Overspent', 'overspent' => 'Overspent',
'left' => 'Left', 'left' => 'Left',
'noCategory' => '(no category)', 'noCategory' => '(no category)',
'noBudget' => '(no budget)', 'noBudget' => '(no budget)',
'category' => 'Category', 'category' => 'Category',
'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',
'asset_accounts' => 'Asset accounts',
'expense_accounts' => 'Expense accounts',
'revenue_accounts' => 'Revenue accounts',
// some extra help:
'accountExtraHelp_asset' => '',
'accountExtraHelp_expense' => '',
'accountExtraHelp_revenue' => '',
]; ];

View File

@ -32,6 +32,9 @@ return [
'tags' => 'Tags', 'tags' => 'Tags',
'deletePermanently' => 'Delete permanently', 'deletePermanently' => 'Delete permanently',
'cancel' => 'Cancel', 'cancel' => 'Cancel',
'targetdate' => 'Target date',
'remind_me' => 'Remind me',
'reminder' => 'Remind me every',
'delete_account' => 'Delete account ":name"', 'delete_account' => 'Delete account ":name"',
'delete_bill' => 'Delete bill ":name"', 'delete_bill' => 'Delete bill ":name"',

View File

@ -27,5 +27,5 @@ return [
'deposit' => 'Deposit', 'deposit' => 'Deposit',
'transfer' => 'Transfer', 'transfer' => 'Transfer',
'type' => 'Type', 'type' => 'Type',
'completed' => 'Completed', 'completed' => 'Completed',
]; ];

View File

@ -2,105 +2,122 @@
// general fields and things. // general fields and things.
return [ return [
'test' => 'Nederlands geselecteerd!', 'test' => 'Nederlands geselecteerd!',
'close' => 'Sluiten', 'close' => 'Sluiten',
'pleaseHold' => 'Momentje...', 'pleaseHold' => 'Momentje...',
'mandatoryFields' => 'Verplichte velden', 'mandatoryFields' => 'Verplichte velden',
'optionalFields' => 'Optionele velden', 'optionalFields' => 'Optionele velden',
'options' => 'Opties', 'options' => 'Opties',
'something' => 'Iets!', 'something' => 'Iets!',
'actions' => 'Acties', 'actions' => 'Acties',
'edit' => 'Wijzig', 'edit' => 'Wijzig',
'delete' => 'Verwijder', 'delete' => 'Verwijder',
'welcomeBack' => 'Hoe staat het er voor?', 'welcomeBack' => 'Hoe staat het er voor?',
// new user: // new user:
'welcome' => 'Welkom bij Firefly!', 'welcome' => 'Welkom bij Firefly!',
'createNewAsset' => 'Maak om te beginnen een nieuwe betaalrekening. Dit is je start van je financiële beheer.', 'createNewAsset' => 'Maak om te beginnen een nieuwe betaalrekening. Dit is je start van je financiële beheer.',
'createNewAssetButton' => 'Maak een nieuwe betaalrekening', 'createNewAssetButton' => 'Maak een nieuwe betaalrekening',
// home page: // home page:
'yourAccounts' => 'Je betaalrekeningen', 'yourAccounts' => 'Je betaalrekeningen',
'budgetsAndSpending' => 'Budgetten en uitgaven', 'budgetsAndSpending' => 'Budgetten en uitgaven',
'savings' => 'Sparen', 'savings' => 'Sparen',
'markAsSavingsToContinue' => 'Om hier wat te zien stel je je betaalrekeningen in als "spaarrekening".', 'markAsSavingsToContinue' => 'Om hier wat te zien stel je je betaalrekeningen in als "spaarrekening".',
'createPiggyToContinue' => 'Maak spaarpotjes om hier iets te zien.', 'createPiggyToContinue' => 'Maak spaarpotjes om hier iets te zien.',
'newWithdrawal' => 'Nieuwe uitgave', 'newWithdrawal' => 'Nieuwe uitgave',
'newDeposit' => 'Nieuwe inkomsten', 'newDeposit' => 'Nieuwe inkomsten',
'newTransfer' => 'Nieuwe overschrijving', 'newTransfer' => 'Nieuwe overschrijving',
'moneyIn' => 'Inkomsten', 'moneyIn' => 'Inkomsten',
'moneyOut' => 'Uitgaven', 'moneyOut' => 'Uitgaven',
'billsToPay' => 'Openstaande rekeningen', 'billsToPay' => 'Openstaande rekeningen',
'billsPaid' => 'Betaalde rekeningen', 'billsPaid' => 'Betaalde rekeningen',
'viewDetails' => 'Meer info', 'viewDetails' => 'Meer info',
'divided' => 'verdeeld', 'divided' => 'verdeeld',
'toDivide' => 'te verdelen', 'toDivide' => 'te verdelen',
// menu and titles, should be recycled as often as possible: // menu and titles, should be recycled as often as possible:
'toggleNavigation' => 'Navigatie aan of uit', 'toggleNavigation' => 'Navigatie aan of uit',
'seeAllReminders' => 'Bekijk alle herinneringen', 'seeAllReminders' => 'Bekijk alle herinneringen',
'reminders' => 'Herinneringen', 'reminders' => 'Herinneringen',
'currency' => 'Munteenheden', 'currency' => 'Munteenheden',
'preferences' => 'Voorkeuren', 'preferences' => 'Voorkeuren',
'logout' => 'Uitloggen', 'logout' => 'Uitloggen',
'searchPlaceholder' => 'Zoeken...', 'searchPlaceholder' => 'Zoeken...',
'dashboard' => 'Dashboard', 'dashboard' => 'Dashboard',
'currencies' => 'Munteenheden', 'currencies' => 'Munteenheden',
'accounts' => 'Rekeningen', 'accounts' => 'Rekeningen',
'assetAccounts' => 'Betaalrekeningen', 'assetAccounts' => 'Betaalrekeningen',
'expenseAccounts' => 'Crediteuren', 'expenseAccounts' => 'Crediteuren',
'revenueAccounts' => 'Debiteuren', 'revenueAccounts' => 'Debiteuren',
'Asset account' => 'Betaalrekening', 'Asset account' => 'Betaalrekening',
'Expense account' => 'Crediteur', 'Expense account' => 'Crediteur',
'Revenue Account' => 'Debiteur', 'Revenue Account' => 'Debiteur',
'budgets' => 'Budgetten', 'budgets' => 'Budgetten',
'categories' => 'Categorieën', 'categories' => 'Categorieën',
'tags' => 'Tags', 'tags' => 'Tags',
'reports' => 'Overzichten', 'reports' => 'Overzichten',
'transactions' => 'Transacties', 'transactions' => 'Transacties',
'expenses' => 'Uitgaven', 'expenses' => 'Uitgaven',
'income' => 'Inkomsten', 'income' => 'Inkomsten',
'transfers' => 'Overschrijvingen', 'transfers' => 'Overschrijvingen',
'moneyManagement' => 'Geldbeheer', 'moneyManagement' => 'Geldbeheer',
'piggyBanks' => 'Spaarpotjes', 'piggyBanks' => 'Spaarpotjes',
'bills' => 'Rekeningen', 'bills' => 'Rekeningen',
'createNew' => 'Nieuw', 'createNew' => 'Nieuw',
'withdrawal' => 'Uitgave', 'withdrawal' => 'Uitgave',
'deposit' => 'Inkomsten', 'deposit' => 'Inkomsten',
'transfer' => 'Overschrijving', 'transfer' => 'Overschrijving',
'Withdrawal' => 'Uitgave', 'Withdrawal' => 'Uitgave',
'Deposit' => 'Inkomsten', 'Deposit' => 'Inkomsten',
'Transfer' => 'Overschrijving', 'Transfer' => 'Overschrijving',
'bill' => 'Rekening', 'bill' => 'Rekening',
'yes' => 'Ja', 'yes' => 'Ja',
'no' => 'Nee', 'no' => 'Nee',
'amount' => 'Bedrag', 'amount' => 'Bedrag',
'newBalance' => 'Nieuw saldo', 'newBalance' => 'Nieuw saldo',
'overview' => 'Overzicht', 'overview' => 'Overzicht',
'saveOnAccount' => 'Sparen op rekening',
// charts: // charts:
'dayOfMonth' => 'Dag vd maand', 'dayOfMonth' => 'Dag vd maand',
'month' => 'Maand', 'month' => 'Maand',
'budget' => 'Budget', 'budget' => 'Budget',
'spent' => 'Uitgegeven', 'spent' => 'Uitgegeven',
'overspent' => 'Teveel uitgegeven', 'overspent' => 'Teveel uitgegeven',
'left' => 'Over', 'left' => 'Over',
'noCategory' => '(geen categorie)', 'noCategory' => '(geen categorie)',
'noBudget' => '(geen budget)', 'noBudget' => '(geen budget)',
'category' => 'Categorie', 'category' => 'Categorie',
'maxAmount' => 'Maximaal bedrag', 'maxAmount' => 'Maximaal bedrag',
'minAmount' => 'Minimaal bedrag', 'minAmount' => 'Minimaal bedrag',
'billEntry' => 'Bedrag voor deze rekening', 'billEntry' => 'Bedrag voor deze rekening',
'name' => 'Naam', 'name' => 'Naam',
'date' => 'Datum', 'date' => 'Datum',
'paid' => 'Betaald', 'paid' => 'Betaald',
'unpaid' => 'Niet betaald', 'unpaid' => 'Niet betaald',
'day' => 'Dag', 'day' => 'Dag',
'budgeted' => 'Gebudgetteerd', 'budgeted' => 'Gebudgetteerd',
'period' => 'Periode', 'period' => 'Periode',
'balance' => 'Saldo', 'balance' => 'Saldo',
'summary' => 'Samenvatting', 'summary' => 'Samenvatting',
'sum' => 'Som', 'sum' => 'Som',
'average' => 'Gemiddeld', 'average' => 'Gemiddeld',
'balanceFor' => 'Saldo op :name', 'balanceFor' => 'Saldo op :name',
'asset_accounts' => 'Betaalrekeningen',
'expense_accounts' => 'Crediteuren',
'revenue_accounts' => 'Debiteuren',
// some extra help:
'accountExtraHelp_asset' => '',
'accountExtraHelp_expense' => 'Een crediteur is een persoon of een bedrijf waar je geld aan moet betalen. Je staat bij ze in het krijt. Een verwarrende'.
' term misschien, maar zo werkt het nou eenmaal. De supermarkt, je huurbaas of de bank zijn crediteuren. Jouw '.
'geld (krediet) gaat naar hen toe. De term komt uit de wereld van de boekhouding. De uitgaves die je hier ziet zijn '.
'positief, want je kijkt uit hun perspectief. Zodra jij afrekent in een winkel, komt het geld er bij hen bij (positief).',
'accountExtraHelp_revenue' => 'Als je geld krijgt van een bedrijf of een persoon is dat een debiteur. '.
'Dat kan salaris zijn, of een andere betaling. ' .
' Ze hebben een schuld (debet) aan jou. De term komt uit de wereld van de boekhouding.'.
' De inkomsten die je hier ziet zijn negatief, want je kijkt uit hun perspectief. Zodra een debiteur geld naar jou '.
'overmaakt gaat het er bij hen af (negatief).',
]; ];

View File

@ -32,6 +32,9 @@ return [
'tags' => 'Tags', 'tags' => 'Tags',
'deletePermanently' => 'Verwijderen', 'deletePermanently' => 'Verwijderen',
'cancel' => 'Annuleren', 'cancel' => 'Annuleren',
'targetdate' => 'Doeldatum',
'remind_me' => 'Help me herinneren',
'reminder' => 'Herinner me elke',
'delete_account' => 'Verwijder rekening ":name"', 'delete_account' => 'Verwijder rekening ":name"',
'delete_bill' => 'Verwijder rekening ":name"', 'delete_bill' => 'Verwijder rekening ":name"',

View File

@ -1,6 +1,13 @@
{% extends "./layout/default.twig" %} {% extends "./layout/default.twig" %}
{% block content %} {% block content %}
{{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }} {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }}
<div class="row">
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
<p>
{{ ('accountExtraHelp_'~what)|_ }}
</p>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="panel panel-default"> <div class="panel panel-default">

View File

@ -13,7 +13,7 @@
<div class="panel-body"> <div class="panel-body">
{{ ExpandedForm.text('name') }} {{ ExpandedForm.text('name') }}
{{ ExpandedForm.select('account_id',accounts,null,{'label' : 'Save on account'}) }} {{ ExpandedForm.select('account_id',accounts,null,{'label' : 'saveOnAccount'|_}) }}
{{ ExpandedForm.amount('targetamount') }} {{ ExpandedForm.amount('targetamount') }}
</div> </div>
@ -26,8 +26,8 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
{{ ExpandedForm.date('targetdate') }} {{ ExpandedForm.date('targetdate') }}
{{ ExpandedForm.checkbox('remind_me','1',false,{'label' : 'Remind me'}) }} {{ ExpandedForm.checkbox('remind_me','1',false) }}
{{ ExpandedForm.select('reminder',periods,'month',{'label' : 'Remind every'}) }} {{ ExpandedForm.select('reminder',periods,'month') }}
</div> </div>
</div> </div>

View File

@ -15,7 +15,7 @@
<div class="panel-body"> <div class="panel-body">
{{ ExpandedForm.text('name') }} {{ ExpandedForm.text('name') }}
{{ ExpandedForm.select('account_id',accounts,null,{'label' : 'Save on account'}) }} {{ ExpandedForm.select('account_id',accounts,null,{'label' : 'saveOnAccount'|_}) }}
{{ ExpandedForm.amount('targetamount') }} {{ ExpandedForm.amount('targetamount') }}
</div> </div>
@ -29,8 +29,8 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
{{ ExpandedForm.date('targetdate') }} {{ ExpandedForm.date('targetdate') }}
{{ ExpandedForm.checkbox('remind_me','1',preFilled.remind_me,{'label' : 'Remind me'}) }} {{ ExpandedForm.checkbox('remind_me','1',preFilled.remind_me) }}
{{ ExpandedForm.select('reminder',periods,preFilled.reminder,{'label' : 'Remind every'}) }} {{ ExpandedForm.select('reminder',periods,preFilled.reminder) }}
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">Piggy banks</div> <div class="panel-heading">{{ 'piggyBanks'|_ }}</div>
{% include 'list/piggy-banks.twig' %} {% include 'list/piggy-banks.twig' %}
</div> </div>
</div> </div>