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

Update Carbon Locale, remove body requirement on pages, minor update to language core en, and update language es. #531

Merged
merged 15 commits into from
May 18, 2018
Merged

Update Carbon Locale, remove body requirement on pages, minor update to language core en, and update language es. #531

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
abaf326
Set Carbon locale
kamekun May 8, 2018
070eb0b
Update AppServiceProvider.php
kamekun May 8, 2018
6aaf5e6
Merge pull request #2 from AsgardCms/3.0
kamekun May 9, 2018
6a97c12
Update changelog.yml to the lasted changes.
kamekun May 9, 2018
fe5094b
Update changelog.yml
kamekun May 9, 2018
f3b2ce5
Update changelog.yml
kamekun May 9, 2018
905b9d5
Update changelog.yml
kamekun May 9, 2018
b8cae94
body not required to create a page.
kamekun May 9, 2018
fb845a4
body not required to edit a page.
kamekun May 9, 2018
2eb6b0d
hide dropdown language if you only have one.
kamekun May 9, 2018
ba4ca8c
Update changelog.yml
kamekun May 9, 2018
692eb02
Update core.php
kamekun May 10, 2018
2739d62
Update core.php
kamekun May 10, 2018
aac061a
Update core.php
kamekun May 10, 2018
6988ae7
Update core.php
kamekun May 10, 2018
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
1 change: 1 addition & 0 deletions Modules/Core/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ versions:
"@unreleased":
changed:
- Updating Dutch translations
- Fix Carbon locale
"3.5.3":
changed:
- Updating Polish translations
Expand Down
3 changes: 1 addition & 2 deletions Modules/Page/Http/Requests/CreatePageRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public function translationRules()
{
return [
'title' => 'required',
'slug' => 'required',
'body' => 'required',
'slug' => 'required',
];
}

Expand Down
3 changes: 1 addition & 2 deletions Modules/Page/Http/Requests/UpdatePageRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public function translationRules()
{
return [
'title' => 'required',
'slug' => 'required',
'body' => 'required',
'slug' => 'required',
];
}

Expand Down
3 changes: 3 additions & 0 deletions Modules/User/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
url: https://github.com/AsgardCms/Platform
versions:
"@unreleased":
changed:
- Adding a test the user token is correctly generated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation is wrong here.
Not sure why you added this aswell as this was done before.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixes the indentation i added maybe you forgot to added to the user module.

"3.5.1":
changed:
- Fix issue 467 id() method checks null instead of false
Expand Down
2 changes: 2 additions & 0 deletions Themes/Adminlte/views/partials/top-nav.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</a>
</li>
<li><a href="{{ url('/') }}"><i class="fa fa-eye"></i> {{ trans('core::core.general.view website') }}</a></li>
@if(count(LaravelLocalization::getSupportedLocales())>1)
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-flag"></i>
Expand All @@ -37,6 +38,7 @@
@endforeach
</ul>
</li>
@endif
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Expand Down
1 change: 1 addition & 0 deletions app/Providers/AppServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public function boot()
{
Schema::defaultStringLength(191);

Carbon::setLocale(config('app.locale'));
Carbon::serializeUsing(function ($carbon) {
return $carbon->format('d/m/y H:i:s');
});
Expand Down