Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-17 17:21:00 +02:00
Code Issues Projects Releases Wiki Activity

Added a config setting for #345 (0s time amount format)

Browse Source
This commit is contained in:
Rsl1122 2017-10-08 11:26:51 +03:00
parent 7af17d6f94
commit 2b4553e5e3
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plan/src/main/java/com/djrapitops/plan/Settings.java
View File

@ -60,6 +60,7 @@ public enum Settings {
FORMAT_HOURS("Customization.Formatting.TimeAmount.Hours"),
FORMAT_MINUTES("Customization.Formatting.TimeAmount.Minutes"),
FORMAT_SECONDS("Customization.Formatting.TimeAmount.Seconds"),
FORMAT_ZERO_SECONDS("Customization.Formatting.TimeAmount.Zero"),
FORMAT_DECIMALS("Customization.Formatting.DecimalPoints"),
//
COLOR_MAIN("Commands.Colors.Main"),

2
Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java
View File

@ -79,7 +79,7 @@ public class ConfigurationWebAPI extends WebAPI {
Settings.DB_DATABASE, Settings.FORMAT_DECIMALS, Settings.FORMAT_SECONDS,
Settings.FORMAT_DAY, Settings.FORMAT_DAYS, Settings.FORMAT_HOURS,
Settings.FORMAT_MINUTES, Settings.FORMAT_MONTHS, Settings.FORMAT_MONTH,
Settings.FORMAT_YEAR, Settings.FORMAT_YEARS,
Settings.FORMAT_YEAR, Settings.FORMAT_YEARS, Settings.FORMAT_ZERO_SECONDS
};
for (Settings setting : sameStrings) {
addConfigValue(configValues, setting, setting.toString());

2
Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java
View File

@ -133,7 +133,7 @@ public class FormatUtils {
}
String formattedTime = StringUtils.remove(builder.toString(), "%zero%");
if (formattedTime.isEmpty()) {
return Settings.FORMAT_SECONDS.toString().replace("%seconds%", "0").replace("%zero%", "0");
return Settings.FORMAT_ZERO_SECONDS.toString();
}
return formattedTime;
}

1
Plan/src/main/resources/bungeeconfig.yml
View File

@ -59,6 +59,7 @@ Customization:
Hours: '%hours%h '
Minutes: '%minutes%m '
Seconds: '%seconds%s'
Zero: '0s'
Theme:
Base: Default

1
Plan/src/main/resources/config.yml
View File

@ -64,6 +64,7 @@ Customization:
Hours: '%hours%h '
Minutes: '%minutes%m '
Seconds: '%seconds%s'
Zero: '0s'
Theme:
Base: Default