Skip to content

Fix trade signs not working with currency suffix #5441

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
Jul 25, 2023
Merged

Fix trade signs not working with currency suffix #5441

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10e7ab8
Fix trade signs not working with currency suffix
JRoy Jul 23, 2023
5341225
Merge branch '2.x' into fix/trade-sign-suffix-issues
JRoy Jul 25, 2023
1ca662c
Merge branch '2.x' into fix/trade-sign-suffix-issues
JRoy Jul 25, 2023
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 Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ protected final void validateTrade(final ISign sign, final int index, final bool
if (amount.compareTo(MINTRANSACTION) < 0 || money.compareTo(MINTRANSACTION) < 0) {
throw new SignException(tl("moreThanZero"));
}
final String newLine = NumberUtil.shortCurrency(money, ess) + ":" + NumberUtil.shortCurrency(amount, ess).substring(1);
final String newLine = NumberUtil.shortCurrency(money, ess) + ":" + NumberUtil.formatAsCurrency(amount);
validateSignLength(newLine);
sign.setLine(index, newLine);
return;
Expand Down Expand Up @@ -333,7 +333,7 @@ private void setAmount(final ISign sign, final int index, final BigDecimal value
final BigDecimal money = getMoney(split[0], ess);
final BigDecimal amount = getBigDecimal(split[1], ess);
if (money != null && amount != null) {
final String newline = NumberUtil.shortCurrency(money, ess) + ":" + NumberUtil.shortCurrency(value, ess).substring(1);
final String newline = NumberUtil.shortCurrency(money, ess) + ":" + NumberUtil.formatAsCurrency(value);
validateSignLength(newline);
sign.setLine(index, newline);
return;
Expand Down