From ad5dfaefede001fd2f199d533924f8e5e01086c8 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Mon, 25 Oct 2021 01:22:29 +0200 Subject: [PATCH] [AB-339] adjusting templates for softBan to banDelete change --- .../resources/en_US/command/ban/ban_log_embed_en_US.ftl | 7 +++++++ .../ban/ban_log_deletion_days_field_title_en_US.ftl | 1 + .../commands/softBan/help/banDelete_description_en_US.ftl | 1 + ...n_long_help_en_US.ftl => banDelete_long_help_en_US.ftl} | 3 +-- ...ays_en_US.ftl => banDelete_parameter_delDays_en_US.ftl} | 0 .../softBan/help/banDelete_parameter_reason_en_US.ftl | 1 + .../softBan/help/banDelete_parameter_user_en_US.ftl | 1 + .../commands/softBan/help/softBan_description_en_US.ftl | 1 - .../commands/softBan/help/softBan_parameter_user_en_US.ftl | 1 - 9 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 translations/moderation/src/main/resources/en_US/commands/ban/ban_log_deletion_days_field_title_en_US.ftl create mode 100644 translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_description_en_US.ftl rename translations/moderation/src/main/resources/en_US/commands/softBan/help/{softBan_long_help_en_US.ftl => banDelete_long_help_en_US.ftl} (65%) rename translations/moderation/src/main/resources/en_US/commands/softBan/help/{softBan_parameter_delDays_en_US.ftl => banDelete_parameter_delDays_en_US.ftl} (100%) create mode 100644 translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_reason_en_US.ftl create mode 100644 translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_user_en_US.ftl delete mode 100644 translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_description_en_US.ftl delete mode 100644 translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_parameter_user_en_US.ftl diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl index a192d19f..b8fd8ce8 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl @@ -22,5 +22,12 @@ "name": "<@safe_include "ban_log_reason_field_title"/>", "value": "${reason?json_string}" } + <#if deletionDays gt 0> + , + { + "name": "<@safe_include "ban_log_deletion_days_field_title"/>", + "value": "${deletionDays?c}" + } + ] } \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_deletion_days_field_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_deletion_days_field_title_en_US.ftl new file mode 100644 index 00000000..9b2f35d6 --- /dev/null +++ b/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_deletion_days_field_title_en_US.ftl @@ -0,0 +1 @@ +Deletion days \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_description_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_description_en_US.ftl new file mode 100644 index 00000000..64109f0f --- /dev/null +++ b/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_description_en_US.ftl @@ -0,0 +1 @@ +Deletes messages of a member and bans them \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_long_help_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_long_help_en_US.ftl similarity index 65% rename from translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_long_help_en_US.ftl rename to translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_long_help_en_US.ftl index 5d0afede..9aaa2cb5 100644 --- a/translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_long_help_en_US.ftl +++ b/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_long_help_en_US.ftl @@ -1,3 +1,2 @@ -This command can be used to delete the messages of a user for at most 7 days. -This is done by banning (and deleting messages) the user and immediately unbanning them. +This command can be used to delete the messages of a user for at most 7 days and ban the user in the same command. If a time period is provided, only the day portion will be considered. For example: 1d20h will only delete messages for one day. \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_parameter_delDays_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_delDays_en_US.ftl similarity index 100% rename from translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_parameter_delDays_en_US.ftl rename to translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_delDays_en_US.ftl diff --git a/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_reason_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_reason_en_US.ftl new file mode 100644 index 00000000..1d9268e6 --- /dev/null +++ b/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_reason_en_US.ftl @@ -0,0 +1 @@ +The reason for the ban \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_user_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_user_en_US.ftl new file mode 100644 index 00000000..1c83862d --- /dev/null +++ b/translations/moderation/src/main/resources/en_US/commands/softBan/help/banDelete_parameter_user_en_US.ftl @@ -0,0 +1 @@ +The user to ban \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_description_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_description_en_US.ftl deleted file mode 100644 index c35cb5af..00000000 --- a/translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_description_en_US.ftl +++ /dev/null @@ -1 +0,0 @@ -Deletes messages of a member and kicks them \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_parameter_user_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_parameter_user_en_US.ftl deleted file mode 100644 index ac6e3a5d..00000000 --- a/translations/moderation/src/main/resources/en_US/commands/softBan/help/softBan_parameter_user_en_US.ftl +++ /dev/null @@ -1 +0,0 @@ -The user to soft ban \ No newline at end of file