From 2adb136f3d234b3edc948dad2d0e37acaef3186c Mon Sep 17 00:00:00 2001 From: Carter Date: Wed, 7 Jun 2017 18:38:48 -0400 Subject: [PATCH] Use balance-format in Currency --- .../appledash/saneeconomy/economy/Currency.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java index 9e4cb9a..b7a201f 100644 --- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java +++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java @@ -16,11 +16,20 @@ public class Currency { private final String nameSingular; private final String namePlural; private final DecimalFormat format; + private final String formatBalance; public Currency(String nameSingular, String namePlural, DecimalFormat format) { this.nameSingular = nameSingular; this.namePlural = namePlural; this.format = format; + this.formatBalance = "%s %s"; + } + + public Currency(String nameSingular,String namePlural,DecimalFormat format,String formatBalance){ + this.nameSingular = nameSingular; + this.namePlural = namePlural; + this.format = format; + this.formatBalance = formatBalance; } public static Currency fromConfig(ConfigurationSection config) { @@ -48,7 +57,8 @@ public class Currency { return new Currency( config.getString("name.singular", "dollar"), config.getString("name.plural", "dollars"), - format + format, + config.getString("balance-format","%s %s") ); } @@ -59,10 +69,10 @@ public class Currency { */ public String formatAmount(double amount) { if (amount == 1) { - return String.format("%s %s", format.format(amount), nameSingular); + return String.format(formatBalance, format.format(amount), nameSingular); } - return String.format("%s %s", format.format(amount), namePlural); + return String.format(formatBalance, format.format(amount), namePlural); } /**