Skip to content

Collapse whitespace around color tags in translations #6611

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

Closed
RasmusKD wants to merge 1 commit into from
+4 −1
Closed

Collapse whitespace around color tags in translations #6611

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
5 changes: 4 additions & 1 deletion Essentials/src/main/java/com/earth2me/essentials/I18n.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
public class I18n implements net.ess3.api.II18n {
private static final String MESSAGES = "messages";
private static final Pattern NODOUBLEMARK = Pattern.compile("''");
// A color tag is invisible once rendered, so a translation with whitespace on
// both sides of one shows a double space in chat. Many locales carry this.
private static final Pattern SPACED_COLOR_TAG = Pattern.compile("\\s+(</?(?:primary|secondary)>)\\s+");
private static volatile ExecutorService BUNDLE_LOADER_EXECUTOR = Executors.newFixedThreadPool(2);
private static final ResourceBundle NULL_BUNDLE = new ResourceBundle() {
@SuppressWarnings("NullableProblems")
Expand Down Expand Up @@ -193,7 +196,7 @@ private String translate(final Locale locale, final String string) {
}

private String format(final Locale locale, final String string, final Object... objects) {
String format = translate(locale, string);
String format = SPACED_COLOR_TAG.matcher(translate(locale, string)).replaceAll(" $1");

MessageFormat messageFormat = messageFormatCache.computeIfAbsent(locale, l -> new HashMap<>()).get(format);
if (messageFormat == null) {
Expand Down