Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2397225 by Chi, ufku: Drupal.formatPlural does not work

8.0.x
Alex Pott 2015-04-08 13:45:05 +01:00
parent 3e275d65dc
commit 7f5bc4e96e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/misc/drupal.js
View File

@ -214,26 +214,29 @@ if (window.jQuery) {
* @ingroup sanitization
*/
Drupal.formatString = function (str, args) {
// Keep args intact.
var processedArgs = {};
// Transform arguments before inserting them.
for (var key in args) {
if (args.hasOwnProperty(key)) {
switch (key.charAt(0)) {
// Escaped only.
case '@':
args[key] = Drupal.checkPlain(args[key]);
processedArgs[key] = Drupal.checkPlain(args[key]);
break;
// Pass-through.
case '!':
processedArgs[key] = args[key];
break;
// Escaped and placeholder.
default:
args[key] = Drupal.theme('placeholder', args[key]);
processedArgs[key] = Drupal.theme('placeholder', args[key]);
break;
}
}
}
return Drupal.stringReplace(str, args, null);
return Drupal.stringReplace(str, processedArgs, null);
};
/**