diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 30e8622482..26d75701c6 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -591,6 +591,8 @@ unit.persecond = /sec unit.timesspeed = x speed unit.percent = % unit.items = items +unit.thousands = k +unit.millions = mil category.general = General category.power = Power category.liquids = Liquids diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index c83ea66d6e..d3f2b919ce 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -589,6 +589,8 @@ unit.persecond = /сек unit.timesspeed = x скорость unit.percent = % unit.items = предметов +unit.thousands = тыс +unit.millions = мил category.general = Основные category.power = Энергия category.liquids = Жидкости diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index e6fca628b7..142481b96d 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -461,11 +461,11 @@ public class UI implements ApplicationListener, Loadable{ public String formatAmount(int number){ if(number >= 1000000){ - return Strings.fixed(number / 1000000f, 1) + "[gray]mil[]"; + return Strings.fixed(number / 1000000f, 1) + "[gray]" + Core.bundle.getOrNull("unit.millions") + "[]"; }else if(number >= 10000){ return number / 1000 + "[gray]k[]"; }else if(number >= 1000){ - return Strings.fixed(number / 1000f, 1) + "[gray]k[]"; + return Strings.fixed(number / 1000f, 1) + "[gray]" + Core.bundle.getOrNull("unit.thousands") + "[]"; }else{ return number + ""; } diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index 1c663f2b4a..1ea3623790 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -189,9 +189,9 @@ public class BlockInventoryFragment extends Fragment{ private String round(float f){ f = (int)f; if(f >= 1000000){ - return (int)(f / 1000000f) + "[gray]mil[]"; + return (int)(f / 1000000f) + "[gray]" + Core.bundle.getOrNull("unit.millions") + "[]"; }else if(f >= 1000){ - return (int)(f / 1000) + "k"; + return (int)(f / 1000) + Core.bundle.getOrNull("unit.thousands"); }else{ return (int)f + ""; }