diff --git a/src/main/java/org/olat/commons/info/notification/InfoMessageNotificationHandler.java b/src/main/java/org/olat/commons/info/notification/InfoMessageNotificationHandler.java index f45963275b622e86e99bfb81294e9c3a131ae154..7bd42ab34e0c6b8a2ade2031bb8b733c6e40d389 100644 --- a/src/main/java/org/olat/commons/info/notification/InfoMessageNotificationHandler.java +++ b/src/main/java/org/olat/commons/info/notification/InfoMessageNotificationHandler.java @@ -26,6 +26,7 @@ import java.util.Locale; import org.olat.commons.info.manager.InfoMessageManager; import org.olat.commons.info.model.InfoMessage; +import org.olat.core.commons.services.notifications.NotificationHelper; import org.olat.core.commons.services.notifications.NotificationsHandler; import org.olat.core.commons.services.notifications.NotificationsManager; import org.olat.core.commons.services.notifications.Publisher; @@ -34,6 +35,7 @@ import org.olat.core.commons.services.notifications.SubscriptionInfo; import org.olat.core.commons.services.notifications.model.SubscriptionListItem; import org.olat.core.commons.services.notifications.model.TitleItem; import org.olat.core.gui.translator.Translator; +import org.olat.core.id.Identity; import org.olat.core.id.OLATResourceable; import org.olat.core.id.context.BusinessControlFactory; import org.olat.core.logging.LogDelegator; @@ -68,13 +70,16 @@ public class InfoMessageNotificationHandler extends LogDelegator implements Noti final Long resId = subscriber.getPublisher().getResId(); final String resName = subscriber.getPublisher().getResName(); String resSubPath = subscriber.getPublisher().getSubidentifier(); - String title = RepositoryManager.getInstance().lookupDisplayNameByOLATResourceableId(resId); + String displayName = RepositoryManager.getInstance().lookupDisplayNameByOLATResourceableId(resId); + Translator translator = Util.createPackageTranslator(this.getClass(), locale); + String title = translator.translate("notification.title", new String[]{ displayName }); si = new SubscriptionInfo(subscriber.getKey(), p.getType(), new TitleItem(title, CSS_CLASS_ICON), null); OLATResourceable ores = OresHelper.createOLATResourceableInstance(resName, resId); List<InfoMessage> infos = InfoMessageManager.getInstance().loadInfoMessageByResource(ores, resSubPath, null, compareDate, null, 0, 0); for(InfoMessage info:infos) { - String desc = info.getTitle(); + Identity ident = info.getAuthor(); + String desc = translator.translate("notifications.entry", new String[] { info.getTitle(), NotificationHelper.getFormatedName(ident) }); String tooltip = info.getMessage(); String infoBusinessPath = info.getBusinessPath() + "[InfoMessage:" + info.getKey() + "]"; String urlToSend = BusinessControlFactory.getInstance().getURLFromBusinessPathString(infoBusinessPath); diff --git a/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_de.properties index 278e4dd705d084f6b3cd46acfda38ef52d191525..3f14671a2da3dc2a899294e632134b7faedfc0ab 100644 --- a/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_de.properties @@ -1,2 +1,3 @@ #Mon Mar 02 09:54:04 CET 2009 -notification.title=Mitteilungen im Kurs "{0}" \ No newline at end of file +notification.title=Mitteilungen im Kurs "{0}" +notifications.entry=Mitteilung "{0}" eingestellt von {1} \ No newline at end of file diff --git a/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_en.properties index 402bb7c8fa20965b6ea90fca77a2472a70377625..6247b7dea72acd61d57149fe28322500c18602f4 100644 --- a/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_en.properties @@ -1,2 +1,3 @@ #Wed Jan 05 12:23:37 CET 2011 notification.title=Notifications in course "{0}" +notifications.entry=Message "{0}" added by {1} diff --git a/src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java b/src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java index 2fd0b29b21970697f0ac334733aa086308f5802a..cf07db61650bfa40996077d8d8c4b852c2fba154 100644 --- a/src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java +++ b/src/main/java/org/olat/core/commons/services/notifications/manager/NotificationsManagerImpl.java @@ -401,7 +401,7 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us //no notification older than a month latestEmail = defaultCompareDate; } - subsitem = createSubscriptionItem(sub, locale, SubscriptionInfo.MIME_PLAIN, SubscriptionInfo.MIME_PLAIN, latestEmail); + subsitem = createSubscriptionItem(sub, locale, SubscriptionInfo.MIME_HTML, SubscriptionInfo.MIME_HTML, latestEmail); } else if(latestEmail != null && latestEmail.after(compareDate)) { //already send an email within the user's settings interval //veto = true; @@ -498,7 +498,7 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us @Override public boolean sendMailToUserAndUpdateSubscriber(Identity curIdent, List<SubscriptionItem> items, Translator translator, List<Subscriber> subscribersToUpdate) { - boolean sentOk = sendEmail(curIdent, translator.translate("rss.title", new String[] { NotificationHelper.getFormatedName(curIdent) }), items); + boolean sentOk = sendEmail(curIdent, translator, items); // save latest email sent date for the subscription just emailed // do this only if the mail was successfully sent if (sentOk) { @@ -529,28 +529,55 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us } } - private boolean sendEmail(Identity to, String title, List<SubscriptionItem> subItems) { - StringBuilder plaintext = new StringBuilder(); + private boolean sendEmail(Identity to, Translator translator, List<SubscriptionItem> subItems) { + String title = translator.translate("rss.title", new String[] { NotificationHelper.getFormatedName(to) }); + StringBuilder htmlText = new StringBuilder(); + htmlText.append("<style>"); + htmlText.append(".o_m_sub h4 {margin: 0 0 10px 0;}"); + htmlText.append(".o_m_sub ul {padding: 0 0 5px 20px; margin: 0;}"); + htmlText.append(".o_m_sub ul li {padding: 0; margin: 1px 0;}"); + htmlText.append(".o_m_go {padding: 5px 0 0 0}"); + htmlText.append(".o_date {font-size: 90%; color: #888}"); + htmlText.append("</style>"); + for (Iterator<SubscriptionItem> it_subs = subItems.iterator(); it_subs.hasNext();) { SubscriptionItem subitem = it_subs.next(); - plaintext.append(subitem.getTitle()); - if(StringHelper.containsNonWhitespace(subitem.getLink())) { - plaintext.append("\n"); - plaintext.append(subitem.getLink()); + // o_m_wrap class for overriding styles in master mail template + htmlText.append("<div class='o_m_wrap'>"); + // add background here for gmail as they ignore classes. + htmlText.append("<div class='o_m_sub' style='background: #FAFAFA; padding: 5px 5px; margin: 10px 0;'>"); + // 1: title + htmlText.append(subitem.getTitle()); + htmlText.append("\n"); + // 2: content + String desc = subitem.getDescription(); + if(StringHelper.containsNonWhitespace(desc)) { + htmlText.append(desc); } - plaintext.append("\n"); - if(StringHelper.containsNonWhitespace(subitem.getDescription())) { - plaintext.append(subitem.getDescription()); + // 3: goto-link + String link = subitem.getLink(); + if(StringHelper.containsNonWhitespace(link)) { + htmlText.append("<div class='o_m_go'><a href=\"").append(link).append("\">"); + SubscriptionInfo subscriptionInfo = subitem.getSubsInfo(); + if (subscriptionInfo != null) { + String innerType = subscriptionInfo.getType(); + String typeName = NewControllerFactory.translateResourceableTypeName(innerType, translator.getLocale()); + String open = translator.translate("resource.open", new String[] { typeName }); + htmlText.append(open); + htmlText.append(" »</a></div>"); + } } - plaintext.append("\n\n"); + + htmlText.append("\n"); + htmlText.append("</div></div>"); } MailerResult result = null; try { MailBundle bundle = new MailBundle(); bundle.setToId(to); - bundle.setContent(title, plaintext.toString()); - result = CoreSpringFactory.getImpl(MailManager.class).sendExternMessage(bundle, null, false); + bundle.setContent(title, htmlText.toString()); + result = CoreSpringFactory.getImpl(MailManager.class).sendExternMessage(bundle, null, true); } catch (Exception e) { // FXOLAT-294 :: sending the mail will throw nullpointer exception if To-Identity has no // valid email-address!, catch it... @@ -1140,7 +1167,9 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us } String description = subsInfo.getSpecificInfo(mimeTypeContent, locale); - return new SubscriptionItem(title, itemLink, description); + SubscriptionItem subscriptionItem = new SubscriptionItem(title, itemLink, description); + subscriptionItem.setSubsInfo(subsInfo); + return subscriptionItem; } /** @@ -1152,19 +1181,16 @@ public class NotificationsManagerImpl extends NotificationsManager implements Us */ private String getFormatedTitle(SubscriptionInfo subsInfo, Subscriber subscriber, Locale locale, String mimeType){ Publisher pub = subscriber.getPublisher(); - String innerType = pub.getType(); - String typeName = NewControllerFactory.translateResourceableTypeName(innerType, locale); StringBuilder titleSb = new StringBuilder(); - titleSb.append(typeName); String title = subsInfo.getTitle(mimeType); if (StringHelper.containsNonWhitespace(title)) { - titleSb.append(": ").append(title); + titleSb.append(title); } else { NotificationsHandler notifHandler = getNotificationsHandler(pub); String titleInfo = notifHandler.createTitleInfo(subscriber, locale); if (StringHelper.containsNonWhitespace(titleInfo)) { - titleSb.append(": ").append(titleInfo); + titleSb.append(titleInfo); } } diff --git a/src/main/java/org/olat/core/commons/services/notifications/model/LinkItemPart.java b/src/main/java/org/olat/core/commons/services/notifications/model/LinkItemPart.java deleted file mode 100644 index c2ac42988196c010e87b9f5168099c979c4b7b8e..0000000000000000000000000000000000000000 --- a/src/main/java/org/olat/core/commons/services/notifications/model/LinkItemPart.java +++ /dev/null @@ -1,50 +0,0 @@ -/** -* OLAT - Online Learning and Training<br> -* http://www.olat.org -* <p> -* Licensed under the Apache License, Version 2.0 (the "License"); <br> -* you may not use this file except in compliance with the License.<br> -* You may obtain a copy of the License at -* <p> -* http://www.apache.org/licenses/LICENSE-2.0 -* <p> -* Unless required by applicable law or agreed to in writing,<br> -* software distributed under the License is distributed on an "AS IS" BASIS, <br> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br> -* See the License for the specific language governing permissions and <br> -* limitations under the License. -* <p> -* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br> -* University of Zurich, Switzerland. -* <hr> -* <a href="http://www.openolat.org"> -* OpenOLAT - Online Learning and Training</a><br> -* This file has been modified by the OpenOLAT community. Changes are licensed -* under the Apache 2.0 license as the original file. -*/ -package org.olat.core.commons.services.notifications.model; - -/** - * Description:<br> - * TODO: rhaag Class Description for LinkItemPart - * - * <P> - * Initial Date: 08.12.2009 <br> - * @author rhaag - */ -public class LinkItemPart extends SubscriptionInfoItem { - - public LinkItemPart(String content, String iconCssClass) { - super(content, iconCssClass); - } - - /** - * @see org.olat.core.commons.services.notifications.model.SubscriptionInfoItem#getHTMLContent() - */ - @Override - String getHTMLContent() { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/src/main/java/org/olat/core/commons/services/notifications/ui/NotificationNewsController.java b/src/main/java/org/olat/core/commons/services/notifications/ui/NotificationNewsController.java index 0d89cd9092b0281678ba88832f97f09a2a56ac4b..05a8e28b1ae2efea20548df3db74e7a64ef72c35 100644 --- a/src/main/java/org/olat/core/commons/services/notifications/ui/NotificationNewsController.java +++ b/src/main/java/org/olat/core/commons/services/notifications/ui/NotificationNewsController.java @@ -161,8 +161,8 @@ public class NotificationNewsController extends BasicController implements for (Subscriber subscriber : subsInfoMap.keySet()) { subsList.add(subscriber); SubscriptionItem item = man.createSubscriptionItem(subscriber, - getLocale(), SubscriptionInfo.MIME_PLAIN, - SubscriptionInfo.MIME_PLAIN, compareDate); + getLocale(), SubscriptionInfo.MIME_HTML, + SubscriptionInfo.MIME_HTML, compareDate); if (item != null) { infoList.add(item); } diff --git a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_da.properties b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_da.properties index 6d9344c74e9188f05a3e1b45c4d9596c5db9b3d0..b567d3a5c84a1e0fd5c156d40fe5f1f2622bd0d5 100644 --- a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_da.properties +++ b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_da.properties @@ -19,7 +19,7 @@ rss.description=Personlig besked om nyheder omkring OLAT via RSS News Feed for b rss.notifications.title={0}\: {1} in {2} {3} rss.olat.description=Dette link vil bringe dig til OLAT. rss.olat.title=Velkommen {0} til OLAT -rss.title=OLAT nyheder for {0} +rss.title=OpenOLAT nyheder for {0} subs.deleted=Kilden for beskederne er slettet\! subs.ok=Gyldig warn.nolaunch=Den valgte ressource kan ikke afvikles mere. diff --git a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_de.properties index e4dd2f6e414fee18ec56ed4e8ed6462e5851fb7c..d27951d898c2e5bfa5402b7837987f7648469fe3 100644 --- a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_de.properties @@ -1,34 +1,7 @@ #Mon Mar 02 09:54:04 CET 2009 actions.title=\u00C4nderungen - - - - - - - - - - - - - - - - - - - - - - - - - - command.subscribe=Abonnieren command.unsubscribe=Abbestellen - subscription.listitem.dateprefix=am {0} user.unknown=unbekannt user.formatted={0} {1} @@ -72,7 +45,7 @@ rss.description=Benachrichtigung \u00FCber Neuigkeiten in OLAT via RSS-News-Feed rss.notifications.title={0}\: {1} in {2} {3} rss.olat.description=Mit diesem Link gelangen Sie zu OLAT. rss.olat.title=Herzlich Willkommen {0} bei OLAT\! -rss.title=OLAT-Neuigkeiten f\u00FCr {0} +rss.title=OpenOLAT-Neuigkeiten f\u00FCr {0} resource.open = {0} öffnen subs.deleted=Quelle der Benachrichtigung gel\u00F6scht\! subs.ok=G\u00FCltig diff --git a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_en.properties index 4f833807b6643e7869b6aa920de7e8f60378e989..890f5e14f9da2548449d16a52a47ca9b2327e032 100644 --- a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_en.properties @@ -73,7 +73,7 @@ rss.description=Notification about news regarding OLAT via RSS News Feed for {0} rss.notifications.title={0}\: {1} in {2} {3} rss.olat.description=This link will bring you to OLAT. rss.olat.title=Welcome {0} to OLAT\! -rss.title=OLAT news for {0} +rss.title=OpenOLAT news for {0} subs.deleted=Source of notification deleted\! subs.ok=Valid subscriptions.desc=Please select one subscription from the list to get to its resource. Delete your subscription if you do no longer wish to receive news. However, it is possible to subscribe again whenever you want to. diff --git a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_lt.properties index 42112f9216e193bb73e50c5ca3c0674bbd671b0b..c46a473a4a8d0719f2cb81f76307da2cb2a5f1ef 100644 --- a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_lt.properties +++ b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_lt.properties @@ -41,7 +41,7 @@ rss.description=Asmeninis prane\u0161imas apie naujien\u0173 per OLAT Naujien\u rss.notifications.title={0}\: {1} \u012F {2} {3} rss.olat.description=\u0160i nuoroda jus nukels \u012F OLAT rss.olat.title=Sveiki {0} atvyk\u0119 \u012F OLAT -rss.title=OLAT naujienos {0} +rss.title=OpenOLAT naujienos {0} subs.deleted=I\u0161trintas informavimo \u0161altinis\! subs.ok=Galiojantis warn.nolaunch=Pa\u017Eym\u0117tas kursas negali b\u016Bti daugiau paleistas diff --git a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_nl_NL.properties index 8cf3ce05a4cdf058d95060d71ff57827bbc8d513..df1f803fe72ebb5eab19e87e12833c09cba478f2 100644 --- a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_nl_NL.properties +++ b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_nl_NL.properties @@ -69,7 +69,7 @@ rss.description=Berichten over nieuwtjes in OLAT via RSS News Feed voor {0}. rss.notifications.title={0}\: {1} in {2} {3} rss.olat.description=Deze link brengt je naar OLAT. rss.olat.title=Welkom {0} bij OLAT\! -rss.title=OLAT nieuwtjes voor {0} +rss.title=OpenOLAT nieuwtjes voor {0} subs.deleted=Bron van de berichten gewist\! subs.ok=Geldig subscriptions.desc=Selecteer een abonnement van de lijst om naar het middel te gaan. Verwijder jouw abonnement als je geen nieuws meer wilt ontvangen. Je kan je altijd opnieuw abonneren. diff --git a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_ru.properties index 87558a0def57afaa8cc775ba77406facd9280a63..d2d1d1b2f681864ffbbe6a77da7e38692453320f 100644 --- a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_ru.properties +++ b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_ru.properties @@ -44,7 +44,7 @@ rss.description=\u041E\u043F\u043E\u0432\u0435\u0449\u0435\u043D\u0438\u0435 \u0 rss.notifications.title={0}\: {1} \u0432 {2} {3} rss.olat.description=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u044F \u044D\u0442\u0443 \u0441\u0441\u044B\u043B\u043A\u0443, \u0412\u044B \u043F\u043E\u043F\u0430\u0434\u0451\u0442\u0435 \u0432 OLAT. rss.olat.title={0}, \u0434\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C \u0432 OLAT\! -rss.title=OLAT \u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0434\u043B\u044F {0} +rss.title=OpenOLAT \u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0434\u043B\u044F {0} subs.deleted=\u0418\u0441\u0442\u043E\u0447\u043D\u0438\u043A \u043E\u043F\u043E\u0432\u0435\u0449\u0435\u043D\u0438\u044F \u0443\u0434\u0430\u043B\u0451\u043D\! subs.ok=\u041E\u041A subscriptions.desc=\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043E\u0434\u043D\u0443 \u043F\u043E\u0434\u043F\u0438\u0441\u043A\u0443 \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430, \u0447\u0442\u043E\u0431\u044B \u0434\u043E\u0431\u0440\u0430\u0442\u044C\u0441\u044F \u0434\u043E \u0441\u0432\u043E\u0435\u0433\u043E \u0440\u0435\u0441\u0443\u0440\u0441\u0430. \u0423\u0434\u0430\u043B\u0438\u0442\u0435 \u0432\u0430\u0448\u0438 \u043F\u043E\u0434\u043F\u0438\u0441\u043A\u0438, \u0435\u0441\u043B\u0438 \u0432\u044B \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0445\u043E\u0442\u0438\u0442\u0435 \u043F\u043E\u043B\u0443\u0447\u0430\u0442\u044C \u043D\u043E\u0432\u043E\u0441\u0442\u0438. \u041E\u0434\u043D\u0430\u043A\u043E, \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u043F\u043E\u0434\u043F\u0438\u0441\u0430\u0442\u044C\u0441\u044F \u0441\u043D\u043E\u0432\u0430, \u043A\u043E\u0433\u0434\u0430 \u0437\u0430\u0445\u043E\u0442\u0438\u0442\u0435. diff --git a/src/main/java/org/olat/core/util/mail/_content/mail_template.html b/src/main/java/org/olat/core/util/mail/_content/mail_template.html index 0fc2397694d5c30e0e17a56755a7fc3fbb033523..f052cf88a2b8c00c2db5db0d4634c4b93281d3f3 100644 --- a/src/main/java/org/olat/core/util/mail/_content/mail_template.html +++ b/src/main/java/org/olat/core/util/mail/_content/mail_template.html @@ -1,4 +1,4 @@ -<body> +<body style="font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif"> <div style="margin: 1em 0 1em 0;">$content</div> <div style="background: #FAFAFA; border: 1px solid #eee; border-radius: 5px; padding: 0 0.5em 0.5em 0.5em; margin: 1em 0 1em 0;">$footer</div> </body> \ No newline at end of file diff --git a/src/main/java/org/olat/user/notification/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/user/notification/_i18n/LocalStrings_de.properties index 1348499e662d2d14251b7811756692edf31a299e..f9164e65bef5daeed3147aa00bf2d76e9aa1b632 100644 --- a/src/main/java/org/olat/user/notification/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/user/notification/_i18n/LocalStrings_de.properties @@ -1,6 +1,6 @@ e#Mon Mar 02 09:54:04 CET 2009 notifications.header=Es wurden neue Benutzerkonten erstellt: notifications.entry={0} erstellt -notifications.title={0} neue Benutzer haben sich angemeldet -notifications.titleOne=1 neuer Benutzer hat sich angemeldet -notifications.table.title=Neue Benutzer angemeldet \ No newline at end of file +notifications.title={0} neue Benutzer wurden erstellt +notifications.titleOne=1 neuer Benutzer wurde erstellt +notifications.table.title=Neue Benutzer erstellt \ No newline at end of file diff --git a/src/main/java/org/olat/user/notification/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/user/notification/_i18n/LocalStrings_en.properties index 6c30c67121a8f383cbcff8955374d37250ceccd4..012a059d9cf911bc774ba557d292916fc85f0338 100644 --- a/src/main/java/org/olat/user/notification/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/user/notification/_i18n/LocalStrings_en.properties @@ -1,7 +1,7 @@ #Wed Jan 26 18:49:19 CET 2011 e\#Mon=Mar 02 09\:54\:04 CET 2009 -notifications.entry={0} created notifications.header=New user accounts have been created\: -notifications.table.title=New users logged on -notifications.title={0} new users have logged on -notifications.titleOne=One new user has logged on +notifications.entry={0} created +notifications.title={0} new users have been created +notifications.titleOne=One new user has been created +notifications.table.title=New users created