[6.x] Fix bug caused by localisation refactoring #29967
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In Laravel 5.8 calling
__(null)
would returnnull
. This is no longer the case in Laravel 6.Calling
__(null)
now returns a Translator object due to the Translator code refactoring;$this->getFromJson(...)
is no longer calling$this->makeReplacements(...)
.As this is not mentioned in the Upgrade Guide and the documentation at https://laravel.com/docs/5.7/localization#retrieving-translation-strings states:
I presume this is an unintended bug. This pull request resolves the issue.
Details:
In Laravel 5.8 you could run the following code in a blade:
If it is intentional the upgrade guide should be updated to put an if statement checking for null for any variables that are translated that could contain null.