From 6be42f112a3cad4769516006f0c5c02f2f59ff18 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 14 May 2015 13:17:53 +0200 Subject: [PATCH] Charts and titles in Dutch. [skip ci] --- app/Http/Controllers/AccountController.php | 2 +- app/Http/Controllers/BillController.php | 2 +- app/Http/Controllers/BudgetController.php | 2 +- app/Http/Controllers/CategoryController.php | 2 +- app/Http/Controllers/CurrencyController.php | 2 +- .../Controllers/GoogleChartController.php | 76 +++++++++---------- app/Http/Controllers/HomeController.php | 2 +- resources/lang/en/firefly.php | 26 +++++++ resources/lang/nl/firefly.php | 2 + 9 files changed, 72 insertions(+), 44 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 74a9966476..a93b9d1589 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -28,7 +28,7 @@ class AccountController extends Controller { parent::__construct(); View::share('mainTitleIcon', 'fa-credit-card'); - View::share('title', 'Accounts'); + View::share('title', trans('firefly.accounts')); } /** diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index d525a1094f..8195fdbfc0 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -29,7 +29,7 @@ class BillController extends Controller public function __construct() { parent::__construct(); - View::share('title', 'Bills'); + View::share('title', trans('firefly.bills')); View::share('mainTitleIcon', 'fa-calendar-o'); } diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 27205a295b..a2ea1b41a7 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -29,7 +29,7 @@ class BudgetController extends Controller public function __construct() { parent::__construct(); - View::share('title', 'Budgets'); + View::share('title', trans('firefly.budgets')); View::share('mainTitleIcon', 'fa-tasks'); View::share('hideBudgets', true); } diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 3b54d2fe1d..26681b3d7a 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -26,7 +26,7 @@ class CategoryController extends Controller public function __construct() { parent::__construct(); - View::share('title', 'Categories'); + View::share('title', trans('firefly.categories')); View::share('mainTitleIcon', 'fa-bar-chart'); } diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 7c0e33404e..2518d5ba7b 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -28,7 +28,7 @@ class CurrencyController extends Controller public function __construct() { parent::__construct(); - View::share('title', 'Currencies'); + View::share('title', trans('firefly.currencies')); View::share('mainTitleIcon', 'fa-usd'); } diff --git a/app/Http/Controllers/GoogleChartController.php b/app/Http/Controllers/GoogleChartController.php index 96fd291304..1fdfe04c64 100644 --- a/app/Http/Controllers/GoogleChartController.php +++ b/app/Http/Controllers/GoogleChartController.php @@ -42,7 +42,7 @@ class GoogleChartController extends Controller */ public function accountBalanceChart(GChart $chart, Account $account) { - $chart->addColumn('Day of month', 'date'); + $chart->addColumn(trans('firefly.dayOfMonth'), 'date'); $chart->addColumn('Balance for ' . $account->name, 'number'); $chart->addCertainty(1); @@ -71,7 +71,7 @@ class GoogleChartController extends Controller */ public function allAccountsBalanceChart(GChart $chart, AccountRepositoryInterface $repository) { - $chart->addColumn('Day of the month', 'date'); + $chart->addColumn(trans('firefly.dayOfMonth'), 'date'); $frontPage = Preferences::get('frontPageAccounts', []); $start = Session::get('start', Carbon::now()->startOfMonth()); @@ -114,7 +114,7 @@ class GoogleChartController extends Controller public function allBudgetsAndSpending(GChart $chart, BudgetRepositoryInterface $repository, $year) { $budgets = $repository->getBudgets(); - $chart->addColumn('Month', 'date'); + $chart->addColumn(trans('firefly.month'), 'date'); foreach ($budgets as $budget) { $chart->addColumn($budget->name, 'number'); } @@ -147,10 +147,10 @@ class GoogleChartController extends Controller */ public function allBudgetsHomeChart(GChart $chart, BudgetRepositoryInterface $repository) { - $chart->addColumn('Budget', 'string'); - $chart->addColumn('Left', 'number'); - $chart->addColumn('Spent', 'number'); - $chart->addColumn('Overspent', 'number'); + $chart->addColumn(trans('firefly.budget'), 'string'); + $chart->addColumn(trans('firefly.left'), 'number'); + $chart->addColumn(trans('firefly.spent'), 'number'); + $chart->addColumn(trans('firefly.overspent'), 'number'); $budgets = $repository->getBudgets(); $start = Session::get('start', Carbon::now()->startOfMonth()); @@ -181,7 +181,7 @@ class GoogleChartController extends Controller } $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end); - $allEntries->push(['(no budget)', 0, 0, $noBudgetExpenses]); + $allEntries->push([trans('firefly.noBudget'), 0, 0, $noBudgetExpenses]); foreach ($allEntries as $entry) { if ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0) { @@ -203,8 +203,8 @@ class GoogleChartController extends Controller */ public function allCategoriesHomeChart(GChart $chart, CategoryRepositoryInterface $repository) { - $chart->addColumn('Category', 'string'); - $chart->addColumn('Spent', 'number'); + $chart->addColumn(trans('firefly.category'), 'string'); + $chart->addColumn(trans('firefly.spent'), 'number'); $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); @@ -212,7 +212,7 @@ class GoogleChartController extends Controller foreach ($set as $entry) { $isEncrypted = intval($entry->encrypted) == 1 ? true : false; - $name = strlen($entry->name) == 0 ? '(no category)' : $entry->name; + $name = strlen($entry->name) == 0 ? trans('firefly.noCategory') : $entry->name; $name = $isEncrypted ? Crypt::decrypt($name) : $name; $chart->addRow($name, floatval($entry->sum)); } @@ -233,10 +233,10 @@ class GoogleChartController extends Controller public function billOverview(GChart $chart, BillRepositoryInterface $repository, Bill $bill) { - $chart->addColumn('Date', 'date'); - $chart->addColumn('Max amount', 'number'); - $chart->addColumn('Min amount', 'number'); - $chart->addColumn('Recorded bill entry', 'number'); + $chart->addColumn(trans('firefly.date'), 'date'); + $chart->addColumn(trans('firefly.maxAmount'), 'number'); + $chart->addColumn(trans('firefly.minAmount'), 'number'); + $chart->addColumn(trans('firefly.billEntry'), 'number'); // get first transaction or today for start: $results = $repository->getJournals($bill); @@ -261,8 +261,8 @@ class GoogleChartController extends Controller */ public function billsOverview(GChart $chart, BillRepositoryInterface $repository, AccountRepositoryInterface $accounts) { - $chart->addColumn('Name', 'string'); - $chart->addColumn('Amount', 'number'); + $chart->addColumn(trans('firefly.name'), 'string'); + $chart->addColumn(trans('firefly.amount'), 'number'); $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); @@ -329,8 +329,8 @@ class GoogleChartController extends Controller unset($amount, $description); } - $chart->addRow('Unpaid: ' . join(', ', $unpaidDescriptions), $unpaidAmount); - $chart->addRow('Paid: ' . join(', ', $paidDescriptions), $paidAmount); + $chart->addRow(trans('firefly.unpaid') . ': ' . join(', ', $unpaidDescriptions), $unpaidAmount); + $chart->addRow(trans('firefly.paid') . ': ' . join(', ', $paidDescriptions), $paidAmount); $chart->generate(); return Response::json($chart->getData()); @@ -349,8 +349,8 @@ class GoogleChartController extends Controller $start = clone $repetition->startdate; $end = $repetition->enddate; - $chart->addColumn('Day', 'date'); - $chart->addColumn('Left', 'number'); + $chart->addColumn(trans('firefly.day'), 'date'); + $chart->addColumn(trans('firefly.left'), 'number'); $amount = $repetition->amount; @@ -380,9 +380,9 @@ class GoogleChartController extends Controller */ public function budgetsAndSpending(GChart $chart, BudgetRepositoryInterface $repository, Budget $budget, $year = 0) { - $chart->addColumn('Month', 'date'); - $chart->addColumn('Budgeted', 'number'); - $chart->addColumn('Spent', 'number'); + $chart->addColumn(trans('firefly.month'), 'date'); + $chart->addColumn(trans('firefly.budgeted'), 'number'); + $chart->addColumn(trans('firefly.spent'), 'number'); if ($year == 0) { $start = $repository->getFirstBudgetLimitDate($budget); @@ -424,8 +424,8 @@ class GoogleChartController extends Controller // jump to start of week / month / year / etc (TODO). $start = Navigation::startOfPeriod($start, $range->data); - $chart->addColumn('Period', 'date'); - $chart->addColumn('Spent', 'number'); + $chart->addColumn(trans('firefly.period'), 'date'); + $chart->addColumn(trans('firefly.spent'), 'number'); $end = new Carbon; while ($start <= $end) { @@ -454,8 +454,8 @@ class GoogleChartController extends Controller public function categoryPeriodChart(GChart $chart, CategoryRepositoryInterface $repository, Category $category) { $start = clone Session::get('start', Carbon::now()->startOfMonth()); - $chart->addColumn('Period', 'date'); - $chart->addColumn('Spent', 'number'); + $chart->addColumn(trans('firefly.period'), 'date'); + $chart->addColumn(trans('firefly.spent'), 'number'); $end = Session::get('end', Carbon::now()->endOfMonth()); while ($start <= $end) { @@ -481,8 +481,8 @@ class GoogleChartController extends Controller */ public function piggyBankHistory(GChart $chart, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) { - $chart->addColumn('Date', 'date'); - $chart->addColumn('Balance', 'number'); + $chart->addColumn(trans('firefly.date'), 'date'); + $chart->addColumn(trans('firefly.balance'), 'number'); /** @var Collection $set */ $set = $repository->getEventSummarySet($piggyBank); @@ -509,9 +509,9 @@ class GoogleChartController extends Controller public function yearInExp(GChart $chart, ReportQueryInterface $query, $year) { $start = new Carbon('01-01-' . $year); - $chart->addColumn('Month', 'date'); - $chart->addColumn('Income', 'number'); - $chart->addColumn('Expenses', 'number'); + $chart->addColumn(trans('firefly.month'), 'date'); + $chart->addColumn(trans('firefly.income'), 'number'); + $chart->addColumn(trans('firefly.expenses'), 'number'); $pref = Preferences::get('showSharedReports', false); $showSharedReports = $pref->data; @@ -548,9 +548,9 @@ class GoogleChartController extends Controller public function yearInExpSum(GChart $chart, ReportQueryInterface $query, $year) { $start = new Carbon('01-01-' . $year); - $chart->addColumn('Summary', 'string'); - $chart->addColumn('Income', 'number'); - $chart->addColumn('Expenses', 'number'); + $chart->addColumn(trans('firefly.summary'), 'string'); + $chart->addColumn(trans('firefly.income'), 'number'); + $chart->addColumn(trans('firefly.expenses'), 'number'); $pref = Preferences::get('showSharedReports', false); $showSharedReports = $pref->data; @@ -576,9 +576,9 @@ class GoogleChartController extends Controller } - $chart->addRow('Sum', $income, $expense); + $chart->addRow(trans('firefly.sum'), $income, $expense); $count = $count > 0 ? $count : 1; - $chart->addRow('Average', ($income / $count), ($expense / $count)); + $chart->addRow(trans('firefly.average'), ($income / $count), ($expense / $count)); $chart->generate(); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index bdaf16b314..519e3e970a 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -53,7 +53,7 @@ class HomeController extends Controller $types = Config::get('firefly.accountTypesByIdentifier.asset'); $count = $repository->countAccounts($types); $title = 'Firefly'; - $subTitle = 'What\'s playing?'; + $subTitle = trans('firefly.welcomeBack'); $mainTitleIcon = 'fa-fire'; $transactions = []; $frontPage = Preferences::get('frontPageAccounts', []); diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index 05a6c72076..31620226d5 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -12,6 +12,7 @@ return [ 'actions' => 'Actions', 'edit' => 'Edit', 'delete' => 'Delete', + 'welcomeBack' => 'What\'s playing?', // new user: 'welcome' => 'Welcome to Firefly!', @@ -44,6 +45,7 @@ return [ 'logout' => 'Logout', 'searchPlaceholder' => 'Search...', 'dashboard' => 'Dashboard', + 'currencies' => 'Currencies', 'accounts' => 'Accounts', 'assetAccounts' => 'Asset accounts', 'expenseAccounts' => 'Expense accounts', @@ -65,4 +67,28 @@ return [ 'transfer' => 'Transfer', 'bill' => 'Rekening', + // charts: + 'dayOfMonth' => 'Dag vd maand', + 'month' => 'Maand', + 'budget' => 'Budget', + 'spent' => 'Uitgegeven', + 'overspent' => 'Teveel uitgegeven', + 'left' => 'Over', + 'noCategory' => '(geen categorie)', + 'noBudget' => '(geen budget)', + 'category' => 'Categorie', + 'maxAmount' => 'Maximaal bedrag', + 'minAmount' => 'Minimaal bedrag', + 'billEntry' => 'Bedrag voor deze rekening', + 'name' => 'Naam', + 'date' => 'Datum', + 'paid' => 'Betaald', + 'unpaid' => 'Niet betaald', + 'day' => 'Dag', + 'budgeted' => 'Gebudgetteerd', + 'period' => 'Periode', + 'balance' => 'Saldo', + 'summary' => 'Samenvatting', + 'sum' => 'Som', + 'average' => 'Gemiddeld', ]; diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index 713b877fad..a48bdba14d 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -12,6 +12,7 @@ return [ 'actions' => 'Acties', 'edit' => 'Wijzig', 'delete' => 'Verwijder', + 'welcomeBack' => 'Hoe staat het er voor?', // new user: 'welcome' => 'Welkom bij Firefly!', @@ -44,6 +45,7 @@ return [ 'logout' => 'Uitloggen', 'searchPlaceholder' => 'Zoeken...', 'dashboard' => 'Dashboard', + 'currencies' => 'Munteenheden', 'accounts' => 'Rekeningen', 'assetAccounts' => 'Betaalrekeningen', 'expenseAccounts' => 'Crediteuren',