Hokan22 / laravel-translator

src/Translator.php

Indentation +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
         // TODO: Cleanup (avoid repetition)
         // Try to create new Instance of Handler and return it
         try {
-             $oHandler = new $oHandler($locale);
+                $oHandler = new $oHandler($locale);
         }
         catch (TranslationCacheNotFound $exception) {
             // Log error and fallback procedure
@@ -231,7 +231,7 @@ 
     private function replaceParameter ($translation, $parameters) {
 
         // Go through each specified Parameter and replace its placeholder "{$key}"
-       foreach ($parameters as $key => $parameter) {
+        foreach ($parameters as $key => $parameter) {
             // TODO: Make Prefix and Suffix configurable
             // If the string (e.g "{name}") is not specified within the "parameters" array it won't be replaced!
             $translation = str_replace("{".$key."}", $parameter, $translation);

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);
         }
 

Braces +10 added lines, -16 removed lines

@@ -124,14 +124,12 @@ 
         // Check if the class from the config exists and implements HandlerInterface
         if (class_exists($handler_class) && is_a($handler_class, 'Hokan22\LaravelTranslator\Handler\HandlerInterface', TRUE)) {
             $oHandler = $handler_class;
-        }
-        elseif (!class_exists($handler_class)) {
+        } elseif (!class_exists($handler_class)) {
             // If one of the previous check fails check if the class does not exists and set message accordingly
             // As it could either be the class does not exist or does not implement HandlerInterface
             // check only the shorter statement to improve readability
             $message = "Handler '".$handler_class."' not found.";
-        }
-        else {
+        } else {
             // If the class exists but the class does not implement HandlerInterface set the message accordingly
             $message = "Handler '".$handler_class."' does not implement HandlerInterface.";
         }
@@ -147,8 +145,7 @@ 
         // Try to create new Instance of Handler and return it
         try {
              $oHandler = new $oHandler($locale);
-        }
-        catch (TranslationCacheNotFound $exception) {
+        } catch (TranslationCacheNotFound $exception) {
             // Log error and fallback procedure
             Log::error($exception);
             Log::warning('Falling back to DatabaseHandler');
@@ -207,8 +204,7 @@ 
 
             // Print notice about creation to laravel log
             Log::notice('The translation string "'.$identifier.'" will be written to the Database');
-        }
-        else {
+        } else {
             Log::warning('The translation string "'.$identifier.'" is already in the Database!');
         }
     }
@@ -279,29 +275,28 @@ 
         }
 
         // Fallback if empty locale was given (should be handled in middleware)
-        if ($locale == ''){
+        if ($locale == '') {
             if (session()->get('locale') != '') {
                 $locale = session()->get('locale');
-            }
-            else {
+            } else {
                 return $default_locale;
             }
         }
 
         // 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;
             }
@@ -309,8 +304,7 @@ 
             elseif (count($found_locales, 0) >= 1) {
                 Log::warning('Locale "'.$locale.'" was not found! Falling back to similar locale "'.$found_locales[0].'"');
                 $locale = $found_locales[0];
-            }
-            else {
+            } else {
                 throw new NotFoundResourceException("Locale '".$locale."' was not found in available locales");
             }
         }