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.

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

Conversation

kamekun
Copy link
Contributor

@kamekun kamekun commented May 8, 2018

No description provided.

@nWidart
Copy link
Member

nWidart commented May 9, 2018

Thanks, this is already set here

@kamekun
Copy link
Contributor Author

kamekun commented May 9, 2018

your only set locale to null or fr when testing config, but laravel localization locale doesn't work with Carbon locale, when i did this change i could see the messages from carbon translate fine.

Edit made some other minor changes.

Regards.-

@@ -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.

@nWidart
Copy link
Member

nWidart commented May 10, 2018

Thanks but you're doing multiple things in one pull request, which makes it harder to review.

PR title is : "Update Carbon Locale", but this PR does much more :D

@kamekun
Copy link
Contributor Author

kamekun commented May 10, 2018

Im sorry, im making the changes via github web, and the commit i made go directly to my last open pull request, i will not make more changes until you check this PR and merge it, also going to fix the title as you requested.

Regards.-

@kamekun kamekun changed the title Update Carbon Locale Update Carbon Locale, remove body requirement on pages, minor update to language core en, and update language es. May 10, 2018
@nWidart
Copy link
Member

nWidart commented May 18, 2018

Thanks!

@nWidart nWidart merged commit 705d04d into AsgardCms:3.0 May 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants