FIX Remove legacy sprintf style translations in favour of placeholders #1826
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
robbieaverill
force-pushed
the
bugfix/remove-sprintf-in-translations
branch
from
a67863a to
521f405
Compare
|
big conflicts |
|
@robbieaverill can we rebase this and I'll merge it in. |
robbieaverill
force-pushed
the
bugfix/remove-sprintf-in-translations
branch
from
521f405 to
92f995d
Compare
|
@tractorcow rebased, thanks =) |
tractorcow
approved these changes
Jul 30, 2017
tractorcow
reviewed
Jul 30, 2017
| @@ -1742,7 +1742,7 @@ public function delete($data, $form) | |||
|
|
|||
| $this->getResponse()->addHeader( | |||
| 'X-Status', | |||
| rawurlencode(sprintf(_t('SilverStripe\\CMS\\Controllers\\CMSMain.REMOVEDPAGEFROMDRAFT', "Removed '%s' from the draft site"), $record->Title)) | |||
| rawurlencode(sprintf(_t(__CLASS__ . '.REMOVEDPAGEFROMDRAFT', "Removed '{title}' from the draft site"), $record->Title)) | |||
There was a problem hiding this comment.
Darn, I just realised we need to remove these sprintf calls.
There was a problem hiding this comment.
Fixed in #1915
|
I've manually cherry picked this to 4 branch. |
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.
Issue: silverstripe/silverstripe-framework#6582
Note: CMSBatchAction_* classes have still got
%dplaceholders in them, because they get passed around a bit before being replaced after the actual translation. I figured this isn't appropriate to replace at this point as it's logic change rather than sprintf -> named placeholder swapping.