Hokan22 / laravel-translator

src/Provider/TranslatorBladeProvider.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function boot()
     {
-        Blade::directive('translate', function ($expression) {
+        Blade::directive('translate', function($expression) {
 
                 $expression = $this->stripParentheses($expression);
 
@@ -35,7 +35,7 @@ 
             }
         );
 
-        Blade::directive('t', function ($expression) {
+        Blade::directive('t', function($expression) {
 
                 $expression = $this->stripParentheses($expression);
 

src/migrations/2017_11_27_162357_create_translator_tables.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
         DB::beginTransaction();
 
         // Create table for storing roles
-        Schema::create('translation_identifiers', function (Blueprint $table)
+        Schema::create('translation_identifiers', function(Blueprint $table)
         {
             $table->increments('id')->unique();
             $table->text('identifier');
@@ -43,7 +43,7 @@ 
         });
 
         // Create table for storing roles
-        Schema::create('translations', function (Blueprint $table)
+        Schema::create('translations', function(Blueprint $table)
         {
             $table->integer('translation_identifier_id')->unsigned();
             $table->foreign('translation_identifier_id')->references('id')->on('translation_identifiers')->onDelete('no action')->onUpdate('no action');

src/resources/routes.php

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
  * @license  http://opensource.org/licenses/MIT MIT
  */
 
-if (! Hokan22\LaravelTranslator\TranslatorFacade::getConfigValue('custom_routes')) {
-    Route::group(['prefix' => 'translator'], function () {
+if (!Hokan22\LaravelTranslator\TranslatorFacade::getConfigValue('custom_routes')) {
+    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');
             Route::get('/{id}', 'Hokan22\LaravelTranslator\Controllers\TranslatorAdminController@edit')->where('id', '[0-9]+')->name('translator.admin.edit');

src/Translator.php

Spacing +9 added lines, -9 removed lines

@@ -188,7 +188,7 @@ 
 
             $keys = [];
             if (is_array($parameters)) {
-                foreach($parameters as $key => $value) {
+                foreach ($parameters as $key => $value) {
                     $keys[] = $key;
                 }
             }
@@ -206,9 +206,9 @@ 
                 // When using file Cache, adding the Identifier to the Database will not add it to file Cache!
                 $this->aHandler[$this->locale]->refreshCache();
             }
-            $this->log('The translation string "'.$identifier.'" will be written to the Database', 'notice');
+            $this->log('The translation string "' . $identifier . '" will be written to the Database', 'notice');
         } else {
-            $this->log('The translation string "'.$identifier.'" is already in the Database!', 'warning');
+            $this->log('The translation string "' . $identifier . '" is already in the Database!', 'warning');
         }
     }
 
@@ -236,7 +236,7 @@ 
     {
         foreach ($parameters as $key => $parameter) {
             // If the string (e.g "{name}") is not specified within the "parameters" array it won't be replaced!
-            $translation = str_replace("{".$key."}", $parameter, $translation);
+            $translation = str_replace("{" . $key . "}", $parameter, $translation);
         }
         return $translation;
     }
@@ -252,7 +252,7 @@ 
     protected function returnMissingTranslation($identifier, $locale)
     {
         if (config('app.env') !== 'production') {
-            return '<'.$identifier.':'.$locale.'>';
+            return '<' . $identifier . ':' . $locale . '>';
         }
         return $identifier;
     }
@@ -304,17 +304,17 @@ 
         $found_locales = [];
 
         foreach ($avail_locales as $avail_locale) {
-            if (strpos($avail_locale, $locale) !== false){
+            if (strpos($avail_locale, $locale) !== false) {
                 $found_locales[] = $avail_locale;
             }
         }
 
-        if (in_array($default_locale, $found_locales) || count($found_locales) == 0){
-            $message = 'Locale "'.$locale.'" was not found! Falling back to default locale "'.$default_locale.'"';
+        if (in_array($default_locale, $found_locales) || count($found_locales) == 0) {
+            $message = 'Locale "' . $locale . '" was not found! Falling back to default locale "' . $default_locale . '"';
             $locale = $default_locale;
 
         } else {
-            $message = 'Locale "'.$locale.'" was not found! Falling back to similar locale "'.$found_locales[0].'"';
+            $message = 'Locale "' . $locale . '" was not found! Falling back to similar locale "' . $found_locales[0] . '"';
             $locale = $found_locales[0];
         }
 

src/Commands/SearchTranslationsCommand.php

Spacing +17 added lines, -17 removed lines

@@ -76,8 +76,8 @@ 
             'js'        => '/\$filter\(\'translate\'\)\(\'(?\'identifier\'.*?)\'\)/'
         ];
 
-        foreach($folders as $folder) {
-            $aFiles = array_merge($aFiles, File::allFiles(base_path().'/'.$folder));
+        foreach ($folders as $folder) {
+            $aFiles = array_merge($aFiles, File::allFiles(base_path() . '/' . $folder));
         }
 
         TranslatorFacade::setLocale('de_DE');
@@ -85,20 +85,20 @@ 
         $num_files = count($aFiles);
 
         $this->bar = $this->output->createProgressBar($num_files);
-        $this->bar->setMessage('Analyzing '.$num_files.' files');
+        $this->bar->setMessage('Analyzing ' . $num_files . ' files');
         $this->bar->setFormat('very_verbose');
 
         foreach ($aFiles as $file) {
 
             $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);
                     }
                 }
@@ -114,10 +114,10 @@ 
             ['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"],
             ]
         );
 
@@ -148,14 +148,14 @@ 
                         $parameter_string = substr($parameter_string, 1, -1);
                     }
 
-                    $parameter_array = explode(",",$parameter_string);
+                    $parameter_array = explode(",", $parameter_string);
                     $parameters = array();
 
-                    foreach($parameter_array as $parameter) {
-                        $parameter = explode("=>",$parameter);
+                    foreach ($parameter_array as $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;
                     }
@@ -163,13 +163,13 @@ 
                     $this->found_parameters++;
                 }
 
-                if(!isset($aTranslations[$identifier])) {
+                if (!isset($aTranslations[$identifier])) {
                     $aTranslations[$identifier] = TranslatorFacade::hasIdentifier($identifier);
 
                     if (!$aTranslations[$identifier]) {
                         TranslatorFacade::addMissingIdentifier($identifier, $parameters, $group);
                         $this->bar->clear();
-                        $this->info('Adding: "'.$identifier.'" to database');
+                        $this->info('Adding: "' . $identifier . '" to database');
                         $this->bar->display();
                         $this->new_identifier++;
                     }
@@ -177,9 +177,9 @@ 
                     $this->dupl_identifier++;
                 }
 
-            } catch(\Exception $e){
+            } catch (\Exception $e) {
                 $this->bar->clear();
-                $this->info($identifier.' '.strlen($identifier));
+                $this->info($identifier . ' ' . strlen($identifier));
                 $this->info($e->getMessage());
                 $this->line('');
                 $this->bar->display();

src/Commands/CacheTranslationCommand.php

Spacing +4 added lines, -4 removed lines

@@ -59,13 +59,13 @@ 
             return;
         }
 
-        $file_path = TranslatorFacade::getConfigValue('cache_path').$locale.'/';
+        $file_path = TranslatorFacade::getConfigValue('cache_path') . $locale . '/';
 
         $groups = $this->getGroups();
         $translations = $this->loadFromDB($locale);
 
         if (!file_exists($file_path)) {
-            $this->alert("The defined cache folder (".$file_path.") does not exists.");
+            $this->alert("The defined cache folder (" . $file_path . ") does not exists.");
             if (!$this->confirm('Do you want to create it now?')) {
                 return;
             }
@@ -88,7 +88,7 @@ 
             }
 
             if (!empty($array)) {
-                $file_name = $file_path.$group.'.json';
+                $file_name = $file_path . $group . '.json';
                 file_put_contents($file_name, json_encode($array));
             }
         }
@@ -114,7 +114,7 @@ 
     {
         $trans_identifier = new TranslationIdentifier();
 
-        $trans_identifier = $trans_identifier->with('translations')->whereHas('translations', function ($item) use ($locale)
+        $trans_identifier = $trans_identifier->with('translations')->whereHas('translations', function($item) use ($locale)
         {
             return $item->where('locale', $locale);
         }

src/Provider/TranslatorProvider.php

Spacing +5 added lines, -5 removed lines

@@ -24,9 +24,9 @@ 
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/translator.php', 'translator');
+        $this->mergeConfigFrom(__DIR__ . '/../config/translator.php', 'translator');
 
-        $this->app->singleton('Translator', function () {
+        $this->app->singleton('Translator', function() {
                 return new Translator();
             }
         );
@@ -43,9 +43,9 @@ 
             'config'
         );
 
-        $this->loadMigrationsFrom(__DIR__.'/../migrations/');
-        $this->loadRoutesFrom(__DIR__.'/../resources/routes.php');
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'translator');
+        $this->loadMigrationsFrom(__DIR__ . '/../migrations/');
+        $this->loadRoutesFrom(__DIR__ . '/../resources/routes.php');
+        $this->loadViewsFrom(__DIR__ . '/../resources/views', 'translator');
 
         if ($this->app->runningInConsole()) {
             $this->commands([

src/Controllers/TranslatorAdminController.php

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
         $query = TranslationIdentifier::with('translations');
 
         if ($locale != '') {
-            $query = $query->whereDoesntHave('translations', function ($query) use ($locale)
+            $query = $query->whereDoesntHave('translations', function($query) use ($locale)
                 {
                     $query->where('translations.locale', 'like', $locale);
                 }
@@ -43,12 +43,12 @@ 
         }
 
         if ($search != '') {
-            $query = $query->where(function ($query) use ($search) {
-                $query ->where('identifier',     'LIKE', '%'.$search.'%')
-                    ->orWhere('parameters', 'LIKE', '%'.$search.'%')
-                    ->orWhere('group',      'LIKE', '%'.$search.'%')
-                    ->orWhere('page_name',  'LIKE', '%'.$search.'%')
-                    ->orWhere('description','LIKE', '%'.$search.'%');
+            $query = $query->where(function($query) use ($search) {
+                $query ->where('identifier', 'LIKE', '%' . $search . '%')
+                    ->orWhere('parameters', 'LIKE', '%' . $search . '%')
+                    ->orWhere('group', 'LIKE', '%' . $search . '%')
+                    ->orWhere('page_name', 'LIKE', '%' . $search . '%')
+                    ->orWhere('description', 'LIKE', '%' . $search . '%');
             });
         }
 
@@ -168,7 +168,7 @@ 
      * @param $state string 'enabled|disabled'
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function changeLiveMode ($state)
+    public function changeLiveMode($state)
     {
         if ($state == 'enable') {
             session(['translation_live_mode' => true]);

src/Handler/CacheJSONHandler.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
             return $this->translations[$group][$identifier];
         }
         else {
-            throw new TranslationNotInCacheException("The translation identifier '".$identifier."' could not be found in Cache");
+            throw new TranslationNotInCacheException("The translation identifier '" . $identifier . "' could not be found in Cache");
         }
     }
 
@@ -58,12 +58,12 @@ 
      */
     public function refreshCache($group = 'default')
     {
-        $locale_dir = TranslatorFacade::getConfigValue('cache_path').$this->locale;
+        $locale_dir = TranslatorFacade::getConfigValue('cache_path') . $this->locale;
 
         try {
-            $trans_identifier = json_decode(file_get_contents($locale_dir.'/'.$group.'.json'), true);
+            $trans_identifier = json_decode(file_get_contents($locale_dir . '/' . $group . '.json'), true);
         } catch (\ErrorException $e) {
-            throw new TranslationCacheNotFound("The Translation cache file '".$locale_dir.'/'.$group.'.json'."' could not be found!");
+            throw new TranslationCacheNotFound("The Translation cache file '" . $locale_dir . '/' . $group . '.json' . "' could not be found!");
         }
 
         $this->translations[$group] = $trans_identifier;