use of typicms.locales config

TypiCMS · Feb 25, 2021 · f5c32a3 · f5c32a3
1 parent de4e5fa
commit f5c32a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/TranslatableBootFormsServiceProvider.php b/src/TranslatableBootFormsServiceProvider.php
@@ -28,8 +28,12 @@ public function register()
         // Override BootForm's form builder in order to get model binding
         // between BootForm & TranslatableBootForm working.
         $this->app->singleton('typicms.form', function ($app) {
+            $locales = array_keys(config('typicms.locales', []));
+            if (empty($locales)) {
+                $locales = config('translatable-bootforms.locales');
+            }
             $formBuilder = new FormBuilder();
-            $formBuilder->setLocales(config('translatable-bootforms.locales'));
+            $formBuilder->setLocales($locales);
             $formBuilder->setErrorStore($app['typicms.form.errorstore']);
             $formBuilder->setOldInputProvider($app['typicms.form.oldinput']);
             $formBuilder->setToken($app['session.store']->token());

diff --git a/tests/TestTranslatableBootForms.php b/tests/TestTranslatableBootForms.php
@@ -53,7 +53,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->app['config']->set('translatable-bootforms.locales', ['en', 'nl']);
+        $this->app['config']->set('typicms.locales', ['en' => 'en_US', 'nl' => 'nl_NL']);
         $this->app['config']->set('translatable-bootforms.label-locale-indicator', '%label (%locale)');
 
         $this->bootform = $this->app->make('typicms.bootform');