From a114f60127db1fdbc4e6bc9b0b8638dd688856b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Lo=CC=88sken?= Date: Mon, 4 Jul 2016 01:02:38 +0200 Subject: [PATCH] Adding translation support for languages - Languages can now be translated via texts.php --- app/Http/Controllers/AccountController.php | 1 - app/Http/Controllers/ClientController.php | 1 - app/Http/Controllers/InvoiceController.php | 1 - .../ViewComposers/TranslationComposer.php | 5 +++++ app/Providers/ComposerServiceProvider.php | 2 +- resources/lang/de/texts.php | 18 ++++++++++++++++++ resources/lang/en/texts.php | 19 +++++++++++++++++++ resources/views/clients/edit.blade.php | 2 +- 8 files changed, 44 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 6e4d4f17c750..a300983f4e9f 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -393,7 +393,6 @@ class AccountController extends BaseController 'dateFormats' => Cache::get('dateFormats'), 'datetimeFormats' => Cache::get('datetimeFormats'), 'currencies' => Cache::get('currencies'), - 'languages' => Cache::get('languages'), 'title' => trans('texts.localization'), ]; diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 1cf49e724c54..6e67d3f31148 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -206,7 +206,6 @@ class ClientController extends BaseController 'sizes' => Cache::get('sizes'), 'paymentTerms' => Cache::get('paymentTerms'), 'currencies' => Cache::get('currencies'), - 'languages' => Cache::get('languages'), 'customLabel1' => Auth::user()->account->custom_client_label1, 'customLabel2' => Auth::user()->account->custom_client_label2, ]; diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index ab0fdd0bffe0..9004d0056ecc 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -369,7 +369,6 @@ class InvoiceController extends BaseController 'taxRateOptions' => $options, 'defaultTax' => $defaultTax, 'currencies' => Cache::get('currencies'), - 'languages' => Cache::get('languages'), 'sizes' => Cache::get('sizes'), 'paymentTerms' => Cache::get('paymentTerms'), 'invoiceDesigns' => InvoiceDesign::getDesigns(), diff --git a/app/Http/ViewComposers/TranslationComposer.php b/app/Http/ViewComposers/TranslationComposer.php index b809eada89a0..76a576ea5444 100644 --- a/app/Http/ViewComposers/TranslationComposer.php +++ b/app/Http/ViewComposers/TranslationComposer.php @@ -39,5 +39,10 @@ class TranslationComposer return $pType->name; })); + $view->with('languages', Cache::get('languages')->each(function ($lang) { + $lang->name = trans('texts.lang_'.$lang->name); + })->sortBy(function ($lang) { + return $lang->name; + })); } } \ No newline at end of file diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 8b1c76158707..0bd4f0b57c2e 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -14,7 +14,7 @@ class ComposerServiceProvider extends ServiceProvider public function boot() { view()->composer( - ['accounts.details', 'clients.edit', 'payments.edit', 'invoices.edit'], + ['accounts.details', 'clients.edit', 'payments.edit', 'invoices.edit', 'accounts.localization'], 'App\Http\ViewComposers\TranslationComposer' ); } diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php index d1c59fd47093..655902c0e914 100644 --- a/resources/lang/de/texts.php +++ b/resources/lang/de/texts.php @@ -1674,6 +1674,24 @@ $LANG = array( 'country_Yemen' => '', 'country_Zambi' => '', + // Languages + 'lang_Brazilian Portuguese' => 'Brazilian Portuguese', + 'lang_Croatian' => 'Kroatisch', + 'lang_Czech' => 'Tschechisch', + 'lang_Danish' => 'Dänisch', + 'lang_Dutch' => 'Niederländisch', + 'lang_English' => 'Englisch', + 'lang_French' => 'Französisch', + 'lang_French - Canada' => 'French - Canada', + 'lang_German' => 'Deutsch', + 'lang_Italian' => 'Italian', + 'lang_Japanese' => 'Japanese', + 'lang_Lithuanian' => 'Lithuanian', + 'lang_Norwegian' => 'Norwegian', + 'lang_Polish' => 'Polish', + 'lang_Spanish' => 'Spanish', + 'lang_Spanish - Spain' => 'Spanish - Spain', + 'lang_Swedish' => 'Swedish', ); return $LANG; diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 53bd1cefbc56..6929b6855ab6 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1674,6 +1674,25 @@ $LANG = array( 'country_Yemen' => 'Yemen', 'country_Zambi' => 'Zambi', + // Languages + 'lang_Brazilian Portuguese' => 'Brazilian Portuguese', + 'lang_Croatian' => 'Croatian', + 'lang_Czech' => 'Czech', + 'lang_Danish' => 'Danish', + 'lang_Dutch' => 'Dutch', + 'lang_English' => 'English', + 'lang_French' => 'French', + 'lang_French - Canada' => 'French - Canada', + 'lang_German' => 'German', + 'lang_Italian' => 'Italian', + 'lang_Japanese' => 'Japanese', + 'lang_Lithuanian' => 'Lithuanian', + 'lang_Norwegian' => 'Norwegian', + 'lang_Polish' => 'Polish', + 'lang_Spanish' => 'Spanish', + 'lang_Spanish - Spain' => 'Spanish - Spain', + 'lang_Swedish' => 'Swedish', + // Frequencies 'freq_weekly' => 'Weekly', 'freq_two_weeks' => 'Two weeks', diff --git a/resources/views/clients/edit.blade.php b/resources/views/clients/edit.blade.php index 7fee89350f2a..afdc6fd0c32f 100644 --- a/resources/views/clients/edit.blade.php +++ b/resources/views/clients/edit.blade.php @@ -122,7 +122,7 @@ ->placeholder($account->currency ? $account->currency->name : '') ->fromQuery($currencies, 'name', 'id') !!} {!! Former::select('language_id')->addOption('','') - ->placeholder($account->language ? $account->language->name : '') + ->placeholder($account->language ? trans('texts.lang_'.$account->language->name) : '') ->fromQuery($languages, 'name', 'id') !!} {!! Former::select('payment_terms')->addOption('','') ->fromQuery($paymentTerms, 'name', 'num_days')