diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl index 791123f2..300a3389 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl @@ -12,7 +12,7 @@ { "name": "<@safe_include "unMute_log_unmuted_user_field_title"/>", <#if unMutedUser?has_content> - "value": "<@full_member_info member=mutingUser/>" + "value": "<@full_member_info member=unMutedUser/>" <#else> "value": "<@safe_include "user_left_server"/> (${mute.mutedUser.userReference.id?c})" diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl index 02c01af0..903b6761 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl @@ -5,7 +5,7 @@ "fields": [ { "name": "Banned user", - "value": ""<@user_detail user=unBannedUser/>" + "value": ""<@user_detail user=bannedUser/>" } <#if banningUser??> , diff --git a/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl index 20a0ba10..01158f53 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl @@ -4,7 +4,7 @@ }, <#include "moderation_action_color">, "description": "<#list warnings as warning><#assign warning=warning/> - <#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.id?c})<#else><#assign warnedUser> ${warning.warnedUser.userId?c} <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.id})<#else><#assign warningUser>${warning.warningUser.warningUser.userId?c} <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss zz")}<#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/> + <#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.idLong?c})<#else><#assign warnedUser> ${warning.warnedUser.userId?c} <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.idLong?c})<#else><#assign warningUser>${warning.warningUser.warningUser.userId?c} <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss zz")}<#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/> <#else> <@safe_include "warnDecay_log_no_warnings"/> " diff --git a/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_member_notification_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_member_notification_embed_en_US.ftl new file mode 100644 index 00000000..cda79814 --- /dev/null +++ b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_member_notification_embed_en_US.ftl @@ -0,0 +1,6 @@ +{ + <#assign reason=warnReason> + <#assign warningDate>${formatDate(warnDate, "yyyy-MM-dd HH:mm:ss zz")} + <#assign remainingWarningsCount=remainingWarningsCount> + "additionalMessage": "<@safe_include "warnDecay_member_notification_text"/>" +} \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/commands/mute/mute_default_reason_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/mute/mute_default_reason_en_US.ftl new file mode 100644 index 00000000..56f33426 --- /dev/null +++ b/translations/moderation/src/main/resources/en_US/commands/mute/mute_default_reason_en_US.ftl @@ -0,0 +1 @@ +default reason \ No newline at end of file diff --git a/translations/moderation/src/main/resources/en_US/job/warnDecay_member_notification_text_en_US.ftl b/translations/moderation/src/main/resources/en_US/job/warnDecay_member_notification_text_en_US.ftl new file mode 100644 index 00000000..112a79d2 --- /dev/null +++ b/translations/moderation/src/main/resources/en_US/job/warnDecay_member_notification_text_en_US.ftl @@ -0,0 +1 @@ +Your warning from ${warningDate} with the reason `${reason}` has been cleared. You have ${remainingWarningsCount} remaining active warnings. \ No newline at end of file