Fix plural strings

bisq-network · Sep 30, 2024 · a653ff8 · a653ff8
1 parent 87e4a0a
commit a653ff8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...op/src/main/java/bisq/desktop/main/content/reputation/ranking/ReputationDetailsPopup.java b/...op/src/main/java/bisq/desktop/main/content/reputation/ranking/ReputationDetailsPopup.java
@@ -200,8 +200,8 @@ public ListItem(ReputationSource reputationSource,
  dateString = DateFormatter.formatDate(blockTime);
  timeString = DateFormatter.formatTime(blockTime);
  age = TimeFormatter.getAgeInDays(blockTime);
- sourceString = reputationSource.getDisplayString();
  ageString = TimeFormatter.formatAgeInDays(blockTime);
+ sourceString = reputationSource.getDisplayString();
  amountString = optionalAmount.map(amount -> AmountFormatter.formatAmountWithCode(Coin.fromValue(amount, "BSQ"))).orElse("-");
  scoreString = String.valueOf(score);
  lockTimeString = optionalLockTime.map(String::valueOf).orElse("-");

diff --git a/i18n/src/main/java/bisq/i18n/Res.java b/i18n/src/main/java/bisq/i18n/Res.java
@@ -93,14 +93,17 @@ public static String get(String key) {
  * Additionally, a '.0' postfix handles 0 values.
  */
  public static String getPluralization(String key, double number) {
+ String pluralKey;
  if (number == 1) {
- return get(key + ".1");
+ pluralKey = key + ".1";
  } else {
  if (number == 0 && has(key + ".0")) {
- return get(key + ".0");
- } else
- return get(key + ".*", number);
+ pluralKey = key + ".0";
+ } else {
+ pluralKey = key + ".*";
+ }
  }
+ return get(pluralKey, number);
  }
 
  public static boolean has(String key) {