From c2241567e4dc777daf14e310716f6c054b236d49 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 11 Jun 2015 18:32:31 +0200 Subject: [PATCH] New translations. [skip ci] --- app/Http/breadcrumbs.php | 22 +++++++++++----------- resources/lang/en/breadcrumbs.php | 19 +------------------ resources/lang/en/firefly.php | 8 +++----- resources/lang/nl/breadcrumbs.php | 17 ----------------- resources/lang/nl/firefly.php | 4 +--- resources/twig/partials/menu.twig | 6 +++--- 6 files changed, 19 insertions(+), 57 deletions(-) diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index fd8e5a146f..c7e18eb35d 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -36,7 +36,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'accounts.index', function (Generator $breadcrumbs, $what) { $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what])); + $breadcrumbs->push(trans('firefly.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what])); } ); @@ -60,7 +60,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'accounts.delete', function (Generator $breadcrumbs, Account $account) { $breadcrumbs->parent('accounts.show', $account); - $breadcrumbs->push(trans('breadcrumbs.delete_account', ['name' => e($account->name)]), route('accounts.delete', [$account->id])); + $breadcrumbs->push(trans('firefly.delete_account', ['name' => e($account->name)]), route('accounts.delete', [$account->id])); } ); @@ -70,7 +70,7 @@ Breadcrumbs::register( $breadcrumbs->parent('accounts.show', $account); $what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); - $breadcrumbs->push(trans('breadcrumbs.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', [$account->id])); + $breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', [$account->id])); } ); @@ -78,26 +78,26 @@ Breadcrumbs::register( Breadcrumbs::register( 'budgets.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.budgets'), route('budgets.index')); + $breadcrumbs->push(trans('firefly.budgets'), route('budgets.index')); } ); Breadcrumbs::register( 'budgets.create', function (Generator $breadcrumbs) { $breadcrumbs->parent('budgets.index'); - $breadcrumbs->push(trans('breadcrumbs.newBudget'), route('budgets.create')); + $breadcrumbs->push(trans('firefly.create_new_budget'), route('budgets.create')); } ); Breadcrumbs::register( 'budgets.edit', function (Generator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); - $breadcrumbs->push(trans('breadcrumbs.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', [$budget->id])); + $breadcrumbs->push(trans('firefly.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', [$budget->id])); } ); Breadcrumbs::register( 'budgets.delete', function (Generator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); - $breadcrumbs->push(trans('breadcrumbs.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', [$budget->id])); + $breadcrumbs->push(trans('firefly.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', [$budget->id])); } ); @@ -124,7 +124,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'categories.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.categories'), route('categories.index')); + $breadcrumbs->push(trans('firefly.categories'), route('categories.index')); } ); Breadcrumbs::register( @@ -137,13 +137,13 @@ Breadcrumbs::register( Breadcrumbs::register( 'categories.edit', function (Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show', $category); - $breadcrumbs->push(trans('breadcrumbs.edit_category', ['name' => e($category->name)]), route('categories.edit', [$category->id])); + $breadcrumbs->push(trans('firefly.edit_category', ['name' => e($category->name)]), route('categories.edit', [$category->id])); } ); Breadcrumbs::register( 'categories.delete', function (Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show', $category); - $breadcrumbs->push(trans('breadcrumbs.delete_category', ['name' => e($category->name)]), route('categories.delete', [$category->id])); + $breadcrumbs->push(trans('firefly.delete_category', ['name' => e($category->name)]), route('categories.delete', [$category->id])); } ); @@ -166,7 +166,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'currency.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.currencies'), route('currency.index')); + $breadcrumbs->push(trans('firefly.currencies'), route('currency.index')); } ); diff --git a/resources/lang/en/breadcrumbs.php b/resources/lang/en/breadcrumbs.php index 4f5ddeadd2..aa16b615d8 100644 --- a/resources/lang/en/breadcrumbs.php +++ b/resources/lang/en/breadcrumbs.php @@ -3,33 +3,16 @@ return [ 'home' => 'Home', // accounts - 'asset_accounts' => 'Asset accounts', - 'expense_accounts' => 'Expense accounts', - 'revenue_accounts' => 'Revenue accounts', 'cash_accounts' => 'Cash accounts', 'new_asset_account' => 'New asset accounts', 'new_expense_account' => 'New expense account', 'new_revenue_account' => 'New revenue account', - 'delete_account' => 'Delete account ":name"', 'edit_account' => 'Edit account ":name"', - 'edit_asset_account' => 'Edit asset account ":name"', - 'edit_expense_account' => 'Edit expense account ":name"', - 'edit_revenue_account' => 'Edit revenue account ":name"', - - // budgets - 'budgets' => 'Budgets', - 'newBudget' => 'Create a new budget', - 'delete_budget' => 'Delete budget ":name"', - 'edit_budget' => 'Edit budget ":name"', // categories - 'categories' => 'Categories', - 'newCategory' => 'Create a new categori', - 'delete_category' => 'Delete category ":name"', - 'edit_category' => 'Edit category ":name"', + 'newCategory' => 'Create a new category', // currencies - 'currencies' => 'Currencies', 'edit_currency' => 'Edit currencies ":name"', 'delete_currency' => 'Delete currencies ":name"', diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index 8c2324ae4b..7156618e21 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -108,6 +108,7 @@ return [ 'without_category' => 'Without a category', 'update_category' => 'Wijzig categorie', 'categories' => 'Categories', + 'edit_category' => 'Edit category ":name"', 'no_category' => '(no category)', 'category' => 'Category', 'delete_category' => 'Delete category ":name"', @@ -154,9 +155,6 @@ return [ 'dashboard' => 'Dashboard', 'currencies' => 'Currencies', 'accounts' => 'Accounts', - 'assetAccounts' => 'Asset accounts', - 'expenseAccounts' => 'Expense accounts', - 'revenueAccounts' => 'Revenue accounts', 'Asset account' => 'Asset account', 'Default account' => 'Asset account', 'Expense account' => 'Expense account', @@ -203,9 +201,9 @@ return [ 'accountBalances' => 'Account balances', 'balanceStartOfYear' => 'Balance at start of year', 'balanceEndOfYear' => 'Balance at end of year', - 'balanceStartOfMonth' => 'Balance at end of month', + 'balanceStartOfMonth' => 'Balance at start of month', 'balanceEndOfMonth' => 'Balance at end of month', - 'balanceStart' => 'Balance at end of period', + 'balanceStart' => 'Balance at start of period', 'balanceEnd' => 'Balance at end of period', 'reportsOwnAccounts' => 'Reports for your own accounts', 'reportsOwnAccountsAndShared' => 'Reports for your own accounts and shared accounts', diff --git a/resources/lang/nl/breadcrumbs.php b/resources/lang/nl/breadcrumbs.php index bfed39b02a..a5a1dddb8a 100644 --- a/resources/lang/nl/breadcrumbs.php +++ b/resources/lang/nl/breadcrumbs.php @@ -3,33 +3,16 @@ return [ 'home' => 'Home', // accounts - 'asset_accounts' => 'Betaalrekeningen', - 'expense_accounts' => 'Crediteuren', - 'revenue_accounts' => 'Debiteuren', 'cash_accounts' => 'Contant geldrekeningen', 'new_asset_account' => 'Nieuwe betaalrekening', 'new_expense_account' => 'Nieuwe crediteur', 'new_revenue_account' => 'Nieuwe debiteur', - 'delete_account' => 'Verwijder rekening ":name"', 'edit_account' => 'Wijzig rekening ":name"', - 'edit_asset_account' => 'Wijzig betaalrekening ":name"', - 'edit_expense_account' => 'Wijzig crediteur ":name"', - 'edit_revenue_account' => 'Wijzig debiteur ":name"', - - // budgets - 'budgets' => 'Budgetten', - 'newBudget' => 'Maak een nieuw budget', - 'delete_budget' => 'Verwijder budget ":name"', - 'edit_budget' => 'Wijzig budget ":name"', // categories - 'categories' => 'Categorieën', 'newCategory' => 'Maak een nieuw categorie', - 'delete_category' => 'Verwijder categorie ":name"', - 'edit_category' => 'Wijzig categorie ":name"', // currencies - 'currencies' => 'Munteenheden', 'edit_currency' => 'Wijzig munteenheid ":name"', 'delete_currency' => 'Verwijder munteenheid ":name"', diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index 8a5581458a..4a42b5ae8e 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -116,6 +116,7 @@ return [ 'create_new_category' => 'Nieuwe categorie', 'without_category' => 'Zonder categorie', 'update_category' => 'Wijzig categorie', + 'edit_category' => 'Wijzig categorie ":name"', 'categories' => 'Categorieën', 'no_category' => '(geen categorie)', 'category' => 'Categorie', @@ -163,9 +164,6 @@ return [ 'dashboard' => 'Dashboard', 'currencies' => 'Munteenheden', 'accounts' => 'Rekeningen', - 'assetAccounts' => 'Betaalrekeningen', - 'expenseAccounts' => 'Crediteuren', - 'revenueAccounts' => 'Debiteuren', 'Asset account' => 'Betaalrekening', 'Default account' => 'Betaalrekening', 'Expense account' => 'Crediteur', diff --git a/resources/twig/partials/menu.twig b/resources/twig/partials/menu.twig index 5958be0395..3d47c33fb3 100644 --- a/resources/twig/partials/menu.twig +++ b/resources/twig/partials/menu.twig @@ -118,15 +118,15 @@