diff options
| author | alexia <me@alexia.lol> | 2024-02-16 08:55:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-16 08:55:11 +0100 |
| commit | 24b0c5f7313fd3f91e4f6e7686b6bac8c38d7750 (patch) | |
| tree | 65bdc64bb157d5574a53cb05197de33c034312f6 /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | 20f087a2597ee46260c949414bed3ce16df8a8bb (diff) | |
| download | skyhanni-24b0c5f7313fd3f91e4f6e7686b6bac8c38d7750.tar.gz skyhanni-24b0c5f7313fd3f91e4f6e7686b6bac8c38d7750.tar.bz2 skyhanni-24b0c5f7313fd3f91e4f6e7686b6bac8c38d7750.zip | |
Clean up string pluralization methods. #975
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt index 50bdd453b..926efc877 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt @@ -183,11 +183,12 @@ object StringUtils { return "$allButLast$delimiterColor, and ${list[lastIndex]}" } - fun optionalPlural(number: Int, singular: String, plural: String) = - "${number.addSeparators()} " + canBePlural(number, singular, plural) - - fun canBePlural(number: Int, singular: String, plural: String) = - if (number == 1) singular else plural + fun pluralize(number: Int, singular: String, plural: String? = null, withNumber: Boolean = false): String { + val pluralForm = plural ?: "${singular}s" + var str = if (number == 1) singular else pluralForm + if (withNumber) str = "${number.addSeparators()} $str" + return str + } fun progressBar(percentage: Double, steps: Int = 24): Any { //'§5§o§2§l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §f§l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §l§m §r §e348,144.3§6/§e936k' |