From cb1abaed7d7ede4b1d0bb1c681afa852cabdadc2 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Wed, 13 May 2020 17:45:55 +0200 Subject: [PATCH] moved some more templates to template config fixed usage of post target exceptions --- .../abstracto/modmail/service/ModMailThreadServiceBean.java | 4 ++-- .../templates/modmail/modmail_thread_header_embed_en_US.ftl | 2 +- .../listener/starboard/starboard_post_embed_en_US.ftl | 2 +- .../abstracto/core/service/PostTargetServiceBean.java | 5 +++-- .../core/service/management/PostTargetManagementBean.java | 4 ++-- .../templates/exceptions/command_not_found_en_US.ftl | 2 +- .../templates/exceptions/feature_disabled_message_en_US.ftl | 2 +- .../templates/exceptions/feature_not_found_en_US.ftl | 2 +- .../seedData/templates/exceptions/immune_role_en_US.ftl | 2 +- .../templates/exceptions/incorrect_parameters_en_US.ftl | 2 +- .../templates/exceptions/insufficient_parameters_en_US.ftl | 2 +- .../templates/exceptions/insufficient_role_en_US.ftl | 2 +- .../templates/exceptions/parameter_too_long_en_US.ftl | 2 +- .../core/exception/PostTargetNotFoundException.java | 5 +---- .../core/exception/PostTargetNotValidException.java | 6 +++++- .../templates/en_US}/config/core_feature_en_US.ftl | 0 .../templates/en_US}/config/link_embeds_feature_en_US.ftl | 0 .../templates/en_US}/config/remind_feature_en_US.ftl | 0 .../templates/en_US}/config/starboard_feature_en_US.ftl | 0 .../templates/en_US}/config/suggestion_feature_en_US.ftl | 0 .../templates/en_US}/config/utility_feature_en_US.ftl | 0 .../templates/en_US/general/embed_page_count_page_en_US.ftl | 1 + .../general/exception/command_not_found_text_en_US.ftl | 1 + .../en_US/general/exception/feature_disabled_text_en_US.ftl | 1 + .../general/exception/feature_not_found_text_en_US.ftl | 1 + .../en_US/general/exception/immune_role_text_en_US.ftl | 1 + .../general/exception/incorrect_parameters_text_en_US.ftl | 1 + .../exception/insufficient_parameters_text_en_US.ftl | 1 + .../general/exception/insufficient_role_text_en_US.ftl | 1 + .../general/exception/parameter_too_long_text_en_US.ftl | 1 + .../notification/modmail_thread_header_no_roles_en_US.ftl | 1 + .../resources/templates/embeds/embed_page_count_en_US.ftl | 2 +- 32 files changed, 34 insertions(+), 22 deletions(-) rename abstracto-application/{core/core-impl/src/main/resources/seedData/templates => template-config/src/main/resources/templates/en_US}/config/core_feature_en_US.ftl (100%) rename abstracto-application/{abstracto-modules/utility/utility-impl/src/main/resources/templates => template-config/src/main/resources/templates/en_US}/config/link_embeds_feature_en_US.ftl (100%) rename abstracto-application/{abstracto-modules/utility/utility-impl/src/main/resources/templates => template-config/src/main/resources/templates/en_US}/config/remind_feature_en_US.ftl (100%) rename abstracto-application/{abstracto-modules/utility/utility-impl/src/main/resources/templates => template-config/src/main/resources/templates/en_US}/config/starboard_feature_en_US.ftl (100%) rename abstracto-application/{abstracto-modules/utility/utility-impl/src/main/resources/templates => template-config/src/main/resources/templates/en_US}/config/suggestion_feature_en_US.ftl (100%) rename abstracto-application/{abstracto-modules/utility/utility-impl/src/main/resources/templates => template-config/src/main/resources/templates/en_US}/config/utility_feature_en_US.ftl (100%) create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/general/embed_page_count_page_en_US.ftl create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/command_not_found_text_en_US.ftl create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_disabled_text_en_US.ftl create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_not_found_text_en_US.ftl create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/immune_role_text_en_US.ftl create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/incorrect_parameters_text_en_US.ftl create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_parameters_text_en_US.ftl create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_role_text_en_US.ftl create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/parameter_too_long_text_en_US.ftl create mode 100644 abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_thread_header_no_roles_en_US.ftl diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java index a5a28e316..b4913fc97 100644 --- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java +++ b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java @@ -3,7 +3,7 @@ package dev.sheldan.abstracto.modmail.service; import com.jagrosh.jdautilities.commons.waiter.EventWaiter; import com.jagrosh.jdautilities.menu.ButtonMenu; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; -import dev.sheldan.abstracto.core.exception.PostTargetNotValidException; +import dev.sheldan.abstracto.core.exception.PostTargetNotFoundException; import dev.sheldan.abstracto.core.models.FullGuild; import dev.sheldan.abstracto.core.models.FullUser; import dev.sheldan.abstracto.core.models.UndoActionInstance; @@ -398,7 +398,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { log.error("Failed to log messages for mod mail thread {}.", modMailThreadId, innerThrowable); return null; }); - } catch (PostTargetNotValidException po) { + } catch (PostTargetNotFoundException po) { log.error("Failed to log mod mail messages", po); sendModMailFailure("modmail_exception_post_target_not_defined", innerModMailThread.getUser(), modMailThreadId, feedBack, po); } catch (Exception e) { diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_thread_header_embed_en_US.ftl b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_thread_header_embed_en_US.ftl index 389f988c1..906afa4fd 100644 --- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_thread_header_embed_en_US.ftl +++ b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_thread_header_embed_en_US.ftl @@ -10,6 +10,6 @@ }, <#assign user>${threadUser.member.effectiveName}#${threadUser.member.user.discriminator} (${threadUser.member.user.id}) <#assign joinDate>${threadUser.member.timeJoined} - <#assign roles><#list threadUser.member.roles as role>${role.asMention}<#sep>,<#else>No roles + <#assign roles><#list threadUser.member.roles as role>${role.asMention}<#sep>,<#else><#include "modmail_thread_header_no_roles"> "description": "<#include "modmail_thread_header_embed_description">" } \ No newline at end of file diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/listener/starboard/starboard_post_embed_en_US.ftl b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/listener/starboard/starboard_post_embed_en_US.ftl index 6f1e8e7e1..4d7e7ad28 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/listener/starboard/starboard_post_embed_en_US.ftl +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/listener/starboard/starboard_post_embed_en_US.ftl @@ -4,7 +4,7 @@ "name": "${author.effectiveName}", "avatar": "${author.user.effectiveAvatarUrl}" <#else> - "name": "${user.id?c} (Has left the server)" + "name": "${user.id?c} (<#include "user_left_server">)" }, "color" : { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java index 0f2530253..ccebce58e 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java @@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.service; import dev.sheldan.abstracto.core.config.DynamicKeyLoader; import dev.sheldan.abstracto.core.exception.ChannelNotFoundException; import dev.sheldan.abstracto.core.exception.GuildException; +import dev.sheldan.abstracto.core.exception.PostTargetNotFoundException; import dev.sheldan.abstracto.core.exception.PostTargetNotValidException; import dev.sheldan.abstracto.core.service.management.PostTargetManagement; import dev.sheldan.abstracto.core.models.database.PostTarget; @@ -70,7 +71,7 @@ public class PostTargetServiceBean implements PostTargetService { return postTarget; } else { log.error("PostTarget {} in server {} was not found!", postTargetName, serverId); - throw new PostTargetNotValidException(postTargetName); + throw new PostTargetNotFoundException(postTargetName); } } @@ -171,7 +172,7 @@ public class PostTargetServiceBean implements PostTargetService { public void throwIfPostTargetIsNotDefined(String name, Long serverId) { PostTarget postTarget = postTargetManagement.getPostTarget(name, serverId); if(postTarget == null) { - throw new PostTargetNotValidException(name); + throw new PostTargetNotValidException(name, dynamicKeyLoader.getPostTargetsAsList()); } } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagementBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagementBean.java index e5c4ec41e..8f383d808 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagementBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagementBean.java @@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service.management; import dev.sheldan.abstracto.core.config.DynamicKeyLoader; import dev.sheldan.abstracto.core.exception.ChannelNotFoundException; -import dev.sheldan.abstracto.core.exception.PostTargetNotFoundException; +import dev.sheldan.abstracto.core.exception.PostTargetNotValidException; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.PostTarget; @@ -36,7 +36,7 @@ public class PostTargetManagementBean implements PostTargetManagement { @Override public PostTarget createPostTarget(String name, AServer server, AChannel targetChannel) { if(!postTargetService.validPostTarget(name)) { - throw new PostTargetNotFoundException(name, dynamicKeyLoader.getPostTargetsAsList()); + throw new PostTargetNotValidException(name, dynamicKeyLoader.getPostTargetsAsList()); } log.info("Creating post target {} pointing towards {}", name, targetChannel); PostTarget build = PostTarget.builder().name(name).channelReference(targetChannel).serverReference(server).build(); diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/command_not_found_en_US.ftl b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/command_not_found_en_US.ftl index 508de0b6d..4c0fe28fb 100644 --- a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/command_not_found_en_US.ftl +++ b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/command_not_found_en_US.ftl @@ -1 +1 @@ -Command was not found. \ No newline at end of file +<#include "command_not_found_text"> \ No newline at end of file diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_disabled_message_en_US.ftl b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_disabled_message_en_US.ftl index e33339344..c52561da6 100644 --- a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_disabled_message_en_US.ftl +++ b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_disabled_message_en_US.ftl @@ -1 +1 @@ -Feature has been disabled. Necessary feature is: <#include "${featureConfig.feature.key}_feature">, you can enable it by executing `enable ${featureConfig.feature.key}`. \ No newline at end of file +<#assign featureName><#include "${featureConfig.feature.key}_feature"><#assign featureKey>${featureConfig.feature.key}<#include "feature_disabled_text"> \ No newline at end of file diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_not_found_en_US.ftl b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_not_found_en_US.ftl index 1453fdd0d..7e62b620b 100644 --- a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_not_found_en_US.ftl +++ b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_not_found_en_US.ftl @@ -1 +1 @@ -Feature ${featureName} not available. The available features are: ${availableFeatures?join(", ")} \ No newline at end of file +<#assign availableFeatures>${availableFeatures?join(", ")}<#include "feature_not_found_text"> \ No newline at end of file diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/immune_role_en_US.ftl b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/immune_role_en_US.ftl index a6d61cd20..ebcc7d2f7 100644 --- a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/immune_role_en_US.ftl +++ b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/immune_role_en_US.ftl @@ -1 +1 @@ -The targeted user is immune against this command, because of the role: ${role.name}. \ No newline at end of file +<#assign roleName>${role.name} <#include "immune_role_text"> \ No newline at end of file diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/incorrect_parameters_en_US.ftl b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/incorrect_parameters_en_US.ftl index f6dd7cdd4..5f1c3978c 100644 --- a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/incorrect_parameters_en_US.ftl +++ b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/incorrect_parameters_en_US.ftl @@ -1 +1 @@ -The necessary parameters were not found. A '${class.simpleName}' was expected as '${parameterName}'. Consult help to see the correct syntax. \ No newline at end of file +<#assign expectedType>${class.simpleName}<#include "incorrect_parameters_text"> \ No newline at end of file diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_parameters_en_US.ftl b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_parameters_en_US.ftl index 0d58143cd..2685882e7 100644 --- a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_parameters_en_US.ftl +++ b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_parameters_en_US.ftl @@ -1 +1 @@ -Insufficient parameters: ${parameterName} was not found. \ No newline at end of file +<#include "insufficient_parameters_text"> \ No newline at end of file diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_role_en_US.ftl b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_role_en_US.ftl index a7d9d58dd..d9668e70e 100644 --- a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_role_en_US.ftl +++ b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_role_en_US.ftl @@ -1 +1 @@ -You lack the necessary role to execute this command. One of the following is needed: <#list allowedRoles as role>${role.name}<#sep>,<#else>None configured. \ No newline at end of file +<#assign roles><#list allowedRoles as role>${role.name}<#sep>,<#else>None configured.<#include "insufficient_role_text"> \ No newline at end of file diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/parameter_too_long_en_US.ftl b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/parameter_too_long_en_US.ftl index 013e2ea27..08e25aa74 100644 --- a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/parameter_too_long_en_US.ftl +++ b/abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/parameter_too_long_en_US.ftl @@ -1 +1 @@ -The parameter ${parameterName} had a too large value: ${actualLength}. The maximum is: ${maximumLength}. \ No newline at end of file +<#include "parameter_too_long_text"> \ No newline at end of file diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotFoundException.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotFoundException.java index b3f0921e3..48e99230e 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotFoundException.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotFoundException.java @@ -8,12 +8,10 @@ import java.util.List; public class PostTargetNotFoundException extends AbstractoRunTimeException implements Templatable { private String postTargetKey; - private List availableTargets; - public PostTargetNotFoundException(String key, List available) { + public PostTargetNotFoundException(String key) { super(""); this.postTargetKey = key; - this.availableTargets = available; } @Override @@ -25,7 +23,6 @@ public class PostTargetNotFoundException extends AbstractoRunTimeException imple public Object getTemplateModel() { HashMap param = new HashMap<>(); param.put("key", this.postTargetKey); - param.put("available", String.join(",", this.availableTargets)); return param; } } diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotValidException.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotValidException.java index e7acb2918..526f5a7a6 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotValidException.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotValidException.java @@ -3,14 +3,17 @@ package dev.sheldan.abstracto.core.exception; import dev.sheldan.abstracto.templating.Templatable; import java.util.HashMap; +import java.util.List; public class PostTargetNotValidException extends AbstractoRunTimeException implements Templatable { private String postTargetKey; + private List availableTargets; - public PostTargetNotValidException(String key) { + public PostTargetNotValidException(String key, List available) { super(""); this.postTargetKey = key; + this.availableTargets = available; } @Override @@ -22,6 +25,7 @@ public class PostTargetNotValidException extends AbstractoRunTimeException imple public Object getTemplateModel() { HashMap param = new HashMap<>(); param.put("key", this.postTargetKey); + param.put("available", String.join(",", this.availableTargets)); return param; } } diff --git a/abstracto-application/core/core-impl/src/main/resources/seedData/templates/config/core_feature_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/config/core_feature_en_US.ftl similarity index 100% rename from abstracto-application/core/core-impl/src/main/resources/seedData/templates/config/core_feature_en_US.ftl rename to abstracto-application/template-config/src/main/resources/templates/en_US/config/core_feature_en_US.ftl diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/link_embeds_feature_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/config/link_embeds_feature_en_US.ftl similarity index 100% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/link_embeds_feature_en_US.ftl rename to abstracto-application/template-config/src/main/resources/templates/en_US/config/link_embeds_feature_en_US.ftl diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/remind_feature_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/config/remind_feature_en_US.ftl similarity index 100% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/remind_feature_en_US.ftl rename to abstracto-application/template-config/src/main/resources/templates/en_US/config/remind_feature_en_US.ftl diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/starboard_feature_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/config/starboard_feature_en_US.ftl similarity index 100% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/starboard_feature_en_US.ftl rename to abstracto-application/template-config/src/main/resources/templates/en_US/config/starboard_feature_en_US.ftl diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/suggestion_feature_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/config/suggestion_feature_en_US.ftl similarity index 100% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/suggestion_feature_en_US.ftl rename to abstracto-application/template-config/src/main/resources/templates/en_US/config/suggestion_feature_en_US.ftl diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/utility_feature_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/config/utility_feature_en_US.ftl similarity index 100% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/config/utility_feature_en_US.ftl rename to abstracto-application/template-config/src/main/resources/templates/en_US/config/utility_feature_en_US.ftl diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/general/embed_page_count_page_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/general/embed_page_count_page_en_US.ftl new file mode 100644 index 000000000..d95c047ca --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/general/embed_page_count_page_en_US.ftl @@ -0,0 +1 @@ +Page ${count} \ No newline at end of file diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/command_not_found_text_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/command_not_found_text_en_US.ftl new file mode 100644 index 000000000..508de0b6d --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/command_not_found_text_en_US.ftl @@ -0,0 +1 @@ +Command was not found. \ No newline at end of file diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_disabled_text_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_disabled_text_en_US.ftl new file mode 100644 index 000000000..4e32f8875 --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_disabled_text_en_US.ftl @@ -0,0 +1 @@ +Feature has been disabled. Necessary feature is: ${featureName}, you can enable it by executing `enable ${featureKey}`. \ No newline at end of file diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_not_found_text_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_not_found_text_en_US.ftl new file mode 100644 index 000000000..ac25aec6e --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_not_found_text_en_US.ftl @@ -0,0 +1 @@ +Feature ${featureName} not available. The available features are: ${availableFeatures}. \ No newline at end of file diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/immune_role_text_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/immune_role_text_en_US.ftl new file mode 100644 index 000000000..914c2ba27 --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/immune_role_text_en_US.ftl @@ -0,0 +1 @@ +The targeted user is immune against this command, because of the role: ${roleName}. \ No newline at end of file diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/incorrect_parameters_text_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/incorrect_parameters_text_en_US.ftl new file mode 100644 index 000000000..92224eebe --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/incorrect_parameters_text_en_US.ftl @@ -0,0 +1 @@ +The necessary parameters were not found. A '${expectedType}' was expected as '${parameterName}'. Consult help to see the correct syntax. \ No newline at end of file diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_parameters_text_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_parameters_text_en_US.ftl new file mode 100644 index 000000000..0d58143cd --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_parameters_text_en_US.ftl @@ -0,0 +1 @@ +Insufficient parameters: ${parameterName} was not found. \ No newline at end of file diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_role_text_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_role_text_en_US.ftl new file mode 100644 index 000000000..89e79e86a --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_role_text_en_US.ftl @@ -0,0 +1 @@ +You lack the necessary role to execute this command. One of the following is needed: ${roles} \ No newline at end of file diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/parameter_too_long_text_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/parameter_too_long_text_en_US.ftl new file mode 100644 index 000000000..013e2ea27 --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/parameter_too_long_text_en_US.ftl @@ -0,0 +1 @@ +The parameter ${parameterName} had a too large value: ${actualLength}. The maximum is: ${maximumLength}. \ No newline at end of file diff --git a/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_thread_header_no_roles_en_US.ftl b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_thread_header_no_roles_en_US.ftl new file mode 100644 index 000000000..b860a5157 --- /dev/null +++ b/abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_thread_header_no_roles_en_US.ftl @@ -0,0 +1 @@ +No roles. \ No newline at end of file diff --git a/abstracto-application/templating/templating-impl/src/main/resources/templates/embeds/embed_page_count_en_US.ftl b/abstracto-application/templating/templating-impl/src/main/resources/templates/embeds/embed_page_count_en_US.ftl index d95c047ca..085e5e592 100644 --- a/abstracto-application/templating/templating-impl/src/main/resources/templates/embeds/embed_page_count_en_US.ftl +++ b/abstracto-application/templating/templating-impl/src/main/resources/templates/embeds/embed_page_count_en_US.ftl @@ -1 +1 @@ -Page ${count} \ No newline at end of file +<#include "embed_page_count_page"> \ No newline at end of file