Merge pull request #1681 from jitendra-webkul/jitendra

Issue #1620, #1671 fixed

config/translatable.php

@@ -29,7 +29,7 @@ return [
     | colombian spanish will be saved as 'es-CO' into the database.
     |
     */
-    'locale_separator' => '-',
+    'locale_separator' => '_',
 
     /*
     |--------------------------------------------------------------------------

packages/Webkul/Core/src/Eloquent/TranslatableModel.php

@@ -5,11 +5,17 @@ namespace Webkul\Core\Eloquent;
 use Illuminate\Database\Eloquent\Model;
 use Astrotomic\Translatable\Translatable;
 use Webkul\Core\Models\Locale;
+use Webkul\Core\Helpers\Locales;
 
 class TranslatableModel extends Model
 {
     use Translatable;
 
+    protected function getLocalesHelper(): Locales
+    {
+        return app(Locales::class);
+    }
+
     /**
      * @param string $key
      *
@@ -52,4 +58,4 @@ class TranslatableModel extends Model
     {
         return false;
     }
-}
+}

packages/Webkul/Core/src/Helpers/Locales.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Webkul\Core\Helpers;
+
+use Astrotomic\Translatable\Locales as BaseLocales;
+
+class Locales extends BaseLocales
+{
+    public function load(): void
+    {
+        $this->locales = [];
+
+        foreach (core()->getAllLocales() as $locale) {
+            $this->locales[$locale->code] = $locale->code;
+        }
+    }
+}

packages/Webkul/Core/src/Providers/CoreServiceProvider.php

@@ -36,8 +36,6 @@ class CoreServiceProvider extends ServiceProvider
         ]);
 
         SliderProxy::observe(SliderObserver::class);
-
-        // config(['translatable.locales' => core()->getAllLocales()->pluck('code')->toArray()]);
     }
 
     /**