Skip to content
Snippets Groups Projects

Resolve #3428652 "Do not use replace pattern"

All threads resolved!
Files
4
+ 7
11
@@ -5,7 +5,7 @@
@@ -5,7 +5,7 @@
* @internal
* @internal
*/
*/
(function ($, Drupal, drupalSettings, slugify) {
(function ($, Drupal, drupalSettings, transliterateLibrary) {
/**
/**
* Trims string by a character.
* Trims string by a character.
*
*
@@ -294,21 +294,17 @@
@@ -294,21 +294,17 @@
drupalSettings.transliteration_language_overrides[
drupalSettings.transliteration_language_overrides[
drupalSettings.langcode
drupalSettings.langcode
];
];
const normalizedLanguageOverrides = {};
const replace = {};
if (languageOverrides) {
if (languageOverrides) {
Object.keys(languageOverrides).forEach((key) => {
Object.keys(languageOverrides).forEach((key) => {
// Updates the keys from hexadecimal to strings.
// Updates the keys from hexadecimal to strings.
normalizedLanguageOverrides[String.fromCharCode(key)] =
replace[String.fromCharCode(key)] = languageOverrides[key];
languageOverrides[key];
});
});
}
}
slugify.config({
separator: settings.replace,
allowedChars: settings.replace_pattern,
replace: normalizedLanguageOverrides,
});
return prepareMachineName(slugify(source), settings);
const transliteratedSource = transliterateLibrary(source, { replace });
 
 
return prepareMachineName(transliteratedSource, settings);
},
},
};
};
})(jQuery, Drupal, drupalSettings, slugify);
})(jQuery, Drupal, drupalSettings, transliterate);
Loading