Merge pull request #14981 from uberbrady/fix_backup_translations

Fixed #14976, #14975, #14973 - Translation strings aren't always working

app/Services/SnipeTranslator.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Helpers\Helper;
 use Illuminate\Translation\Translator;
 
 /***************************************************************
@@ -17,6 +18,10 @@
  ***************************************************************/
 class SnipeTranslator extends Translator {
 
+    static $legacy_translation_namespaces = [
+        "backup::" //Spatie backup uses 'legacy' locale names
+    ];
+
     //This is copied-and-pasted (almost) verbatim from Illuminate\Translation\Translator
     public function choice($key, $number, array $replace = [], $locale = null)
     {
@@ -39,4 +44,28 @@ public function choice($key, $number, array $replace = [], $locale = null)
         );
     }
 
+    public function get($key, array $replace = [], $locale = null, $fallback = true)
+    {
+        $modified_locale = $locale;
+        $changed_fallback = false;
+        $previous_fallback = $this->fallback;
+        // 'legacy' translation directories tend to be two-char ('en'), not 5-char ('en-US').
+        // Here we try our best to handle that.
+        foreach (self::$legacy_translation_namespaces as $namespace) {
+            if (preg_match("/^$namespace/", $key)) {
+                $modified_locale = Helper::mapBackToLegacyLocale($locale);
+                $changed_fallback = true;
+                $this->fallback = 'en'; //TODO - should this be 'env-able'? Or do we just put our foot down and say 'en'?
+                break;
+            }
+        }
+
+        $result = parent::get($key, $replace, $modified_locale, $fallback);
+        if ($changed_fallback) {
+            $this->fallback = $previous_fallback;
+        }
+        return $result;
+    }
+
+
 }

config/app.php

@@ -112,7 +112,7 @@
     |
     */
 
-    'fallback_locale' =>  env('FALLBACK_APP_LOCALE', 'en'),
+    'fallback_locale' => env('FALLBACK_APP_LOCALE', 'en-US'),
 
     /*
     |--------------------------------------------------------------------------