From a39124e208e163951e96511a544a977cfbacc55b Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Fri, 22 Nov 2024 23:12:07 +0100 Subject: [PATCH] [OPB-xxx] updating abstracto version to 1.5.51 adapting templates to use the default locale --- .env | 2 +- .../dev/sheldan/oneplus/bot/modules/faq/command/FAQ.java | 6 +++--- .../sheldan/oneplus/bot/modules/faq/command/FAQUsage.java | 2 +- .../oneplus/bot/modules/faq/command/ListFAQCommands.java | 2 +- .../bot/modules/referral/listener/ReferralListener.java | 4 ++-- deployment/helm/oneplus-bot/values.yaml | 4 ++-- pom.xml | 4 ++-- .../warning_threshold_notification_embed.ftl} | 0 .../starboard_post_created_notification_embed.ftl} | 0 .../starboard_post_deleted_notification_embed.ftl} | 0 .../commands/FAQUsage/FAQUsage_response_embed.ftl} | 0 .../commands/faq/FAQ_response_embed.ftl} | 0 .../commands/faq/FAQ_response_no_command_found_embed.ftl} | 0 .../listFAQCommands/listFAQCommands_response_embed.ftl} | 0 .../exceptions/duplicated_command_or_alias_exception.ftl} | 0 .../exceptions/duplicated_faq_command_alias_exception.ftl} | 0 .../exceptions/faq_command_alias_shadowing_exception.ftl} | 0 .../exceptions/faq_command_not_found_exception.ftl} | 0 .../faq_command_response_duplicated_position_exception.ftl} | 0 .../global_faq_command_config_mismatch_exception.ftl} | 0 .../exceptions/global_faq_command_responses_exception.ftl} | 0 .../exceptions/no_faq_response_found_exception.ftl} | 0 .../commands/news/news_post_embed.ftl} | 0 .../exception/news_post_locked_exception.ftl} | 0 .../exception/news_post_not_found_exception.ftl} | 0 .../job/newsForumPost_notification_embed.ftl} | 0 .../referralListener_no_referral_link_found_embed.ftl} | 0 .../referralListener_referral_post_embed.ftl} | 0 .../referralListener_too_recent_post_embed.ftl} | 0 .../colors/abstracto_color.ftl} | 0 .../colors/exception_color.ftl} | 0 .../colors/success_color.ftl} | 0 .../colors/warning_color.ftl} | 0 .../listener/user_joined/user_join_embed.ftl} | 0 .../listener/user_left/user_leave_embed.ftl} | 0 .../config/colors/moderation_action_color.ftl} | 0 .../config/colors/modmail_color.ftl} | 0 .../emotes/config/statistic_color.ftl} | 0 .../urbanDefine/urban_define_response_model_embed.ftl} | 0 .../dynamicActivity/dynamic_activity_fans.ftl} | 0 .../dynamicActivity/dynamic_activity_help.ftl} | 0 .../dynamicActivity/dynamic_activity_modmail.ftl} | 0 .../commands/modMode/help/modMode_description.ftl} | 0 .../commands/modMode/help/modMode_long_help.ftl} | 0 .../modMode/help/modMode_parameter_newState_help.ftl} | 0 .../config/feature_moderationCustom.ftl} | 0 .../config/feature_setup_config_modModeNewRoleColor.ftl} | 0 .../config/feature_setup_config_modModeRoleId.ftl} | 0 .../feature_setup_config_warnNotificationThreshold.ftl} | 0 .../feature_setup_posttarget_warnThresholdNotification.ftl} | 0 .../exception/mod_role_not_found_exception.ftl} | 0 .../warning_threshold_reached_notification_description.ftl} | 0 .../warning_threshold_reached_notification_title.ftl} | 0 .../feature_setup_posttarget_starboardNotification.ftl} | 0 .../config/feature_starboardNotification.ftl} | 0 .../starboard_post_created_description.ftl} | 0 .../starboardNotification/starboard_post_created_title.ftl} | 0 .../starboard_post_deleted_description.ftl} | 0 .../starboardNotification/starboard_post_deleted_title.ftl} | 0 ...starboard_post_notification_field_starboard_message.ftl} | 0 ...oard_post_notification_field_starboard_message_jump.ftl} | 0 .../starboard_post_notification_field_starred_message.ftl} | 0 .../starboard_post_notification_field_starred_user.ftl} | 0 .../starboard_post_notification_field_starring_user.ftl} | 0 .../commands/FAQ/FAQ_response_no_command_found_message.ftl} | 0 ...esponse_no_command_found_message_available_commands.ftl} | 0 .../FAQ_response_no_command_found_message_no_commands.ftl} | 0 .../commands/FAQ/help/FAQ_description.ftl} | 0 .../commands/FAQ/help/FAQ_long_help.ftl} | 0 .../commands/FAQ/help/FAQ_parameter_channel.ftl} | 0 .../commands/FAQ/help/FAQ_parameter_command.ftl} | 0 .../commands/FAQUsage/FAQUsage_command_display.ftl} | 0 .../commands/FAQUsage/FAQUsage_no_usages.ftl} | 0 .../commands/FAQUsage/FAQUsage_usage_display.ftl} | 0 .../commands/FAQUsage/help/FAQUsage_description.ftl} | 0 .../commands/FAQUsage/help/FAQUsage_long_help.ftl} | 0 .../FAQUsage/help/FAQUsage_parameter_commandName.ftl} | 0 .../commands/deleteFAQ/help/deleteFAQ_description.ftl} | 0 .../commands/deleteFAQ/help/deleteFAQ_long_help.ftl} | 0 .../deleteFAQ/help/deleteFAQ_parameter_commandName.ftl} | 0 .../commands/exportFAQ/help/exportFAQ_description.ftl} | 0 .../commands/exportFAQ/help/exportFAQ_long_help.ftl} | 0 .../exportFAQ/help/exportFAQ_parameter_commandName.ftl} | 0 .../commands/importFAQ/help/importFAQ_description.ftl} | 0 .../commands/importFAQ/help/importFAQ_long_help.ftl} | 0 .../commands/importFAQ/help/importFAQ_parameter_file.ftl} | 0 .../listFAQCommands/help/listFAQCommands_description.ftl} | 0 .../listFAQCommands/help/listFAQCommands_long_help.ftl} | 0 .../listFAQCommands_channel_group_display.ftl} | 0 .../listFAQCommands_channel_group_display_aliases.ftl} | 0 .../listFAQCommands_channel_groups_header.ftl} | 0 .../listFAQCommands/listFAQCommands_command_display.ftl} | 0 .../listFAQCommands/listFAQCommands_command_header.ftl} | 0 .../listFAQCommands/listFAQCommands_no_commands.ftl} | 0 .../config/channel_group_type_faq_name.ftl} | 0 .../config/feature_faq.ftl} | 0 .../config/module_faqModule_description.ftl} | 0 .../config/setup_global_channel_group_info.ftl} | 0 .../duplicated_command_or_alias_exception_message.ftl} | 0 .../duplicated_faq_command_alias_exception_message.ftl} | 0 .../faq_command_alias_shadowing_exception_message.ftl} | 0 .../exception/faq_command_not_found_exception_message.ftl} | 0 ...mand_response_duplicated_position_exception_message.ftl} | 0 ...lobal_faq_command_config_mismatch_exception_message.ftl} | 0 .../global_faq_command_responses_exception_message.ftl} | 0 .../exception/no_faq_response_found_exception_message.ftl} | 0 .../commands/news/help/news_description.ftl} | 0 .../commands/news/help/news_long_help.ftl} | 0 .../commands/news/help/news_parameter_text.ftl} | 0 .../commands/news/news_post_description.ftl} | 0 .../commands/updateNews/help/updateNews_description.ftl} | 0 .../commands/updateNews/help/updateNews_long_help.ftl} | 0 .../updateNews/help/updateNews_parameter_newsPostId.ftl} | 0 .../commands/updateNews/help/updateNews_parameter_text.ftl} | 0 .../config/feature_news.ftl} | 0 .../feature_setup_posttarget_forumPostNotification.ftl} | 0 .../config/feature_setup_posttarget_news.ftl} | 0 .../config/module_newsModule_description.ftl} | 0 .../exception/news_post_locked_exception_message.ftl} | 0 .../exception/news_post_not_found_exception_text.ftl} | 0 .../config/feature_referral.ftl} | 0 .../config/feature_setup_posttarget_referral.ftl} | 0 .../config/referral_link_type_accessories.ftl} | 0 .../config/referral_link_type_smartphone.ftl} | 0 .../config/referral_link_type_smartphoneIndia.ftl} | 0 .../listener/no_referral_link_found.ftl} | 0 .../referralListener_referral_post_description.ftl} | 0 .../listener/too_recent_referral_post.ftl} | 0 .../addRoleToLights/help/addRoleToLights_description.ftl} | 0 .../addRoleToLights/help/addRoleToLights_long_help.ftl} | 0 .../help/addRoleToLights_parameter_role.ftl} | 0 .../help/removeRoleFromLights_description.ftl} | 0 .../help/removeRoleFromLights_long_help.ftl} | 0 .../help/removeRoleFromLights_parameter_role.ftl} | 0 .../switchLights/help/switchLights_description.ftl} | 0 .../commands/switchLights/help/switchLights_long_help.ftl} | 0 .../lights/config/feature_lights.ftl} | 0 .../config/feature_setup.ftl} | 0 .../config/feature_setup_posttarget_setup.ftl} | 0 ...otification_text_en_US.ftl => ban_notification_text.ftl} | 0 140 files changed, 12 insertions(+), 12 deletions(-) rename templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/{en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl => default/listener/warningCreatedListener/warning_threshold_notification_embed.ftl} (100%) rename templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/{en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl => default/listener/starboardNotification/starboard_post_created_notification_embed.ftl} (100%) rename templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/{en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl => default/listener/starboardNotification/starboard_post_deleted_notification_embed.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl => default/commands/FAQUsage/FAQUsage_response_embed.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/commands/faq/FAQ_response_embed_en_US.ftl => default/commands/faq/FAQ_response_embed.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/commands/faq/FAQ_response_no_command_found_embed_en_US.ftl => default/commands/faq/FAQ_response_no_command_found_embed.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl => default/commands/listFAQCommands/listFAQCommands_response_embed.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/exceptions/duplicated_command_or_alias_exception_en_US.ftl => default/exceptions/duplicated_command_or_alias_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/exceptions/duplicated_faq_command_alias_exception_en_US.ftl => default/exceptions/duplicated_faq_command_alias_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/exceptions/faq_command_alias_shadowing_exception_en_US.ftl => default/exceptions/faq_command_alias_shadowing_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/exceptions/faq_command_not_found_exception_en_US.ftl => default/exceptions/faq_command_not_found_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/exceptions/faq_command_response_duplicated_position_exception_en_US.ftl => default/exceptions/faq_command_response_duplicated_position_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/exceptions/global_faq_command_config_mismatch_exception_en_US.ftl => default/exceptions/global_faq_command_config_mismatch_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/exceptions/global_faq_command_responses_exception_en_US.ftl => default/exceptions/global_faq_command_responses_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/{en_US/exceptions/no_faq_response_found_exception_en_US.ftl => default/exceptions/no_faq_response_found_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/{en_US/commands/news/news_post_embed_en_US.ftl => default/commands/news/news_post_embed.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/{en_US/exception/news_post_locked_exception_en_US.ftl => default/exception/news_post_locked_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/{en_US/exception/news_post_not_found_exception_en_US.ftl => default/exception/news_post_not_found_exception.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/{en_US/job/newsForumPost_notification_embed_en_US.ftl => default/job/newsForumPost_notification_embed.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/{en_US/listener/referralListener/referralListener_no_referral_link_found_embed_en_US.ftl => default/listener/referralListener/referralListener_no_referral_link_found_embed.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/{en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl => default/listener/referralListener/referralListener_referral_post_embed.ftl} (100%) rename templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/{en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl => default/listener/referralListener/referralListener_too_recent_post_embed.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/{en_US/colors/abstracto_color_en_US.ftl => default/colors/abstracto_color.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/{en_US/colors/exception_color_en_US.ftl => default/colors/exception_color.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/{en_US/colors/success_color_en_US.ftl => default/colors/success_color.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/{en_US/colors/warning_color_en_US.ftl => default/colors/warning_color.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/{en_US/listener/user_joined/user_join_embed_en_US.ftl => default/listener/user_joined/user_join_embed.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/{en_US/listener/user_left/user_leave_embed_en_US.ftl => default/listener/user_left/user_leave_embed.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/src/main/resources/{en_US/config/colors/moderation_action_color_en_US.ftl => default/config/colors/moderation_action_color.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/src/main/resources/{en_US/config/colors/modmail_color_en_US.ftl => default/config/colors/modmail_color.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/src/main/resources/{en_US/emotes/config/statistic_color_en_US.ftl => default/emotes/config/statistic_color.ftl} (100%) rename templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/{en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl => default/urban/commands/urbanDefine/urban_define_response_model_embed.ftl} (100%) rename templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/{en_US/dynamicActivity/dynamic_activity_fans_en_US.ftl => default/dynamicActivity/dynamic_activity_fans.ftl} (100%) rename templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/{en_US/dynamicActivity/dynamic_activity_help_en_US.ftl => default/dynamicActivity/dynamic_activity_help.ftl} (100%) rename templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/{en_US/dynamicActivity/dynamic_activity_modmail_en_US.ftl => default/dynamicActivity/dynamic_activity_modmail.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/commands/modMode/help/modMode_description_en_US.ftl => default/commands/modMode/help/modMode_description.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/commands/modMode/help/modMode_long_help_en_US.ftl => default/commands/modMode/help/modMode_long_help.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/commands/modMode/help/modMode_parameter_newState_help_en_US.ftl => default/commands/modMode/help/modMode_parameter_newState_help.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/config/feature_moderationCustom_en_US.ftl => default/config/feature_moderationCustom.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/config/feature_setup_config_modModeNewRoleColor_en_US.ftl => default/config/feature_setup_config_modModeNewRoleColor.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/config/feature_setup_config_modModeRoleId_en_US.ftl => default/config/feature_setup_config_modModeRoleId.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/config/feature_setup_config_warnNotificationThreshold_en_US.ftl => default/config/feature_setup_config_warnNotificationThreshold.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl => default/config/feature_setup_posttarget_warnThresholdNotification.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/exception/mod_role_not_found_exception_en_US.ftl => default/exception/mod_role_not_found_exception.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/listener/warningCreated/warning_threshold_reached_notification_description_en_US.ftl => default/listener/warningCreated/warning_threshold_reached_notification_description.ftl} (100%) rename templates/translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/listener/warningCreated/warning_threshold_reached_notification_title_en_US.ftl => default/listener/warningCreated/warning_threshold_reached_notification_title.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/config/feature_setup_posttarget_starboardNotification_en_US.ftl => default/config/feature_setup_posttarget_starboardNotification.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/config/feature_starboardNotification_en_US.ftl => default/config/feature_starboardNotification.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/listener/starboardNotification/starboard_post_created_description_en_US.ftl => default/listener/starboardNotification/starboard_post_created_description.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/listener/starboardNotification/starboard_post_created_title_en_US.ftl => default/listener/starboardNotification/starboard_post_created_title.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/listener/starboardNotification/starboard_post_deleted_description_en_US.ftl => default/listener/starboardNotification/starboard_post_deleted_description.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/listener/starboardNotification/starboard_post_deleted_title_en_US.ftl => default/listener/starboardNotification/starboard_post_deleted_title.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_en_US.ftl => default/listener/starboardNotification/starboard_post_notification_field_starboard_message.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump_en_US.ftl => default/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/listener/starboardNotification/starboard_post_notification_field_starred_message_en_US.ftl => default/listener/starboardNotification/starboard_post_notification_field_starred_message.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/listener/starboardNotification/starboard_post_notification_field_starred_user_en_US.ftl => default/listener/starboardNotification/starboard_post_notification_field_starred_user.ftl} (100%) rename templates/translations/customization-translations/starboard-customization-translations/src/main/resources/{en_US/listener/starboardNotification/starboard_post_notification_field_starring_user_en_US.ftl => default/listener/starboardNotification/starboard_post_notification_field_starring_user.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQ/FAQ_response_no_command_found_message_en_US.ftl => default/commands/FAQ/FAQ_response_no_command_found_message.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQ/FAQ_response_no_command_found_message_available_commands_en_US.ftl => default/commands/FAQ/FAQ_response_no_command_found_message_available_commands.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQ/FAQ_response_no_command_found_message_no_commands_en_US.ftl => default/commands/FAQ/FAQ_response_no_command_found_message_no_commands.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQ/help/FAQ_description_en_US.ftl => default/commands/FAQ/help/FAQ_description.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQ/help/FAQ_long_help_en_US.ftl => default/commands/FAQ/help/FAQ_long_help.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQ/help/FAQ_parameter_channel_en_US.ftl => default/commands/FAQ/help/FAQ_parameter_channel.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQ/help/FAQ_parameter_command_en_US.ftl => default/commands/FAQ/help/FAQ_parameter_command.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQUsage/FAQUsage_command_display_en_US.ftl => default/commands/FAQUsage/FAQUsage_command_display.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQUsage/FAQUsage_no_usages_en_US.ftl => default/commands/FAQUsage/FAQUsage_no_usages.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQUsage/FAQUsage_usage_display_en_US.ftl => default/commands/FAQUsage/FAQUsage_usage_display.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQUsage/help/FAQUsage_description_en_US.ftl => default/commands/FAQUsage/help/FAQUsage_description.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQUsage/help/FAQUsage_long_help_en_US.ftl => default/commands/FAQUsage/help/FAQUsage_long_help.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/FAQUsage/help/FAQUsage_parameter_commandName_en_US.ftl => default/commands/FAQUsage/help/FAQUsage_parameter_commandName.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/deleteFAQ/help/deleteFAQ_description_en_US.ftl => default/commands/deleteFAQ/help/deleteFAQ_description.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/deleteFAQ/help/deleteFAQ_long_help_en_US.ftl => default/commands/deleteFAQ/help/deleteFAQ_long_help.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/deleteFAQ/help/deleteFAQ_parameter_commandName_en_US.ftl => default/commands/deleteFAQ/help/deleteFAQ_parameter_commandName.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/exportFAQ/help/exportFAQ_description_en_US.ftl => default/commands/exportFAQ/help/exportFAQ_description.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/exportFAQ/help/exportFAQ_long_help_en_US.ftl => default/commands/exportFAQ/help/exportFAQ_long_help.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/exportFAQ/help/exportFAQ_parameter_commandName_en_US.ftl => default/commands/exportFAQ/help/exportFAQ_parameter_commandName.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/importFAQ/help/importFAQ_description_en_US.ftl => default/commands/importFAQ/help/importFAQ_description.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/importFAQ/help/importFAQ_long_help_en_US.ftl => default/commands/importFAQ/help/importFAQ_long_help.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/importFAQ/help/importFAQ_parameter_file_en_US.ftl => default/commands/importFAQ/help/importFAQ_parameter_file.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/listFAQCommands/help/listFAQCommands_description_en_US.ftl => default/commands/listFAQCommands/help/listFAQCommands_description.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/listFAQCommands/help/listFAQCommands_long_help_en_US.ftl => default/commands/listFAQCommands/help/listFAQCommands_long_help.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_en_US.ftl => default/commands/listFAQCommands/listFAQCommands_channel_group_display.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases_en_US.ftl => default/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/listFAQCommands/listFAQCommands_channel_groups_header_en_US.ftl => default/commands/listFAQCommands/listFAQCommands_channel_groups_header.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/listFAQCommands/listFAQCommands_command_display_en_US.ftl => default/commands/listFAQCommands/listFAQCommands_command_display.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/listFAQCommands/listFAQCommands_command_header_en_US.ftl => default/commands/listFAQCommands/listFAQCommands_command_header.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/commands/listFAQCommands/listFAQCommands_no_commands_en_US.ftl => default/commands/listFAQCommands/listFAQCommands_no_commands.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/config/channel_group_type_faq_name_en_US.ftl => default/config/channel_group_type_faq_name.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/config/feature_faq_en_US.ftl => default/config/feature_faq.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/config/module_faqModule_description_en_US.ftl => default/config/module_faqModule_description.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/config/setup_global_channel_group_info_en_US.ftl => default/config/setup_global_channel_group_info.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/exception/duplicated_command_or_alias_exception_message_en_US.ftl => default/exception/duplicated_command_or_alias_exception_message.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/exception/duplicated_faq_command_alias_exception_message_en_US.ftl => default/exception/duplicated_faq_command_alias_exception_message.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/exception/faq_command_alias_shadowing_exception_message_en_US.ftl => default/exception/faq_command_alias_shadowing_exception_message.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/exception/faq_command_not_found_exception_message_en_US.ftl => default/exception/faq_command_not_found_exception_message.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/exception/faq_command_response_duplicated_position_exception_message_en_US.ftl => default/exception/faq_command_response_duplicated_position_exception_message.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/exception/global_faq_command_config_mismatch_exception_message_en_US.ftl => default/exception/global_faq_command_config_mismatch_exception_message.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/exception/global_faq_command_responses_exception_message_en_US.ftl => default/exception/global_faq_command_responses_exception_message.ftl} (100%) rename templates/translations/module-translations/faq-translations/src/main/resources/{en_US/exception/no_faq_response_found_exception_message_en_US.ftl => default/exception/no_faq_response_found_exception_message.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/commands/news/help/news_description_en_US.ftl => default/commands/news/help/news_description.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/commands/news/help/news_long_help_en_US.ftl => default/commands/news/help/news_long_help.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/commands/news/help/news_parameter_text_en_US.ftl => default/commands/news/help/news_parameter_text.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/commands/news/news_post_description_en_US.ftl => default/commands/news/news_post_description.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/commands/updateNews/help/updateNews_description_en_US.ftl => default/commands/updateNews/help/updateNews_description.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/commands/updateNews/help/updateNews_long_help_en_US.ftl => default/commands/updateNews/help/updateNews_long_help.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/commands/updateNews/help/updateNews_parameter_newsPostId_en_US.ftl => default/commands/updateNews/help/updateNews_parameter_newsPostId.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/commands/updateNews/help/updateNews_parameter_text_en_US.ftl => default/commands/updateNews/help/updateNews_parameter_text.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/config/feature_news_en_US.ftl => default/config/feature_news.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/config/feature_setup_posttarget_forumPostNotification_en_US.ftl => default/config/feature_setup_posttarget_forumPostNotification.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/config/feature_setup_posttarget_news_en_US.ftl => default/config/feature_setup_posttarget_news.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/config/module_newsModule_description_en_US.ftl => default/config/module_newsModule_description.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/exception/news_post_locked_exception_message_en_US.ftl => default/exception/news_post_locked_exception_message.ftl} (100%) rename templates/translations/module-translations/news-translations/src/main/resources/{en_US/exception/news_post_not_found_exception_text_en_US.ftl => default/exception/news_post_not_found_exception_text.ftl} (100%) rename templates/translations/module-translations/referral-translations/src/main/resources/{en_US/config/feature_referral_en_US.ftl => default/config/feature_referral.ftl} (100%) rename templates/translations/module-translations/referral-translations/src/main/resources/{en_US/config/feature_setup_posttarget_referral_en_US.ftl => default/config/feature_setup_posttarget_referral.ftl} (100%) rename templates/translations/module-translations/referral-translations/src/main/resources/{en_US/config/referral_link_type_accessories_en_US.ftl => default/config/referral_link_type_accessories.ftl} (100%) rename templates/translations/module-translations/referral-translations/src/main/resources/{en_US/config/referral_link_type_smartphone_en_US.ftl => default/config/referral_link_type_smartphone.ftl} (100%) rename templates/translations/module-translations/referral-translations/src/main/resources/{en_US/config/referral_link_type_smartphoneIndia_en_US.ftl => default/config/referral_link_type_smartphoneIndia.ftl} (100%) rename templates/translations/module-translations/referral-translations/src/main/resources/{en_US/listener/no_referral_link_found_en_US.ftl => default/listener/no_referral_link_found.ftl} (100%) rename templates/translations/module-translations/referral-translations/src/main/resources/{en_US/listener/referralListener_referral_post_description_en_US.ftl => default/listener/referralListener_referral_post_description.ftl} (100%) rename templates/translations/module-translations/referral-translations/src/main/resources/{en_US/listener/too_recent_referral_post_en_US.ftl => default/listener/too_recent_referral_post.ftl} (100%) rename templates/translations/module-translations/seasonal-translations/src/main/resources/{en_US/lights/commands/addRoleToLights/help/addRoleToLights_description_en_US.ftl => default/lights/commands/addRoleToLights/help/addRoleToLights_description.ftl} (100%) rename templates/translations/module-translations/seasonal-translations/src/main/resources/{en_US/lights/commands/addRoleToLights/help/addRoleToLights_long_help_en_US.ftl => default/lights/commands/addRoleToLights/help/addRoleToLights_long_help.ftl} (100%) rename templates/translations/module-translations/seasonal-translations/src/main/resources/{en_US/lights/commands/addRoleToLights/help/addRoleToLights_parameter_role_en_US.ftl => default/lights/commands/addRoleToLights/help/addRoleToLights_parameter_role.ftl} (100%) rename templates/translations/module-translations/seasonal-translations/src/main/resources/{en_US/lights/commands/removeRoleFromLights/help/removeRoleFromLights_description_en_US.ftl => default/lights/commands/removeRoleFromLights/help/removeRoleFromLights_description.ftl} (100%) rename templates/translations/module-translations/seasonal-translations/src/main/resources/{en_US/lights/commands/removeRoleFromLights/help/removeRoleFromLights_long_help_en_US.ftl => default/lights/commands/removeRoleFromLights/help/removeRoleFromLights_long_help.ftl} (100%) rename templates/translations/module-translations/seasonal-translations/src/main/resources/{en_US/lights/commands/removeRoleFromLights/help/removeRoleFromLights_parameter_role_en_US.ftl => default/lights/commands/removeRoleFromLights/help/removeRoleFromLights_parameter_role.ftl} (100%) rename templates/translations/module-translations/seasonal-translations/src/main/resources/{en_US/lights/commands/switchLights/help/switchLights_description_en_US.ftl => default/lights/commands/switchLights/help/switchLights_description.ftl} (100%) rename templates/translations/module-translations/seasonal-translations/src/main/resources/{en_US/lights/commands/switchLights/help/switchLights_long_help_en_US.ftl => default/lights/commands/switchLights/help/switchLights_long_help.ftl} (100%) rename templates/translations/module-translations/seasonal-translations/src/main/resources/{en_US/lights/config/feature_lights_en_US.ftl => default/lights/config/feature_lights.ftl} (100%) rename templates/translations/module-translations/setup-translations/src/main/resources/{en_US/config/feature_setup_en_US.ftl => default/config/feature_setup.ftl} (100%) rename templates/translations/module-translations/setup-translations/src/main/resources/{en_US/config/feature_setup_posttarget_setup_en_US.ftl => default/config/feature_setup_posttarget_setup.ftl} (100%) rename templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/{ban_notification_text_en_US.ftl => ban_notification_text.ftl} (100%) diff --git a/.env b/.env index 4e24fd5..433a2e7 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/ ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/ VERSION=1.6.33 -ABSTRACTO_VERSION=1.5.50 \ No newline at end of file +ABSTRACTO_VERSION=1.5.51 \ No newline at end of file diff --git a/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQ.java b/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQ.java index 3fc216d..a2b13a0 100644 --- a/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQ.java +++ b/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQ.java @@ -66,14 +66,14 @@ public class FAQ extends AbstractConditionableCommand { .forEach(faqResponseMessageModel -> messageFutures.add(FutureUtils. toSingleFutureGeneric(channelService. - sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_TEMPLATE_KEY, + sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_TEMPLATE_KEY, faqResponseMessageModel, commandContext.getChannel())))); return FutureUtils.toSingleFutureGeneric(messageFutures); } else { return FutureUtils .toSingleFutureGeneric( channelService. - sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY, + sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY, faqResponseModel, commandContext.getChannel())); } }) @@ -85,7 +85,7 @@ public class FAQ extends AbstractConditionableCommand { return FutureUtils .toSingleFutureGeneric( channelService. - sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY, + sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY, model, commandContext.getChannel())) .thenApply(unused -> CommandResult.fromSuccess()); } diff --git a/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQUsage.java b/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQUsage.java index 11a6c11..157823e 100644 --- a/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQUsage.java +++ b/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQUsage.java @@ -52,7 +52,7 @@ public class FAQUsage extends AbstractConditionableCommand { model = faqUsageServiceBean.getFAQUsageModel(server, commandName); } - return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(FAQ_USAGE_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel())) + return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(FAQ_USAGE_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel())) .thenApply(unused -> CommandResult.fromSuccess()); } diff --git a/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/ListFAQCommands.java b/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/ListFAQCommands.java index 2207e27..5b3f6b0 100644 --- a/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/ListFAQCommands.java +++ b/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/ListFAQCommands.java @@ -39,7 +39,7 @@ public class ListFAQCommands extends AbstractConditionableCommand { public CompletableFuture executeAsync(CommandContext commandContext) { AServer server = serverManagementService.loadServer(commandContext.getGuild()); ListFAQCommandsModel model = faqServiceBean.getCommandListingForServer(server); - return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(LIST_FAQ_COMMANDS_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel())) + return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(LIST_FAQ_COMMANDS_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel())) .thenApply(unused -> CommandResult.fromSuccess()); } diff --git a/application/oneplus-bot-modules/referral/src/main/java/dev/sheldan/oneplus/bot/modules/referral/listener/ReferralListener.java b/application/oneplus-bot-modules/referral/src/main/java/dev/sheldan/oneplus/bot/modules/referral/listener/ReferralListener.java index fb113b8..1bac25c 100644 --- a/application/oneplus-bot-modules/referral/src/main/java/dev/sheldan/oneplus/bot/modules/referral/listener/ReferralListener.java +++ b/application/oneplus-bot-modules/referral/src/main/java/dev/sheldan/oneplus/bot/modules/referral/listener/ReferralListener.java @@ -119,7 +119,7 @@ public class ReferralListener implements AsyncMessageReceivedListener { .build(); ServerUser serverUser = ServerUser.fromMember(message.getMember()); CompletableFutureList sendFutures = new CompletableFutureList<>(channelService - .sendEmbedTemplateInMessageChannelList(REFERRAL_POST_EMBED_TEMPLATE_KEY, postModel, message.getChannel())); + .sendEmbedTemplateInMessageChannel(REFERRAL_POST_EMBED_TEMPLATE_KEY, postModel, message.getChannel())); CompletableFuture deletionFuture = messageService.deleteMessage(message); CompletableFuture.allOf(sendFutures.getMainFuture(), deletionFuture) .thenAccept(unused -> self.updateReferralStateInDatabase(serverUser)) @@ -139,7 +139,7 @@ public class ReferralListener implements AsyncMessageReceivedListener { private void deleteAndNotify(Message message, String usedTemplate, Object usedModel) { CompletableFutureList futures = new CompletableFutureList<>(channelService - .sendEmbedTemplateInMessageChannelList(usedTemplate, usedModel, message.getChannel())); + .sendEmbedTemplateInMessageChannel(usedTemplate, usedModel, message.getChannel())); futures.getMainFuture().thenAccept(unused -> scheduledExecutorService.schedule(() -> futures.getObjects().forEach(createdMessage -> messageService.deleteMessage(createdMessage)), diff --git a/deployment/helm/oneplus-bot/values.yaml b/deployment/helm/oneplus-bot/values.yaml index e53706e..872fbb9 100644 --- a/deployment/helm/oneplus-bot/values.yaml +++ b/deployment/helm/oneplus-bot/values.yaml @@ -22,7 +22,7 @@ templateDeployment: repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-template-deployment - tag: 1.5.50 + tag: 1.5.51 templateDeploymentData: repository: harbor.sheldan.dev/oneplus-bot pullPolicy: Always @@ -33,7 +33,7 @@ dbConfigDeployment: repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-db-deployment - tag: 1.5.50 + tag: 1.5.51 dbConfigDeploymentData: repository: harbor.sheldan.dev/oneplus-bot pullPolicy: Always diff --git a/pom.xml b/pom.xml index 67231df..3ff50f5 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ 17 17 - 1.5.50 - 1.4.45 + 1.5.51 + 1.4.46 diff --git a/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/default/listener/warningCreatedListener/warning_threshold_notification_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl rename to templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/default/listener/warningCreatedListener/warning_threshold_notification_embed.ftl diff --git a/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/default/listener/starboardNotification/starboard_post_created_notification_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl rename to templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/default/listener/starboardNotification/starboard_post_created_notification_embed.ftl diff --git a/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/default/listener/starboardNotification/starboard_post_deleted_notification_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl rename to templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/default/listener/starboardNotification/starboard_post_deleted_notification_embed.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/commands/FAQUsage/FAQUsage_response_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/commands/FAQUsage/FAQUsage_response_embed.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/commands/faq/FAQ_response_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/commands/faq/FAQ_response_embed.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_no_command_found_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/commands/faq/FAQ_response_no_command_found_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_no_command_found_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/commands/faq/FAQ_response_no_command_found_embed.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/commands/listFAQCommands/listFAQCommands_response_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/commands/listFAQCommands/listFAQCommands_response_embed.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_command_or_alias_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/duplicated_command_or_alias_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_command_or_alias_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/duplicated_command_or_alias_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_faq_command_alias_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/duplicated_faq_command_alias_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_faq_command_alias_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/duplicated_faq_command_alias_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_alias_shadowing_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/faq_command_alias_shadowing_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_alias_shadowing_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/faq_command_alias_shadowing_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_not_found_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/faq_command_not_found_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_not_found_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/faq_command_not_found_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_response_duplicated_position_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/faq_command_response_duplicated_position_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_response_duplicated_position_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/faq_command_response_duplicated_position_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_config_mismatch_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/global_faq_command_config_mismatch_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_config_mismatch_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/global_faq_command_config_mismatch_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_responses_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/global_faq_command_responses_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_responses_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/global_faq_command_responses_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/no_faq_response_found_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/no_faq_response_found_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/no_faq_response_found_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/default/exceptions/no_faq_response_found_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/default/commands/news/news_post_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/default/commands/news/news_post_embed.ftl diff --git a/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/exception/news_post_locked_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/default/exception/news_post_locked_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/exception/news_post_locked_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/default/exception/news_post_locked_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/exception/news_post_not_found_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/default/exception/news_post_not_found_exception.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/exception/news_post_not_found_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/default/exception/news_post_not_found_exception.ftl diff --git a/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/job/newsForumPost_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/default/job/newsForumPost_notification_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/job/newsForumPost_notification_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/default/job/newsForumPost_notification_embed.ftl diff --git a/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_no_referral_link_found_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/default/listener/referralListener/referralListener_no_referral_link_found_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_no_referral_link_found_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/default/listener/referralListener/referralListener_no_referral_link_found_embed.ftl diff --git a/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/default/listener/referralListener/referralListener_referral_post_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/default/listener/referralListener/referralListener_referral_post_embed.ftl diff --git a/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/default/listener/referralListener/referralListener_too_recent_post_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/default/listener/referralListener/referralListener_too_recent_post_embed.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/abstracto_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/default/colors/abstracto_color.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/abstracto_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/default/colors/abstracto_color.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/exception_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/default/colors/exception_color.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/exception_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/default/colors/exception_color.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/success_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/default/colors/success_color.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/success_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/default/colors/success_color.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/warning_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/default/colors/warning_color.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/warning_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/default/colors/warning_color.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_joined/user_join_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_joined/user_join_embed.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_left/user_leave_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_left/user_leave_embed.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/src/main/resources/default/config/colors/moderation_action_color.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/src/main/resources/default/config/colors/moderation_action_color.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/src/main/resources/default/config/colors/modmail_color.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/src/main/resources/default/config/colors/modmail_color.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/src/main/resources/en_US/emotes/config/statistic_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/src/main/resources/default/emotes/config/statistic_color.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/src/main/resources/en_US/emotes/config/statistic_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/src/main/resources/default/emotes/config/statistic_color.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/default/urban/commands/urbanDefine/urban_define_response_model_embed.ftl similarity index 100% rename from templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/default/urban/commands/urbanDefine/urban_define_response_model_embed.ftl diff --git a/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_fans_en_US.ftl b/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/default/dynamicActivity/dynamic_activity_fans.ftl similarity index 100% rename from templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_fans_en_US.ftl rename to templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/default/dynamicActivity/dynamic_activity_fans.ftl diff --git a/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_help_en_US.ftl b/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/default/dynamicActivity/dynamic_activity_help.ftl similarity index 100% rename from templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_help_en_US.ftl rename to templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/default/dynamicActivity/dynamic_activity_help.ftl diff --git a/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_modmail_en_US.ftl b/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/default/dynamicActivity/dynamic_activity_modmail.ftl similarity index 100% rename from templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_modmail_en_US.ftl rename to templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/default/dynamicActivity/dynamic_activity_modmail.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_description_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_description.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_description_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_description.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_long_help.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_long_help.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_help_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_parameter_newState_help.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_help_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_parameter_newState_help.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_moderationCustom_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_moderationCustom.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_moderationCustom_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_moderationCustom.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeNewRoleColor_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_modModeNewRoleColor.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeNewRoleColor_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_modModeNewRoleColor.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeRoleId_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_modModeRoleId.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeRoleId_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_modModeRoleId.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_warnNotificationThreshold_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_warnNotificationThreshold.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_warnNotificationThreshold_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_warnNotificationThreshold.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_posttarget_warnThresholdNotification.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_posttarget_warnThresholdNotification.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/exception/mod_role_not_found_exception_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/exception/mod_role_not_found_exception.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/exception/mod_role_not_found_exception_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/exception/mod_role_not_found_exception.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_description_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/listener/warningCreated/warning_threshold_reached_notification_description.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_description_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/listener/warningCreated/warning_threshold_reached_notification_description.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_title_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/listener/warningCreated/warning_threshold_reached_notification_title.ftl similarity index 100% rename from templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_title_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/default/listener/warningCreated/warning_threshold_reached_notification_title.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_starboardNotification_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/config/feature_setup_posttarget_starboardNotification.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_starboardNotification_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/config/feature_setup_posttarget_starboardNotification.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/config/feature_starboardNotification_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/config/feature_starboardNotification.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/config/feature_starboardNotification_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/config/feature_starboardNotification.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_description_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_created_description.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_description_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_created_description.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_title_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_created_title.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_title_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_created_title.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_description_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_deleted_description.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_description_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_deleted_description.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_title_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_deleted_title.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_title_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_deleted_title.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starboard_message.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starboard_message.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_message_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starred_message.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_message_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starred_message.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_user_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starred_user.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_user_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starred_user.ftl diff --git a/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starring_user_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starring_user.ftl similarity index 100% rename from templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starring_user_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/default/listener/starboardNotification/starboard_post_notification_field_starring_user.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/FAQ_response_no_command_found_message.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/FAQ_response_no_command_found_message.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_available_commands_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/FAQ_response_no_command_found_message_available_commands.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_available_commands_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/FAQ_response_no_command_found_message_available_commands.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_no_commands_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/FAQ_response_no_command_found_message_no_commands.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_no_commands_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/FAQ_response_no_command_found_message_no_commands.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/help/FAQ_description.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/help/FAQ_description.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/help/FAQ_long_help.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/help/FAQ_long_help.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_channel_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/help/FAQ_parameter_channel.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_channel_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/help/FAQ_parameter_channel.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_command_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/help/FAQ_parameter_command.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_command_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQ/help/FAQ_parameter_command.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_command_display_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/FAQUsage_command_display.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_command_display_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/FAQUsage_command_display.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_no_usages_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/FAQUsage_no_usages.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_no_usages_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/FAQUsage_no_usages.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_usage_display_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/FAQUsage_usage_display.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_usage_display_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/FAQUsage_usage_display.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/help/FAQUsage_description.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/help/FAQUsage_description.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/help/FAQUsage_long_help.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/help/FAQUsage_long_help.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_parameter_commandName_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/help/FAQUsage_parameter_commandName.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_parameter_commandName_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/FAQUsage/help/FAQUsage_parameter_commandName.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/deleteFAQ/help/deleteFAQ_description.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/deleteFAQ/help/deleteFAQ_description.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/deleteFAQ/help/deleteFAQ_long_help.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/deleteFAQ/help/deleteFAQ_long_help.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_parameter_commandName_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/deleteFAQ/help/deleteFAQ_parameter_commandName.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_parameter_commandName_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/deleteFAQ/help/deleteFAQ_parameter_commandName.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/exportFAQ/help/exportFAQ_description.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/exportFAQ/help/exportFAQ_description.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/exportFAQ/help/exportFAQ_long_help.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/exportFAQ/help/exportFAQ_long_help.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_parameter_commandName_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/exportFAQ/help/exportFAQ_parameter_commandName.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_parameter_commandName_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/exportFAQ/help/exportFAQ_parameter_commandName.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/importFAQ/help/importFAQ_description.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/importFAQ/help/importFAQ_description.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/importFAQ/help/importFAQ_long_help.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/importFAQ/help/importFAQ_long_help.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_parameter_file_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/importFAQ/help/importFAQ_parameter_file.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_parameter_file_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/importFAQ/help/importFAQ_parameter_file.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/help/listFAQCommands_description.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/help/listFAQCommands_description.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/help/listFAQCommands_long_help.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/help/listFAQCommands_long_help.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_channel_group_display.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_channel_group_display.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_groups_header_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_channel_groups_header.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_groups_header_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_channel_groups_header.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_display_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_command_display.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_display_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_command_display.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_header_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_command_header.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_header_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_command_header.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_no_commands_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_no_commands.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_no_commands_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/commands/listFAQCommands/listFAQCommands_no_commands.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/channel_group_type_faq_name_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/config/channel_group_type_faq_name.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/channel_group_type_faq_name_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/config/channel_group_type_faq_name.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/feature_faq_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/config/feature_faq.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/feature_faq_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/config/feature_faq.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/module_faqModule_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/config/module_faqModule_description.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/module_faqModule_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/config/module_faqModule_description.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/setup_global_channel_group_info_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/config/setup_global_channel_group_info.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/setup_global_channel_group_info_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/config/setup_global_channel_group_info.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/duplicated_command_or_alias_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/exception/duplicated_command_or_alias_exception_message.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/duplicated_command_or_alias_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/exception/duplicated_command_or_alias_exception_message.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/duplicated_faq_command_alias_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/exception/duplicated_faq_command_alias_exception_message.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/duplicated_faq_command_alias_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/exception/duplicated_faq_command_alias_exception_message.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_alias_shadowing_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/exception/faq_command_alias_shadowing_exception_message.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_alias_shadowing_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/exception/faq_command_alias_shadowing_exception_message.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_not_found_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/exception/faq_command_not_found_exception_message.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_not_found_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/exception/faq_command_not_found_exception_message.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_response_duplicated_position_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/exception/faq_command_response_duplicated_position_exception_message.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_response_duplicated_position_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/exception/faq_command_response_duplicated_position_exception_message.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_config_mismatch_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/exception/global_faq_command_config_mismatch_exception_message.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_config_mismatch_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/exception/global_faq_command_config_mismatch_exception_message.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_responses_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/exception/global_faq_command_responses_exception_message.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_responses_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/exception/global_faq_command_responses_exception_message.ftl diff --git a/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/no_faq_response_found_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/default/exception/no_faq_response_found_exception_message.ftl similarity index 100% rename from templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/no_faq_response_found_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/default/exception/no_faq_response_found_exception_message.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_description_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/commands/news/help/news_description.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_description_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/commands/news/help/news_description.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_long_help_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/commands/news/help/news_long_help.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_long_help_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/commands/news/help/news_long_help.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_parameter_text_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/commands/news/help/news_parameter_text.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_parameter_text_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/commands/news/help/news_parameter_text.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/news_post_description_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/commands/news/news_post_description.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/news_post_description_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/commands/news/news_post_description.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_description_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/commands/updateNews/help/updateNews_description.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_description_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/commands/updateNews/help/updateNews_description.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_long_help_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/commands/updateNews/help/updateNews_long_help.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_long_help_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/commands/updateNews/help/updateNews_long_help.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_newsPostId_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/commands/updateNews/help/updateNews_parameter_newsPostId.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_newsPostId_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/commands/updateNews/help/updateNews_parameter_newsPostId.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_text_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/commands/updateNews/help/updateNews_parameter_text.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_text_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/commands/updateNews/help/updateNews_parameter_text.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_news_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/config/feature_news.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_news_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/config/feature_news.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_setup_posttarget_forumPostNotification_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/config/feature_setup_posttarget_forumPostNotification.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_setup_posttarget_forumPostNotification_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/config/feature_setup_posttarget_forumPostNotification.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_setup_posttarget_news_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/config/feature_setup_posttarget_news.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_setup_posttarget_news_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/config/feature_setup_posttarget_news.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/config/module_newsModule_description_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/config/module_newsModule_description.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/config/module_newsModule_description_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/config/module_newsModule_description.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/exception/news_post_locked_exception_message_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/exception/news_post_locked_exception_message.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/exception/news_post_locked_exception_message_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/exception/news_post_locked_exception_message.ftl diff --git a/templates/translations/module-translations/news-translations/src/main/resources/en_US/exception/news_post_not_found_exception_text_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/default/exception/news_post_not_found_exception_text.ftl similarity index 100% rename from templates/translations/module-translations/news-translations/src/main/resources/en_US/exception/news_post_not_found_exception_text_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/default/exception/news_post_not_found_exception_text.ftl diff --git a/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/feature_referral_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/default/config/feature_referral.ftl similarity index 100% rename from templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/feature_referral_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/default/config/feature_referral.ftl diff --git a/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/feature_setup_posttarget_referral_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/default/config/feature_setup_posttarget_referral.ftl similarity index 100% rename from templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/feature_setup_posttarget_referral_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/default/config/feature_setup_posttarget_referral.ftl diff --git a/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_accessories_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/default/config/referral_link_type_accessories.ftl similarity index 100% rename from templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_accessories_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/default/config/referral_link_type_accessories.ftl diff --git a/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphone_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/default/config/referral_link_type_smartphone.ftl similarity index 100% rename from templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphone_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/default/config/referral_link_type_smartphone.ftl diff --git a/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphoneIndia_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/default/config/referral_link_type_smartphoneIndia.ftl similarity index 100% rename from templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphoneIndia_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/default/config/referral_link_type_smartphoneIndia.ftl diff --git a/templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/no_referral_link_found_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/default/listener/no_referral_link_found.ftl similarity index 100% rename from templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/no_referral_link_found_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/default/listener/no_referral_link_found.ftl diff --git a/templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/referralListener_referral_post_description_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/default/listener/referralListener_referral_post_description.ftl similarity index 100% rename from templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/referralListener_referral_post_description_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/default/listener/referralListener_referral_post_description.ftl diff --git a/templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/too_recent_referral_post_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/default/listener/too_recent_referral_post.ftl similarity index 100% rename from templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/too_recent_referral_post_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/default/listener/too_recent_referral_post.ftl diff --git a/templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/addRoleToLights/help/addRoleToLights_description_en_US.ftl b/templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/addRoleToLights/help/addRoleToLights_description.ftl similarity index 100% rename from templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/addRoleToLights/help/addRoleToLights_description_en_US.ftl rename to templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/addRoleToLights/help/addRoleToLights_description.ftl diff --git a/templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/addRoleToLights/help/addRoleToLights_long_help_en_US.ftl b/templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/addRoleToLights/help/addRoleToLights_long_help.ftl similarity index 100% rename from templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/addRoleToLights/help/addRoleToLights_long_help_en_US.ftl rename to templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/addRoleToLights/help/addRoleToLights_long_help.ftl diff --git a/templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/addRoleToLights/help/addRoleToLights_parameter_role_en_US.ftl b/templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/addRoleToLights/help/addRoleToLights_parameter_role.ftl similarity index 100% rename from templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/addRoleToLights/help/addRoleToLights_parameter_role_en_US.ftl rename to templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/addRoleToLights/help/addRoleToLights_parameter_role.ftl diff --git a/templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/removeRoleFromLights/help/removeRoleFromLights_description_en_US.ftl b/templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/removeRoleFromLights/help/removeRoleFromLights_description.ftl similarity index 100% rename from templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/removeRoleFromLights/help/removeRoleFromLights_description_en_US.ftl rename to templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/removeRoleFromLights/help/removeRoleFromLights_description.ftl diff --git a/templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/removeRoleFromLights/help/removeRoleFromLights_long_help_en_US.ftl b/templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/removeRoleFromLights/help/removeRoleFromLights_long_help.ftl similarity index 100% rename from templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/removeRoleFromLights/help/removeRoleFromLights_long_help_en_US.ftl rename to templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/removeRoleFromLights/help/removeRoleFromLights_long_help.ftl diff --git a/templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/removeRoleFromLights/help/removeRoleFromLights_parameter_role_en_US.ftl b/templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/removeRoleFromLights/help/removeRoleFromLights_parameter_role.ftl similarity index 100% rename from templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/removeRoleFromLights/help/removeRoleFromLights_parameter_role_en_US.ftl rename to templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/removeRoleFromLights/help/removeRoleFromLights_parameter_role.ftl diff --git a/templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/switchLights/help/switchLights_description_en_US.ftl b/templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/switchLights/help/switchLights_description.ftl similarity index 100% rename from templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/switchLights/help/switchLights_description_en_US.ftl rename to templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/switchLights/help/switchLights_description.ftl diff --git a/templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/switchLights/help/switchLights_long_help_en_US.ftl b/templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/switchLights/help/switchLights_long_help.ftl similarity index 100% rename from templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/commands/switchLights/help/switchLights_long_help_en_US.ftl rename to templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/commands/switchLights/help/switchLights_long_help.ftl diff --git a/templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/config/feature_lights_en_US.ftl b/templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/config/feature_lights.ftl similarity index 100% rename from templates/translations/module-translations/seasonal-translations/src/main/resources/en_US/lights/config/feature_lights_en_US.ftl rename to templates/translations/module-translations/seasonal-translations/src/main/resources/default/lights/config/feature_lights.ftl diff --git a/templates/translations/module-translations/setup-translations/src/main/resources/en_US/config/feature_setup_en_US.ftl b/templates/translations/module-translations/setup-translations/src/main/resources/default/config/feature_setup.ftl similarity index 100% rename from templates/translations/module-translations/setup-translations/src/main/resources/en_US/config/feature_setup_en_US.ftl rename to templates/translations/module-translations/setup-translations/src/main/resources/default/config/feature_setup.ftl diff --git a/templates/translations/module-translations/setup-translations/src/main/resources/en_US/config/feature_setup_posttarget_setup_en_US.ftl b/templates/translations/module-translations/setup-translations/src/main/resources/default/config/feature_setup_posttarget_setup.ftl similarity index 100% rename from templates/translations/module-translations/setup-translations/src/main/resources/en_US/config/feature_setup_posttarget_setup_en_US.ftl rename to templates/translations/module-translations/setup-translations/src/main/resources/default/config/feature_setup_posttarget_setup.ftl diff --git a/templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl b/templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/ban_notification_text.ftl similarity index 100% rename from templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl rename to templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/ban_notification_text.ftl