From 208dd8c893ecbfa1d4b4546590e990a52f1f1d67 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Fri, 22 Nov 2024 22:30:34 +0100 Subject: [PATCH] [SIS-xxx] updating abstracto version to 1.5.51 adjusting template names to not use a locale --- .../command/OrangeSunDogeCommandAlternative.java | 2 +- .../sissi/module/debra/commands/Donations.java | 2 +- .../module/debra/service/DonationService.java | 2 +- .../listener/MeetupConfirmationListener.java | 2 +- .../meetup/listener/MeetupDecisionListener.java | 2 +- .../module/meetup/service/MeetupServiceBean.java | 14 +++++++------- pom.xml | 4 ++-- .../commands/doge_orangeSun_response_embed.ftl} | 0 .../commands/modMode/modMode_response_embed.ftl} | 0 .../debraInfoButton/debraInfoButton_embed.ftl} | 1 - .../debraInfoButton_response_embed.ftl} | 0 .../donations/donations_response_embed.ftl} | 1 - .../donation_amount_not_found_exception.ftl} | 0 .../listener/debraInfoMessage_embed.ftl} | 1 - .../listener/debraInfoMessage_response_embed.ftl} | 1 - .../debra_donation_notification_embed.ftl} | 1 - .../cancelMeetup/cancelMeetup_response_embed.ftl} | 0 .../meetup_cancel_notification_embed.ftl} | 0 .../changeMeetup/changeMeetup_response_embed.ftl} | 0 .../changeMeetupTime_confirmation_embed.ftl} | 0 .../changeMeetupTime_notification_embed.ftl} | 0 .../createMeetup_confirmation_embed.ftl} | 0 .../listMeetups/listMeetups_response_embed.ftl} | 0 ...tupParticipants_notification_message_embed.ftl} | 0 .../notifyMeetupParticipants_response_embed.ftl} | 0 .../exception/meetup_in_past_exception.ftl} | 0 .../exception/meetup_not_found_exception.ftl} | 0 .../exception/meetup_not_organizer_exception.ftl} | 0 .../general/meetup_display_embed.ftl} | 0 .../general/meetup_ice_file_download.ftl} | 0 .../meetup_reminder_notification_embed.ftl} | 0 .../addWeeklyText_response_embed.ftl} | 0 .../removeWeeklyText_response_embed.ftl} | 0 .../showWeeklyTexts_item_entry.ftl} | 0 .../showWeeklyTexts_no_items_found_embed.ftl} | 0 .../showWeeklyTexts/showWeeklyTexts_paginator.ftl} | 0 .../showWeeklyTexts_response_item_entry.ftl} | 0 .../job/weekly_text_item_post_embed.ftl} | 0 .../commands/quote/quote_response_embed.ftl} | 0 .../quoteDelete/quoteDelete_response_embed.ftl} | 0 .../quoteStats/quoteStats_response_embed.ftl} | 0 .../exceptions/quote_not_found_exception.ftl} | 0 .../createNewsCategory_response_embed.ftl} | 0 ...eNewsCategoryChannelMapping_response_embed.ftl} | 0 ...ateNewsCategorySubscription_response_embed.ftl} | 0 .../deleteNewsCategory_response_embed.ftl} | 0 ...eNewsCategoryChannelMapping_response_embed.ftl} | 0 ...eteNewsCategorySubscription_response_embed.ftl} | 0 .../showNewsCategories_response_embed.ftl} | 0 .../news_category_already_exists_exception.ftl} | 0 ...y_channel_mapping_already_exists_exception.ftl} | 0 ...tegory_channel_mapping_not_found_exception.ftl} | 0 .../news_category_not_found_exception.ftl} | 0 ...s_feed_source_category_not_found_exception.ftl} | 0 ...gory_subscription_already_exists_exception.ftl} | 0 ..._category_subscription_not_found_exception.ftl} | 0 .../news_feed_source_not_found_exception.ftl} | 0 .../orf/job/orf_news_post_embed.ftl} | 0 .../experience_level_up_notification_embed.ftl} | 1 - .../listener/user_joined/user_join_embed.ftl} | 1 - .../listener/user_left/user_leave_embed.ftl} | 1 - .../reactionReport_notification_embed.ftl} | 0 .../commands/modMode/help/modMode_description.ftl} | 0 .../commands/modMode/help/modMode_long_help.ftl} | 0 .../modMode/help/modMode_parameter_newState.ftl} | 0 .../commands/modMode/modMode_response_text.ftl} | 0 .../config/feature_moderationCustom.ftl} | 0 .../feature_setup_config_modModeNewRoleColor.ftl} | 0 .../config/feature_setup_config_modModeRoleId.ftl} | 0 .../feature_setup_config_reportReactionAmount.ftl} | 0 .../exception/mod_role_not_found_exception.ftl} | 0 .../debraInfoButton_button_label.ftl} | 0 .../debraInfoButton_response_text.ftl} | 0 .../debraInfoButton/debraInfoButton_text.ftl} | 0 .../help/debraInfoButton_description.ftl} | 0 .../help/debraInfoButton_long_help.ftl} | 0 .../debraInfoButton_parameter_targetChannel.ftl} | 0 .../donations/donations_response_description.ftl} | 0 .../donations/help/donations_description.ftl} | 0 .../donations/help/donations_long_help.ftl} | 0 .../help/donations_parameter_parametervalue.ftl} | 0 .../donations/help/donations_parameter_type.ftl} | 0 .../config/feature_debra.ftl} | 0 ...ure_setup_config_debraDonationApiFetchSize.ftl} | 0 ...onfig_debraDonationNotificationDelayMillis.ftl} | 0 ...ature_setup_config_endlessStreamMinuteRate.ftl} | 0 .../donation_amount_not_found_exception_text.ftl} | 0 .../listener/debraInfoMessage_response_text.ftl} | 0 ...tion_notification_embed_field_amount_title.ftl} | 0 ...tion_notification_embed_field_amount_value.ftl} | 0 .../debra_donation_notification_embed_footer.ftl} | 0 .../debra_donation_notification_embed_title.ftl} | 0 .../cancelMeetup/cancelMeetup_response_text.ftl} | 0 .../help/cancelMeetup_description.ftl} | 0 .../cancelMeetup/help/cancelMeetup_long_help.ftl} | 0 .../help/cancelMeetup_parameter_meetupId.ftl} | 0 .../meetup_cancel_notification_description.ftl} | 0 .../changeMeetup/changeMeetup_response_text.ftl} | 0 .../help/changeMeetup_description.ftl} | 0 .../changeMeetup/help/changeMeetup_long_help.ftl} | 0 .../help/changeMeetup_parameter_meetupId.ftl} | 0 .../help/changeMeetup_parameter_newValue.ftl} | 0 .../help/changeMeetup_parameter_property.ftl} | 0 ...etup_parameter_property_choice_DESCRIPTION.ftl} | 0 ...eMeetup_parameter_property_choice_LOCATION.ftl} | 0 ...angeMeetup_parameter_property_choice_TOPIC.ftl} | 0 .../changeMeetupTime_notification_text.ftl} | 0 .../help/changeMeetupTime_description.ftl} | 0 .../help/changeMeetupTime_long_help.ftl} | 0 .../help/changeMeetupTime_parameter_meetupId.ftl} | 0 .../changeMeetupTime_parameter_newTimeStamp.ftl} | 0 .../createMeetup_cancel_button_label.ftl} | 0 .../createMeetup_confirm_button_label.ftl} | 0 ...teMeetup_confirmation_location_field_title.ftl} | 0 .../help/createMeetup_description.ftl} | 0 .../createMeetup/help/createMeetup_long_help.ftl} | 0 .../help/createMeetup_parameter_description.ftl} | 0 .../help/createMeetup_parameter_location.ftl} | 0 .../help/createMeetup_parameter_meetupTime.ftl} | 0 .../help/createMeetup_parameter_topic.ftl} | 0 .../listMeetups/help/listMeetups_description.ftl} | 0 .../listMeetups/help/listMeetups_long_help.ftl} | 0 .../listMeetups/meetup_list_meetup_display.ftl} | 0 .../listMeetups/meetup_list_no_meetups.ftl} | 0 .../help/notifyMeetupParticipants_description.ftl} | 0 .../help/notifyMeetupParticipants_long_help.ftl} | 0 ...otifyMeetupParticipants_parameter_decision.ftl} | 0 ...rticipants_parameter_decision_choice_MAYBE.ftl} | 0 ...pParticipants_parameter_decision_choice_NO.ftl} | 0 ...icipants_parameter_decision_choice_NO_TIME.ftl} | 0 ...Participants_parameter_decision_choice_YES.ftl} | 0 ...otifyMeetupParticipants_parameter_meetupId.ftl} | 0 ...Participants_parameter_notificationMessage.ftl} | 0 .../notifyMeetupParticipants_response_text.ftl} | 0 .../config/feature_meetup.ftl} | 0 .../meetup_in_past_exception_message.ftl} | 0 .../meetup_not_found_exception_message.ftl} | 0 .../meetup_not_organizer_exception_message.ftl} | 0 .../general/meetup_display_description.ftl} | 0 .../general/meetup_ics_file_name.ftl} | 0 .../general/meetup_message_id_display.ftl} | 0 .../meetup_message_location_button_label.ftl} | 0 .../general/meetup_message_maybe_button_label.ftl} | 0 .../general/meetup_message_no_button_label.ftl} | 0 .../general/meetup_message_no_member.ftl} | 0 .../meetup_message_no_time_button_label.ftl} | 0 .../general/meetup_message_yes_button_label.ftl} | 0 .../meetup_reminder_notification_description.ftl} | 0 .../addWeeklyText/addWeeklyText_response_text.ftl} | 0 .../help/addWeeklyText_description.ftl} | 0 .../help/addWeeklyText_long_help.ftl} | 0 .../help/addWeeklyText_parameter_text.ftl} | 0 .../help/removeWeeklyText_description.ftl} | 0 .../help/removeWeeklyText_long_help.ftl} | 0 .../help/removeWeeklyText_parameter_id.ftl} | 0 .../removeWeeklyText_response_text.ftl} | 0 .../help/showWeeklyTexts_description.ftl} | 0 .../help/showWeeklyTexts_long_help.ftl} | 0 .../help/showWeeklyTexts_parameter_showAll.ftl} | 0 .../showWeeklyTexts_no_items_found_text.ftl} | 0 .../showWeeklyTexts_response_text.ftl} | 0 .../config/feature_weeklyText.ftl} | 0 .../job/weekly_text_item_post_text.ftl} | 0 .../commands/quote/help/quote_description.ftl} | 0 .../commands/quote/help/quote_long_help.ftl} | 0 .../quote/help/quote_parameter_member.ftl} | 0 .../quote/quote_response_default_adder_name.ftl} | 0 .../quote/quote_response_default_author_name.ftl} | 0 .../quote/quote_response_default_channel_name.ftl} | 0 .../commands/quote/quote_response_description.ftl} | 0 .../quote/quote_response_footer_adder_name.ftl} | 0 .../quote/quote_response_header_author_name.ftl} | 0 .../quoteDelete/help/quoteDelete_description.ftl} | 0 .../quoteDelete/help/quoteDelete_long_help.ftl} | 0 .../help/quoteDelete_parameter_quoteId.ftl} | 0 .../quoteDelete/quoteDelete_confirmation.ftl} | 0 .../quoteDelete/quoteDelete_response_text.ftl} | 0 .../quoteGet/help/quoteGet_description.ftl} | 0 .../commands/quoteGet/help/quoteGet_long_help.ftl} | 0 .../quoteGet/help/quoteGet_parameter_quoteId.ftl} | 0 .../quoteSearch/help/quoteSearch_description.ftl} | 0 .../quoteSearch/help/quoteSearch_long_help.ftl} | 0 .../help/quoteSearch_parameter_member.ftl} | 0 .../help/quoteSearch_parameter_query.ftl} | 0 .../quoteStats/help/quoteStats_description.ftl} | 0 .../quoteStats/help/quoteStats_long_help.ftl} | 0 .../help/quoteStats_parameter_member.ftl} | 0 .../quoteStats_response_message_text.ftl} | 0 .../config/feature_quotes.ftl} | 0 .../config/feature_starboardQuoteSync.ftl} | 0 .../config/module_quotes_description.ftl} | 0 .../exceptions/quote_not_found_exception_text.ftl} | 0 .../createNewsCategory_response_text.ftl} | 0 .../help/createNewsCategory_description.ftl} | 0 .../help/createNewsCategory_long_help.ftl} | 0 .../createNewsCategory_parameter_categoryName.ftl} | 0 ...teNewsCategoryChannelMapping_response_text.ftl} | 0 ...eateNewsCategoryChannelMapping_description.ftl} | 0 ...createNewsCategoryChannelMapping_long_help.ftl} | 0 ...egoryChannelMapping_parameter_categoryName.ftl} | 0 ...wsCategoryChannelMapping_parameter_channel.ftl} | 0 ...eateNewsCategorySubscription_response_text.ftl} | 0 ...createNewsCategorySubscription_description.ftl} | 0 .../createNewsCategorySubscription_long_help.ftl} | 0 ...ategorySubscription_parameter_categoryName.ftl} | 0 ...ewsCategorySubscription_parameter_newsFeed.ftl} | 0 ...egorySubscription_parameter_sourceCategory.ftl} | 0 .../deleteNewsCategory_response_text.ftl} | 0 .../help/deleteNewsCategory_description.ftl} | 0 .../help/deleteNewsCategory_long_help.ftl} | 0 .../deleteNewsCategory_parameter_categoryName.ftl} | 0 ...teNewsCategoryChannelMapping_response_text.ftl} | 0 ...leteNewsCategoryChannelMapping_description.ftl} | 0 ...deleteNewsCategoryChannelMapping_long_help.ftl} | 0 ...egoryChannelMapping_parameter_categoryName.ftl} | 0 ...wsCategoryChannelMapping_parameter_channel.ftl} | 0 ...leteNewsCategorySubscription_response_text.ftl} | 0 ...deleteNewsCategorySubscription_description.ftl} | 0 .../deleteNewsCategorySubscription_long_help.ftl} | 0 ...ategorySubscription_parameter_categoryName.ftl} | 0 ...ewsCategorySubscription_parameter_newsFeed.ftl} | 0 ...egorySubscription_parameter_sourceCategory.ftl} | 0 .../help/showNewsCategories_description.ftl} | 0 .../help/showNewsCategories_long_help.ftl} | 0 .../showNewsCategories_category_display.ftl} | 0 .../showNewsCategories_mapping_display.ftl} | 0 .../showNewsCategories_no_categories.ftl} | 0 .../showNewsCategories_no_mappings.ftl} | 0 .../showNewsCategories_no_subscriptions.ftl} | 0 .../showNewsCategories_subscription_display.ftl} | 0 .../config/feature_orfNews.ftl} | 0 .../config/feature_rssNews.ftl} | 0 ...ews_category_already_exists_exception_text.ftl} | 0 ...nnel_mapping_already_exists_exception_text.ftl} | 0 ...y_channel_mapping_not_found_exception_text.ftl} | 0 .../news_category_not_found_exception_text.ftl} | 0 ...d_source_category_not_found_exception_text.ftl} | 0 ...subscription_already_exists_exception_text.ftl} | 0 ...gory_subscription_not_found_exception_text.ftl} | 0 .../news_feed_source_not_found_exception_text.ftl} | 0 .../orf/job/orf_news_post_author.ftl} | 0 ..._message_to_channel_above_level_r+_message.ftl} | 0 .../ban/commands/ban_notification_text.ftl} | 0 .../reaction_report_custom_text.ftl} | 0 244 files changed, 14 insertions(+), 22 deletions(-) rename templates/sissi-templates/customization-templates/image-generation-customization-templates/src/main/resources/{en_US/commands/doge_orangeSun_response_embed_en_US.ftl => default/commands/doge_orangeSun_response_embed.ftl} (100%) rename templates/sissi-templates/customization-templates/moderation-customization-templates/src/main/resources/{en_US/commands/modMode/modMode_response_embed_en_US.ftl => default/commands/modMode/modMode_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/debra-templates/src/main/resources/{en_US/commands/debraInfoButton/debraInfoButton_embed_en_US.ftl => default/commands/debraInfoButton/debraInfoButton_embed.ftl} (89%) rename templates/sissi-templates/module-templates/debra-templates/src/main/resources/{en_US/commands/debraInfoButton/debraInfoButton_response_embed_en_US.ftl => default/commands/debraInfoButton/debraInfoButton_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/debra-templates/src/main/resources/{en_US/commands/donations/donations_response_embed_en_US.ftl => default/commands/donations/donations_response_embed.ftl} (97%) rename templates/sissi-templates/module-templates/debra-templates/src/main/resources/{en_US/exceptions/donation_amount_not_found_exception_en_US.ftl => default/exceptions/donation_amount_not_found_exception.ftl} (100%) rename templates/sissi-templates/module-templates/debra-templates/src/main/resources/{en_US/listener/debraInfoMessage_embed_en_US.ftl => default/listener/debraInfoMessage_embed.ftl} (70%) rename templates/sissi-templates/module-templates/debra-templates/src/main/resources/{en_US/listener/debraInfoMessage_response_embed_en_US.ftl => default/listener/debraInfoMessage_response_embed.ftl} (81%) rename templates/sissi-templates/module-templates/debra-templates/src/main/resources/{en_US/listener/debra_donation_notification_embed_en_US.ftl => default/listener/debra_donation_notification_embed.ftl} (96%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/commands/cancelMeetup/cancelMeetup_response_embed_en_US.ftl => default/commands/cancelMeetup/cancelMeetup_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/commands/cancelMeetup/meetup_cancel_notification_embed_en_US.ftl => default/commands/cancelMeetup/meetup_cancel_notification_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/commands/changeMeetup/changeMeetup_response_embed_en_US.ftl => default/commands/changeMeetup/changeMeetup_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/commands/changeMeetupTime/changeMeetupTime_confirmation_embed_en_US.ftl => default/commands/changeMeetupTime/changeMeetupTime_confirmation_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/commands/changeMeetupTime/changeMeetupTime_notification_embed_en_US.ftl => default/commands/changeMeetupTime/changeMeetupTime_notification_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/commands/createMeetup/createMeetup_confirmation_embed_en_US.ftl => default/commands/createMeetup/createMeetup_confirmation_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/commands/listMeetups/listMeetups_response_embed_en_US.ftl => default/commands/listMeetups/listMeetups_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/commands/notifyMeetupParticipants/notifyMeetupParticipants_notification_message_embed_en_US.ftl => default/commands/notifyMeetupParticipants/notifyMeetupParticipants_notification_message_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_embed_en_US.ftl => default/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/exception/meetup_in_past_exception_en_US.ftl => default/exception/meetup_in_past_exception.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/exception/meetup_not_found_exception_en_US.ftl => default/exception/meetup_not_found_exception.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/exception/meetup_not_organizer_exception_en_US.ftl => default/exception/meetup_not_organizer_exception.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/general/meetup_display_embed_en_US.ftl => default/general/meetup_display_embed.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/general/meetup_ice_file_download_en_US.ftl => default/general/meetup_ice_file_download.ftl} (100%) rename templates/sissi-templates/module-templates/meetup-templates/src/main/resources/{en_US/general/meetup_reminder_notification_embed_en_US.ftl => default/general/meetup_reminder_notification_embed.ftl} (100%) rename templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/{en_US/commands/addWeeklyText/addWeeklyText_response_embed_en_US.ftl => default/commands/addWeeklyText/addWeeklyText_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/{en_US/commands/removeWeeklyText/removeWeeklyText_response_embed_en_US.ftl => default/commands/removeWeeklyText/removeWeeklyText_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/{en_US/commands/showWeeklyTexts/showWeeklyTexts_item_entry_en_US.ftl => default/commands/showWeeklyTexts/showWeeklyTexts_item_entry.ftl} (100%) rename templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/{en_US/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_embed_en_US.ftl => default/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_embed.ftl} (100%) rename templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/{en_US/commands/showWeeklyTexts/showWeeklyTexts_paginator_en_US.ftl => default/commands/showWeeklyTexts/showWeeklyTexts_paginator.ftl} (100%) rename templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/{en_US/commands/showWeeklyTexts/showWeeklyTexts_response_item_entry_en_US.ftl => default/commands/showWeeklyTexts/showWeeklyTexts_response_item_entry.ftl} (100%) rename templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/{en_US/job/weekly_text_item_post_embed_en_US.ftl => default/job/weekly_text_item_post_embed.ftl} (100%) rename templates/sissi-templates/module-templates/quotes-templates/src/main/resources/{en_US/commands/quote/quote_response_embed_en_US.ftl => default/commands/quote/quote_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/quotes-templates/src/main/resources/{en_US/commands/quoteDelete/quoteDelete_response_embed_en_US.ftl => default/commands/quoteDelete/quoteDelete_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/quotes-templates/src/main/resources/{en_US/commands/quoteStats/quoteStats_response_embed_en_US.ftl => default/commands/quoteStats/quoteStats_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/quotes-templates/src/main/resources/{en_US/exceptions/quote_not_found_exception_en_US.ftl => default/exceptions/quote_not_found_exception.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/commands/createNewsCategory/createNewsCategory_response_embed_en_US.ftl => default/commands/createNewsCategory/createNewsCategory_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_embed_en_US.ftl => default/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_embed_en_US.ftl => default/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/commands/deleteNewsCategory/deleteNewsCategory_response_embed_en_US.ftl => default/commands/deleteNewsCategory/deleteNewsCategory_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_embed_en_US.ftl => default/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_embed_en_US.ftl => default/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/commands/showNewsCategories/showNewsCategories_response_embed_en_US.ftl => default/commands/showNewsCategories/showNewsCategories_response_embed.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/exceptions/news_category_already_exists_exception_en_US.ftl => default/exceptions/news_category_already_exists_exception.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/exceptions/news_category_channel_mapping_already_exists_exception_en_US.ftl => default/exceptions/news_category_channel_mapping_already_exists_exception.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/exceptions/news_category_channel_mapping_not_found_exception_en_US.ftl => default/exceptions/news_category_channel_mapping_not_found_exception.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/exceptions/news_category_not_found_exception_en_US.ftl => default/exceptions/news_category_not_found_exception.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/exceptions/news_feed_source_category_not_found_exception_en_US.ftl => default/exceptions/news_feed_source_category_not_found_exception.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/exceptions/news_feed_source_category_subscription_already_exists_exception_en_US.ftl => default/exceptions/news_feed_source_category_subscription_already_exists_exception.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/exceptions/news_feed_source_category_subscription_not_found_exception_en_US.ftl => default/exceptions/news_feed_source_category_subscription_not_found_exception.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/exceptions/news_feed_source_not_found_exception_en_US.ftl => default/exceptions/news_feed_source_not_found_exception.ftl} (100%) rename templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/{en_US/orf/job/orf_news_post_embed_en_US.ftl => default/orf/job/orf_news_post_embed.ftl} (100%) rename templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/{en_US/listener/experienceTrackerListener/experience_level_up_notification_embed_en_US.ftl => default/listener/experienceTrackerListener/experience_level_up_notification_embed.ftl} (87%) rename templates/sissi-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} (86%) rename templates/sissi-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} (83%) rename templates/sissi-templates/template-overrides/moderation-template-overrides/src/main/resources/{en_US/listener/reactionReport/reactionReport_notification_embed_en_US.ftl => default/listener/reactionReport/reactionReport_notification_embed.ftl} (100%) rename templates/sissi-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/sissi-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/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/commands/modMode/help/modMode_parameter_newState_en_US.ftl => default/commands/modMode/help/modMode_parameter_newState.ftl} (100%) rename templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/commands/modMode/modMode_response_text_en_US.ftl => default/commands/modMode/modMode_response_text.ftl} (100%) rename templates/sissi-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/sissi-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/sissi-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/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/{en_US/config/feature_setup_config_reportReactionAmount_en_US.ftl => default/config/feature_setup_config_reportReactionAmount.ftl} (100%) rename templates/sissi-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/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/debraInfoButton/debraInfoButton_button_label_en_US.ftl => default/commands/debraInfoButton/debraInfoButton_button_label.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/debraInfoButton/debraInfoButton_response_text_en_US.ftl => default/commands/debraInfoButton/debraInfoButton_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/debraInfoButton/debraInfoButton_text_en_US.ftl => default/commands/debraInfoButton/debraInfoButton_text.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/debraInfoButton/help/debraInfoButton_description_en_US.ftl => default/commands/debraInfoButton/help/debraInfoButton_description.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/debraInfoButton/help/debraInfoButton_long_help_en_US.ftl => default/commands/debraInfoButton/help/debraInfoButton_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/debraInfoButton/help/debraInfoButton_parameter_targetChannel_en_US.ftl => default/commands/debraInfoButton/help/debraInfoButton_parameter_targetChannel.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/donations/donations_response_description_en_US.ftl => default/commands/donations/donations_response_description.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/donations/help/donations_description_en_US.ftl => default/commands/donations/help/donations_description.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/donations/help/donations_long_help_en_US.ftl => default/commands/donations/help/donations_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/donations/help/donations_parameter_parametervalue_en_US.ftl => default/commands/donations/help/donations_parameter_parametervalue.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/commands/donations/help/donations_parameter_type_en_US.ftl => default/commands/donations/help/donations_parameter_type.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/config/feature_debra_en_US.ftl => default/config/feature_debra.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/config/feature_setup_config_debraDonationApiFetchSize_en_US.ftl => default/config/feature_setup_config_debraDonationApiFetchSize.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/config/feature_setup_config_debraDonationNotificationDelayMillis_en_US.ftl => default/config/feature_setup_config_debraDonationNotificationDelayMillis.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/config/feature_setup_config_endlessStreamMinuteRate_en_US.ftl => default/config/feature_setup_config_endlessStreamMinuteRate.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/exception/donation_amount_not_found_exception_text_en_US.ftl => default/exception/donation_amount_not_found_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/listener/debraInfoMessage_response_text_en_US.ftl => default/listener/debraInfoMessage_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/listener/debra_donation_notification_embed_field_amount_title_en_US.ftl => default/listener/debra_donation_notification_embed_field_amount_title.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/listener/debra_donation_notification_embed_field_amount_value_en_US.ftl => default/listener/debra_donation_notification_embed_field_amount_value.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/listener/debra_donation_notification_embed_footer_en_US.ftl => default/listener/debra_donation_notification_embed_footer.ftl} (100%) rename templates/sissi-translations/module-translations/debra-translations/src/main/resources/{en_US/listener/debra_donation_notification_embed_title_en_US.ftl => default/listener/debra_donation_notification_embed_title.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/cancelMeetup/cancelMeetup_response_text_en_US.ftl => default/commands/cancelMeetup/cancelMeetup_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/cancelMeetup/help/cancelMeetup_description_en_US.ftl => default/commands/cancelMeetup/help/cancelMeetup_description.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/cancelMeetup/help/cancelMeetup_long_help_en_US.ftl => default/commands/cancelMeetup/help/cancelMeetup_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/cancelMeetup/help/cancelMeetup_parameter_meetupId_en_US.ftl => default/commands/cancelMeetup/help/cancelMeetup_parameter_meetupId.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/cancelMeetup/meetup_cancel_notification_description_en_US.ftl => default/commands/cancelMeetup/meetup_cancel_notification_description.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetup/changeMeetup_response_text_en_US.ftl => default/commands/changeMeetup/changeMeetup_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetup/help/changeMeetup_description_en_US.ftl => default/commands/changeMeetup/help/changeMeetup_description.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetup/help/changeMeetup_long_help_en_US.ftl => default/commands/changeMeetup/help/changeMeetup_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetup/help/changeMeetup_parameter_meetupId_en_US.ftl => default/commands/changeMeetup/help/changeMeetup_parameter_meetupId.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetup/help/changeMeetup_parameter_newValue_en_US.ftl => default/commands/changeMeetup/help/changeMeetup_parameter_newValue.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetup/help/changeMeetup_parameter_property_en_US.ftl => default/commands/changeMeetup/help/changeMeetup_parameter_property.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetup/help/changeMeetup_parameter_property_choice_DESCRIPTION_en_US.ftl => default/commands/changeMeetup/help/changeMeetup_parameter_property_choice_DESCRIPTION.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetup/help/changeMeetup_parameter_property_choice_LOCATION_en_US.ftl => default/commands/changeMeetup/help/changeMeetup_parameter_property_choice_LOCATION.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetup/help/changeMeetup_parameter_property_choice_TOPIC_en_US.ftl => default/commands/changeMeetup/help/changeMeetup_parameter_property_choice_TOPIC.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetupTime/changeMeetupTime_notification_text_en_US.ftl => default/commands/changeMeetupTime/changeMeetupTime_notification_text.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetupTime/help/changeMeetupTime_description_en_US.ftl => default/commands/changeMeetupTime/help/changeMeetupTime_description.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetupTime/help/changeMeetupTime_long_help_en_US.ftl => default/commands/changeMeetupTime/help/changeMeetupTime_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetupTime/help/changeMeetupTime_parameter_meetupId_en_US.ftl => default/commands/changeMeetupTime/help/changeMeetupTime_parameter_meetupId.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/changeMeetupTime/help/changeMeetupTime_parameter_newTimeStamp_en_US.ftl => default/commands/changeMeetupTime/help/changeMeetupTime_parameter_newTimeStamp.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/createMeetup/createMeetup_cancel_button_label_en_US.ftl => default/commands/createMeetup/createMeetup_cancel_button_label.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/createMeetup/createMeetup_confirm_button_label_en_US.ftl => default/commands/createMeetup/createMeetup_confirm_button_label.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/createMeetup/createMeetup_confirmation_location_field_title_en_US.ftl => default/commands/createMeetup/createMeetup_confirmation_location_field_title.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/createMeetup/help/createMeetup_description_en_US.ftl => default/commands/createMeetup/help/createMeetup_description.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/createMeetup/help/createMeetup_long_help_en_US.ftl => default/commands/createMeetup/help/createMeetup_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/createMeetup/help/createMeetup_parameter_description_en_US.ftl => default/commands/createMeetup/help/createMeetup_parameter_description.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/createMeetup/help/createMeetup_parameter_location_en_US.ftl => default/commands/createMeetup/help/createMeetup_parameter_location.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/createMeetup/help/createMeetup_parameter_meetupTime_en_US.ftl => default/commands/createMeetup/help/createMeetup_parameter_meetupTime.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/createMeetup/help/createMeetup_parameter_topic_en_US.ftl => default/commands/createMeetup/help/createMeetup_parameter_topic.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/listMeetups/help/listMeetups_description_en_US.ftl => default/commands/listMeetups/help/listMeetups_description.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/listMeetups/help/listMeetups_long_help_en_US.ftl => default/commands/listMeetups/help/listMeetups_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/listMeetups/meetup_list_meetup_display_en_US.ftl => default/commands/listMeetups/meetup_list_meetup_display.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/listMeetups/meetup_list_no_meetups_en_US.ftl => default/commands/listMeetups/meetup_list_no_meetups.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_description_en_US.ftl => default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_description.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_long_help_en_US.ftl => default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_en_US.ftl => default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_MAYBE_en_US.ftl => default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_MAYBE.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO_en_US.ftl => default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO_TIME_en_US.ftl => default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO_TIME.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_YES_en_US.ftl => default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_YES.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_meetupId_en_US.ftl => default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_meetupId.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_notificationMessage_en_US.ftl => default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_notificationMessage.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_text_en_US.ftl => default/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/config/feature_meetup_en_US.ftl => default/config/feature_meetup.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/exception/meetup_in_past_exception_message_en_US.ftl => default/exception/meetup_in_past_exception_message.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/exception/meetup_not_found_exception_message_en_US.ftl => default/exception/meetup_not_found_exception_message.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/exception/meetup_not_organizer_exception_message_en_US.ftl => default/exception/meetup_not_organizer_exception_message.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_display_description_en_US.ftl => default/general/meetup_display_description.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_ics_file_name_en_US.ftl => default/general/meetup_ics_file_name.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_message_id_display_en_US.ftl => default/general/meetup_message_id_display.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_message_location_button_label_en_US.ftl => default/general/meetup_message_location_button_label.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_message_maybe_button_label_en_US.ftl => default/general/meetup_message_maybe_button_label.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_message_no_button_label_en_US.ftl => default/general/meetup_message_no_button_label.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_message_no_member_en_US.ftl => default/general/meetup_message_no_member.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_message_no_time_button_label_en_US.ftl => default/general/meetup_message_no_time_button_label.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_message_yes_button_label_en_US.ftl => default/general/meetup_message_yes_button_label.ftl} (100%) rename templates/sissi-translations/module-translations/meetup-translations/src/main/resources/{en_US/general/meetup_reminder_notification_description_en_US.ftl => default/general/meetup_reminder_notification_description.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/addWeeklyText/addWeeklyText_response_text_en_US.ftl => default/commands/addWeeklyText/addWeeklyText_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/addWeeklyText/help/addWeeklyText_description_en_US.ftl => default/commands/addWeeklyText/help/addWeeklyText_description.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/addWeeklyText/help/addWeeklyText_long_help_en_US.ftl => default/commands/addWeeklyText/help/addWeeklyText_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/addWeeklyText/help/addWeeklyText_parameter_text_en_US.ftl => default/commands/addWeeklyText/help/addWeeklyText_parameter_text.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/removeWeeklyText/help/removeWeeklyText_description_en_US.ftl => default/commands/removeWeeklyText/help/removeWeeklyText_description.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/removeWeeklyText/help/removeWeeklyText_long_help_en_US.ftl => default/commands/removeWeeklyText/help/removeWeeklyText_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/removeWeeklyText/help/removeWeeklyText_parameter_id_en_US.ftl => default/commands/removeWeeklyText/help/removeWeeklyText_parameter_id.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/removeWeeklyText/removeWeeklyText_response_text_en_US.ftl => default/commands/removeWeeklyText/removeWeeklyText_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/showWeeklyTexts/help/showWeeklyTexts_description_en_US.ftl => default/commands/showWeeklyTexts/help/showWeeklyTexts_description.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/showWeeklyTexts/help/showWeeklyTexts_long_help_en_US.ftl => default/commands/showWeeklyTexts/help/showWeeklyTexts_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/showWeeklyTexts/help/showWeeklyTexts_parameter_showAll_en_US.ftl => default/commands/showWeeklyTexts/help/showWeeklyTexts_parameter_showAll.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_text_en_US.ftl => default/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_text.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/commands/showWeeklyTexts/showWeeklyTexts_response_text_en_US.ftl => default/commands/showWeeklyTexts/showWeeklyTexts_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/config/feature_weeklyText_en_US.ftl => default/config/feature_weeklyText.ftl} (100%) rename templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/{en_US/job/weekly_text_item_post_text_en_US.ftl => default/job/weekly_text_item_post_text.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quote/help/quote_description_en_US.ftl => default/commands/quote/help/quote_description.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quote/help/quote_long_help_en_US.ftl => default/commands/quote/help/quote_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quote/help/quote_parameter_member_en_US.ftl => default/commands/quote/help/quote_parameter_member.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quote/quote_response_default_adder_name_en_US.ftl => default/commands/quote/quote_response_default_adder_name.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quote/quote_response_default_author_name_en_US.ftl => default/commands/quote/quote_response_default_author_name.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quote/quote_response_default_channel_name_en_US.ftl => default/commands/quote/quote_response_default_channel_name.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quote/quote_response_description_en_US.ftl => default/commands/quote/quote_response_description.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quote/quote_response_footer_adder_name_en_US.ftl => default/commands/quote/quote_response_footer_adder_name.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quote/quote_response_header_author_name_en_US.ftl => default/commands/quote/quote_response_header_author_name.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteDelete/help/quoteDelete_description_en_US.ftl => default/commands/quoteDelete/help/quoteDelete_description.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteDelete/help/quoteDelete_long_help_en_US.ftl => default/commands/quoteDelete/help/quoteDelete_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteDelete/help/quoteDelete_parameter_quoteId_en_US.ftl => default/commands/quoteDelete/help/quoteDelete_parameter_quoteId.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteDelete/quoteDelete_confirmation_en_US.ftl => default/commands/quoteDelete/quoteDelete_confirmation.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteDelete/quoteDelete_response_text_en_US.ftl => default/commands/quoteDelete/quoteDelete_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteGet/help/quoteGet_description_en_US.ftl => default/commands/quoteGet/help/quoteGet_description.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteGet/help/quoteGet_long_help_en_US.ftl => default/commands/quoteGet/help/quoteGet_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteGet/help/quoteGet_parameter_quoteId_en_US.ftl => default/commands/quoteGet/help/quoteGet_parameter_quoteId.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteSearch/help/quoteSearch_description_en_US.ftl => default/commands/quoteSearch/help/quoteSearch_description.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteSearch/help/quoteSearch_long_help_en_US.ftl => default/commands/quoteSearch/help/quoteSearch_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteSearch/help/quoteSearch_parameter_member_en_US.ftl => default/commands/quoteSearch/help/quoteSearch_parameter_member.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteSearch/help/quoteSearch_parameter_query_en_US.ftl => default/commands/quoteSearch/help/quoteSearch_parameter_query.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteStats/help/quoteStats_description_en_US.ftl => default/commands/quoteStats/help/quoteStats_description.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteStats/help/quoteStats_long_help_en_US.ftl => default/commands/quoteStats/help/quoteStats_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteStats/help/quoteStats_parameter_member_en_US.ftl => default/commands/quoteStats/help/quoteStats_parameter_member.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/commands/quoteStats/quoteStats_response_message_text_en_US.ftl => default/commands/quoteStats/quoteStats_response_message_text.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/config/feature_quotes_en_US.ftl => default/config/feature_quotes.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/config/feature_starboardQuoteSync_en_US.ftl => default/config/feature_starboardQuoteSync.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/config/module_quotes_description_en_US.ftl => default/config/module_quotes_description.ftl} (100%) rename templates/sissi-translations/module-translations/quote-translations/src/main/resources/{en_US/exceptions/quote_not_found_exception_text_en_US.ftl => default/exceptions/quote_not_found_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategory/createNewsCategory_response_text_en_US.ftl => default/commands/createNewsCategory/createNewsCategory_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategory/help/createNewsCategory_description_en_US.ftl => default/commands/createNewsCategory/help/createNewsCategory_description.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategory/help/createNewsCategory_long_help_en_US.ftl => default/commands/createNewsCategory/help/createNewsCategory_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategory/help/createNewsCategory_parameter_categoryName_en_US.ftl => default/commands/createNewsCategory/help/createNewsCategory_parameter_categoryName.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_text_en_US.ftl => default/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_description_en_US.ftl => default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_description.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_long_help_en_US.ftl => default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_categoryName_en_US.ftl => default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_categoryName.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_channel_en_US.ftl => default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_channel.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_text_en_US.ftl => default/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_description_en_US.ftl => default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_description.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_long_help_en_US.ftl => default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_categoryName_en_US.ftl => default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_categoryName.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_newsFeed_en_US.ftl => default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_newsFeed.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_sourceCategory_en_US.ftl => default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_sourceCategory.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategory/deleteNewsCategory_response_text_en_US.ftl => default/commands/deleteNewsCategory/deleteNewsCategory_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategory/help/deleteNewsCategory_description_en_US.ftl => default/commands/deleteNewsCategory/help/deleteNewsCategory_description.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategory/help/deleteNewsCategory_long_help_en_US.ftl => default/commands/deleteNewsCategory/help/deleteNewsCategory_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategory/help/deleteNewsCategory_parameter_categoryName_en_US.ftl => default/commands/deleteNewsCategory/help/deleteNewsCategory_parameter_categoryName.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_text_en_US.ftl => default/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_description_en_US.ftl => default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_description.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_long_help_en_US.ftl => default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_categoryName_en_US.ftl => default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_categoryName.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_channel_en_US.ftl => default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_channel.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_text_en_US.ftl => default/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_description_en_US.ftl => default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_description.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_long_help_en_US.ftl => default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_categoryName_en_US.ftl => default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_categoryName.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_newsFeed_en_US.ftl => default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_newsFeed.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_sourceCategory_en_US.ftl => default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_sourceCategory.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/showNewsCategories/help/showNewsCategories_description_en_US.ftl => default/commands/showNewsCategories/help/showNewsCategories_description.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/showNewsCategories/help/showNewsCategories_long_help_en_US.ftl => default/commands/showNewsCategories/help/showNewsCategories_long_help.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/showNewsCategories/showNewsCategories_category_display_en_US.ftl => default/commands/showNewsCategories/showNewsCategories_category_display.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/showNewsCategories/showNewsCategories_mapping_display_en_US.ftl => default/commands/showNewsCategories/showNewsCategories_mapping_display.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/showNewsCategories/showNewsCategories_no_categories_en_US.ftl => default/commands/showNewsCategories/showNewsCategories_no_categories.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/showNewsCategories/showNewsCategories_no_mappings_en_US.ftl => default/commands/showNewsCategories/showNewsCategories_no_mappings.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/showNewsCategories/showNewsCategories_no_subscriptions_en_US.ftl => default/commands/showNewsCategories/showNewsCategories_no_subscriptions.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/commands/showNewsCategories/showNewsCategories_subscription_display_en_US.ftl => default/commands/showNewsCategories/showNewsCategories_subscription_display.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/config/feature_orfNews_en_US.ftl => default/config/feature_orfNews.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/config/feature_rssNews_en_US.ftl => default/config/feature_rssNews.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/exceptions/news_category_already_exists_exception_text_en_US.ftl => default/exceptions/news_category_already_exists_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/exceptions/news_category_channel_mapping_already_exists_exception_text_en_US.ftl => default/exceptions/news_category_channel_mapping_already_exists_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/exceptions/news_category_channel_mapping_not_found_exception_text_en_US.ftl => default/exceptions/news_category_channel_mapping_not_found_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/exceptions/news_category_not_found_exception_text_en_US.ftl => default/exceptions/news_category_not_found_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/exceptions/news_feed_source_category_not_found_exception_text_en_US.ftl => default/exceptions/news_feed_source_category_not_found_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/exceptions/news_feed_source_category_subscription_already_exists_exception_text_en_US.ftl => default/exceptions/news_feed_source_category_subscription_already_exists_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/exceptions/news_feed_source_category_subscription_not_found_exception_text_en_US.ftl => default/exceptions/news_feed_source_category_subscription_not_found_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/exceptions/news_feed_source_not_found_exception_text_en_US.ftl => default/exceptions/news_feed_source_not_found_exception_text.ftl} (100%) rename templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/{en_US/orf/job/orf_news_post_author_en_US.ftl => default/orf/job/orf_news_post_author.ftl} (100%) rename templates/sissi-translations/translation-overrides/experience-translation-overrides/src/main/resources/de_DE/action/{level_action_send_message_to_channel_above_level_r+_message_en_US.ftl => level_action_send_message_to_channel_above_level_r+_message.ftl} (100%) rename templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/{en_US/ban/commands/ban_notification_text_en_US.ftl => default/ban/commands/ban_notification_text.ftl} (100%) rename templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/{en_US/listener/reactionReport/reaction_report_custom_text_en_US.ftl => default/listener/reactionReport/reaction_report_custom_text.ftl} (100%) diff --git a/application/sissi-customizations/image-generation-custom/src/main/java/dev/sheldan/sissi/module/custom/imagegeneration/command/OrangeSunDogeCommandAlternative.java b/application/sissi-customizations/image-generation-custom/src/main/java/dev/sheldan/sissi/module/custom/imagegeneration/command/OrangeSunDogeCommandAlternative.java index 6308f66e..b912e316 100644 --- a/application/sissi-customizations/image-generation-custom/src/main/java/dev/sheldan/sissi/module/custom/imagegeneration/command/OrangeSunDogeCommandAlternative.java +++ b/application/sissi-customizations/image-generation-custom/src/main/java/dev/sheldan/sissi/module/custom/imagegeneration/command/OrangeSunDogeCommandAlternative.java @@ -61,7 +61,7 @@ public class OrangeSunDogeCommandAlternative implements CommandAlternative { List parameters = Arrays.asList(contentStripped.split(" ")); String inputText = commandRegistry.getCommandName(parameters.get(0), message.getGuild().getIdLong()); File triggeredGifFile = imageGenerationService.getOrangeSunDogeImage(inputText); - MessageToSend messageToSend = templateService.renderEmbedTemplate(DOGE_ORANGE_SUN_RESPONSE_TEMPLATE_KEY, new Object()); + MessageToSend messageToSend = templateService.renderEmbedTemplate(DOGE_ORANGE_SUN_RESPONSE_TEMPLATE_KEY, new Object(), message.getGuildIdLong()); // template support does not support binary files AttachedFile file = AttachedFile .builder() diff --git a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/commands/Donations.java b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/commands/Donations.java index da24bbc5..fc61aa56 100644 --- a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/commands/Donations.java +++ b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/commands/Donations.java @@ -124,7 +124,7 @@ public class Donations extends AbstractConditionableCommand { } else { donationModel.setDonations(new ArrayList<>()); } - return templateService.renderEmbedTemplate(DONATIONS_RESPONSE_TEMPLATE_KEY, donationModel); + return templateService.renderEmbedTemplate(DONATIONS_RESPONSE_TEMPLATE_KEY, donationModel, serverId); } @Override diff --git a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java index c4c38fda..4758f382 100644 --- a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java +++ b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java @@ -182,7 +182,7 @@ public class DonationService { .donation(donation) .totalDonationAmount(donationInfoModel.getTotalAmount()) .build(); - MessageToSend messageToSend = templateService.renderEmbedTemplate(DEBRA_DONATION_NOTIFICATION_TEMPLATE_KEY, model); + MessageToSend messageToSend = templateService.renderEmbedTemplate(DEBRA_DONATION_NOTIFICATION_TEMPLATE_KEY, model, targetServerId); List> firstMessage = postTargetService.sendEmbedInPostTarget(messageToSend, DebraPostTarget.DEBRA_DONATION_NOTIFICATION, targetServerId); List> secondMessage = postTargetService.sendEmbedInPostTarget(messageToSend, DebraPostTarget.DEBRA_DONATION_NOTIFICATION2, targetServerId); firstMessage.addAll(secondMessage); diff --git a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupConfirmationListener.java b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupConfirmationListener.java index de3c0047..507f3478 100644 --- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupConfirmationListener.java +++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupConfirmationListener.java @@ -115,7 +115,7 @@ public class MeetupConfirmationListener implements ButtonClickedListener { messageModel.setCancelled(false); Long meetupId = payload.getMeetupId(); Long serverId = payload.getGuildId(); - MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(messageModel); + MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(messageModel, model.getServerId()); List> messageFutures = channelService.sendMessageToSendToChannel(messageToSend, model.getEvent().getMessageChannel()); FutureUtils.toSingleFutureGeneric(messageFutures).thenAccept(unused -> { messageService.deleteMessage(model.getEvent().getMessage()); diff --git a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupDecisionListener.java b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupDecisionListener.java index d8c8e86c..6d82087d 100644 --- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupDecisionListener.java +++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/listener/MeetupDecisionListener.java @@ -59,7 +59,7 @@ public class MeetupDecisionListener implements ButtonClickedListener { } MeetupMessageModel meetupMessageModel = meetupServiceBean.getMeetupMessageModel(meetup); addParticipationToModel(meetupMessageModel, userInAServer, payload.getMeetupDecision()); - MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(meetupMessageModel); + MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(meetupMessageModel, model.getServerId()); channelService.editEmbedMessageInAChannel(messageToSend.getEmbeds().get(0), model.getEvent().getChannel(), meetup.getMessageId()) .thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetup.getId().getId(), meetup.getMeetupChannel().getId(), meetup.getServer().getId())) .exceptionally(throwable -> { diff --git a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/MeetupServiceBean.java b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/MeetupServiceBean.java index ac4f9604..0a9d24cc 100644 --- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/MeetupServiceBean.java +++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/MeetupServiceBean.java @@ -206,8 +206,8 @@ public class MeetupServiceBean { .collect(Collectors.toList()); } - public MessageToSend getMeetupMessage(MeetupMessageModel model) { - return templateService.renderEmbedTemplate(MEETUP_DISPLAY_TEMPLATE, model); + public MessageToSend getMeetupMessage(MeetupMessageModel model, Long serverId) { + return templateService.renderEmbedTemplate(MEETUP_DISPLAY_TEMPLATE, model, serverId); } public CompletableFuture cancelMeetup(Meetup meetup) { @@ -221,7 +221,7 @@ public class MeetupServiceBean { .map(meetupComponent -> meetupComponent.getId().getComponentId()) .collect(Collectors.toList()); model.setCancelled(true); - MessageToSend meetupMessage = getMeetupMessage(model); + MessageToSend meetupMessage = getMeetupMessage(model, serverId); return messageService.editMessageInChannel(channel, meetupMessage, meetup.getMessageId()) .thenAccept(unused -> self.notifyParticipants(meetupId, serverId)) .thenAccept(unused -> self.cleanupMeetup(meetupId, serverId, componentPayloads)); @@ -231,7 +231,7 @@ public class MeetupServiceBean { public void notifyParticipants(Long meetupId, Long serverId) { Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, serverId); MeetupMessageModel model = getMeetupMessageModel(meetup); - MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_CANCELLATION_TEMPLATE, model); + MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_CANCELLATION_TEMPLATE, model, serverId); meetup .getParticipants() .stream() @@ -319,7 +319,7 @@ public class MeetupServiceBean { public void remindParticipants(Long meetupId, Long serverId) { Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, serverId); MeetupMessageModel model = getMeetupMessageModel(meetup); - MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_REMINDER_TEMPLATE, model); + MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_REMINDER_TEMPLATE, model, serverId); meetup .getParticipants() .stream() @@ -423,7 +423,7 @@ public class MeetupServiceBean { meetupMessageModel.setMaybeParticipants(new ArrayList<>()); meetupMessageModel.setNoTimeParticipants(new ArrayList<>()); - MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel); + MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel, serverId); GuildMessageChannel meetupChannel = channelService.getMessageChannelFromServer(serverId, meetup.getMeetupChannel().getId()); return channelService.editMessageInAChannelFuture(updatedMeetupMessage, meetupChannel, meetup.getMessageId()) .thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetupId, meetup.getMeetupChannel().getId(), serverId)) @@ -457,7 +457,7 @@ public class MeetupServiceBean { Long meetupId = meetup.getId().getId(); Long serverId = meetup.getId().getServerId(); MeetupMessageModel meetupMessageModel = getMeetupMessageModel(meetup); - MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel); + MessageToSend updatedMeetupMessage = getMeetupMessage(meetupMessageModel, serverId); GuildMessageChannel meetupChannel = channelService.getMessageChannelFromServer(serverId, meetup.getMeetupChannel().getId()); return channelService.editMessageInAChannelFuture(updatedMeetupMessage, meetupChannel, meetup.getMessageId()) .thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetupId, meetup.getMeetupChannel().getId(), serverId)) diff --git a/pom.xml b/pom.xml index f3a739bc..ec93511f 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,8 @@ 17 17 - 1.5.50 - 1.4.45 + 1.5.51 + 1.4.46 4.9.0 3.5.0 diff --git a/templates/sissi-templates/customization-templates/image-generation-customization-templates/src/main/resources/en_US/commands/doge_orangeSun_response_embed_en_US.ftl b/templates/sissi-templates/customization-templates/image-generation-customization-templates/src/main/resources/default/commands/doge_orangeSun_response_embed.ftl similarity index 100% rename from templates/sissi-templates/customization-templates/image-generation-customization-templates/src/main/resources/en_US/commands/doge_orangeSun_response_embed_en_US.ftl rename to templates/sissi-templates/customization-templates/image-generation-customization-templates/src/main/resources/default/commands/doge_orangeSun_response_embed.ftl diff --git a/templates/sissi-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/commands/modMode/modMode_response_embed_en_US.ftl b/templates/sissi-templates/customization-templates/moderation-customization-templates/src/main/resources/default/commands/modMode/modMode_response_embed.ftl similarity index 100% rename from templates/sissi-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/commands/modMode/modMode_response_embed_en_US.ftl rename to templates/sissi-templates/customization-templates/moderation-customization-templates/src/main/resources/default/commands/modMode/modMode_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_embed_en_US.ftl b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/debraInfoButton/debraInfoButton_embed.ftl similarity index 89% rename from templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_embed_en_US.ftl rename to templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/debraInfoButton/debraInfoButton_embed.ftl index 68d7791b..428cacfb 100644 --- a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/debraInfoButton/debraInfoButton_embed.ftl @@ -1,5 +1,4 @@ { - <#setting locale="de_DE"> "additionalMessage": "<@safe_include "debraInfoButton_text"/>", "buttons": [ { diff --git a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/debraInfoButton/debraInfoButton_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/debraInfoButton/debraInfoButton_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/commands/donations/donations_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/donations/donations_response_embed.ftl similarity index 97% rename from templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/commands/donations/donations_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/donations/donations_response_embed.ftl index 27f00976..78155b6f 100644 --- a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/commands/donations/donations_response_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/commands/donations/donations_response_embed.ftl @@ -1,6 +1,5 @@ { <#assign donationAmount=totalAmount> - <#setting locale="de_DE"> "additionalMessage": "<#include "donations_response_description">", "embeds": [ { diff --git a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/exceptions/donation_amount_not_found_exception_en_US.ftl b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/exceptions/donation_amount_not_found_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/exceptions/donation_amount_not_found_exception_en_US.ftl rename to templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/exceptions/donation_amount_not_found_exception.ftl diff --git a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/listener/debraInfoMessage_embed_en_US.ftl b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debraInfoMessage_embed.ftl similarity index 70% rename from templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/listener/debraInfoMessage_embed_en_US.ftl rename to templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debraInfoMessage_embed.ftl index 82462607..5f04639a 100644 --- a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/listener/debraInfoMessage_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debraInfoMessage_embed.ftl @@ -1,4 +1,3 @@ { - <#setting locale="de_DE"> "additionalMessage": "<@safe_include "debraInfoMessage_text"/>" } \ No newline at end of file diff --git a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/listener/debraInfoMessage_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debraInfoMessage_response_embed.ftl similarity index 81% rename from templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/listener/debraInfoMessage_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debraInfoMessage_response_embed.ftl index bf063a1a..1b0a899a 100644 --- a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/listener/debraInfoMessage_response_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debraInfoMessage_response_embed.ftl @@ -1,5 +1,4 @@ { - <#setting locale="de_DE"> "additionalMessage": "<@safe_include "debraInfoMessage_response_text"/>", "messageConfig": { "ephemeral": true diff --git a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/listener/debra_donation_notification_embed_en_US.ftl b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debra_donation_notification_embed.ftl similarity index 96% rename from templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/listener/debra_donation_notification_embed_en_US.ftl rename to templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debra_donation_notification_embed.ftl index ee19677e..4e208db9 100644 --- a/templates/sissi-templates/module-templates/debra-templates/src/main/resources/en_US/listener/debra_donation_notification_embed_en_US.ftl +++ b/templates/sissi-templates/module-templates/debra-templates/src/main/resources/default/listener/debra_donation_notification_embed.ftl @@ -2,7 +2,6 @@ "embeds": [ { "title": { - <#setting locale="de_DE"> <#assign donatorName=donation.donatorName> <#assign donationAmount=donation.amount> "title": "<@safe_include "debra_donation_notification_embed_title"/>" diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/cancelMeetup/cancelMeetup_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/cancelMeetup/cancelMeetup_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/cancelMeetup/cancelMeetup_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/cancelMeetup/cancelMeetup_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/cancelMeetup/meetup_cancel_notification_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/cancelMeetup/meetup_cancel_notification_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/cancelMeetup/meetup_cancel_notification_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/cancelMeetup/meetup_cancel_notification_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetup/changeMeetup_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/changeMeetup/changeMeetup_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetup/changeMeetup_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/changeMeetup/changeMeetup_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_confirmation_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/changeMeetupTime/changeMeetupTime_confirmation_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_confirmation_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/changeMeetupTime/changeMeetupTime_confirmation_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_notification_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/changeMeetupTime/changeMeetupTime_notification_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_notification_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/changeMeetupTime/changeMeetupTime_notification_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/createMeetup/createMeetup_confirmation_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/createMeetup/createMeetup_confirmation_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/createMeetup/createMeetup_confirmation_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/createMeetup/createMeetup_confirmation_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/listMeetups/listMeetups_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/listMeetups/listMeetups_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/listMeetups/listMeetups_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/listMeetups/listMeetups_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/notifyMeetupParticipants/notifyMeetupParticipants_notification_message_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/notifyMeetupParticipants/notifyMeetupParticipants_notification_message_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/notifyMeetupParticipants/notifyMeetupParticipants_notification_message_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/notifyMeetupParticipants/notifyMeetupParticipants_notification_message_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/exception/meetup_in_past_exception_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/exception/meetup_in_past_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/exception/meetup_in_past_exception_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/exception/meetup_in_past_exception.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/exception/meetup_not_found_exception_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/exception/meetup_not_found_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/exception/meetup_not_found_exception_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/exception/meetup_not_found_exception.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/exception/meetup_not_organizer_exception_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/exception/meetup_not_organizer_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/exception/meetup_not_organizer_exception_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/exception/meetup_not_organizer_exception.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_display_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/general/meetup_display_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_display_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/general/meetup_display_embed.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_ice_file_download_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/general/meetup_ice_file_download.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_ice_file_download_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/general/meetup_ice_file_download.ftl diff --git a/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_reminder_notification_embed_en_US.ftl b/templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/general/meetup_reminder_notification_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_reminder_notification_embed_en_US.ftl rename to templates/sissi-templates/module-templates/meetup-templates/src/main/resources/default/general/meetup_reminder_notification_embed.ftl diff --git a/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/addWeeklyText/addWeeklyText_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/addWeeklyText/addWeeklyText_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/addWeeklyText/addWeeklyText_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/addWeeklyText/addWeeklyText_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/removeWeeklyText/removeWeeklyText_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/removeWeeklyText/removeWeeklyText_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/removeWeeklyText/removeWeeklyText_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/removeWeeklyText/removeWeeklyText_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_item_entry_en_US.ftl b/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_item_entry.ftl similarity index 100% rename from templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_item_entry_en_US.ftl rename to templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_item_entry.ftl diff --git a/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_embed_en_US.ftl b/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_embed_en_US.ftl rename to templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_embed.ftl diff --git a/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_paginator_en_US.ftl b/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_paginator.ftl similarity index 100% rename from templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_paginator_en_US.ftl rename to templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_paginator.ftl diff --git a/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_response_item_entry_en_US.ftl b/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_response_item_entry.ftl similarity index 100% rename from templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_response_item_entry_en_US.ftl rename to templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_response_item_entry.ftl diff --git a/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/job/weekly_text_item_post_embed_en_US.ftl b/templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/job/weekly_text_item_post_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/en_US/job/weekly_text_item_post_embed_en_US.ftl rename to templates/sissi-templates/module-templates/miepscord-templates/src/main/resources/default/job/weekly_text_item_post_embed.ftl diff --git a/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quote/quote_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/default/commands/quote/quote_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quote/quote_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/quotes-templates/src/main/resources/default/commands/quote/quote_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quoteDelete/quoteDelete_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/default/commands/quoteDelete/quoteDelete_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quoteDelete/quoteDelete_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/quotes-templates/src/main/resources/default/commands/quoteDelete/quoteDelete_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quoteStats/quoteStats_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/default/commands/quoteStats/quoteStats_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quoteStats/quoteStats_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/quotes-templates/src/main/resources/default/commands/quoteStats/quoteStats_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/exceptions/quote_not_found_exception_en_US.ftl b/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/default/exceptions/quote_not_found_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/exceptions/quote_not_found_exception_en_US.ftl rename to templates/sissi-templates/module-templates/quotes-templates/src/main/resources/default/exceptions/quote_not_found_exception.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/createNewsCategory/createNewsCategory_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/createNewsCategory/createNewsCategory_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/createNewsCategory/createNewsCategory_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/createNewsCategory/createNewsCategory_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/deleteNewsCategory/deleteNewsCategory_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/deleteNewsCategory/deleteNewsCategory_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/deleteNewsCategory/deleteNewsCategory_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/deleteNewsCategory/deleteNewsCategory_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/showNewsCategories/showNewsCategories_response_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/commands/showNewsCategories/showNewsCategories_response_embed.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_category_already_exists_exception_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_category_already_exists_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_category_already_exists_exception_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_category_already_exists_exception.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_category_channel_mapping_already_exists_exception_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_category_channel_mapping_already_exists_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_category_channel_mapping_already_exists_exception_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_category_channel_mapping_already_exists_exception.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_category_channel_mapping_not_found_exception_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_category_channel_mapping_not_found_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_category_channel_mapping_not_found_exception_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_category_channel_mapping_not_found_exception.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_category_not_found_exception_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_category_not_found_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_category_not_found_exception_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_category_not_found_exception.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_feed_source_category_not_found_exception_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_feed_source_category_not_found_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_feed_source_category_not_found_exception_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_feed_source_category_not_found_exception.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_feed_source_category_subscription_already_exists_exception_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_feed_source_category_subscription_already_exists_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_feed_source_category_subscription_already_exists_exception_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_feed_source_category_subscription_already_exists_exception.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_feed_source_category_subscription_not_found_exception_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_feed_source_category_subscription_not_found_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_feed_source_category_subscription_not_found_exception_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_feed_source_category_subscription_not_found_exception.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_feed_source_not_found_exception_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_feed_source_not_found_exception.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/exceptions/news_feed_source_not_found_exception_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/exceptions/news_feed_source_not_found_exception.ftl diff --git a/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/orf/job/orf_news_post_embed_en_US.ftl b/templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/orf/job/orf_news_post_embed.ftl similarity index 100% rename from templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/en_US/orf/job/orf_news_post_embed_en_US.ftl rename to templates/sissi-templates/module-templates/rss-news-templates/src/main/resources/default/orf/job/orf_news_post_embed.ftl diff --git a/templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/en_US/listener/experienceTrackerListener/experience_level_up_notification_embed_en_US.ftl b/templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/default/listener/experienceTrackerListener/experience_level_up_notification_embed.ftl similarity index 87% rename from templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/en_US/listener/experienceTrackerListener/experience_level_up_notification_embed_en_US.ftl rename to templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/default/listener/experienceTrackerListener/experience_level_up_notification_embed.ftl index c6dc3cf5..408b7b0b 100644 --- a/templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/en_US/listener/experienceTrackerListener/experience_level_up_notification_embed_en_US.ftl +++ b/templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/default/listener/experienceTrackerListener/experience_level_up_notification_embed.ftl @@ -2,6 +2,5 @@ <#assign userMention=memberDisplay.memberMention> <#assign pastLevel=oldLevel> <#assign currentLevel=newLevel> - <#setting locale="de_DE"> "additionalMessage": "<@safe_include "experience_level_up_notification_text"/>" } diff --git a/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_joined/user_join_embed.ftl similarity index 86% rename from templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl rename to templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_joined/user_join_embed.ftl index a70a84b6..25d57953 100644 --- a/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl +++ b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_joined/user_join_embed.ftl @@ -1,6 +1,5 @@ { <#assign userMention>${member.asMention} <#assign user>${member.user.name} (${member.asMention}: ${member.id}) - <#setting locale="de_DE"> "additionalMessage": "<@safe_include "user_joined_text"/>" } \ No newline at end of file diff --git a/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_left/user_leave_embed.ftl similarity index 83% rename from templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl rename to templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_left/user_leave_embed.ftl index be522c31..9dbdfd8a 100644 --- a/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl +++ b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_left/user_leave_embed.ftl @@ -1,6 +1,5 @@ { <#include "user_detail"> <#assign user><@user_detail user=user/> - <#setting locale="de_DE"> "additionalMessage": "<@safe_include "user_left_text"/>" } \ No newline at end of file diff --git a/templates/sissi-templates/template-overrides/moderation-template-overrides/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_en_US.ftl b/templates/sissi-templates/template-overrides/moderation-template-overrides/src/main/resources/default/listener/reactionReport/reactionReport_notification_embed.ftl similarity index 100% rename from templates/sissi-templates/template-overrides/moderation-template-overrides/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_en_US.ftl rename to templates/sissi-templates/template-overrides/moderation-template-overrides/src/main/resources/default/listener/reactionReport/reactionReport_notification_embed.ftl diff --git a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_description_en_US.ftl b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_description.ftl similarity index 100% rename from templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_description_en_US.ftl rename to templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_description.ftl diff --git a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_long_help.ftl similarity index 100% rename from templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl rename to templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_long_help.ftl diff --git a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_en_US.ftl b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_parameter_newState.ftl similarity index 100% rename from templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_en_US.ftl rename to templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/help/modMode_parameter_newState.ftl diff --git a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/modMode_response_text_en_US.ftl b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/modMode_response_text.ftl similarity index 100% rename from templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/modMode_response_text_en_US.ftl rename to templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/commands/modMode/modMode_response_text.ftl diff --git a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_moderationCustom_en_US.ftl b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_moderationCustom.ftl similarity index 100% rename from templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_moderationCustom_en_US.ftl rename to templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_moderationCustom.ftl diff --git a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeNewRoleColor_en_US.ftl b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_modModeNewRoleColor.ftl similarity index 100% rename from templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeNewRoleColor_en_US.ftl rename to templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_modModeNewRoleColor.ftl diff --git a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeRoleId_en_US.ftl b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_modModeRoleId.ftl similarity index 100% rename from templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeRoleId_en_US.ftl rename to templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_modModeRoleId.ftl diff --git a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_reportReactionAmount_en_US.ftl b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_reportReactionAmount.ftl similarity index 100% rename from templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_reportReactionAmount_en_US.ftl rename to templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/config/feature_setup_config_reportReactionAmount.ftl diff --git a/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/exception/mod_role_not_found_exception_en_US.ftl b/templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/exception/mod_role_not_found_exception.ftl similarity index 100% rename from templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/exception/mod_role_not_found_exception_en_US.ftl rename to templates/sissi-translations/customization-translations/moderation-customization-translations/src/main/resources/default/exception/mod_role_not_found_exception.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_button_label_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/debraInfoButton_button_label.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_button_label_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/debraInfoButton_button_label.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_response_text_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/debraInfoButton_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/debraInfoButton_response_text.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_text_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/debraInfoButton_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/debraInfoButton_text_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/debraInfoButton_text.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/help/debraInfoButton_description_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/help/debraInfoButton_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/help/debraInfoButton_description_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/help/debraInfoButton_description.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/help/debraInfoButton_long_help_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/help/debraInfoButton_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/help/debraInfoButton_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/help/debraInfoButton_long_help.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/help/debraInfoButton_parameter_targetChannel_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/help/debraInfoButton_parameter_targetChannel.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/debraInfoButton/help/debraInfoButton_parameter_targetChannel_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/debraInfoButton/help/debraInfoButton_parameter_targetChannel.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/donations_response_description_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/donations_response_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/donations_response_description_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/donations_response_description.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/help/donations_description_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/help/donations_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/help/donations_description_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/help/donations_description.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/help/donations_long_help_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/help/donations_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/help/donations_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/help/donations_long_help.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/help/donations_parameter_parametervalue_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/help/donations_parameter_parametervalue.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/help/donations_parameter_parametervalue_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/help/donations_parameter_parametervalue.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/help/donations_parameter_type_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/help/donations_parameter_type.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/commands/donations/help/donations_parameter_type_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/commands/donations/help/donations_parameter_type.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/config/feature_debra_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/config/feature_debra.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/config/feature_debra_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/config/feature_debra.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/config/feature_setup_config_debraDonationApiFetchSize_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/config/feature_setup_config_debraDonationApiFetchSize.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/config/feature_setup_config_debraDonationApiFetchSize_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/config/feature_setup_config_debraDonationApiFetchSize.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/config/feature_setup_config_debraDonationNotificationDelayMillis_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/config/feature_setup_config_debraDonationNotificationDelayMillis.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/config/feature_setup_config_debraDonationNotificationDelayMillis_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/config/feature_setup_config_debraDonationNotificationDelayMillis.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/config/feature_setup_config_endlessStreamMinuteRate_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/config/feature_setup_config_endlessStreamMinuteRate.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/config/feature_setup_config_endlessStreamMinuteRate_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/config/feature_setup_config_endlessStreamMinuteRate.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/exception/donation_amount_not_found_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/exception/donation_amount_not_found_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/exception/donation_amount_not_found_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/exception/donation_amount_not_found_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debraInfoMessage_response_text_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debraInfoMessage_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debraInfoMessage_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debraInfoMessage_response_text.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_field_amount_title_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debra_donation_notification_embed_field_amount_title.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_field_amount_title_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debra_donation_notification_embed_field_amount_title.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_field_amount_value_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debra_donation_notification_embed_field_amount_value.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_field_amount_value_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debra_donation_notification_embed_field_amount_value.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_footer_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debra_donation_notification_embed_footer.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_footer_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debra_donation_notification_embed_footer.ftl diff --git a/templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_title_en_US.ftl b/templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debra_donation_notification_embed_title.ftl similarity index 100% rename from templates/sissi-translations/module-translations/debra-translations/src/main/resources/en_US/listener/debra_donation_notification_embed_title_en_US.ftl rename to templates/sissi-translations/module-translations/debra-translations/src/main/resources/default/listener/debra_donation_notification_embed_title.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/cancelMeetup_response_text_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/cancelMeetup_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/cancelMeetup_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/cancelMeetup_response_text.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/help/cancelMeetup_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/help/cancelMeetup_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/help/cancelMeetup_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/help/cancelMeetup_description.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/help/cancelMeetup_long_help_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/help/cancelMeetup_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/help/cancelMeetup_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/help/cancelMeetup_long_help.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/help/cancelMeetup_parameter_meetupId_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/help/cancelMeetup_parameter_meetupId.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/help/cancelMeetup_parameter_meetupId_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/help/cancelMeetup_parameter_meetupId.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/meetup_cancel_notification_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/meetup_cancel_notification_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/cancelMeetup/meetup_cancel_notification_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/cancelMeetup/meetup_cancel_notification_description.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/changeMeetup_response_text_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/changeMeetup_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/changeMeetup_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/changeMeetup_response_text.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_description.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_long_help_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_long_help.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_meetupId_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_meetupId.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_meetupId_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_meetupId.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_newValue_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_newValue.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_newValue_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_newValue.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_property_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_property.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_property_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_property.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_property_choice_DESCRIPTION_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_property_choice_DESCRIPTION.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_property_choice_DESCRIPTION_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_property_choice_DESCRIPTION.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_property_choice_LOCATION_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_property_choice_LOCATION.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_property_choice_LOCATION_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_property_choice_LOCATION.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_property_choice_TOPIC_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_property_choice_TOPIC.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetup/help/changeMeetup_parameter_property_choice_TOPIC_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetup/help/changeMeetup_parameter_property_choice_TOPIC.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_notification_text_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/changeMeetupTime_notification_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/changeMeetupTime_notification_text_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/changeMeetupTime_notification_text.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/help/changeMeetupTime_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/help/changeMeetupTime_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/help/changeMeetupTime_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/help/changeMeetupTime_description.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/help/changeMeetupTime_long_help_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/help/changeMeetupTime_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/help/changeMeetupTime_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/help/changeMeetupTime_long_help.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/help/changeMeetupTime_parameter_meetupId_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/help/changeMeetupTime_parameter_meetupId.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/help/changeMeetupTime_parameter_meetupId_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/help/changeMeetupTime_parameter_meetupId.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/help/changeMeetupTime_parameter_newTimeStamp_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/help/changeMeetupTime_parameter_newTimeStamp.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/changeMeetupTime/help/changeMeetupTime_parameter_newTimeStamp_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/changeMeetupTime/help/changeMeetupTime_parameter_newTimeStamp.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/createMeetup_cancel_button_label_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/createMeetup_cancel_button_label.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/createMeetup_cancel_button_label_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/createMeetup_cancel_button_label.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/createMeetup_confirm_button_label_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/createMeetup_confirm_button_label.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/createMeetup_confirm_button_label_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/createMeetup_confirm_button_label.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/createMeetup_confirmation_location_field_title_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/createMeetup_confirmation_location_field_title.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/createMeetup_confirmation_location_field_title_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/createMeetup_confirmation_location_field_title.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_description.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_long_help_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_long_help.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_parameter_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_parameter_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_parameter_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_parameter_description.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_parameter_location_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_parameter_location.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_parameter_location_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_parameter_location.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_parameter_meetupTime_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_parameter_meetupTime.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_parameter_meetupTime_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_parameter_meetupTime.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_parameter_topic_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_parameter_topic.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/createMeetup/help/createMeetup_parameter_topic_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/createMeetup/help/createMeetup_parameter_topic.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/listMeetups/help/listMeetups_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/help/listMeetups_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/listMeetups/help/listMeetups_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/help/listMeetups_description.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/listMeetups/help/listMeetups_long_help_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/help/listMeetups_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/listMeetups/help/listMeetups_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/help/listMeetups_long_help.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/listMeetups/meetup_list_meetup_display_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/meetup_list_meetup_display.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/listMeetups/meetup_list_meetup_display_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/meetup_list_meetup_display.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/listMeetups/meetup_list_no_meetups_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/meetup_list_no_meetups.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/listMeetups/meetup_list_no_meetups_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/listMeetups/meetup_list_no_meetups.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_description.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_long_help_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_long_help.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_MAYBE_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_MAYBE.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_MAYBE_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_MAYBE.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO_TIME_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO_TIME.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO_TIME_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_NO_TIME.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_YES_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_YES.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_YES_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_decision_choice_YES.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_meetupId_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_meetupId.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_meetupId_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_meetupId.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_notificationMessage_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_notificationMessage.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_notificationMessage_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/help/notifyMeetupParticipants_parameter_notificationMessage.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_text_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/commands/notifyMeetupParticipants/notifyMeetupParticipants_response_text.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/config/feature_meetup_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/config/feature_meetup.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/config/feature_meetup_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/config/feature_meetup.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/exception/meetup_in_past_exception_message_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/exception/meetup_in_past_exception_message.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/exception/meetup_in_past_exception_message_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/exception/meetup_in_past_exception_message.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/exception/meetup_not_found_exception_message_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/exception/meetup_not_found_exception_message.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/exception/meetup_not_found_exception_message_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/exception/meetup_not_found_exception_message.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/exception/meetup_not_organizer_exception_message_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/exception/meetup_not_organizer_exception_message.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/exception/meetup_not_organizer_exception_message_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/exception/meetup_not_organizer_exception_message.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_display_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_display_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_display_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_display_description.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_ics_file_name_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_ics_file_name.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_ics_file_name_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_ics_file_name.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_id_display_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_id_display.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_id_display_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_id_display.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_location_button_label_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_location_button_label.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_location_button_label_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_location_button_label.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_maybe_button_label_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_maybe_button_label.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_maybe_button_label_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_maybe_button_label.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_no_button_label_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_no_button_label.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_no_button_label_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_no_button_label.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_no_member_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_no_member.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_no_member_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_no_member.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_no_time_button_label_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_no_time_button_label.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_no_time_button_label_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_no_time_button_label.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_yes_button_label_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_yes_button_label.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_message_yes_button_label_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_message_yes_button_label.ftl diff --git a/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_reminder_notification_description_en_US.ftl b/templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_reminder_notification_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/meetup-translations/src/main/resources/en_US/general/meetup_reminder_notification_description_en_US.ftl rename to templates/sissi-translations/module-translations/meetup-translations/src/main/resources/default/general/meetup_reminder_notification_description.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/addWeeklyText/addWeeklyText_response_text_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/addWeeklyText/addWeeklyText_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/addWeeklyText/addWeeklyText_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/addWeeklyText/addWeeklyText_response_text.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/addWeeklyText/help/addWeeklyText_description_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/addWeeklyText/help/addWeeklyText_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/addWeeklyText/help/addWeeklyText_description_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/addWeeklyText/help/addWeeklyText_description.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/addWeeklyText/help/addWeeklyText_long_help_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/addWeeklyText/help/addWeeklyText_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/addWeeklyText/help/addWeeklyText_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/addWeeklyText/help/addWeeklyText_long_help.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/addWeeklyText/help/addWeeklyText_parameter_text_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/addWeeklyText/help/addWeeklyText_parameter_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/addWeeklyText/help/addWeeklyText_parameter_text_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/addWeeklyText/help/addWeeklyText_parameter_text.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/removeWeeklyText/help/removeWeeklyText_description_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/removeWeeklyText/help/removeWeeklyText_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/removeWeeklyText/help/removeWeeklyText_description_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/removeWeeklyText/help/removeWeeklyText_description.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/removeWeeklyText/help/removeWeeklyText_long_help_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/removeWeeklyText/help/removeWeeklyText_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/removeWeeklyText/help/removeWeeklyText_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/removeWeeklyText/help/removeWeeklyText_long_help.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/removeWeeklyText/help/removeWeeklyText_parameter_id_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/removeWeeklyText/help/removeWeeklyText_parameter_id.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/removeWeeklyText/help/removeWeeklyText_parameter_id_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/removeWeeklyText/help/removeWeeklyText_parameter_id.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/removeWeeklyText/removeWeeklyText_response_text_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/removeWeeklyText/removeWeeklyText_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/removeWeeklyText/removeWeeklyText_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/removeWeeklyText/removeWeeklyText_response_text.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/help/showWeeklyTexts_description_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/help/showWeeklyTexts_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/help/showWeeklyTexts_description_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/help/showWeeklyTexts_description.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/help/showWeeklyTexts_long_help_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/help/showWeeklyTexts_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/help/showWeeklyTexts_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/help/showWeeklyTexts_long_help.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/help/showWeeklyTexts_parameter_showAll_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/help/showWeeklyTexts_parameter_showAll.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/help/showWeeklyTexts_parameter_showAll_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/help/showWeeklyTexts_parameter_showAll.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_text_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_text_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_no_items_found_text.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_response_text_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/commands/showWeeklyTexts/showWeeklyTexts_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/commands/showWeeklyTexts/showWeeklyTexts_response_text.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/config/feature_weeklyText_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/config/feature_weeklyText.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/config/feature_weeklyText_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/config/feature_weeklyText.ftl diff --git a/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/job/weekly_text_item_post_text_en_US.ftl b/templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/job/weekly_text_item_post_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/en_US/job/weekly_text_item_post_text_en_US.ftl rename to templates/sissi-translations/module-translations/miepscord-translations/src/main/resources/default/job/weekly_text_item_post_text.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/help/quote_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/help/quote_description.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/help/quote_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/help/quote_long_help.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_parameter_member_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/help/quote_parameter_member.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_parameter_member_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/help/quote_parameter_member.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_adder_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_default_adder_name.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_adder_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_default_adder_name.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_author_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_default_author_name.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_author_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_default_author_name.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_channel_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_default_channel_name.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_channel_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_default_channel_name.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_description.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_footer_adder_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_footer_adder_name.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_footer_adder_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_footer_adder_name.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_header_author_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_header_author_name.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_header_author_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quote/quote_response_header_author_name.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/help/quoteDelete_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/help/quoteDelete_description.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/help/quoteDelete_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/help/quoteDelete_long_help.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_parameter_quoteId_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/help/quoteDelete_parameter_quoteId.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_parameter_quoteId_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/help/quoteDelete_parameter_quoteId.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/quoteDelete_confirmation_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/quoteDelete_confirmation.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/quoteDelete_confirmation_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/quoteDelete_confirmation.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/quoteDelete_response_text_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/quoteDelete_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/quoteDelete_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteDelete/quoteDelete_response_text.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteGet/help/quoteGet_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteGet/help/quoteGet_description.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteGet/help/quoteGet_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteGet/help/quoteGet_long_help.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_parameter_quoteId_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteGet/help/quoteGet_parameter_quoteId.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_parameter_quoteId_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteGet/help/quoteGet_parameter_quoteId.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteSearch/help/quoteSearch_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteSearch/help/quoteSearch_description.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteSearch/help/quoteSearch_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteSearch/help/quoteSearch_long_help.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_parameter_member_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteSearch/help/quoteSearch_parameter_member.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_parameter_member_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteSearch/help/quoteSearch_parameter_member.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_parameter_query_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteSearch/help/quoteSearch_parameter_query.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_parameter_query_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteSearch/help/quoteSearch_parameter_query.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteStats/help/quoteStats_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteStats/help/quoteStats_description.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteStats/help/quoteStats_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteStats/help/quoteStats_long_help.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_parameter_member_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteStats/help/quoteStats_parameter_member.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_parameter_member_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteStats/help/quoteStats_parameter_member.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/quoteStats_response_message_text_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteStats/quoteStats_response_message_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/quoteStats_response_message_text_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/commands/quoteStats/quoteStats_response_message_text.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/feature_quotes_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/config/feature_quotes.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/feature_quotes_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/config/feature_quotes.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/feature_starboardQuoteSync_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/config/feature_starboardQuoteSync.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/feature_starboardQuoteSync_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/config/feature_starboardQuoteSync.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/module_quotes_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/config/module_quotes_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/module_quotes_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/config/module_quotes_description.ftl diff --git a/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/exceptions/quote_not_found_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/exceptions/quote_not_found_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/exceptions/quote_not_found_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/default/exceptions/quote_not_found_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategory/createNewsCategory_response_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategory/createNewsCategory_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategory/createNewsCategory_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategory/createNewsCategory_response_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategory/help/createNewsCategory_description_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategory/help/createNewsCategory_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategory/help/createNewsCategory_description_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategory/help/createNewsCategory_description.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategory/help/createNewsCategory_long_help_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategory/help/createNewsCategory_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategory/help/createNewsCategory_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategory/help/createNewsCategory_long_help.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategory/help/createNewsCategory_parameter_categoryName_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategory/help/createNewsCategory_parameter_categoryName.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategory/help/createNewsCategory_parameter_categoryName_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategory/help/createNewsCategory_parameter_categoryName.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/createNewsCategoryChannelMapping_response_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_description_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_description_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_description.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_long_help_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_long_help.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_categoryName_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_categoryName.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_categoryName_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_categoryName.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_channel_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_channel.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_channel_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategoryChannelMapping/help/createNewsCategoryChannelMapping_parameter_channel.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/createNewsCategorySubscription_response_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_description_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_description_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_description.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_long_help_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_long_help.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_categoryName_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_categoryName.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_categoryName_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_categoryName.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_newsFeed_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_newsFeed.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_newsFeed_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_newsFeed.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_sourceCategory_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_sourceCategory.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_sourceCategory_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/createNewsCategorySubscription/help/createNewsCategorySubscription_parameter_sourceCategory.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategory/deleteNewsCategory_response_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategory/deleteNewsCategory_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategory/deleteNewsCategory_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategory/deleteNewsCategory_response_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategory/help/deleteNewsCategory_description_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategory/help/deleteNewsCategory_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategory/help/deleteNewsCategory_description_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategory/help/deleteNewsCategory_description.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategory/help/deleteNewsCategory_long_help_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategory/help/deleteNewsCategory_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategory/help/deleteNewsCategory_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategory/help/deleteNewsCategory_long_help.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategory/help/deleteNewsCategory_parameter_categoryName_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategory/help/deleteNewsCategory_parameter_categoryName.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategory/help/deleteNewsCategory_parameter_categoryName_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategory/help/deleteNewsCategory_parameter_categoryName.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/deleteNewsCategoryChannelMapping_response_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_description_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_description_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_description.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_long_help_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_long_help.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_categoryName_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_categoryName.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_categoryName_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_categoryName.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_channel_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_channel.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_channel_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategoryChannelMapping/help/deleteNewsCategoryChannelMapping_parameter_channel.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/deleteNewsCategorySubscription_response_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_description_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_description_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_description.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_long_help_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_long_help.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_categoryName_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_categoryName.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_categoryName_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_categoryName.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_newsFeed_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_newsFeed.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_newsFeed_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_newsFeed.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_sourceCategory_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_sourceCategory.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_sourceCategory_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/deleteNewsCategorySubscription/help/deleteNewsCategorySubscription_parameter_sourceCategory.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/help/showNewsCategories_description_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/help/showNewsCategories_description.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/help/showNewsCategories_description_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/help/showNewsCategories_description.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/help/showNewsCategories_long_help_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/help/showNewsCategories_long_help.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/help/showNewsCategories_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/help/showNewsCategories_long_help.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_category_display_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_category_display.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_category_display_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_category_display.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_mapping_display_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_mapping_display.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_mapping_display_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_mapping_display.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_no_categories_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_no_categories.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_no_categories_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_no_categories.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_no_mappings_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_no_mappings.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_no_mappings_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_no_mappings.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_no_subscriptions_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_no_subscriptions.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_no_subscriptions_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_no_subscriptions.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_subscription_display_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_subscription_display.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/commands/showNewsCategories/showNewsCategories_subscription_display_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/commands/showNewsCategories/showNewsCategories_subscription_display.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/config/feature_orfNews_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/config/feature_orfNews.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/config/feature_orfNews_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/config/feature_orfNews.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/config/feature_rssNews_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/config/feature_rssNews.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/config/feature_rssNews_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/config/feature_rssNews.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_category_already_exists_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_category_already_exists_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_category_already_exists_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_category_already_exists_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_category_channel_mapping_already_exists_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_category_channel_mapping_already_exists_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_category_channel_mapping_already_exists_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_category_channel_mapping_already_exists_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_category_channel_mapping_not_found_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_category_channel_mapping_not_found_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_category_channel_mapping_not_found_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_category_channel_mapping_not_found_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_category_not_found_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_category_not_found_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_category_not_found_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_category_not_found_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_feed_source_category_not_found_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_feed_source_category_not_found_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_feed_source_category_not_found_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_feed_source_category_not_found_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_feed_source_category_subscription_already_exists_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_feed_source_category_subscription_already_exists_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_feed_source_category_subscription_already_exists_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_feed_source_category_subscription_already_exists_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_feed_source_category_subscription_not_found_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_feed_source_category_subscription_not_found_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_feed_source_category_subscription_not_found_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_feed_source_category_subscription_not_found_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_feed_source_not_found_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_feed_source_not_found_exception_text.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/exceptions/news_feed_source_not_found_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/exceptions/news_feed_source_not_found_exception_text.ftl diff --git a/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/orf/job/orf_news_post_author_en_US.ftl b/templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/orf/job/orf_news_post_author.ftl similarity index 100% rename from templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/en_US/orf/job/orf_news_post_author_en_US.ftl rename to templates/sissi-translations/module-translations/rss-news-translations/src/main/resources/default/orf/job/orf_news_post_author.ftl diff --git a/templates/sissi-translations/translation-overrides/experience-translation-overrides/src/main/resources/de_DE/action/level_action_send_message_to_channel_above_level_r+_message_en_US.ftl b/templates/sissi-translations/translation-overrides/experience-translation-overrides/src/main/resources/de_DE/action/level_action_send_message_to_channel_above_level_r+_message.ftl similarity index 100% rename from templates/sissi-translations/translation-overrides/experience-translation-overrides/src/main/resources/de_DE/action/level_action_send_message_to_channel_above_level_r+_message_en_US.ftl rename to templates/sissi-translations/translation-overrides/experience-translation-overrides/src/main/resources/de_DE/action/level_action_send_message_to_channel_above_level_r+_message.ftl diff --git a/templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/ban/commands/ban_notification_text_en_US.ftl b/templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/default/ban/commands/ban_notification_text.ftl similarity index 100% rename from templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/ban/commands/ban_notification_text_en_US.ftl rename to templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/default/ban/commands/ban_notification_text.ftl diff --git a/templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/listener/reactionReport/reaction_report_custom_text_en_US.ftl b/templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/default/listener/reactionReport/reaction_report_custom_text.ftl similarity index 100% rename from templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/listener/reactionReport/reaction_report_custom_text_en_US.ftl rename to templates/sissi-translations/translation-overrides/moderation-translation-overrides/src/main/resources/default/listener/reactionReport/reaction_report_custom_text.ftl