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

[5.7] Revert email lang template changes #25963

Merged
merged 1 commit into from
Oct 6, 2018
Merged

[5.7] Revert email lang template changes #25963

merged 1 commit into from
Oct 6, 2018

Conversation

laurencei
Copy link
Contributor

Reverts my original PR #25723 - because all the lang changes have been reverted, so we should revert this as well.

@laurencei laurencei changed the title [5.7] Revent email lang template changes [5.7] Revert email lang template changes Oct 6, 2018
@TBlindaruk
Copy link
Contributor

@laurencei , should we also revert this changes in v5.6?

@taylorotwell taylorotwell merged commit c982008 into laravel:5.7 Oct 6, 2018
TBlindaruk added a commit to TBlindaruk/laravel-framework that referenced this pull request Oct 7, 2018
I`m not sure, but probably we also should reverting `email lang template` ([laravel#25734](laravel#25734)) changes in 5.6 version

Since in prev 5.6 release we also had:
 - `Fixed translation escaping ([laravel#25858](laravel#25858), [4c46500](https://github.com/laravel/framework/commit/4c465007bbf51d7f269871cd76b6d99de7df90bb))` for fixed translation escaping

The same revert was in 5.7 (laravel#25963)
taylorotwell pushed a commit that referenced this pull request Oct 7, 2018
* [5.6] Revert email lang template changes.
I`m not sure, but probably we also should reverting `email lang template` ([#25734](#25734)) changes in 5.6 version

Since in prev 5.6 release we also had:
 - `Fixed translation escaping ([#25858](#25858), [4c46500](https://github.com/laravel/framework/commit/4c465007bbf51d7f269871cd76b6d99de7df90bb))` for fixed translation escaping

The same revert was in 5.7 (#25963)

* [5.6] Revert email lang template changes.
 - add `comma` after last value in array.
taylorotwell pushed a commit to illuminate/notifications that referenced this pull request Oct 7, 2018
* [5.6] Revert email lang template changes.
I`m not sure, but probably we also should reverting `email lang template` ([#25734](laravel/framework#25734)) changes in 5.6 version

Since in prev 5.6 release we also had:
 - `Fixed translation escaping ([#25858](laravel/framework#25858), [4c46500](https://github.com/laravel/framework/commit/4c465007bbf51d7f269871cd76b6d99de7df90bb))` for fixed translation escaping

The same revert was in 5.7 (laravel/framework#25963)

* [5.6] Revert email lang template changes.
 - add `comma` after last value in array.
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.

3 participants