Use proper grammar for single items

Not possible for SubServers.Client since it uses global lang, but the mistake was less egregious in that case anyway.
This commit is contained in:
ME1312 2020-06-26 02:52:34 -04:00
parent 312d010585
commit 928c40addc
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
3 changed files with 12 additions and 12 deletions

View File

@ -439,7 +439,7 @@ public final class SubCommand extends CommandX {
success++; success++;
} }
} }
if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?"":"s") + " were already running"); if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?" was":"s were") + " already running");
if (success > 0) sender.sendMessage("SubServers > Started " + success + " subserver"+((success == 1)?"":"s")); if (success > 0) sender.sendMessage("SubServers > Started " + success + " subserver"+((success == 1)?"":"s"));
} }
} else { } else {
@ -513,7 +513,7 @@ public final class SubCommand extends CommandX {
success++; success++;
} }
} }
if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?"":"s") + " were already offline"); if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?" was":"s were") + " already offline");
if (success > 0) sender.sendMessage("SubServers > Stopping " + success + " subserver"+((success == 1)?"":"s")); if (success > 0) sender.sendMessage("SubServers > Stopping " + success + " subserver"+((success == 1)?"":"s"));
} }
} else { } else {
@ -531,7 +531,7 @@ public final class SubCommand extends CommandX {
success++; success++;
} }
} }
if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?"":"s") + " were already offline"); if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?" was":"s were") + " already offline");
if (success > 0) sender.sendMessage("SubServers > Terminated " + success + " subserver"+((success == 1)?"":"s")); if (success > 0) sender.sendMessage("SubServers > Terminated " + success + " subserver"+((success == 1)?"":"s"));
} }
} else { } else {
@ -557,7 +557,7 @@ public final class SubCommand extends CommandX {
success++; success++;
} }
} }
if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?"":"s") + " were offline"); if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?" was":"s were") + " offline");
if (success > 0) sender.sendMessage("SubServers > Sent command to " + success + " subserver"+((success == 1)?"":"s")); if (success > 0) sender.sendMessage("SubServers > Sent command to " + success + " subserver"+((success == 1)?"":"s"));
} else { } else {
sender.sendMessage("SubServers > No command was entered"); sender.sendMessage("SubServers > No command was entered");

View File

@ -452,7 +452,7 @@ public class SubCommand {
PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0);
PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0);
AsyncConsolidator merge = new AsyncConsolidator(() -> { AsyncConsolidator merge = new AsyncConsolidator(() -> {
if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?"":"s") + " were already running"); if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " already running");
if (success.value > 0) sender.sendMessage("Started " + success.value + " subserver"+((success.value == 1)?"":"s")); if (success.value > 0) sender.sendMessage("Started " + success.value + " subserver"+((success.value == 1)?"":"s"));
}); });
for (SubServer server : select.subservers) { for (SubServer server : select.subservers) {
@ -609,7 +609,7 @@ public class SubCommand {
PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0);
PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0);
AsyncConsolidator merge = new AsyncConsolidator(() -> { AsyncConsolidator merge = new AsyncConsolidator(() -> {
if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?"":"s") + " were already offline"); if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline");
if (success.value > 0) sender.sendMessage("Stopping " + success.value + " subserver"+((success.value == 1)?"":"s")); if (success.value > 0) sender.sendMessage("Stopping " + success.value + " subserver"+((success.value == 1)?"":"s"));
}); });
for (SubServer server : select.subservers) { for (SubServer server : select.subservers) {
@ -653,7 +653,7 @@ public class SubCommand {
PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0);
PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0);
AsyncConsolidator merge = new AsyncConsolidator(() -> { AsyncConsolidator merge = new AsyncConsolidator(() -> {
if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?"":"s") + " were already offline"); if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline");
if (success.value > 0) sender.sendMessage("Terminated " + success.value + " subserver"+((success.value == 1)?"":"s")); if (success.value > 0) sender.sendMessage("Terminated " + success.value + " subserver"+((success.value == 1)?"":"s"));
}); });
for (SubServer server : select.subservers) { for (SubServer server : select.subservers) {
@ -707,7 +707,7 @@ public class SubCommand {
PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0);
PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0);
AsyncConsolidator merge = new AsyncConsolidator(() -> { AsyncConsolidator merge = new AsyncConsolidator(() -> {
if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?"":"s") + " were offline"); if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " offline");
if (success.value > 0) sender.sendMessage("Sent command to " + success.value + " subserver"+((success.value == 1)?"":"s")); if (success.value > 0) sender.sendMessage("Sent command to " + success.value + " subserver"+((success.value == 1)?"":"s"));
}); });
for (SubServer server : select.subservers) { for (SubServer server : select.subservers) {

View File

@ -367,7 +367,7 @@ public final class SubCommand extends CommandX {
PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0);
PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0);
AsyncConsolidator merge = new AsyncConsolidator(() -> { AsyncConsolidator merge = new AsyncConsolidator(() -> {
if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?"":"s") + " were already running"); if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already running");
if (success.value > 0) sender.sendMessage("SubServers > Started " + success.value + " subserver"+((success.value == 1)?"":"s")); if (success.value > 0) sender.sendMessage("SubServers > Started " + success.value + " subserver"+((success.value == 1)?"":"s"));
}); });
for (SubServer server : select.subservers) { for (SubServer server : select.subservers) {
@ -501,7 +501,7 @@ public final class SubCommand extends CommandX {
PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0);
PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0);
AsyncConsolidator merge = new AsyncConsolidator(() -> { AsyncConsolidator merge = new AsyncConsolidator(() -> {
if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?"":"s") + " were already offline"); if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline");
if (success.value > 0) sender.sendMessage("SubServers > Stopping " + success.value + " subserver"+((success.value == 1)?"":"s")); if (success.value > 0) sender.sendMessage("SubServers > Stopping " + success.value + " subserver"+((success.value == 1)?"":"s"));
}); });
for (SubServer server : select.subservers) { for (SubServer server : select.subservers) {
@ -534,7 +534,7 @@ public final class SubCommand extends CommandX {
PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0);
PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0);
AsyncConsolidator merge = new AsyncConsolidator(() -> { AsyncConsolidator merge = new AsyncConsolidator(() -> {
if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?"":"s") + " were already offline"); if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline");
if (success.value > 0) sender.sendMessage("SubServers > Terminated " + success.value + " subserver"+((success.value == 1)?"":"s")); if (success.value > 0) sender.sendMessage("SubServers > Terminated " + success.value + " subserver"+((success.value == 1)?"":"s"));
}); });
for (SubServer server : select.subservers) { for (SubServer server : select.subservers) {
@ -574,7 +574,7 @@ public final class SubCommand extends CommandX {
PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> success = new PrimitiveContainer<Integer>(0);
PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0); PrimitiveContainer<Integer> running = new PrimitiveContainer<Integer>(0);
AsyncConsolidator merge = new AsyncConsolidator(() -> { AsyncConsolidator merge = new AsyncConsolidator(() -> {
if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?"":"s") + " were offline"); if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " offline");
if (success.value > 0) sender.sendMessage("SubServers > Sent command to " + success.value + " subserver"+((success.value == 1)?"":"s")); if (success.value > 0) sender.sendMessage("SubServers > Sent command to " + success.value + " subserver"+((success.value == 1)?"":"s"));
}); });
for (SubServer server : select.subservers) { for (SubServer server : select.subservers) {