Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

escape html characters #24245

Merged
merged 1 commit into from
Nov 15, 2023
Merged

escape html characters #24245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions generators/angular/support/translate-angular.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ function replaceErrorMessage(getWebappTranslation, content) {
* @this {import('../generator-base.js')}
*/
export const createTranslationReplacer = (getWebappTranslation, enableTranslation) => {
const htmlJhiTranslateReplacer = createJhiTransformTranslateReplacer(getWebappTranslation);
const htmlJhiTranslateStringifyReplacer = createJhiTransformTranslateStringifyReplacer(getWebappTranslation);
const htmlJhiTranslateReplacer = createJhiTransformTranslateReplacer(getWebappTranslation, { escapeHtml: true });
const htmlJhiTranslateStringifyReplacer = createJhiTransformTranslateStringifyReplacer(getWebappTranslation, { escapeHtml: true });
return function replaceAngularTranslations(content, filePath) {
if (/\.html$/.test(filePath)) {
if (!enableTranslation) {
Expand Down
2 changes: 1 addition & 1 deletion generators/languages/support/translate.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const replaceTranslationKeysWithText = (
replacement = `${wrapTranslation[0]}${translation}${wrapTranslation[1]}`;
} else if (escapeHtml) {
// Escape specific chars
replacement = replacement.replace(/'/g, ''').replace(/"/g, '"');
replacement = replacement.replace(/'/g, ''').replace(/"/g, '"').replace(/@/g, '@');
} else if (stringify) {
replacement = JSON.stringify(replacement);
}
Expand Down