Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: format code with PHP CS Fixer and Prettier #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

style: format code with PHP CS Fixer and Prettier #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ class Product extends Resource
}
}
```

#### In this example, rules will be added to the following values

```dotenv
max: name.*
required: name.en
Expand Down
22 changes: 16 additions & 6 deletions src/FieldServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function register()
});

// Register mixin
Field::mixin(new TranslatableFieldMixin);
Field::mixin(new TranslatableFieldMixin());
}

protected static function isValidLocaleArray($localeArray)
Expand All @@ -33,20 +33,30 @@ protected static function isValidLocaleArray($localeArray)

public static function getLocales($overrideLocales = null)
{
if (is_callable($overrideLocales)) $overrideLocales = call_user_func($overrideLocales);
if (static::isValidLocaleArray($overrideLocales)) return $overrideLocales;
if (is_callable($overrideLocales)) {
$overrideLocales = call_user_func($overrideLocales);
}
if (static::isValidLocaleArray($overrideLocales)) {
return $overrideLocales;
}

$configuredLocales = config('nova-translatable.locales', ['en' => 'English']);
if (is_callable($configuredLocales)) $configuredLocales = call_user_func($configuredLocales);
if (static::isValidLocaleArray($configuredLocales)) return $configuredLocales;
if (is_callable($configuredLocales)) {
$configuredLocales = call_user_func($configuredLocales);
}
if (static::isValidLocaleArray($configuredLocales)) {
return $configuredLocales;
}

return ['en' => 'English'];
}

public static function normalizeAttribute($attribute)
{
if (in_array(request()->method(), ['PUT', 'POST'])) {
if (substr($attribute, -2) === '.*') $attribute = substr($attribute, 0, -2);
if (substr($attribute, -2) === '.*') {
$attribute = substr($attribute, 0, -2);
}
}
return $attribute;
}
Expand Down
4 changes: 2 additions & 2 deletions webpack.mix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ mix
.webpackConfig({
externals: {
vue: 'Vue',
'laravel-nova': 'LaravelNova'
'laravel-nova': 'LaravelNova',
},
output: {
uniqueName: 'outl1ne/nova-translatable',
},
})
});