Hokan22 / laravel-translator

src/Translator.php

Spacing +10 added lines, -10 removed lines

@@ -59,7 +59,7 @@ 
      * @throws \Exception
      * TODO: Make function Parameters interchangeable
      */
-    public function translate($identifier , $parameters = null, $locale = '') {
+    public function translate($identifier, $parameters = null, $locale = '') {
 
         // Validate the locale given as parameter or take the saved locale
         if ($locale !== '' || $this->locale === '') {
@@ -181,12 +181,12 @@ 
      */
     public function addMissingIdentifier($identifier, $parameters, $group) {
 
-        if(! $this->hasIdentifier($identifier)) {
+        if (!$this->hasIdentifier($identifier)) {
 
             // Save only the keys from the parameter array
             $keys = [];
             if (is_array($parameters)) {
-                foreach($parameters as $key => $value) {
+                foreach ($parameters as $key => $value) {
                     $keys[] = $key;
                 }
             }
@@ -228,7 +228,7 @@ 
      * @param $parameters
      * @return string
      */
-    private function replaceParameter ($translation, $parameters) {
+    private function replaceParameter($translation, $parameters) {
 
         // Go through each specified Parameter and replace its placeholder "{$key}"
        foreach ($parameters as $key => $parameter) {
@@ -249,7 +249,7 @@ 
      * @return string
      * @throws \Exception
      */
-    private function returnMissingTranslation ($identifier, $locale) {
+    private function returnMissingTranslation($identifier, $locale) {
 
         // Return identifier and locale for easier debug
         if (config('app.env') !== 'production') {
@@ -279,7 +279,7 @@ 
         }
 
         // Fallback if empty locale was given (should be handled in middleware)
-        if ($locale == ''){
+        if ($locale == '') {
             if (session()->get('locale') != '') {
                 $locale = session()->get('locale');
             }
@@ -289,19 +289,19 @@ 
         }
 
         // If the given locale is not defined as valid, try to get a fallback locale
-        if (!in_array($locale, $avail_locales)){
+        if (!in_array($locale, $avail_locales)) {
 
             $found_locales = [];
 
             // Find any available locale which contains the locale as substring
             foreach ($avail_locales as $avail_locale) {
-                if (strpos($avail_locale, $locale) !== false){
+                if (strpos($avail_locale, $locale) !== false) {
                     $found_locales[] = $avail_locale;
                 }
             }
 
             // Check if default locale is inside the found locales. If it was, use it!
-            if (in_array($default_locale, $found_locales)){
+            if (in_array($default_locale, $found_locales)) {
                 Log::warning('Locale "'.$locale.'" was not found! Falling back to default locale "'.$default_locale.'"');
                 $locale = $default_locale;
             }
@@ -324,7 +324,7 @@ 
      * @return array|mixed
      */
     public function getAllTranslations($locale, $group) {
-        if(!isset($this->aHandler[$locale])) {
+        if (!isset($this->aHandler[$locale])) {
             $this->aHandler[$locale] = $this->createHandler($locale);
         }
 

src/Middleware/TranslatorMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
             $locale = TranslatorFacade::validateLocale($locale);
 
-            if(Session::has('locale') == false){
+            if (Session::has('locale') == false) {
                 Session::put('locale', $locale);
                 Session::save();
             }

src/Handler/DatabaseHandler.php

Spacing +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
      */
     public function getTranslation($identifier, $group) {
 
-        if(isset($this->translations[$identifier])) {
+        if (isset($this->translations[$identifier])) {
             if ($this->translations[$identifier]->translation == null) {
                 throw new TranslationNotFoundException("The translation for identifier '".$identifier."' and locale '".$this->locale."' could not be found");
             }
@@ -58,9 +58,9 @@ 
      */
     public function refreshCache() {
         // Get all Texts with translations for the given locale
-        $translations =   new TranslationIdentifier();
-        $translations =   $translations->leftJoin('translations', function ($join) {
-                                                    $join->on( 'translation_identifiers.id', '=', 'translations.translation_identifier_id')
+        $translations = new TranslationIdentifier();
+        $translations = $translations->leftJoin('translations', function($join) {
+                                                    $join->on('translation_identifiers.id', '=', 'translations.translation_identifier_id')
                                                          ->where('locale', $this->locale);
                                                 })->get();
 

src/Handler/CacheJSONHandler.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
      * @throws TranslationCacheNotFound
      */
     public function __construct($locale) {
-        $this->locale   = $locale;
+        $this->locale = $locale;
 
         $this->refreshCache();
     }
@@ -44,7 +44,7 @@ 
         // NOTE: This should never trigger the addition of the identifier to the database,
         // because the cache will not be updated automatically.
         // So not finding the same identifier twice in the cache, will result in an error.
-        if(isset($this->translations[$group][$identifier])) {
+        if (isset($this->translations[$group][$identifier])) {
             return $this->translations[$group][$identifier];
         }
         else {
@@ -80,7 +80,7 @@ 
      */
     public function getAllTranslations($group)
     {
-        if(!isset($this->translations[$group])) {
+        if (!isset($this->translations[$group])) {
             $this->refreshCache($group);
         }
         return $this->translations[$group];

src/Provider/TranslatorBladeProvider.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
      */
     public function boot()
     {
-        Blade::directive('translate', function ($expression) {
+        Blade::directive('translate', function($expression) {
 
             $expression = $this->stripParentheses($expression);
 
@@ -24,7 +24,7 @@ 
             return "<?php echo Hokan22\\LaravelTranslator\\TranslatorFacade::translate({$expression}); ?>";
         });
 
-        Blade::directive('t', function ($expression) {
+        Blade::directive('t', function($expression) {
 
             $expression = $this->stripParentheses($expression);
 

src/Provider/TranslatorProvider.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     {
         $this->mergeConfigFrom(__DIR__.'/../config/translator.php', 'translator');
 
-        $this->app->singleton('Translator', function () {
+        $this->app->singleton('Translator', function() {
             return new Translator();
         });
     }
@@ -29,7 +29,7 @@ 
      */
     public function boot() {
         $this->publishes([
-            __DIR__ . '/../config/translator.php' => config_path('translator.php'),
+            __DIR__.'/../config/translator.php' => config_path('translator.php'),
             ],
             'config'
         );

src/resources/routes.php

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?php
 
-if (! Hokan22\LaravelTranslator\TranslatorFacade::getConfigValue('custom_routes')) {
+if (!Hokan22\LaravelTranslator\TranslatorFacade::getConfigValue('custom_routes')) {
 
-    Route::group(['prefix' => 'translator'], function () {
+    Route::group(['prefix' => 'translator'], function() {
 
         Route::get('/test', 'Hokan22\LaravelTranslator\Controllers\TranslatorAdminController@test')->name('translator.test');
 
-        Route::group(['prefix' => 'admin'], function () {
+        Route::group(['prefix' => 'admin'], function() {
 
             Route::get('/', 'Hokan22\LaravelTranslator\Controllers\TranslatorAdminController@index')->name('translator.admin');
             Route::post('/', 'Hokan22\LaravelTranslator\Controllers\TranslatorAdminController@postIdentifier')->name('translator.post.admin');

src/Controllers/TranslatorAdminController.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
     /**
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index () {
+    public function index() {
 
         $locale = Input::get('locale', '');
         $search = Input::get('search', '');
@@ -28,24 +28,24 @@ 
         $query = TranslationIdentifier::with('translations')->orderBy('updated_at', 'DESC')->orderBy('id', 'DESC');
 
         if ($locale != '') {
-            $query = TranslationIdentifier::wheredoesntHave('translations', function ($query) use ($locale) {
+            $query = TranslationIdentifier::wheredoesntHave('translations', function($query) use ($locale) {
                             $query->where('locale', 'like', $locale);
                         });
         }
 
         if ($search != '') {
-            $query = TranslationIdentifier::where('identifier',     'LIKE', '%'.$search.'%')
+            $query = TranslationIdentifier::where('identifier', 'LIKE', '%'.$search.'%')
                                             ->orWhere('parameters', 'LIKE', '%'.$search.'%')
-                                            ->orWhere('group',      'LIKE', '%'.$search.'%')
-                                            ->orWhere('page_name',  'LIKE', '%'.$search.'%')
-                                            ->orWhere('description','LIKE', '%'.$search.'%');
+                                            ->orWhere('group', 'LIKE', '%'.$search.'%')
+                                            ->orWhere('page_name', 'LIKE', '%'.$search.'%')
+                                            ->orWhere('description', 'LIKE', '%'.$search.'%');
         }
 
         $trans_identifier = $query->orderBy('updated_at', 'DESC')->orderBy('id', 'DESC')->paginate(20)->appends(Input::except('page'));
 
         $available_locales = TranslatorFacade::getConfigValue('available_locales');
 
-        return view('translator::index',[
+        return view('translator::index', [
             'identifier'         =>  $trans_identifier,
             'available_locales'  =>  $available_locales,
         ]);
@@ -55,13 +55,13 @@ 
      * @param $id
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function edit ($id) {
+    public function edit($id) {
 
         $identifier = TranslationIdentifier::findOrFail($id);
 
         $available_locales = TranslatorFacade::getConfigValue('available_locales');
 
-        return view('translator::edit',[
+        return view('translator::edit', [
             'identifier'         =>  $identifier,
             'available_locales'  =>  $available_locales,
         ]);
@@ -73,7 +73,7 @@ 
      * @param Request $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function postEdit ($id, Request $request) {
+    public function postEdit($id, Request $request) {
         
         TranslationIdentifier::findOrFail($id);
 
@@ -106,7 +106,7 @@ 
      * @param Request $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function postIdentifier (Request $request) {
+    public function postIdentifier(Request $request) {
 
         /** @var TranslationIdentifier $translation_identifiers */
         $translation_identifiers = TranslationIdentifier::all()->whereIn('id', array_keys($request->all()));
@@ -133,7 +133,7 @@ 
     /**
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function test () {
+    public function test() {
         return view('translator::test');
     }
 }
\ No newline at end of file

src/Commands/SearchTranslationsCommand.php

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
  * Class SearchTranslationsCommand
  * @package App\Console\Commands
  */
-class SearchTranslationsCommand extends Command{
+class SearchTranslationsCommand extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -47,7 +47,7 @@ 
     /**
      * Create a new command instance.
      */
-    public function __construct(){
+    public function __construct() {
         parent::__construct();
     }
 
@@ -57,7 +57,7 @@ 
      * @return mixed
      * @throws \Exception
      */
-    public function handle(){
+    public function handle() {
 
         // Get start time
         $start = microtime(true);
@@ -79,7 +79,7 @@ 
             'js'        => '/\$filter\(\'translate\'\)\(\'(?\'identifier\'.*?)\'\)/'
         ];
 
-        foreach($folders as $folder){
+        foreach ($folders as $folder) {
             $aFiles = array_merge($aFiles, File::allFiles(base_path().'/'.$folder));
         }
 
@@ -95,13 +95,13 @@ 
 
             $extension = $file->getExtension();
 
-            if(in_array($extension, $valid_extensions)){
+            if (in_array($extension, $valid_extensions)) {
                 $content = file_get_contents($file);
 
                 foreach ($regexes as $key => $regex) {
                     preg_match_all($regex, $content, $result, PREG_SET_ORDER);
 
-                    if(!empty($result[0])){
+                    if (!empty($result[0])) {
                         $this->addMissing($result, $key);
                     }
                 }
@@ -113,23 +113,23 @@ 
         $this->line('');
         $this->line('');
 
-        $this->table(['Num', 'Translations...'],[
+        $this->table(['Num', 'Translations...'], [
             [$this->found_identifier, "Found"],
-            [$this->new_identifier,   "New"],
-            [$this->dupl_identifier,  "Duplicates"],
+            [$this->new_identifier, "New"],
+            [$this->dupl_identifier, "Duplicates"],
             [$this->found_parameters, "With Parameters"],
-            [$this->found_invalid,    "Invalid"],
+            [$this->found_invalid, "Invalid"],
         ]);
 
         $this->line('');
 
-        $this->info('Finished in: ' . number_format(microtime(true) - $start, 2) . 'sec');
+        $this->info('Finished in: '.number_format(microtime(true) - $start, 2).'sec');
     }
 
     private function addMissing($result, $group) {
 
         foreach ($result as $item) {
-            try{
+            try {
 
                 $identifier = trim($item['identifier']);
                 $this->found_identifier++;
@@ -140,19 +140,19 @@ 
 
                     $parameter_string = $item['parameters'];
 
-                    if (substr($parameter_string, 0, 1 ) === '[') {
+                    if (substr($parameter_string, 0, 1) === '[') {
                         $parameter_string = substr($parameter_string, 1, -1);
                     }
 
-                    $parameter_array = explode(",",$parameter_string);
+                    $parameter_array = explode(",", $parameter_string);
 
                     $parameters = array();
-                    foreach($parameter_array as $parameter )
+                    foreach ($parameter_array as $parameter)
                     {
-                        $parameter = explode("=>",$parameter);
+                        $parameter = explode("=>", $parameter);
 
-                        $key = str_replace([" ", "'"],"", $parameter[0]);
-                        $value = str_replace([" ", "'"],"", $parameter[1]);
+                        $key = str_replace([" ", "'"], "", $parameter[0]);
+                        $value = str_replace([" ", "'"], "", $parameter[1]);
 
                         $parameters[$key] = $value;
                     }
@@ -160,10 +160,10 @@ 
                     $this->found_parameters++;
                 }
 
-                if(!isset($aTranslations[$identifier])){
+                if (!isset($aTranslations[$identifier])) {
                     $aTranslations[$identifier] = TranslatorFacade::hasIdentifier($identifier);
 
-                    if (! $aTranslations[$identifier]) {
+                    if (!$aTranslations[$identifier]) {
                         TranslatorFacade::addMissingIdentifier($identifier, $parameters, $group);
                         $this->bar->clear();
                         $this->info('Adding: "'.$identifier.'" to database');
@@ -175,7 +175,7 @@ 
                     $this->dupl_identifier++;
                 }
 
-            }catch(\Exception $e){
+            } catch (\Exception $e) {
                 $this->bar->clear();
                 $this->info($identifier.' '.strlen($identifier));
                 $this->info($e->getMessage());