Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated translation strings

This commit is contained in:
NotMyFault 2021-02-02 16:48:01 +01:00
parent aca2d2e510
commit 18c1a0e4f6
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/src/main/java/com/plotsquared/core/command/Cluster.java
View File

@ -150,7 +150,10 @@ public class Cluster extends SubCommand {
player.getClusterCount() :
player.getPlotCount(player.getLocation().getWorldName());
if (currentClusters >= player.getAllowedPlots()) {
player.sendMessage(TranslatableCaption.of("permission.cant_claim_more_clusters"));
player.sendMessage(
TranslatableCaption.of("permission.cant_claim_more_clusters"),
Template.of("amount", String.valueOf(player.getAllowedPlots()))
);
}
PlotId pos1;
PlotId pos2;

4
Core/src/main/java/com/plotsquared/core/command/Condense.java
View File

@ -164,7 +164,7 @@ public class Condense extends SubCommand {
@Override
public void run() {
if (!Condense.TASK) {
player.sendMessage(TranslatableCaption.of("condense.task_cancelled"));
player.sendMessage(TranslatableCaption.of("debugexec.task_cancelled"));
}
if (allPlots.isEmpty()) {
Condense.TASK = false;
@ -218,7 +218,7 @@ public class Condense extends SubCommand {
}
case "stop":
if (!Condense.TASK) {
player.sendMessage(TranslatableCaption.of("condense.task_already_stopped"));
player.sendMessage(TranslatableCaption.of("condense.task_stopped"));
return false;
}
Condense.TASK = false;

2
Core/src/main/java/com/plotsquared/core/command/DebugExec.java
View File

@ -331,7 +331,7 @@ public class DebugExec extends SubCommand {
return false;
}
HybridUtils.UPDATE = false;
player.sendMessage(TranslatableCaption.of("debugexec.cancelling_task"));
player.sendMessage(TranslatableCaption.of("debugexec.task_cancelled"));
return true;
case "start-expire":
if (ExpireManager.IMP == null) {

5
Core/src/main/resources/lang/messages_en.json
View File

@ -177,7 +177,7 @@
"permission.no_permission_event": "<prefix><red>You are lacking the permission node: <gold><node></gold>.</red>",
"permission.no_plot_perms": "<prefix><red>You must be the plot owner to perform this action.</red>",
"permission.cant_claim_more_plots": "<prefix><red>You can't claim more than <gold><amount> </gold>plots.</red>",
"permission.cant_claim_more_clusters": "<prefix><red>You can't claim more clusters.</red>",
"permission.cant_claim_more_clusters": "<prefix><red>You can't claim more than <gold><amount> </gold>clusters.</red>",
"permission.cant_transfer_more_plots": "<prefix><red>You can't send more plots to that user.</red>",
"permission.cant_claim_more_plots_num": "<prefix><red>You can't claim more than <gold><amount> </gold>plots at once.</red>",
"merge.merge_request_confirm": "<prefix><gray>Merge request from </gray><gold><player></gold><gray>.</gray>",
@ -211,12 +211,10 @@
"condense.radius_too_small": "<prefix><red>Radius too small.</red>",
"condense.no_free_plots_found": "<prefix><red>No free plots found.</red>",
"condense.task_started": "<prefix><gold>Task started...</gold>",
"condense.task_cancelled": "<prefix><gold>Task cancelled.</gold>",
"condense.task_complete": "<prefix><gold>Task complete. Please verify that no new plots have been claimed during the task.</gold>",
"condense.moving": "<gold>Moving: </gold><gray><origin></gray><gold> -> </gold><green><possible></green>",
"condense.task_failed": "<prefix><red>Task failed. No free plots found.</red>",
"condense.skipping": "<prefix><red>Skipping complex plot: </red><gold><plot></gold><red>.</red>",
"condense.task_already_stopped": "<prefix><gold>Task already stopped.</gold>",
"condense.task_stopped": "<prefix><gold>Task already stopped.</gold>",
"condense.default_eval": "<dark_gray><strikethrough>=== <reset> <gold>DEFAULT EVAL </gold><dark_gray><strikethrough>===</dark_gray>",
"condense.minimum_radius": "<gold>Minimum radius: </gold><gray><minimumRadius></gray>",
@ -244,7 +242,6 @@
"debugexec.threshold_default_double": "<prefix><gray><gold><threshold> </gold><gray>= </gray><gold>The percentage of plots you want to clear as a number between 0 - 100.</gold>",
"debugexec.calibration_done": "<prefix><gold>Thank you for calibrating plot expiry.</gold>",
"debugexec.task_halted": "<prefix><gray>Task already halted.</gray>",
"debugexec.cancelling_task": "<prefix><red>Task cancelled.</red>",
"debugexec.task_cancelled": "<prefix><gold>Task cancelled.</gold>",
"debugexec.cleared_flag": "<prefix><gold>Cleared flag: </gold><dark_aqua><value></dark_aqua>",
"debugexec.mass_schematic_update_in_progress": "<prefix><red>Cannot schedule mass schematic update. (Is one already in progress?)</red>",