From 91a0265e6e139abb8e976aa033c972d421c2ab70 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Wed, 25 Dec 2024 20:30:34 +0100 Subject: [PATCH] [SIS-xxx] updating abstracto version to contain the giveaway key features adding template for custom giveaway winner notification --- deployment/image-packaging/pom.xml | 10 ++++++ .../config/artifact_versions.json | 2 +- pom.xml | 4 +-- .../giveaway-translation-overrides/pom.xml | 36 +++++++++++++++++++ .../src/main/assembly/assembly.xml | 15 ++++++++ ...inner_modmail_notification_description.ftl | 5 +++ ...away_winner_modmail_notification_title.ftl | 1 + .../translation-overrides/pom.xml | 1 + 8 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 templates/sissi-translations/translation-overrides/giveaway-translation-overrides/pom.xml create mode 100644 templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/assembly/assembly.xml create mode 100644 templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/resources/de_DE/general/giveaway_winner_modmail_notification_description.ftl create mode 100644 templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/resources/de_DE/general/giveaway_winner_modmail_notification_title.ftl diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml index 5af43c26..1c7d6eb4 100644 --- a/deployment/image-packaging/pom.xml +++ b/deployment/image-packaging/pom.xml @@ -917,6 +917,16 @@ logging-translation-overrides.zip + + dev.sheldan.sissi.templates.translations.overrides + giveaway-translation-overrides + ${project.version} + zip + true + ${file.basedir}/template-data/translation-artifacts/ + giveaway-translation-overrides.zip + + diff --git a/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json b/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json index f9cf90c8..db928bd2 100644 --- a/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json +++ b/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json @@ -14,7 +14,7 @@ "image-generation", "quotes", "meetup", "debra", "rss-news", "miepscord", "moderation-custom", - "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides" + "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides", "giveaway-translation-overrides" ] } diff --git a/pom.xml b/pom.xml index 2e5a0a6d..1b652e39 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,8 @@ 17 17 - 1.5.54 - 1.4.47 + 1.5.55 + 1.4.48 4.9.0 3.5.0 diff --git a/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/pom.xml b/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/pom.xml new file mode 100644 index 00000000..3df1a9bb --- /dev/null +++ b/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/pom.xml @@ -0,0 +1,36 @@ + + + + dev.sheldan.sissi.templates.translations.overrides + translation-overrides + 1.4.68-SNAPSHOT + + 4.0.0 + + giveaway-translation-overrides + pom + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + giveaway-translation-overrides-${project.version} + false + + src/main/assembly/assembly.xml + + + + + + + + \ No newline at end of file diff --git a/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/assembly/assembly.xml b/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/assembly/assembly.xml new file mode 100644 index 00000000..aca1e510 --- /dev/null +++ b/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/assembly/assembly.xml @@ -0,0 +1,15 @@ + + zip + false + + zip + + + + . + ${project.basedir}/src/main/resources + + + \ No newline at end of file diff --git a/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/resources/de_DE/general/giveaway_winner_modmail_notification_description.ftl b/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/resources/de_DE/general/giveaway_winner_modmail_notification_description.ftl new file mode 100644 index 00000000..6257664f --- /dev/null +++ b/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/resources/de_DE/general/giveaway_winner_modmail_notification_description.ftl @@ -0,0 +1,5 @@ +Der key ist `${key}`. +Bitte antworte auf diese Nachricht um zu bestätigen, dass du den Key erhalten hast. +<#if description?has_content>Mehr details: ${description}. + +<#if benefactor?has_content>Der Key wurde gesponsert von: ${benefactor} \ No newline at end of file diff --git a/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/resources/de_DE/general/giveaway_winner_modmail_notification_title.ftl b/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/resources/de_DE/general/giveaway_winner_modmail_notification_title.ftl new file mode 100644 index 00000000..4c272d66 --- /dev/null +++ b/templates/sissi-translations/translation-overrides/giveaway-translation-overrides/src/main/resources/de_DE/general/giveaway_winner_modmail_notification_title.ftl @@ -0,0 +1 @@ +🎉 Glückwunsch! Du hast ${title} gewonnen. 🎉 \ No newline at end of file diff --git a/templates/sissi-translations/translation-overrides/pom.xml b/templates/sissi-translations/translation-overrides/pom.xml index 705547d7..b29920b2 100644 --- a/templates/sissi-translations/translation-overrides/pom.xml +++ b/templates/sissi-translations/translation-overrides/pom.xml @@ -15,6 +15,7 @@ moderation-translation-overrides experience-translation-overrides logging-translation-overrides + giveaway-translation-overrides \ No newline at end of file