Skip to content

Use legacy text for TranslatableException#getMessage #6134

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

Merged
JRoy merged 3 commits into from
Apr 27, 2025
Merged

Use legacy text for TranslatableException#getMessage #6134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc44e76
Use legacy text for TranslatableException#getMessage
JRoy Apr 27, 2025
1242158
Merge branch '2.x' into fix/translate-exception-legacy
JRoy Apr 27, 2025
e582d5b
fix tests
JRoy Apr 27, 2025
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/net/ess3/api/TranslatableException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package net.ess3.api;

import com.earth2me.essentials.utils.AdventureUtil;

import static com.earth2me.essentials.I18n.tlLiteral;

/**
Expand Down Expand Up @@ -39,6 +41,7 @@ public Object[] getArgs() {

@Override
public String getMessage() {
return tlLiteral(tlKey, args);
final String literal = tlLiteral(tlKey, args);
return AdventureUtil.miniToLegacy(literal);
}
}
3 changes: 2 additions & 1 deletion Essentials/src/test/java/com/earth2me/essentials/EconomyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.earth2me.essentials.api.UserDoesNotExistException;
import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.commands.NoChargeException;
import com.earth2me.essentials.utils.AdventureUtil;
import net.ess3.api.Economy;
import net.ess3.api.MaxMoneyException;
import org.bukkit.command.CommandSender;
Expand Down Expand Up @@ -138,7 +139,7 @@ public void testNegativePayCommand() {
try {
runCommand("pay", user1, PLAYERNAME2 + " -123");
} catch (final Exception e) {
Assert.assertEquals(I18n.tlLiteral("payMustBePositive"), e.getMessage());
Assert.assertEquals(AdventureUtil.miniToLegacy(I18n.tlLiteral("payMustBePositive")), e.getMessage());
}
}
}
Loading