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.

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

fix: login page doesn't display the correct localized characters #3528

Merged
merged 1 commit into from
Jan 6, 2023
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import org.apache.commons.text.StringEscapeUtils;
import io.jans.service.el.ExpressionEvaluator;
import io.jans.util.StringHelper;

/**
* @author Yuriy Movchan
Expand Down Expand Up @@ -55,12 +56,20 @@ public void add(Severity severity, String message) {
}

public void add(String clientId, Severity severity, String message) {
boolean escape = StringHelper.isNotEmpty(clientId);
add(clientId, severity, message, escape);
}

public void add(String clientId, Severity severity, String message, boolean escape) {
if (facesContext == null) {
return;
}

String evaluatedMessage = evalAsString(message);
String encodedMessage = StringEscapeUtils.escapeHtml4(evaluatedMessage);
String encodedMessage = evaluatedMessage;
if (escape) {
encodedMessage = StringEscapeUtils.escapeHtml4(evaluatedMessage);
}
FacesMessage facesMessage = new FacesMessage(severity, encodedMessage, encodedMessage);
facesContext.addMessage(clientId, facesMessage);

Expand Down