Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix and revert

Browse Source
This commit is contained in:
Pig Fang 2018-07-13 23:19:59 +08:00
parent 5b485b7b10
commit 709baae712
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Services/OptionForm.php
View File

@ -71,10 +71,7 @@ class OptionForm
// Assign name for option item // Assign name for option item
if (! isset($params[1]) || Arr::get($params, 1) == OptionForm::AUTO_DETECT) { if (! isset($params[1]) || Arr::get($params, 1) == OptionForm::AUTO_DETECT) {
$params[1] = trans("options.$this->id.$params[0]"); $params[1] = Arr::get(trans("options.$this->id.$params[0]"), 'title', trans("options.$this->id.$params[0]"));
if ($params[1] == "options.$this->id.$params[0]") {
$params[1] = trans("options.$this->id.$params[0].title");
}
} }
$class = new ReflectionClass('App\Services\OptionForm'.Str::title($method)); $class = new ReflectionClass('App\Services\OptionForm'.Str::title($method));

2
config/yaml-translation.php
View File

@ -11,5 +11,5 @@ return [
| If true, this will flatten all array contents into a string. | If true, this will flatten all array contents into a string.
*/ */
'dot_syntax' => true, 'dot_syntax' => false,
]; ];