JosephNC / translation

src/Middleware/LocaleMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function handle(Request $request, Closure $next)
     {
-        Translation::setLocale( Translation::getRoutePrefix() ?? '' );
+        Translation::setLocale(Translation::getRoutePrefix() ?? '');
 
         return $next($request);
     }

src/TranslationServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -20,8 +20,8 @@ 
      */
     public function boot()
     {
-        Blade::directive('trans', function ( string $text, array $replacements = [], string $to_locale = '' ) {
-            $translation = __trans( $text, $replacements, $to_locale );
+        Blade::directive('trans', function(string $text, array $replacements = [], string $to_locale = '') {
+            $translation = __trans($text, $replacements, $to_locale);
 
             return "<?php echo $translation ?>";
         });
@@ -50,11 +50,11 @@ 
         require_once __DIR__.'/helpers.php';
 
         // Bind translation to the IoC.
-        $this->app->bind( 'translation', function ( Application $app ) {
-            return new Translation( $app );
+        $this->app->bind('translation', function(Application $app) {
+            return new Translation($app);
         } );
 
-        register_shutdown_function( [ $this->app->translation, 'shutdown' ] );
+        register_shutdown_function([$this->app->translation, 'shutdown']);
     }
 
     /**

Braces +4 added lines, -1 removed lines

@@ -34,7 +34,10 @@
      */
     public function register()
     {
-        if (PHP_SESSION_NONE == session_status()) session_start(); // Start Session
+        if (PHP_SESSION_NONE == session_status()) {
+            session_start();
+        }
+        // Start Session
 
         // Allow configuration to be publishable.
         $this->publishes([

src/Migrations/2019_03_23_164730_create_translations_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('translations', function (Blueprint $table) {
+        Schema::create('translations', function(Blueprint $table) {
             $table->increments('id');
             $table->text('text');
             $table->longText('data');

src/helpers.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 use Illuminate\Support\Facades\App;
 
-if ( ! function_exists( '__trans' ) ) :
+if ( ! function_exists('__trans')) :
     /**
      * Shorthand function for translating text.
      *
@@ -12,7 +12,7 @@ 
      *
      * @return string
      */
-    function __trans( string $text, array $replacements = [], string $to_locale = '' ) {
-        return App::make('translation')->translate( $text, $replacements, $to_locale );
+    function __trans(string $text, array $replacements = [], string $to_locale = '') {
+        return App::make('translation')->translate($text, $replacements, $to_locale);
     }
 endif;
\ No newline at end of file

src/Translation.php

Spacing +46 added lines, -46 removed lines

@@ -43,10 +43,10 @@ 
      * @access public
      * @var Illuminate\Contracts\Foundation\Application
      */
-    public function __construct( Application $app )
+    public function __construct(Application $app)
     {
         $this->config           = $app->make('config');
-        $this->request          = app( \Illuminate\Http\Request::class );
+        $this->request          = app(\Illuminate\Http\Request::class);
         $this->translationModel = $app->make($this->getTranslationModel());
     }
 
@@ -57,7 +57,7 @@ 
      */
     public function getApiKey() : string
     {
-        return (string) $this->config->get( 'translation.key', '' );
+        return (string) $this->config->get('translation.key', '');
     }
 
     /**
@@ -69,7 +69,7 @@ 
     {
         $locale = $_SESSION['locale'] ?? $this->getDefaultLocale();
 
-        return (string) ( empty( $locale ) ? $this->getDefaultLocale() :$locale );
+        return (string) (empty($locale) ? $this->getDefaultLocale() : $locale);
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     protected function getLocales() : array
     {
-        return (array) $this->config->get( 'translation.locales' );
+        return (array) $this->config->get('translation.locales');
     }
 
     /**
@@ -91,7 +91,7 @@ 
      */
     protected function getDefaultLocale() : string
     {
-        return (string) $this->config->get( 'app.locale', $this->config->get('app.fallback_locale', 'en') );
+        return (string) $this->config->get('app.locale', $this->config->get('app.fallback_locale', 'en'));
     }
 
     /**
@@ -114,9 +114,9 @@ 
      */
     public function getRoutePrefix() : string
     {
-        $locale = (string) $this->request->segment( $this->getRequestSegment() );
+        $locale = (string) $this->request->segment($this->getRequestSegment());
 
-        return $this->localeExist( $locale ) ? $locale : '';
+        return $this->localeExist($locale) ? $locale : '';
     }
 
     /**
@@ -126,7 +126,7 @@ 
      */
     protected function getRequestSegment() : int
     {
-        return $this->config->get( 'translation.request_segment', 1 );
+        return $this->config->get('translation.request_segment', 1);
     }
 
     /**
@@ -135,12 +135,12 @@ 
      * @param string $locale    The locale to use. Defaults to 'en'.
      * @throws InvalidArgumentException|Exception
      */
-    public function setLocale( string $locale = 'en' )
+    public function setLocale(string $locale = 'en')
     {
-        if ( ! empty( $locale ) && ! $this->localeExist( $locale ) ) {
+        if ( ! empty($locale) && ! $this->localeExist($locale)) {
             $message = 'Invalid Argument! Locale passed does not exist.';
 
-            throw new InvalidArgumentException( $message );
+            throw new InvalidArgumentException($message);
         }
 
         $_SESSION['locale'] = $locale;
@@ -153,9 +153,9 @@ 
      * 
      * @return bool
      */
-    public function localeExist( string $locale = 'en' ) : bool
+    public function localeExist(string $locale = 'en') : bool
     {
-        return array_key_exists( $locale, (array) $this->getLocales() ) ? true : false;
+        return array_key_exists($locale, (array) $this->getLocales()) ? true : false;
     }
 
     /**
@@ -171,58 +171,58 @@ 
      * 
      * @return string   The translated text.
      */
-    public function translate( string $text, array $replacements = [], string $to_locale = '' ) : string
+    public function translate(string $text, array $replacements = [], string $to_locale = '') : string
     {
         $do_translate   = false;
         $data           = [];
         $locale         = 'en';
-        $to_locale      = empty( $to_locale ) ? $this->getLocale() : $to_locale;
-        $text           = preg_replace( '/:([a-z]+)/i', '__$1__', $text ); // Turn replacements to placeholders
+        $to_locale      = empty($to_locale) ? $this->getLocale() : $to_locale;
+        $text           = preg_replace('/:([a-z]+)/i', '__$1__', $text); // Turn replacements to placeholders
         $trans          = $text;
         $translations   = [];
 
-        if ( ! array_key_exists( $to_locale, $this->getLocales() ) ) {
+        if ( ! array_key_exists($to_locale, $this->getLocales())) {
             $message = 'Invalid Argument. Locale not found for translation.';
 
-            throw new InvalidArgumentException( $message );
+            throw new InvalidArgumentException($message);
         }
 
-        if ( empty( $text ) ) return $text;
+        if (empty($text)) return $text;
 
         // Get translation data from session or database
-        $translations = (array) ($_SESSION['__translations'] ?? $this->translationModel->pluck( 'data', 'text' )->toArray());
+        $translations = (array) ($_SESSION['__translations'] ?? $this->translationModel->pluck('data', 'text')->toArray());
 
-        if ( ( empty( $translations ) || ! isset( $translations[ $text ] ) ) && $locale != $to_locale ) {
+        if ((empty($translations) || ! isset($translations[$text])) && $locale != $to_locale) {
             $do_translate = true;
-        } else if ( isset( $translations[ $text ] ) ) {
-            $data = json_decode( $translations[ $text ], true );
+        } else if (isset($translations[$text])) {
+            $data = json_decode($translations[$text], true);
 
-            if ( $locale != $to_locale ) {
-                $trans = $data[ $to_locale ] ?? '';
+            if ($locale != $to_locale) {
+                $trans = $data[$to_locale] ?? '';
 
-                $do_translate = ! empty( $trans ) && $trans == $text ? true : ( empty( $trans ) ? true : false );
+                $do_translate = ! empty($trans) && $trans == $text ? true : (empty($trans) ? true : false);
             }
         }
 
-        if ( $do_translate ) {
+        if ($do_translate) {
             // Let's request for translation
             try {
-                $trans = (new T1( $this->getApiKey() ))->translate( $text, $to_locale, $locale );
+                $trans = (new T1($this->getApiKey()))->translate($text, $to_locale, $locale);
 
             } catch (\Exception $e) {
-                Log::info( $e->getMessage() );
+                Log::info($e->getMessage());
 
                 // $trans = T2::trans( $text, $to_locale, $locale );
             }
         }
 
-        $data = array_merge( $data, [ $to_locale => $trans ] );
-        $translations[ $text ] = json_encode( $data );
+        $data = array_merge($data, [$to_locale => $trans]);
+        $translations[$text] = json_encode($data);
 
         // Save to session
         $_SESSION['__translations'] = $translations;
 
-        return (string) ( empty( $replacements ) ? $trans : $this->makeReplacements( $trans, $replacements ) );
+        return (string) (empty($replacements) ? $trans : $this->makeReplacements($trans, $replacements));
     }
 
     /**
@@ -234,13 +234,13 @@ 
      * 
      * @return string   The replaced text
      */
-    private function makeReplacements( string $text, array $replacements ) : string
+    private function makeReplacements(string $text, array $replacements) : string
     {
-        $keys       = strtolower( '__' . join( '__,__', array_keys( $replacements ) ) . '__' );
-        $search     = explode( ',', $keys );
-        $replace    = array_values( $replacements );
+        $keys       = strtolower('__'.join('__,__', array_keys($replacements)).'__');
+        $search     = explode(',', $keys);
+        $replace    = array_values($replacements);
 
-        return (string) str_replace( $search, $replace, $text );
+        return (string) str_replace($search, $replace, $text);
     }
 
     /**
@@ -252,21 +252,21 @@ 
     {
         // Get translation data from session
         $new_translations = $_SESSION['__translations'] ?? [];
-        $old_translations = (array) $this->translationModel->pluck( 'data', 'text' )->toArray();
+        $old_translations = (array) $this->translationModel->pluck('data', 'text')->toArray();
 
-        if ( json_encode( $new_translations ) == json_encode( $old_translations ) ) return;
+        if (json_encode($new_translations) == json_encode($old_translations)) return;
 
         $now = Carbon::now('utc')->toDateTimeString();
         $insert = $update = [];
 
-        if ( empty( $new_translations ) ) return;
+        if (empty($new_translations)) return;
 
         foreach ($new_translations as $text => $data) {
-            if ( isset( $old_translations[ $text ] ) ) {
-                if ( $old_translations[ $text ] == $data ) continue;
+            if (isset($old_translations[$text])) {
+                if ($old_translations[$text] == $data) continue;
 
                 // Update old
-                $this->translationModel->where( 'text', $text )->update( [ 'data' => $data ] );
+                $this->translationModel->where('text', $text)->update(['data' => $data]);
                 continue;
             }
 
@@ -279,9 +279,9 @@ 
             ];
         }
 
-        if ( ! empty( $insert ) ) $this->translationModel->insert( $insert );
+        if ( ! empty($insert)) $this->translationModel->insert($insert);
 
         // Remove the translation
-        if ( isset( $_SESSION['__translations'] ) ) unset( $_SESSION['__translations'] );
+        if (isset($_SESSION['__translations'])) unset($_SESSION['__translations']);
     }
 }

Braces +18 added lines, -6 removed lines

@@ -187,7 +187,9 @@ 
             throw new InvalidArgumentException( $message );
         }
 
-        if ( empty( $text ) ) return $text;
+        if ( empty( $text ) ) {
+            return $text;
+        }
 
         // Get translation data from session or database
         $translations = (array) ($_SESSION['__translations'] ?? $this->translationModel->pluck( 'data', 'text' )->toArray());
@@ -254,16 +256,22 @@ 
         $new_translations = $_SESSION['__translations'] ?? [];
         $old_translations = (array) $this->translationModel->pluck( 'data', 'text' )->toArray();
 
-        if ( json_encode( $new_translations ) == json_encode( $old_translations ) ) return;
+        if ( json_encode( $new_translations ) == json_encode( $old_translations ) ) {
+            return;
+        }
 
         $now = Carbon::now('utc')->toDateTimeString();
         $insert = $update = [];
 
-        if ( empty( $new_translations ) ) return;
+        if ( empty( $new_translations ) ) {
+            return;
+        }
 
         foreach ($new_translations as $text => $data) {
             if ( isset( $old_translations[ $text ] ) ) {
-                if ( $old_translations[ $text ] == $data ) continue;
+                if ( $old_translations[ $text ] == $data ) {
+                    continue;
+                }
 
                 // Update old
                 $this->translationModel->where( 'text', $text )->update( [ 'data' => $data ] );
@@ -279,9 +287,13 @@ 
             ];
         }
 
-        if ( ! empty( $insert ) ) $this->translationModel->insert( $insert );
+        if ( ! empty( $insert ) ) {
+            $this->translationModel->insert( $insert );
+        }
 
         // Remove the translation
-        if ( isset( $_SESSION['__translations'] ) ) unset( $_SESSION['__translations'] );
+        if ( isset( $_SESSION['__translations'] ) ) {
+            unset( $_SESSION['__translations'] );
+        }
     }
 }