Fix pluralization of /glist player summary

This commit is contained in:
Andrew Steinborn
2021-04-18 11:16:11 -04:00
parent c069a0730f
commit d26d61f038
3 changed files with 10 additions and 19 deletions

View File

@@ -37,6 +37,7 @@ import java.util.Optional;
import net.kyori.adventure.identity.Identity; import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.TranslatableComponent;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
public class GlistCommand { public class GlistCommand {
@@ -104,19 +105,11 @@ public class GlistCommand {
private void sendTotalProxyCount(CommandSource target) { private void sendTotalProxyCount(CommandSource target) {
int online = server.countConnectedPlayers(); int online = server.countConnectedPlayers();
target.sendMessage(Identity.nil(), Component.text() TranslatableComponent msg = online == 1
.append(Component.text(Integer.toString(online), NamedTextColor.GREEN)) ? Component.translatable("velocity.command.glist-player-singular")
.append(Component.space()) : Component.translatable("velocity.command.glist-player-plural");
.append(Component.translatable( target.sendMessage(msg.color(NamedTextColor.YELLOW)
online == 1 .args(Component.text(Integer.toString(online), NamedTextColor.GREEN)));
? "velocity.command.glist-player-singular"
: "velocity.command.glist-player-plural",
NamedTextColor.YELLOW
))
.append(Component.space())
.append(Component.translatable("velocity.command.glist-total-suffix",
NamedTextColor.YELLOW))
.build());
} }
private void sendServerPlayers(CommandSource target, RegisteredServer server, boolean fromAll) { private void sendServerPlayers(CommandSource target, RegisteredServer server, boolean fromAll) {

View File

@@ -45,9 +45,8 @@ velocity.command.server-tooltip-players-online={0} players online
velocity.command.server-tooltip-current-server=Currently connected to this server velocity.command.server-tooltip-current-server=Currently connected to this server
velocity.command.server-tooltip-offer-connect-server=Click to connect to this server velocity.command.server-tooltip-offer-connect-server=Click to connect to this server
velocity.command.glist-player-singular=player velocity.command.glist-player-singular={0} player is currently connected to the proxy.
velocity.command.glist-player-plural=players velocity.command.glist-player-plural={0} players are currently connected to the proxy.
velocity.command.glist-total-suffix= are currently connected to the proxy.
velocity.command.glist-view-all=To view all players on servers, use /glist all. velocity.command.glist-view-all=To view all players on servers, use /glist all.
velocity.command.reload-success=Velocity configuration successfully reloaded. velocity.command.reload-success=Velocity configuration successfully reloaded.

View File

@@ -45,9 +45,8 @@ velocity.command.server-tooltip-players-online=ǝuᴉluo sɹǝʎɐld {0}
velocity.command.server-tooltip-current-server=ɹǝʌɹǝs sᴉɥʇ oʇ pǝʇɔǝuuoɔ ʎlʇuǝɹɹnƆ velocity.command.server-tooltip-current-server=ɹǝʌɹǝs sᴉɥʇ oʇ pǝʇɔǝuuoɔ ʎlʇuǝɹɹnƆ
velocity.command.server-tooltip-offer-connect-server=ɹǝʌɹǝs sᴉɥʇ oʇ ʇɔǝuuoɔ oʇ ʞɔᴉlƆ velocity.command.server-tooltip-offer-connect-server=ɹǝʌɹǝs sᴉɥʇ oʇ ʇɔǝuuoɔ oʇ ʞɔᴉlƆ
velocity.command.glist-player-singular=ɹǝʎɐld velocity.command.glist-player-singular=˙ʎxoɹd ǝɥʇ oʇ pǝʇɔǝuuoɔ ʎlʇuǝɹɹnɔ sᴉ ɹǝʎɐld {0}
velocity.command.glist-player-plural=sɹǝʎɐld velocity.command.glist-player-plural=˙ʎxoɹd ǝɥʇ oʇ pǝʇɔǝuuoɔ ʎlʇuǝɹɹnɔ ǝɹɐ sɹǝʎɐld {0}
velocity.command.glist-total-suffix=˙ʎxoɹd ǝɥʇ oʇ pǝʇɔǝuuoɔ ʎlʇuǝɹɹnɔ ǝɹɐ
velocity.command.glist-view-all=˙/glist all ǝsn 'sɹǝʌɹǝs uo sɹǝʎɐld llɐ ʍǝᴉʌ o┴ velocity.command.glist-view-all=˙/glist all ǝsn 'sɹǝʌɹǝs uo sɹǝʎɐld llɐ ʍǝᴉʌ o┴
velocity.command.reload-success=˙pǝpɐolǝɹ ʎllnɟssǝɔɔns uoᴉʇɐɹnƃᴉɟuoɔ ʎʇᴉɔolǝΛ velocity.command.reload-success=˙pǝpɐolǝɹ ʎllnɟssǝɔɔns uoᴉʇɐɹnƃᴉɟuoɔ ʎʇᴉɔolǝΛ