diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index f2b40c9747..a00ec82c5f 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -85,7 +85,7 @@ class CategoryRepository implements CategoryRepositoryInterface $result[$categoryId]['sum'] += floatval($entry->amount); } else { $isEncrypted = intval($entry->category_encrypted) == 1 ? true : false; - $name = strlen($entry->name) == 0 ? trans('firefly.noCategory') : $entry->name; + $name = strlen($entry->name) == 0 ? trans('firefly.no_category') : $entry->name; $name = $isEncrypted ? Crypt::decrypt($name) : $name; $result[$categoryId] = [ 'name' => $name, diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index bffcf4d117..3501451e7a 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -29,8 +29,6 @@ return [ 'transactionsWithoutBudgetDate' => 'Expenses without budget in :date', 'createBudget' => 'New budget', 'inactiveBudgets' => 'Inactive budgets', - 'newCategory' => 'New category', - 'withoutCategory' => 'Without a category', 'details_for_asset' => 'Details for asset account ":name"', 'details_for_expense' => 'Details for expense account ":name"', @@ -53,6 +51,14 @@ return [ 'make_new_expense_account' => 'New expense account', 'make_new_revenue_account' => 'New revenue account', + // categories: + 'new_category' => 'New category', + 'without_category' => 'Without a category', + 'update_category' => 'Wijzig categorie', + 'categories' => 'Categories', + 'no_category' => '(no category)', + 'category' => 'Category', + // new user: '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', @@ -94,7 +100,6 @@ return [ 'Expense account' => 'Expense account', 'Revenue account' => 'Revenue account', 'budgets' => 'Budgets', - 'categories' => 'Categories', 'tags' => 'Tags', 'reports' => 'Reports', 'transactions' => 'Transactions', @@ -171,9 +176,7 @@ return [ 'spent' => 'Spent', 'overspent' => 'Overspent', 'left' => 'Left', - 'noCategory' => '(no category)', 'noBudget' => '(no budget)', - 'category' => 'Category', 'maxAmount' => 'Maximum amount', 'minAmount' => 'Minumum amount', 'billEntry' => 'Current bill entry', diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index 9c478835b7..0848a47e34 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -29,8 +29,6 @@ return [ 'transactionsWithoutBudgetDate' => 'Uitgaven zonder budget in :date', 'createBudget' => 'Maak nieuw budget', 'inactiveBudgets' => 'Inactieve budgetten', - 'newCategory' => 'Nieuwe categorie', - 'withoutCategory' => 'Zonder categorie', 'details_for_asset' => 'Overzicht voor betaalrekening ":name"', 'details_for_expense' => 'Overzicht voor crediteur ":name"', @@ -53,6 +51,14 @@ return [ 'make_new_expense_account' => 'Nieuwe crediteur', 'make_new_revenue_account' => 'Nieuwe debiteur', + // categories: + 'new_category' => 'Nieuwe categorie', + 'without_category' => 'Zonder categorie', + 'update_category' => 'Wijzig categorie', + 'categories' => 'Categorieën', + 'no_category' => '(geen categorie)', + 'category' => 'Categorie', + // new user: 'welcome' => 'Welkom bij Firefly!', 'createNewAsset' => 'Maak om te beginnen een nieuwe betaalrekening. Dit is je start van je financiële beheer.', @@ -94,7 +100,6 @@ return [ 'Expense account' => 'Crediteur', 'Revenue account' => 'Debiteur', 'budgets' => 'Budgetten', - 'categories' => 'Categorieën', 'tags' => 'Tags', 'reports' => 'Overzichten', 'transactions' => 'Transacties', @@ -171,9 +176,7 @@ return [ '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', diff --git a/resources/twig/categories/edit.twig b/resources/twig/categories/edit.twig index 446e51faf5..1492610a43 100644 --- a/resources/twig/categories/edit.twig +++ b/resources/twig/categories/edit.twig @@ -34,7 +34,7 @@