From 664fde23441608f00c4bc81e8643bbd6b3420ad8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 23 Jan 2016 09:10:22 +0100 Subject: [PATCH] Some forgotten translations. --- app/Http/Controllers/CurrencyController.php | 14 +++++++------- resources/lang/en_US/firefly.php | 9 +++++++++ resources/views/currency/index.twig | 12 ++++++------ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index d2bdbf7e06..c7422c7195 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -60,7 +60,7 @@ class CurrencyController extends Controller Preferences::set('currencyPreference', $currency->code); Preferences::mark(); - Session::flash('success', $currency->name . ' is now the default currency.'); + Session::flash('success', trans('firefly.new_default_currency', ['name' => $currency->name])); Cache::forget('FFCURRENCYSYMBOL'); Cache::forget('FFCURRENCYCODE'); @@ -78,7 +78,7 @@ class CurrencyController extends Controller { if ($repository->countJournals($currency) > 0) { - Session::flash('error', 'Cannot delete ' . e($currency->name) . ' because there are still transactions attached to it.'); + Session::flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name])); return redirect(route('currency.index')); } @@ -103,12 +103,12 @@ class CurrencyController extends Controller public function destroy(CurrencyRepositoryInterface $repository, TransactionCurrency $currency) { if ($repository->countJournals($currency) > 0) { - Session::flash('error', 'Cannot destroy ' . e($currency->name) . ' because there are still transactions attached to it.'); + Session::flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name])); return redirect(route('currency.index')); } - Session::flash('success', 'Currency "' . e($currency->name) . '" deleted'); + Session::flash('success', trans('firefly.deleted_currency', ['name' => $currency->name])); if (Auth::user()->hasRole('owner')) { $currency->delete(); } @@ -151,7 +151,7 @@ class CurrencyController extends Controller if (!Auth::user()->hasRole('owner')) { - Session::flash('warning', 'Please ask ' . env('SITE_OWNER') . ' to add, remove or edit currencies.'); + Session::flash('warning', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')])); } @@ -170,7 +170,7 @@ class CurrencyController extends Controller $data = $request->getCurrencyData(); if (Auth::user()->hasRole('owner')) { $currency = $repository->store($data); - Session::flash('success', 'Currency "' . $currency->name . '" created'); + Session::flash('success', trans('firefly.created_currency', ['name' => $currency->name])); } @@ -199,7 +199,7 @@ class CurrencyController extends Controller if (Auth::user()->hasRole('owner')) { $currency = $repository->update($currency, $data); } - Session::flash('success', 'Currency "' . e($currency->name) . '" updated.'); + Session::flash('success', trans('firefly.updated_currency', ['name' => $currency->name])); Preferences::mark(); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index d30005be04..eda8736b29 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -302,6 +302,15 @@ return [ 'edit_currency' => 'Edit currency ":name"', 'store_currency' => 'Store new currency', 'update_currency' => 'Update currency', + 'new_default_currency' => ':name is now the default currency.', + 'cannot_delete_currency' => 'Cannot delete :name because there are still transactions attached to it!', + 'deleted_currency' => 'Currency :name deleted', + 'created_currency' => 'Currency :name created', + 'updated_currency' => 'Currency :name updated', + 'ask_site_owner' => 'Please ask :owner to add, remove or edit currencies.', + 'currencies_intro' => 'Firefly III supports various currencies which you can set and enable here.', + 'make_default_currency' => 'make default', + 'default_currency' => 'default', // new user: 'submit' => 'Submit', diff --git a/resources/views/currency/index.twig b/resources/views/currency/index.twig index 8449d1a9fa..f8fd9dbb50 100644 --- a/resources/views/currency/index.twig +++ b/resources/views/currency/index.twig @@ -9,18 +9,18 @@
-

Currencies

+

{{ 'currencies'|_ }}

- Firefly III supports various currencies which you can set and enable here. + {{ 'currencies_intro'|_ }}

{% if currencies|length > 0 %} - + @@ -35,9 +35,9 @@ @@ -47,7 +47,7 @@ {% endif %}
 Currency{{ 'currency'|_ }}
{{ currency.name }} ({{ currency.code }}) ({{ currency.symbol|raw }}) {% if currency.id == defaultCurrency.id %} - default + {{ 'default_currency'|_ }} {% else %} - make default + {{ 'make_default_currency'|_ }} {% endif %}