FIX Finish removing deprecated i18n functionality. #11528
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This deprecated functionality was partially removed in silverstripe#10594. This commit finishes the job.
GuySartorelli
commented
Jan 7, 2025
Comment on lines
+174
to
177
| // Injection must be associative | ||
| if (!empty($injection) && !ArrayLib::is_associative($injection)) { | ||
| throw new InvalidArgumentException('Injection must be an associative array'); | ||
| } |
There was a problem hiding this comment.
Uses a more declarative condition than the previous one, but the result is the same.
Error moved here from below, as per the comment (see line 209)
GuySartorelli
commented
Jan 7, 2025
| // Pass args directly to handle deprecation | ||
| // Pass args directly as we allow variable args. |
There was a problem hiding this comment.
We still allow variable args because you can technically add a comment which should be but isn't used by the i18n text collector. Changing that is well outside the scope of this PR so leaving as is.
This was referenced Jan 7, 2025
emteknetnz
approved these changes
Jan 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This functionality was deprecated in #6558 and partially removed in #10594.
There's no chance anyone is still using the legacy
%sin localisation strings today, as doing so would result in a hard error - so it's time to fully remove this legacy code.Issue