fix issue of empty language property

meysampg · May 24, 2017 · 4f9f5ce · 4f9f5ce
1 parent 4d818d0
commit 4f9f5ce
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/FormBuilder.php b/FormBuilder.php
@@ -106,17 +106,20 @@ private function getFBOptions()
             [
                 'dataType' => $this->dataType,
                 'formData' => $this->{$this->arrayToTypeFunction}($this->data),
-                'i18n' => [
-                    'locale' => $this->language ? $this->language : 'en-US',
-                    'preloaded' => [
-                        $this->getLanguage() => $this->getMessages()
-                    ],
-                ],
                 'showActionButtons' => $this->showActionButtons,
             ],
             $this->options
         );
 
+        if ($this->language) {
+            $this->options['i18n'] = [
+                'locale' => $this->language,
+                'preloaded' => [
+                    $this->language => $this->getMessages()
+                ],
+            ];
+        }
+
         return json_encode($this->options);
     }