3.0 remove error translation #2588
Conversation
|
Builds failing. |
| trigger_error(__d( | ||
| 'cake_dev', 'Could not apply permission mask "%s" on cache file "%s"', | ||
| trigger_error(sprintf( | ||
| 'Could not apply permission mask "%s" on cache file "%s"', | ||
| [$this->_File->getPathname(), $this->_config['mask']]), E_USER_WARNING); |
There was a problem hiding this comment.
I don't think this array wrapping should stay.
|
If anyone is willing to add extra commits to this branch please go ahead. I'll be out for some time and will not be able to take care of the new comments until tomorrow |
| <strong><?php echo __d('cake_dev', 'Error'); ?>: </strong> | ||
| <?php echo __d('cake_dev', '%s could not be found.', '<em>' . h($pluginDot . $class) . '</em>'); ?> | ||
| <strong>Error: </strong> | ||
| <?php echo sprintf('%s could not be found.', '<em>' . h($pluginDot . $class) . '</em>'); ?> |
There was a problem hiding this comment.
the markup here should be in the replacement string or.. no sprintf usage and only
text <?= h($pluginDot . $class) ?>
|
Man that looks like it was tedious to do 👏 There are a few recurring things that I think should be fixed before merging, but if they aren't 👍 anyway:
I'll try and address some of them. |
|
I've squashed everything together ontop of 3.0 and addressed the conflicts - because it touches so many files would be awesome to review and merge as soon as travis says A-OK. |
| trigger_error(__d( | ||
| 'cake_dev', 'Could not apply permission mask "%s" on log file "%s"', | ||
| trigger_error(sprintf( | ||
| 'Could not apply permission mask "%s" on log file "%s"', | ||
| array($this->_config['mask'], $pathname)), E_USER_WARNING); |
There was a problem hiding this comment.
The array needs to be removed here.
This takes care of ticket #2586
Feel free to merge once it is approved there