This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit db4e0284 authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

Fixing Info Email Content

parent 1a48b7a4
Branches
Tags
2 merge requests!55June Release,!52Resolve "Extend Bookmarklists and implement stored searches"
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 29645 additions and 38 deletions
.settings/org.eclipse.core.resources.prefs
+ 1
− 0
View file @ db4e0284
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/main/resources/i18n/messages_de.properties=UTF-8
encoding//src/main/webapp/i18n/de/checkFrequency.json=UTF-8
encoding//src/main/webapp/i18n/de/exercise.json=UTF-8
encoding//src/main/webapp/i18n/de/global.json=UTF-8
......
package-lock.json
+ 29610
− 22
View file @ db4e0284
This diff is collapsed.
src/main/java/at/ac/uibk/gitsearch/service/UserWatchListService.java
+ 0
− 1
View file @ db4e0284
......@@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.codeability.sharing.plugins.api.search.SearchResultDTO;
......
src/main/java/at/ac/uibk/gitsearch/web/rest/TestResource.java → src/main/java/at/ac/uibk/gitsearch/web/rest/CheckResource.java
+ 3
− 3
View file @ db4e0284
......@@ -18,16 +18,16 @@ import at.ac.uibk.gitsearch.service.dto.MessageDTO;
*/
@RestController
@RequestMapping("/api")
public class TestResource {
public class CheckResource {
private final Logger log = LoggerFactory.getLogger(TestResource.class);
private final Logger log = LoggerFactory.getLogger(CheckResource.class);
private final MailService mailService;
@SuppressWarnings("unused")
private final TokenProvider tokenProvider;
private final UserService userService;
public TestResource(MailService mailService,
public CheckResource(MailService mailService,
TokenProvider tokenProvider, UserService userService
) {
this.mailService = mailService;
......
src/main/resources/i18n/messages_de.properties
+ 8
− 0
View file @ db4e0284
......@@ -19,3 +19,11 @@ email.reset.title=gitsearch Passwort zurücksetzen
email.reset.greeting=Liebe(r) {0}
email.reset.text1=Für Ihren gitsearch Account wurde ein neues Passwort angefordert, bitte klicken Sie unten auf den Link, um das Passwort zurückzusetzen:
email.reset.text2=Grüße,
# Info email
email.info.title=Austausch Plattform: Aktualisierungsinformation
email.info.greeting=Sehr geehrter Nutzer,
email.info.textIntro=Diese E-Mail wurde versandt, da sich Inhalte in der Plattform, die Sie beobachten, geändert haben.
email.info.textWatchlist=Einige Aufgabe auf Ihrer Lesezeichenliste wurden k�rzlich aktualisiert:
email.info.noChangesOnWatchlist=Es gab keine Änderungen auf Ihren Lesezeichenliste seit dem letzten Email-Versand.
email.info.textRegards=Mit besten Grüßen,
email.info.textClosing=Falls Sie diese Mail nicht mehr erhalten wollen, loggen Sie sich bitte auf der Austauschplattform ein und passen Sie Ihre Einstellungen an:
src/main/resources/i18n/messages_en.properties
+ 5
− 4
View file @ db4e0284
......@@ -9,7 +9,7 @@ email.activation.title=gitsearch account activation
email.activation.greeting=Dear {0}
email.activation.text1=Your gitsearch account has been created, please click on the URL below to activate it:
email.activation.text2=Regards,
email.signature=gitsearch Team.
email.signature=Your CodeAbility Sharing Platform Service Team
# Creation email
email.creation.text1=Your gitsearch account has been created, please click on the URL below to access it:
......@@ -22,9 +22,10 @@ email.reset.text2=Regards,
# Info email
email.info.title=Sharing Platform: Update Mail
email.info.greeting=Dear {0}
email.info.textIntro=You get this e-mail, because one of your automatic checks was triggered.
email.info.textWatchList=Some exercises on your watchlist were recently updated:
email.info.greeting=Dear {0} {1},
email.info.textIntro=You get this e-mail, because some of your automatic checks was triggered.
email.info.textWatchlist=Some exercises on your watchlist were recently updated:
email.info.noChangesOnWatchlist=There were no changes on your watchlists
email.info.textRegards=Regards,
email.info.textClosing=If you are not interested in getting this e-mail, please log in to the CodeAbility Sharing Platform, and reset your update triggers:
......
src/main/resources/templates/mail/info/infoEmail.html
+ 12
− 8
View file @ db4e0284
......@@ -6,7 +6,7 @@
<link rel="icon" th:href="@{|${baseUrl}/favicon.ico|}" />
</head>
<body>
<p th:text="#{email.info.greeting(${user.login})}">
<p th:text="#{email.info.greeting(null == ${user.firstName}?'':${user.firstName}, ${user.lastName})}">
Dear participant,
</p>
<p th:text="#{email.info.textIntro}">
......@@ -15,7 +15,9 @@
<p th:text="#{email.info.textWatchlist}">
Some exercises on your watchlist were recently updated:
</p>
<table><caption>Updated Exercises</caption><tr><th scope="col">Exercise Name</th><th scope="col">Watchlist</th></tr>
<p th:if="${#lists.isEmpty(watchListUpdates)}" th:text="#{email.info.noChangesOnWatchlist}">There were no changes on your watchlists</p>
<table th:if="${not #lists.isEmpty(watchListUpdates)}"><caption>Updated Exercises</caption><tr><th scope="col">Exercise Name</th><th scope="col">Watchlist</th></tr>
<tr th:each="wlUpdate: ${watchListUpdates}">
<td><span th:text="${wlUpdate.key.metadata.title}"></span><span th:text="${#temporals.format(wlUpdate.key.project.last_activity_at,'dd MMMM yyyy')}">Exercise title</span></td>
<td th:text="${wlUpdate.value.name}">Exercise title</td>
......@@ -23,13 +25,15 @@
</table>
<p>
<a th:with="url=(@{|${baseUrl}/account/activate?key=${user.activationKey}|})" th:href="${url}"
th:text="${url}">Activation link</a>
</p>
<p>
<span th:text="#{email.activation.textRegards}">Regards, </span>
<span th:text="#{email.info.textRegards}">Regards, </span>
<br/>
<em th:text="#{email.signature}">You CodeAbility Sharing Platform Service Team.</em>
<em th:text="#{email.signature}">Your CodeAbility Sharing Platform Service Team.</em>
</p>
<br/><br/>
<p><span th:text="#{email.info.textClosing}">
If you are not interested in getting this e-mail, please log in to the CodeAbility Sharing Platform, and reset your update triggers
</span> <a th:with="url=(@{|${baseUrl}|})" th:href="${url}" th:text="${url}">Link to the Sharing Plattform</a>
</p>
</body>
</html>
src/test/resources/i18n/messages_en.properties
+ 6
− 0
View file @ db4e0284
......@@ -5,4 +5,10 @@ email.activation.title=gitsearch account activation
# Info email
email.info.title=Sharing Platform: Update Mail
email.info.greeting=Dear user,
email.info.textIntro=You get this e-mail, because some of your automatic checks was triggered.
email.info.textWatchlist=Some exercises on your watchlist were recently updated:
email.info.noChangesOnWatchlist=There were no changes on your watchlists
email.info.textRegards=Regards,
email.info.textClosing=If you are not interested in getting this e-mail, please log in to the CodeAbility Sharing Platform, and reset your update triggers:
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment