diff --git a/component/api/src/main/java/org/exoplatform/social/core/identity/model/Profile.java b/component/api/src/main/java/org/exoplatform/social/core/identity/model/Profile.java index 776efcf22a9..e8ce7c415ed 100644 --- a/component/api/src/main/java/org/exoplatform/social/core/identity/model/Profile.java +++ b/component/api/src/main/java/org/exoplatform/social/core/identity/model/Profile.java @@ -55,9 +55,27 @@ public class Profile { /** About me key. */ public static final String ABOUT_ME = "aboutMe"; - /** TimeZone key. */ + /** + * TimeZone key of the legacy profile property, still written by the CSV + * users import and read through {@link #getTimeZone()}. + * + * @deprecated since 7.3.0, not for removal: the timezone of the user is + * {@link #USER_TIME_ZONE}, kept up to date by the platform + * timezone synchronization; this key stays for the CSV import + * and its readers, which nothing has written since the sync + * moved to {@link #USER_TIME_ZONE} + */ + @Deprecated(since = "7.3.0", forRemoval = false) public static final String TIME_ZONE = "timeZone"; + /** + * The organization profile attribute holding the timezone the browser of the + * user lives in, for example Europe/Paris. It is the source of truth for + * everything sent to the user on a schedule, kept up to date on every page + * load by the platform timezone synchronization. + */ + public static final String USER_TIME_ZONE = "user.timeZone"; + /** TimeZone DayLight savings key. */ public static final String TIME_ZONE_DST_SAVINGS = "timeZoneDSTSavings"; diff --git a/component/core/src/main/java/io/meeds/social/timezone/service/UserTimeZoneService.java b/component/core/src/main/java/io/meeds/social/timezone/service/UserTimeZoneService.java new file mode 100644 index 00000000000..5ce510c38a9 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/timezone/service/UserTimeZoneService.java @@ -0,0 +1,129 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.timezone.service; + +import java.time.DateTimeException; +import java.time.ZoneId; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import org.exoplatform.services.listener.ListenerService; +import org.exoplatform.services.organization.OrganizationService; +import org.exoplatform.services.organization.UserProfile; +import org.exoplatform.services.organization.UserProfileHandler; +import org.exoplatform.social.core.identity.model.Profile; + +/** + * Holds the timezone of each user, the one his browser lives in, under the + * profile attribute {@link Profile#USER_TIME_ZONE}. The browser of the user + * keeps it up to date on every page load, so that everything sent to him on a + * schedule, starting with the digest mail notifications, goes out at the right + * local hour. This synchronization used to live in the agenda addon and is now + * owned by the platform, so that it works whatever the installed addons; + * agenda delegates its own copy here. + */ +@Service +public class UserTimeZoneService { + + /** + * Event broadcast when the timezone of a user is saved, with the username as + * source and the timezone as data. A profile listener can't be used for + * that: it never fires when this attribute changes. + */ + public static final String USER_TIME_ZONE_SAVED_EVENT = "social.timeZone.saved"; + + private static final Logger LOG = LoggerFactory.getLogger(UserTimeZoneService.class); + + private final OrganizationService organizationService; + + private final ListenerService listenerService; + + public UserTimeZoneService(OrganizationService organizationService, ListenerService listenerService) { + this.organizationService = organizationService; + this.listenerService = listenerService; + } + + /** + * @param username the user to read the timezone of + * @return the timezone of the user, null when it is unknown: a user who never + * loaded a page has no timezone yet. The caller falls back to the + * server timezone. + */ + public String getUserTimeZone(String username) { + if (StringUtils.isBlank(username)) { + return null; + } + try { + UserProfile userProfile = organizationService.getUserProfileHandler().findUserProfileByName(username); + return userProfile == null ? null : userProfile.getAttribute(Profile.USER_TIME_ZONE); + } catch (Exception e) { + // An unknown timezone only makes what is sent on a schedule go out on + // the server hour, it must never break the caller + LOG.warn("Can't read the timezone of user {}, the server timezone will be used instead", username, e); + return null; + } + } + + /** + * Saves the timezone the browser of the user lives in, then broadcasts + * {@link #USER_TIME_ZONE_SAVED_EVENT} so that whatever keeps a copy of the + * timezone, like the digest work list, can refresh it. + * + * @param username the user to save the timezone of + * @param zoneId the timezone identifier, for example Europe/Paris + * @throws IllegalArgumentException when the timezone is not a known one + * @throws IllegalStateException when the profile of the user can't be saved + */ + public void saveUserTimeZone(String username, String zoneId) { + if (StringUtils.isBlank(username)) { + throw new IllegalArgumentException("Username is mandatory"); + } + try { + ZoneId.of(zoneId); + } catch (DateTimeException | NullPointerException e) { + throw new IllegalArgumentException("Unknown timezone " + zoneId, e); + } + try { + UserProfileHandler userProfileHandler = organizationService.getUserProfileHandler(); + UserProfile userProfile = userProfileHandler.findUserProfileByName(username); + if (userProfile == null) { + userProfile = userProfileHandler.createUserProfileInstance(username); + } + userProfile.setAttribute(Profile.USER_TIME_ZONE, zoneId); + userProfileHandler.saveUserProfile(userProfile, true); + } catch (Exception e) { + throw new IllegalStateException("Can't save the timezone of user " + username, e); + } + broadcast(username, zoneId); + } + + private void broadcast(String username, String zoneId) { + try { + listenerService.broadcast(USER_TIME_ZONE_SAVED_EVENT, username, zoneId); + } catch (Exception e) { + // The timezone is saved, a listener failure must not undo that for the + // user: whoever keeps a copy refreshes it at worst on his next save + LOG.warn("Error broadcasting the timezone change of user {}", username, e); + } + } + +} diff --git a/component/core/src/test/java/io/meeds/social/timezone/service/UserTimeZoneServiceTest.java b/component/core/src/test/java/io/meeds/social/timezone/service/UserTimeZoneServiceTest.java new file mode 100644 index 00000000000..207d9ecfe68 --- /dev/null +++ b/component/core/src/test/java/io/meeds/social/timezone/service/UserTimeZoneServiceTest.java @@ -0,0 +1,139 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.timezone.service; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import org.exoplatform.services.listener.ListenerService; +import org.exoplatform.services.organization.OrganizationService; +import org.exoplatform.services.organization.UserProfile; +import org.exoplatform.services.organization.UserProfileHandler; +import org.exoplatform.social.core.identity.model.Profile; + +@RunWith(MockitoJUnitRunner.class) +public class UserTimeZoneServiceTest { + + private static final String USERNAME = "ayoub"; + + private static final String TIME_ZONE = "Africa/Tunis"; + + @Mock + private OrganizationService organizationService; + + @Mock + private ListenerService listenerService; + + @Mock + private UserProfileHandler userProfileHandler; + + @Mock + private UserProfile userProfile; + + private UserTimeZoneService userTimeZoneService; + + @Before + public void setUp() { + userTimeZoneService = new UserTimeZoneService(organizationService, listenerService); + lenient().when(organizationService.getUserProfileHandler()).thenReturn(userProfileHandler); + } + + @Test + public void testGetUserTimeZone() throws Exception { + when(userProfileHandler.findUserProfileByName(USERNAME)).thenReturn(userProfile); + when(userProfile.getAttribute(Profile.USER_TIME_ZONE)).thenReturn(TIME_ZONE); + + assertEquals(TIME_ZONE, userTimeZoneService.getUserTimeZone(USERNAME)); + } + + @Test + public void testNoTimeZoneBeforeTheFirstPageLoad() throws Exception { + when(userProfileHandler.findUserProfileByName(USERNAME)).thenReturn(null); + assertNull(userTimeZoneService.getUserTimeZone(USERNAME)); + assertNull(userTimeZoneService.getUserTimeZone(null)); + } + + @Test + public void testAProfileReadFailureFallsBackToTheServerTimeZone() throws Exception { + when(userProfileHandler.findUserProfileByName(USERNAME)).thenThrow(new IllegalStateException("Store is down")); + assertNull(userTimeZoneService.getUserTimeZone(USERNAME)); + } + + @Test + public void testSaveUserTimeZone() throws Exception { + when(userProfileHandler.findUserProfileByName(USERNAME)).thenReturn(userProfile); + + userTimeZoneService.saveUserTimeZone(USERNAME, TIME_ZONE); + + verify(userProfile).setAttribute(Profile.USER_TIME_ZONE, TIME_ZONE); + verify(userProfileHandler).saveUserProfile(userProfile, true); + // Whoever keeps a copy of the timezone, like the digest work list, + // refreshes it on this event: a profile listener never fires for it + verify(listenerService).broadcast(UserTimeZoneService.USER_TIME_ZONE_SAVED_EVENT, USERNAME, TIME_ZONE); + } + + @Test + public void testSaveCreatesTheProfileOfANeverSeenUser() throws Exception { + when(userProfileHandler.findUserProfileByName(USERNAME)).thenReturn(null); + when(userProfileHandler.createUserProfileInstance(USERNAME)).thenReturn(userProfile); + + userTimeZoneService.saveUserTimeZone(USERNAME, TIME_ZONE); + + verify(userProfile).setAttribute(Profile.USER_TIME_ZONE, TIME_ZONE); + verify(userProfileHandler).saveUserProfile(userProfile, true); + } + + @Test + public void testAnUnknownTimeZoneIsRefused() throws Exception { + assertThrows(IllegalArgumentException.class, () -> userTimeZoneService.saveUserTimeZone(USERNAME, "Mars/Olympus")); + assertThrows(IllegalArgumentException.class, () -> userTimeZoneService.saveUserTimeZone(USERNAME, null)); + assertThrows(IllegalArgumentException.class, () -> userTimeZoneService.saveUserTimeZone(null, TIME_ZONE)); + verify(userProfileHandler, never()).saveUserProfile(any(), any(Boolean.class).booleanValue()); + verify(listenerService, never()).broadcast(any(String.class), any(), any()); + } + + @Test + public void testABroadcastFailureDoesNotUndoTheSave() throws Exception { + when(userProfileHandler.findUserProfileByName(USERNAME)).thenReturn(userProfile); + doBroadcastFailure(); + + userTimeZoneService.saveUserTimeZone(USERNAME, TIME_ZONE); + + verify(userProfileHandler).saveUserProfile(userProfile, true); + } + + private void doBroadcastFailure() throws Exception { + org.mockito.Mockito.doThrow(new IllegalStateException("Listener failure")) + .when(listenerService) + .broadcast(any(String.class), any(), any()); + } + +} diff --git a/component/core/src/test/java/org/exoplatform/social/core/test/NoContainerTestSuite.java b/component/core/src/test/java/org/exoplatform/social/core/test/NoContainerTestSuite.java index be3f1b4211e..50b96be4405 100644 --- a/component/core/src/test/java/org/exoplatform/social/core/test/NoContainerTestSuite.java +++ b/component/core/src/test/java/org/exoplatform/social/core/test/NoContainerTestSuite.java @@ -79,6 +79,7 @@ import io.meeds.social.space.template.storage.SpaceTemplateStorageTest; import io.meeds.social.upgrade.SpaceNavigationIconUpgradePluginTest; import io.meeds.social.user.plugin.UserAclPluginTest; +import io.meeds.social.timezone.service.UserTimeZoneServiceTest; import io.meeds.social.identity.permission.listener.UserPermissionGroupListenerTest; import io.meeds.social.identity.permission.listener.UserPermissionMembershipListenerTest; import io.meeds.social.identity.permission.listener.UserPermissionNestedMembershipListenerTest; @@ -93,6 +94,7 @@ @RunWith(Suite.class) @SuiteClasses({ + UserTimeZoneServiceTest.class, ReactionServiceImplTest.class, ActivityReportServiceImplTest.class, ReportActivityProcessorTest.class, diff --git a/component/notification/src/main/java/io/meeds/social/notification/digest/SocialDigestLinePlugin.java b/component/notification/src/main/java/io/meeds/social/notification/digest/SocialDigestLinePlugin.java new file mode 100644 index 00000000000..460228d4c8b --- /dev/null +++ b/component/notification/src/main/java/io/meeds/social/notification/digest/SocialDigestLinePlugin.java @@ -0,0 +1,215 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.notification.digest; + +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; + +import org.exoplatform.commons.utils.CommonsUtils; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.social.core.activity.model.ExoSocialActivity; +import org.exoplatform.social.core.identity.model.Identity; +import org.exoplatform.social.core.manager.ActivityManager; +import org.exoplatform.social.core.manager.IdentityManager; +import org.exoplatform.social.core.service.LinkProvider; +import org.exoplatform.social.core.space.model.Space; +import org.exoplatform.social.core.space.spi.SpaceService; +import org.exoplatform.social.notification.LinkProviderUtils; +import org.exoplatform.social.notification.plugin.SocialNotificationUtils; + +import io.meeds.commons.digest.model.DigestItem; +import io.meeds.commons.digest.model.DigestLine; +import io.meeds.commons.digest.plugin.DigestLineContext; +import io.meeds.commons.digest.plugin.DigestLinePlugin; + +/** + * The digest email lines of the notification types social owns: the space + * life (invitations, join requests) and the feed (posts in my spaces, comments + * on what I watch). Everything is read fresh from the stored ids: a space or + * an activity that no longer exists gives no line. + */ +public class SocialDigestLinePlugin extends DigestLinePlugin { + + public static final String SPACE_INVITATION_PLUGIN = "SpaceInvitationPlugin"; + + public static final String REQUEST_JOIN_SPACE_PLUGIN = "RequestJoinSpacePlugin"; + + public static final String POST_ACTIVITY_SPACE_PLUGIN = "PostActivitySpaceStreamPlugin"; + + public static final String ACTIVITY_COMMENT_WATCH_PLUGIN = "ActivityCommentWatchPlugin"; + + /** The stored parameters: the very keys the notification plugins write */ + static final String SPACE_ID_PARAM = SocialNotificationUtils.SPACE_ID.getKey(); + + static final String INVITER_PARAM = SocialNotificationUtils.PROFILE.getKey(); + + static final String REQUESTER_PARAM = SocialNotificationUtils.REQUEST_FROM.getKey(); + + static final String POSTER_PARAM = SocialNotificationUtils.POSTER.getKey(); + + static final String ACTIVITY_ID_PARAM = SocialNotificationUtils.ACTIVITY_ID.getKey(); + + private static final String LINE_KEY_PREFIX = "digest.line."; + + private static final int TITLE_MAX_LENGTH = 100; + + private SpaceService spaceService; + + private ActivityManager activityManager; + + private IdentityManager identityManager; + + public SocialDigestLinePlugin(InitParams params) { + super(params); + } + + SocialDigestLinePlugin(InitParams params, + SpaceService spaceService, + ActivityManager activityManager, + IdentityManager identityManager) { + super(params); + this.spaceService = spaceService; + this.activityManager = activityManager; + this.identityManager = identityManager; + } + + @Override + public DigestLine buildLine(DigestItem item, DigestLineContext context) { + return switch (item.getPluginId()) { + case SPACE_INVITATION_PLUGIN -> invitationLine(item); + case REQUEST_JOIN_SPACE_PLUGIN -> requestLine(item); + case POST_ACTIVITY_SPACE_PLUGIN -> activityLine(item, true); + case ACTIVITY_COMMENT_WATCH_PLUGIN -> activityLine(item, false); + default -> null; + }; + } + + /** + * "{actor} invited you to join {space}", linking to the space page, which + * lets the user accept the invitation while it is pending (EXO-90021) + */ + private DigestLine invitationLine(DigestItem item) { + Space space = findSpace(item.getParam(SPACE_ID_PARAM)); + if (space == null) { + return null; + } + return DigestLine.of(LINE_KEY_PREFIX + item.getPluginId(), fullName(item.getParam(INVITER_PARAM)), space.getDisplayName()) + .withUrl(spaceUrl(space)); + } + + /** + * "{actor} requested to join {space}", linking to the members page of the + * space where the manager handles the request + */ + private DigestLine requestLine(DigestItem item) { + Space space = findSpace(item.getParam(SPACE_ID_PARAM)); + if (space == null) { + return null; + } + return DigestLine.of(LINE_KEY_PREFIX + item.getPluginId(), fullName(item.getParam(REQUESTER_PARAM)), space.getDisplayName()) + .withUrl(spaceMembersUrl(space)); + } + + /** + * "{actor} posted "{title}" in {space}" / "{actor} commented on "{title}" + * you're watching" + */ + private DigestLine activityLine(DigestItem item, boolean withSpace) { + String activityId = item.getParam(ACTIVITY_ID_PARAM); + ExoSocialActivity activity = StringUtils.isBlank(activityId) ? null : getActivityManager().getActivity(activityId); + if (activity == null) { + return null; + } + String actor = fullName(item.getParam(POSTER_PARAM)); + String title = cleanTitle(activity.getTitle()); + String url = redirectUrl("view_full_activity", activityId); + if (withSpace) { + Space space = findSpace(activity.getSpaceId()); + return DigestLine.of(LINE_KEY_PREFIX + item.getPluginId(), actor, title, space == null ? "" : space.getDisplayName()) + .withUrl(url); + } + return DigestLine.of(LINE_KEY_PREFIX + item.getPluginId(), actor, title).withUrl(url); + } + + private Space findSpace(String spaceId) { + return StringUtils.isBlank(spaceId) ? null : getSpaceService().getSpaceById(spaceId); + } + + private String fullName(String username) { + if (StringUtils.isBlank(username)) { + return ""; + } + Identity identity = getIdentityManager().getOrCreateUserIdentity(username); + String fullName = identity == null || identity.getProfile() == null ? null : identity.getProfile().getFullName(); + return StringUtils.isBlank(fullName) ? username : fullName; + } + + /** + * An activity title is stored as HTML: the email line wants its text, short + */ + static String cleanTitle(String title) { + if (StringUtils.isBlank(title)) { + return ""; + } + String text = StringEscapeUtils.unescapeHtml4(title.replaceAll("<[^>]+>", " ")); + text = StringUtils.normalizeSpace(text); + return StringUtils.abbreviate(text, TITLE_MAX_LENGTH); + } + + /** + * The same redirection links as the instant notification emails, resolved + * by the platform at click time + */ + protected String redirectUrl(String type, String objectId) { + return LinkProviderUtils.getRedirectUrl(type, objectId); + } + + /** The space page, /portal/s/{id} */ + protected String spaceUrl(Space space) { + return CommonsUtils.getCurrentDomain() + "/" + LinkProvider.getPortalName(null) + "/s/" + space.getId(); + } + + /** The members page of a space, /portal/s/{id}/members */ + protected String spaceMembersUrl(Space space) { + return spaceUrl(space) + "/members"; + } + + private SpaceService getSpaceService() { + if (spaceService == null) { + spaceService = ExoContainerContext.getService(SpaceService.class); + } + return spaceService; + } + + private ActivityManager getActivityManager() { + if (activityManager == null) { + activityManager = ExoContainerContext.getService(ActivityManager.class); + } + return activityManager; + } + + private IdentityManager getIdentityManager() { + if (identityManager == null) { + identityManager = ExoContainerContext.getService(IdentityManager.class); + } + return identityManager; + } + +} diff --git a/component/notification/src/main/java/io/meeds/social/notification/rest/NotificationSettingsRestService.java b/component/notification/src/main/java/io/meeds/social/notification/rest/NotificationSettingsRestService.java index 519d8121632..b141f02d4d2 100644 --- a/component/notification/src/main/java/io/meeds/social/notification/rest/NotificationSettingsRestService.java +++ b/component/notification/src/main/java/io/meeds/social/notification/rest/NotificationSettingsRestService.java @@ -37,10 +37,8 @@ import org.exoplatform.commons.api.notification.channel.AbstractChannel; import org.exoplatform.commons.api.notification.channel.ChannelManager; import org.exoplatform.commons.api.notification.model.*; -import org.exoplatform.commons.api.notification.model.UserSetting.FREQUENCY; import org.exoplatform.commons.api.notification.plugin.config.PluginConfig; import io.meeds.social.notification.rest.model.ChannelActivationChoice; -import io.meeds.social.notification.rest.model.EmailDigestChoice; import io.meeds.social.notification.rest.model.UserNotificationSettings; import org.exoplatform.commons.api.notification.service.setting.PluginSettingService; import org.exoplatform.commons.api.notification.service.setting.UserSettingService; @@ -69,11 +67,13 @@ public class NotificationSettingsRestService implements ResourceContainer { private static final Log LOG = ExoLogger.getLogger(NotificationSettingsRestService.class); - private static final String DAILY = "Daily"; - - private static final String WEEKLY = "Weekly"; - - private static final String NEVER = "Never"; + /** + * The notification bundle of commons, holding the default labels of the + * notification groups (UINotification.label.group.*). It is the last resort + * when neither the plugin nor the plugins of its group declare a bundle + * holding the key. + */ + private static final String DEFAULT_PLUGIN_RESOURCE_BUNDLE_NAME = "locale.notification.template.CommonsNotification"; private ResourceBundleService resourceBundleService; @@ -192,7 +192,7 @@ public Response savePluginSetting( @Parameter(description = "Notification plugin Id", required = true) @PathParam("pluginId") String pluginId, - @Parameter(description = "Notification digest to use for corresponding plugin Id", required = true) + @Parameter(description = "Channels statuses for corresponding plugin Id, such as MAIL_CHANNEL=true,WEB_CHANNEL=false", required = true) @FormParam("channels") String channels) { String[] channelsArray = StringUtils.split(channels, ','); @@ -231,13 +231,9 @@ public Response savePluginSetting( required = true ) @PathParam("pluginId") String pluginId, @Parameter( - description = "Notification digest to use for corresponding plugin Id", - required = true - ) @FormParam("channels") String channels, - @Parameter( - description = "Notification digest to use for corresponding plugin Id", + description = "Channels statuses for corresponding plugin Id, such as MAIL_CHANNEL=true,WEB_CHANNEL=false", required = true - ) @FormParam("digest") String digest) { + ) @FormParam("channels") String channels) { Identity identity = ConversationState.getCurrent().getIdentity(); boolean isAdmin = userACL.isAdministrator(identity); @@ -249,16 +245,6 @@ public Response savePluginSetting( try { UserSetting setting = userSettingService.get(username); - // digest - if (WEEKLY.equals(digest)) { - setting.addPlugin(pluginId, FREQUENCY.WEEKLY); - } else if (DAILY.equals(digest)) { - setting.addPlugin(pluginId, FREQUENCY.DAILY); - } else { - setting.removePlugin(pluginId, FREQUENCY.WEEKLY); - setting.removePlugin(pluginId, FREQUENCY.DAILY); - } - // channels String[] channelsArray = StringUtils.split(channels, ','); Map channelsStatus = Arrays.stream(channelsArray) @@ -411,21 +397,6 @@ public Response saveActiveStatus( return Response.noContent().build(); } - private Map buildDigestDescriptions(Context context) { - Map options = new HashMap<>(); - options.put(DAILY, context.appRes("UINotification.description.Daily")); - options.put(WEEKLY, context.appRes("UINotification.description.Weekly")); - return options; - } - - private Map buildDigestLabels(Context context) { - Map options = new HashMap<>(); - options.put(DAILY, context.appRes("UINotification.label.Daily")); - options.put(WEEKLY, context.appRes("UINotification.label.Weekly")); - options.put(NEVER, context.appRes("UINotification.label.Never")); - return options; - } - private List getChannels(boolean activeChannelsOnly) { List channels = new ArrayList<>(); for (AbstractChannel channel : channelManager.getChannels()) { @@ -449,7 +420,6 @@ private boolean computeChoices(UserSetting userSetting, // NOSONAR List channels, List groups, Map channelStatus, - List emailDigestChoices, List channelCheckBoxList) { boolean hasActivePlugin = false; for (GroupProvider groupProvider : groups) { @@ -465,28 +435,12 @@ private boolean computeChoices(UserSetting userSetting, // NOSONAR pluginSettingService.isAllowed(channelId, pluginId), isChannelActive && userSetting.isActive(channelId, pluginId), isChannelActive)); - if (UserSetting.EMAIL_CHANNEL.equals(channelId)) { - emailDigestChoices.add(new EmailDigestChoice(channelId, - pluginId, - getValue(userSetting, pluginId), - isChannelActive)); - } } } } return hasActivePlugin; } - private String getValue(UserSetting setting, String pluginId) { - if (setting != null && setting.isInWeekly(pluginId)) { - return WEEKLY; - } else if (setting != null && setting.isInDaily(pluginId)) { - return DAILY; - } else { - return NEVER; - } - } - private boolean isAdministrator(String username) { Identity identity = userACL.getUserIdentity(username); return identity != null && userACL.isAdministrator(identity); @@ -543,21 +497,15 @@ private UserNotificationSettings mapToRestModel(UserSetting setting, boolean act return StringUtils.EMPTY; })); - Map digestLabels = buildDigestLabels(context); - Map digestDescriptions = buildDigestDescriptions(context); - List emailDigestChoices = new ArrayList<>(); List channelCheckBoxList = new ArrayList<>(); - boolean hasActivePlugin = computeChoices(setting, channels, groups, channelStatus, emailDigestChoices, channelCheckBoxList); + boolean hasActivePlugin = computeChoices(setting, channels, groups, channelStatus, channelCheckBoxList); return new UserNotificationSettings(groups, groupsLabels, pluginLabels, channelLabels, channelDescriptions, - digestLabels, - digestDescriptions, hasActivePlugin, - emailDigestChoices, channelCheckBoxList, channelStatus, setting.getChannelDefaultValue(), @@ -612,8 +560,7 @@ private String getBundlePath(String id, String key) { // NOSONAR } } - PluginConfig defaultPluginConfig = pluginSettingService.getPluginConfig("DigestDailyPlugin"); - return defaultPluginConfig == null ? null : defaultPluginConfig.getBundlePath(); + return DEFAULT_PLUGIN_RESOURCE_BUNDLE_NAME; } public String pluginRes(String key, String id) { diff --git a/component/notification/src/main/java/io/meeds/social/notification/rest/model/EmailDigestChoice.java b/component/notification/src/main/java/io/meeds/social/notification/rest/model/EmailDigestChoice.java deleted file mode 100644 index 5d9e2f69119..00000000000 --- a/component/notification/src/main/java/io/meeds/social/notification/rest/model/EmailDigestChoice.java +++ /dev/null @@ -1,72 +0,0 @@ -/** - * This file is part of the Meeds project (https://meeds.io/). - * - * Copyright (C) 2020 - 2025 Meeds Association contact@meeds.io - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package io.meeds.social.notification.rest.model; - -public class EmailDigestChoice { - String channelId; - - String pluginId; - - String value; - - boolean channelActive; - - public EmailDigestChoice(String channelId, - String pluginId, - String value, - boolean channelActive) { - this.channelId = channelId; - this.pluginId = pluginId; - this.value = value; - this.channelActive = channelActive; - } - - public String getChannelId() { - return channelId; - } - - public void setChannelId(String channelId) { - this.channelId = channelId; - } - - public String getPluginId() { - return pluginId; - } - - public void setPluginId(String pluginId) { - this.pluginId = pluginId; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public boolean isChannelActive() { - return channelActive; - } - - public void setChannelActive(boolean channelActive) { - this.channelActive = channelActive; - } - -} diff --git a/component/notification/src/main/java/io/meeds/social/notification/rest/model/UserNotificationSettings.java b/component/notification/src/main/java/io/meeds/social/notification/rest/model/UserNotificationSettings.java index 43b6699f84d..a631ab4f76f 100644 --- a/component/notification/src/main/java/io/meeds/social/notification/rest/model/UserNotificationSettings.java +++ b/component/notification/src/main/java/io/meeds/social/notification/rest/model/UserNotificationSettings.java @@ -38,14 +38,8 @@ public class UserNotificationSettings { private Map channelDescriptions; - private Map digestLabels; - - private Map digestDescriptions; - private boolean hasActivePlugin = false; - private List emailDigestChoices = null; - private List channelCheckBoxList = null; private Map channelStatus; @@ -71,10 +65,7 @@ public UserNotificationSettings(List groups, // NOSONAR Map pluginLabels, Map channelLabels, Map channelDescriptions, - Map digestLabels, - Map digestDescriptions, boolean hasActivePlugin, - List emailDigestChoices, List channelCheckBoxList, Map channelStatus, Map channelDefaultValue, @@ -85,10 +76,7 @@ public UserNotificationSettings(List groups, // NOSONAR this.pluginLabels = pluginLabels; this.channelLabels = channelLabels; this.channelDescriptions = channelDescriptions; - this.digestLabels = digestLabels; - this.digestDescriptions = digestDescriptions; this.hasActivePlugin = hasActivePlugin; - this.emailDigestChoices = emailDigestChoices; this.channelCheckBoxList = channelCheckBoxList; this.channelStatus = channelStatus; this.channels = channels; @@ -120,22 +108,6 @@ public void setChannelDescriptions(Map channelDescriptions) { this.channelDescriptions = channelDescriptions; } - public Map getDigestLabels() { - return digestLabels; - } - - public void setDigestLabels(Map digestLabels) { - this.digestLabels = digestLabels; - } - - public Map getDigestDescriptions() { - return digestDescriptions; - } - - public void setDigestDescriptions(Map digestDescriptions) { - this.digestDescriptions = digestDescriptions; - } - public boolean isHasActivePlugin() { return hasActivePlugin; } @@ -144,14 +116,6 @@ public void setHasActivePlugin(boolean hasActivePlugin) { this.hasActivePlugin = hasActivePlugin; } - public List getEmailDigestChoices() { - return emailDigestChoices; - } - - public void setEmailDigestChoices(List emailDigestChoices) { - this.emailDigestChoices = emailDigestChoices; - } - public Map getGroupsLabels() { return groupsLabels; } diff --git a/component/notification/src/main/java/io/meeds/social/notification/service/MailTemplateContentTransformerService.java b/component/notification/src/main/java/io/meeds/social/notification/service/MailTemplateContentTransformerService.java index 2fba64b2324..944cfcc9af9 100644 --- a/component/notification/src/main/java/io/meeds/social/notification/service/MailTemplateContentTransformerService.java +++ b/component/notification/src/main/java/io/meeds/social/notification/service/MailTemplateContentTransformerService.java @@ -52,12 +52,6 @@ public String processGroovy(TemplateContext ctx) { return transform(html, ctx); } - @Override - public String processDigest(TemplateContext ctx) { - String digest = super.processDigest(ctx); - return transform(digest, ctx); - } - @Override protected String transform(String value, TemplateContext ctx) { if (value == null) { diff --git a/component/notification/src/main/java/org/exoplatform/social/notification/channel/template/MailTemplateProvider.java b/component/notification/src/main/java/org/exoplatform/social/notification/channel/template/MailTemplateProvider.java index 2e72e4501ac..19ad5dc60f4 100644 --- a/component/notification/src/main/java/org/exoplatform/social/notification/channel/template/MailTemplateProvider.java +++ b/component/notification/src/main/java/org/exoplatform/social/notification/channel/template/MailTemplateProvider.java @@ -18,23 +18,13 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.IOException; -import java.io.Writer; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Locale; -import java.util.Map; import io.meeds.social.notification.plugin.JoinedSpaceByInvitationLinkPlugin; import io.meeds.social.notification.util.NotificationUtils; import io.meeds.social.report.notification.plugin.PostReportPlugin; import org.apache.commons.text.StringEscapeUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; import org.exoplatform.commons.api.notification.NotificationContext; import org.exoplatform.commons.api.notification.annotation.TemplateConfig; @@ -58,9 +48,7 @@ import org.exoplatform.social.core.identity.model.Profile; import org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider; import org.exoplatform.social.core.identity.provider.SpaceIdentityProvider; -import org.exoplatform.social.core.manager.IdentityManager; import org.exoplatform.social.core.processor.I18NActivityProcessor; -import org.exoplatform.social.core.relationship.model.Relationship; import org.exoplatform.social.core.service.LinkProvider; import org.exoplatform.social.core.space.model.Space; import org.exoplatform.social.core.utils.MentionUtils; @@ -128,53 +116,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - SocialNotificationUtils.addFooterAndFirstName(first.getTo(), templateContext); - - //Store the activity id as key, and the list all identities who posted to the activity. - Map> receiverMap = new LinkedHashMap>(); - Map>> activityUserComments = new LinkedHashMap>>(); - - try { - String imagePlaceHolder = SocialNotificationUtils.getImagePlaceHolder(language); - for (NotificationInfo message : notifications) { - String commentId = message.getValueOwnerParameter(SocialNotificationUtils.COMMENT_ID.getKey()); - ExoSocialActivity commentActivity = Utils.getActivityManager().getActivity(commentId); - if (commentActivity == null || commentActivity.getParentCommentId() == null) { - continue; - } - - ExoSocialActivity parentCommentActivity = Utils.getActivityManager().getActivity(commentActivity.getParentCommentId()); - if (!parentCommentActivity.isComment()) { - continue; - } - Identity identity = Utils.getIdentityManager().getIdentity(parentCommentActivity.getPosterId(), true); - if (identity == null || StringUtils.isBlank(message.getTo()) || !message.getTo().equals(identity.getRemoteId())) { - continue; - } - String poster = message.getValueOwnerParameter("poster"); - String title = SocialNotificationUtils.processImageTitle(getActivityTitle(commentActivity, language), imagePlaceHolder); - Pair userComment = new ImmutablePair(poster, title); - ExoSocialActivity parentActivity = Utils.getActivityManager().getParentActivity(commentActivity); - // - SocialNotificationUtils.processInforSendTo(receiverMap, parentActivity.getId(), poster); - SocialNotificationUtils.processInforUserComments(activityUserComments, parentActivity.getId(), userComment); - } - writer.append(SocialNotificationUtils.getMessageByIds(receiverMap, activityUserComments, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - - return true; - } - }; /** Defines the template builder for ActivityCommentPlugin*/ @@ -225,77 +166,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - SocialNotificationUtils.addFooterAndFirstName(first.getTo(), templateContext); - - //Store the activity id as key, and the list all identities who posted to the activity. - Map> receiverMap = new LinkedHashMap>(); - Map>> activityUserComments = new LinkedHashMap>>(); - - - try { - String imagePlaceHolder = SocialNotificationUtils.getImagePlaceHolder(language); - for (NotificationInfo message : notifications) { - String activityId = message.getValueOwnerParameter(SocialNotificationUtils.ACTIVITY_ID.getKey()); - ExoSocialActivity activity = Utils.getActivityManager().getActivity(activityId); - if (activity == null) { - continue; - } - String commentId = message.getValueOwnerParameter(SocialNotificationUtils.COMMENT_ID.getKey()); - ExoSocialActivity parentActivity = null; - if(StringUtils.isBlank(commentId)) { - LOG.warn("Attempt to send a mail message with id '{}' and receiver '{}' with empty parameter 'commentId' and activityId = '{}' ", - message.getId(), - message.getTo(), - activityId); - } else { - parentActivity = activity; - activity = Utils.getActivityManager().getActivity(commentId); - if (activity == null) { - continue; - } - } - - String poster = message.getValueOwnerParameter("poster"); - if(message.getTo() != null && poster != null && poster.equals(message.getTo())) { - continue; - } - String title = SocialNotificationUtils.processImageTitle(getActivityTitle(activity, language), imagePlaceHolder); - Pair userComment = new ImmutablePair(poster, title); - if (parentActivity.getStreamOwner() != null) { - Identity spaceIdentity = Utils.getIdentityManager().getOrCreateIdentity(SpaceIdentityProvider.NAME, parentActivity.getStreamOwner(), true); - if (spaceIdentity == null) { - if (message.getTo()!=null && !message.getTo().equals(parentActivity.getStreamOwner())) { - continue; - } - } else if (parentActivity.getPosterId() != null) { - Identity identity = Utils.getIdentityManager().getIdentity(parentActivity.getPosterId(), true); - if (identity != null) { - if (message.getTo() != null && !message.getTo().equals(identity.getRemoteId())) { - continue; - } - } - } - } - // - SocialNotificationUtils.processInforSendTo(receiverMap, parentActivity.getId(), poster); - SocialNotificationUtils.processInforUserComments(activityUserComments, parentActivity.getId(), userComment); - } - writer.append(SocialNotificationUtils.getMessageByIds(receiverMap, activityUserComments, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - - return true; - } - }; /** Defines the template builder for EditCommentPlugin*/ @@ -346,77 +216,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - SocialNotificationUtils.addFooterAndFirstName(first.getTo(), templateContext); - - //Store the activity id as key, and the list all identities who posted to the activity. - Map> receiverMap = new LinkedHashMap>(); - Map>> activityUserComments = new LinkedHashMap>>(); - - - try { - String imagePlaceHolder = SocialNotificationUtils.getImagePlaceHolder(language); - for (NotificationInfo message : notifications) { - String activityId = message.getValueOwnerParameter(SocialNotificationUtils.ACTIVITY_ID.getKey()); - ExoSocialActivity activity = Utils.getActivityManager().getActivity(activityId); - if (activity == null) { - continue; - } - String commentId = message.getValueOwnerParameter(SocialNotificationUtils.COMMENT_ID.getKey()); - ExoSocialActivity parentActivity = activity; - if(StringUtils.isBlank(commentId)) { - LOG.warn("Attempt to send a mail message with id '{}' and receiver '{}' with empty parameter 'commentId' and activityId = '{}' ", - message.getId(), - message.getTo(), - activityId); - } else { - parentActivity = activity; - activity = Utils.getActivityManager().getActivity(commentId); - if (activity == null) { - continue; - } - } - - String poster = message.getValueOwnerParameter("poster"); - if(message.getTo() != null && poster != null && poster.equals(message.getTo())) { - continue; - } - String title = SocialNotificationUtils.processImageTitle(getActivityTitle(activity, language), imagePlaceHolder); - Pair userComment = new ImmutablePair(poster, title); - if (parentActivity.getStreamOwner() != null) { - Identity spaceIdentity = Utils.getIdentityManager().getOrCreateIdentity(SpaceIdentityProvider.NAME, parentActivity.getStreamOwner(), true); - if (spaceIdentity == null) { - if (message.getTo()!=null && !message.getTo().equals(parentActivity.getStreamOwner())) { - continue; - } - } else if (parentActivity.getPosterId() != null) { - Identity identity = Utils.getIdentityManager().getIdentity(parentActivity.getPosterId(), true); - if (identity != null) { - if (message.getTo() != null && !message.getTo().equals(identity.getRemoteId())) { - continue; - } - } - } - } - // - SocialNotificationUtils.processInforSendTo(receiverMap, parentActivity.getId(), poster); - SocialNotificationUtils.processInforUserComments(activityUserComments, parentActivity.getId(), userComment); - } - writer.append(SocialNotificationUtils.getMessageByIds(receiverMap, activityUserComments, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - - return true; - } - }; /** Defines the template builder for EditActivityPlugin*/ @@ -456,48 +255,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - SocialNotificationUtils.addFooterAndFirstName(first.getTo(), templateContext); - - //Store the activity id as key, and the list all identities who posted to the activity. - Map> receiverMap = new LinkedHashMap>(); - Map>> activityUserComments = new LinkedHashMap>>(); - - - try { - String imagePlaceHolder = SocialNotificationUtils.getImagePlaceHolder(language); - for (NotificationInfo message : notifications) { - String activityId = message.getValueOwnerParameter(SocialNotificationUtils.ACTIVITY_ID.getKey()); - ExoSocialActivity activity = Utils.getActivityManager().getActivity(activityId); - if (activity == null) { - continue; - } - - String poster = message.getValueOwnerParameter("poster"); - if(message.getTo() != null && poster != null && poster.equals(message.getTo())) { - continue; - } - String title = SocialNotificationUtils.processImageTitle(getActivityTitle(activity, language), imagePlaceHolder); - Pair userComment = new ImmutablePair(poster, title); - - SocialNotificationUtils.processInforSendTo(receiverMap, activity.getId(), poster); - SocialNotificationUtils.processInforUserComments(activityUserComments, activity.getId(), userComment); - } - writer.append(SocialNotificationUtils.getMessageByIds(receiverMap, activityUserComments, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - - return true; - } - }; /** Defines the template builder for ActivityMentionPlugin*/ @@ -547,53 +304,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - - Map> receiverMap = new LinkedHashMap>(); - try { - for (NotificationInfo notification : notifications) { - String activityId = notification.getValueOwnerParameter(SocialNotificationUtils.ACTIVITY_ID.getKey()); - ExoSocialActivity activity = Utils.getActivityManager().getActivity(activityId); - if (activity == null) { - continue; - } - List mentionedUsers = new LinkedList(); - for (String id : activity.getMentionedIds()) { - if (id.contains("@")) { - id = id.substring(0, id.length() - 2); - } - Identity identity = Utils.getIdentityManager().getIdentity(id, true); - if (identity != null) { - mentionedUsers.add(identity.getRemoteId()); - } - } - if (notification.getTo() != null && !mentionedUsers.contains(notification.getTo())) { - continue; - } - Identity identity = Utils.getIdentityManager().getIdentity(activity.getPosterId(), true); - - if (activity.isComment()) { - activity = Utils.getActivityManager().getParentActivity(activity); - } - - //make the list receivers who will send mail to them. - SocialNotificationUtils.processInforSendTo(receiverMap, activity.getId(), identity.getRemoteId()); - } - writer.append(SocialNotificationUtils.getMessageByIds(receiverMap, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - - return true; - } - }; /** Defines the template builder for LikePlugin*/ @@ -633,56 +343,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - - Map> map = new LinkedHashMap>(); - - try { - for (NotificationInfo message : notifications) { - String activityId = message.getValueOwnerParameter(SocialNotificationUtils.ACTIVITY_ID.getKey()); - - ExoSocialActivity activity = Utils.getActivityManager().getActivity(activityId); - - // - if (activity == null) { - continue; - } - - if (activity.getPosterId() != null) { - Identity identity = Utils.getIdentityManager().getIdentity(activity.getPosterId(), true); - if (identity != null) { - if (message.getTo() != null && !message.getTo().equals(identity.getRemoteId())) { - continue; - } - } - } - - // - String fromUser = message.getValueOwnerParameter("likersId"); - - Identity identityFrom = Utils.getService(IdentityManager.class).getOrCreateIdentity(OrganizationIdentityProvider.NAME, fromUser, false); - if (identityFrom == null || !Arrays.asList(activity.getLikeIdentityIds()).contains(identityFrom.getId())) { - continue; - } - // - SocialNotificationUtils.processInforSendTo(map, activityId, message.getValueOwnerParameter("likersId")); - } - writer.append(SocialNotificationUtils.getMessageByIds(map, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - - - return true; - } - }; /** Defines the template builder for PostReportPlugin */ @@ -742,11 +402,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { ctx.setException(templateContext.getException()); return messageInfo.subject(subject).body(body).end(); } - - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - return false; - } }; /** Defines the template builder for LikeCommentPlugin*/ @@ -791,46 +446,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - Map> map = new LinkedHashMap>(); - try { - for (NotificationInfo message : notifications) { - String activityId = message.getValueOwnerParameter(SocialNotificationUtils.ACTIVITY_ID.getKey()); - ExoSocialActivity activity = Utils.getActivityManager().getActivity(activityId); - // - if (activity == null) { - continue; - } - if (activity.getPosterId() != null) { - Identity identity = Utils.getIdentityManager().getIdentity(activity.getPosterId(), true); - if (identity != null) { - if (message.getTo() != null && !message.getTo().equals(identity.getRemoteId())) { - continue; - } - } - } - // - String fromUser = message.getValueOwnerParameter("likersId"); - Identity identityFrom = Utils.getService(IdentityManager.class).getOrCreateIdentity(OrganizationIdentityProvider.NAME, fromUser, false); - if (identityFrom == null || !Arrays.asList(activity.getLikeIdentityIds()).contains(identityFrom.getId())) { - continue; - } - // - SocialNotificationUtils.processInforSendTo(map, activityId, message.getValueOwnerParameter("likersId")); - } - writer.append(SocialNotificationUtils.getMessageByIds(map, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - return true; - } - }; /** Defines the template builder for AccountDeactivationRequestPlugin */ @@ -859,49 +474,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return new MessageInfo().subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - - // deduplicated by username: the same account can be deactivated, - // reactivated and deactivated again within one digest period - Map requesterNames = new LinkedHashMap<>(); - for (NotificationInfo message : notifications) { - String remoteId = message.getValueOwnerParameter(SocialNotificationUtils.REMOTE_ID.getKey()); - Identity identity = Utils.getIdentityManager().getOrCreateIdentity(OrganizationIdentityProvider.NAME, remoteId, true); - if (identity == null || identity.isDeleted()) { - continue; - } - requesterNames.putIfAbsent(remoteId, identity.getProfile().getFullName()); - } - if (requesterNames.isEmpty()) { - return false; - } - - List names = List.copyOf(requesterNames.values()); - int count = names.size(); - if (count == 1) { - templateContext.put("USER", names.get(0)); - } else if (count <= 3) { - templateContext.put("USER_LIST", String.join(", ", names)); - } else { - templateContext.put("LAST3_USERS", String.join(", ", names.subList(0, 3))); - templateContext.put("COUNT", String.valueOf(count - 3)); - } - try { - writer.append("
  • ") - .append(TemplateUtils.processDigest(templateContext.digestType(count))) - .append("
    • "); - } catch (IOException e) { - ctx.setException(e); - return false; - } - return true; - } }; /** Defines the template builder for NewUserPlugin*/ @@ -938,43 +510,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - - Map> map = new LinkedHashMap>(); - try { - for (NotificationInfo message : notifications) { - String remoteId = message.getValueOwnerParameter(SocialNotificationUtils.REMOTE_ID.getKey()); - - Identity identity = Utils.getIdentityManager().getOrCreateIdentity(OrganizationIdentityProvider.NAME, remoteId); - if (identity == null) { - continue; - } - // - if (identity.isDeleted() == true) { - continue; - } - - SocialNotificationUtils.processInforSendTo(map, first.getKey().getId(), remoteId); - } - - templateContext.put("PORTAL_NAME", NotificationPluginUtils.getBrandingPortalName()); - templateContext.put("PORTAL_HOME", SocialNotificationUtils.buildRedirecUrl("portal_home", "home", "")); - - writer.append(SocialNotificationUtils.getMessageByIds(map, templateContext, "new_user")); - } catch (IOException e) { - ctx.setException(e); - return false; - } - - return true; - } - }; /** Defines the template builder for PostActivityPlugin*/ @@ -1012,34 +547,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - String sendToUser = first.getTo(); - String language = getLanguage(first); - - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - Map> receiverMap = new LinkedHashMap>(); - - try { - for (NotificationInfo message : notifications) { - ExoSocialActivity activity = Utils.getActivityManager().getActivity(message.getValueOwnerParameter(SocialNotificationUtils.ACTIVITY_ID.getKey())); - - //Case of activity was deleted, ignore this notification - if (activity == null || !activity.getStreamOwner().equals(message.getTo())) { - continue; - } - SocialNotificationUtils.processInforSendTo(receiverMap, sendToUser, message.getValueOwnerParameter(SocialNotificationUtils.POSTER.getKey())); - } - writer.append(SocialNotificationUtils.getMessageByIds(receiverMap, templateContext, "user")); - } catch (IOException e) { - ctx.setException(e); - return false; - } - return true; - } - }; /** Defines the template builder for PostActivitySpaceStreamPlugin*/ @@ -1088,45 +595,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - - Map> map = new LinkedHashMap>(); - - try { - for (NotificationInfo message : notifications) { - String poster = message.getValueOwnerParameter(SocialNotificationUtils.POSTER.getKey()); - String activityId = message.getValueOwnerParameter(SocialNotificationUtils.ACTIVITY_ID.getKey()); - ExoSocialActivity activity = Utils.getActivityManager().getActivity(activityId); - if (activity == null) { - continue; - } - Space space = Utils.getSpaceService().getSpaceByPrettyName(activity.getStreamOwner()); - if (space == null) { - continue; - } - if (!Arrays.asList(space.getMembers()).contains(message.getTo())) { - continue; - } - if(message.getTo() != null && poster != null && poster.equals(message.getTo())) { - continue; - } - // - SocialNotificationUtils.processInforSendTo(map, space.getId(), poster); - } - writer.append(SocialNotificationUtils.getMessageInSpace(map, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - return true; - } - }; /** Defines the template builder for PostActivitySpaceStreamPlugin*/ @@ -1176,42 +644,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - - Map> map = new LinkedHashMap<>(); - - try { - for (NotificationInfo message : notifications) { - String poster = message.getValueOwnerParameter(SocialNotificationUtils.POSTER.getKey()); - String activityId = message.getValueOwnerParameter(SocialNotificationUtils.ACTIVITY_ID.getKey()); - ExoSocialActivity activity = Utils.getActivityManager().getActivity(activityId); - if (activity != null) { - Space space = Utils.getSpaceService().getSpaceByPrettyName(activity.getStreamOwner()); - if (space != null) { - if (!Arrays.asList(space.getMembers()).contains(message.getTo())) { - continue; - } - if(message.getTo() != null && poster != null && poster.equals(message.getTo())) { - continue; - } - SocialNotificationUtils.processInforSendTo(map, space.getId(), poster); - } - } - } - writer.append(SocialNotificationUtils.getMessageInSpace(map, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - return true; - } - }; @@ -1246,31 +678,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - String language = getLanguage(first); - - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - Map> receiverMap = new LinkedHashMap>(); - - try { - for (NotificationInfo message : notifications) { - Relationship relationship = Utils.getRelationshipManager().get(message.getValueOwnerParameter(SocialNotificationUtils.RELATIONSHIP_ID.getKey())); - if (relationship == null || relationship.getStatus().name().equals("PENDING") == false || !relationship.getReceiver().getRemoteId().equals(message.getTo())) { - continue; - } - SocialNotificationUtils.processInforSendTo(receiverMap, first.getTo(), message.getValueOwnerParameter(SocialNotificationUtils.SENDER.getKey())); - } - writer.append(SocialNotificationUtils.getMessageByIds(receiverMap, templateContext, "connections_request")); - } catch (IOException e) { - ctx.setException(e); - return false; - } - return true; - } - }; /** Defines the template builder for RequestJoinSpacePlugin*/ @@ -1312,38 +719,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - - String language = getLanguage(first); - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - - Map> map = new LinkedHashMap>(); - - try { - for (NotificationInfo message : notifications) { - String spaceId = message.getValueOwnerParameter(SocialNotificationUtils.SPACE_ID.getKey()); - String fromUser = message.getValueOwnerParameter("request_from"); - Space space = Utils.getSpaceService().getSpaceById(spaceId); - if (space == null) { - continue; - } - if (ArrayUtils.contains(space.getPendingUsers(), fromUser) == false || !ArrayUtils.contains(space.getManagers(), message.getTo())) { - continue; - } - // - SocialNotificationUtils.processInforSendTo(map, spaceId, fromUser); - } - writer.append(SocialNotificationUtils.getMessageInSpace(map, templateContext)); - } catch (IOException e) { - ctx.setException(e); - return false; - } - return true; - } - }; /** Defines the template builder for SpaceInvitationPlugin*/ @@ -1378,38 +753,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext ctx, Writer writer) { - List notifications = ctx.getNotificationInfos(); - NotificationInfo first = notifications.get(0); - String language = getLanguage(first); - - TemplateContext templateContext = new TemplateContext(first.getKey().getId(), language); - Map> receiverMap = new LinkedHashMap>(); - - try { - for (NotificationInfo message : notifications) { - String spaceId = message.getValueOwnerParameter(SocialNotificationUtils.SPACE_ID.getKey()); - Space space = Utils.getSpaceService().getSpaceById(spaceId); - if(space == null) { - LOG.info("Can't find space with id '{}'. Mail notification with id '{}' will not be sent", spaceId, message.getId()); - continue; - } - if (ArrayUtils.contains(space.getInvitedUsers(), first.getTo()) == false) { - continue; - } - - SocialNotificationUtils.processInforSendTo(receiverMap, first.getTo(), spaceId); - } - writer.append(SocialNotificationUtils.getMessageByIds(receiverMap, templateContext, "space")); - } catch (IOException e) { - ctx.setException(e); - return false; - } - - return true; - } - }; private class JoinedSpaceByInvitationLinkTemplateBuilder extends AbstractTemplateBuilder { @@ -1444,10 +787,6 @@ protected MessageInfo makeMessage(NotificationContext notificationContext) { return messageInfo.subject(subject).body(body).end(); } - @Override - protected boolean makeDigest(NotificationContext notificationContext, Writer writer) { - return false; - } } protected ExoSocialActivity getI18N(ExoSocialActivity activity,Locale locale) { diff --git a/component/notification/src/main/java/org/exoplatform/social/notification/impl/SpaceNotificationImpl.java b/component/notification/src/main/java/org/exoplatform/social/notification/impl/SpaceNotificationImpl.java index a60523140fa..f24cb1f8be9 100644 --- a/component/notification/src/main/java/org/exoplatform/social/notification/impl/SpaceNotificationImpl.java +++ b/component/notification/src/main/java/org/exoplatform/social/notification/impl/SpaceNotificationImpl.java @@ -37,10 +37,13 @@ import org.exoplatform.social.core.space.model.Space; import org.exoplatform.social.core.space.spi.SpaceLifeCycleEvent; import org.exoplatform.social.notification.Utils; +import org.exoplatform.container.ExoContainerContext; import org.exoplatform.social.notification.plugin.RequestJoinSpacePlugin; import org.exoplatform.social.notification.plugin.SocialNotificationUtils; import org.exoplatform.social.notification.plugin.SpaceInvitationPlugin; +import io.meeds.commons.digest.DigestService; + public class SpaceNotificationImpl extends SpaceListenerPlugin { private WebNotificationService webNotificationService; @@ -118,6 +121,7 @@ public void addPendingUser(SpaceLifeCycleEvent event) { } private void removeNotifications(String spaceId, String userId, String pluginId) { + discardDigestItems(spaceId, userId, pluginId); WebNotificationFilter webNotificationFilter = new WebNotificationFilter(userId); webNotificationFilter.setParameter("spaceId", spaceId); webNotificationFilter.setPluginKey(new PluginKey(pluginId)); @@ -127,6 +131,23 @@ private void removeNotifications(String spaceId, String userId, String pluginId) } } + /** + * The digest must not announce an invitation or a request that was undone + * before it went out, the same way the on-site notification is removed. The + * digest service is a Spring bean looked up lazily; a digest failure never + * prevents the on-site removal. + */ + private void discardDigestItems(String spaceId, String userId, String pluginId) { + try { + DigestService digestService = ExoContainerContext.getService(DigestService.class); + if (digestService != null) { + digestService.discard(userId, pluginId, "spaceId", spaceId); + } + } catch (Exception e) { + LOG.warn("Error discarding the waiting digest items of user {} about space {}", userId, spaceId, e); + } + } + private void updateNotificationsStatus(Space space, String from, String to, String pluginId) { WebNotificationFilter webNotificationFilter = new WebNotificationFilter(to); webNotificationFilter.setParameter("spaceId", space.getId()); diff --git a/component/notification/src/main/java/org/exoplatform/social/notification/plugin/SocialNotificationUtils.java b/component/notification/src/main/java/org/exoplatform/social/notification/plugin/SocialNotificationUtils.java index a10f3ccf504..dfb088075ec 100644 --- a/component/notification/src/main/java/org/exoplatform/social/notification/plugin/SocialNotificationUtils.java +++ b/component/notification/src/main/java/org/exoplatform/social/notification/plugin/SocialNotificationUtils.java @@ -21,17 +21,11 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang3.tuple.Pair; -import org.apache.commons.text.StringEscapeUtils; import org.exoplatform.commons.api.notification.NotificationContext; import org.exoplatform.commons.api.notification.model.ArgumentLiteral; @@ -155,283 +149,6 @@ public static boolean isSpaceActivity(ExoSocialActivity activity) { return (id != null); } - /** - * @param receiversMap - * @param templateContext - * @return - */ - public static String getMessageInSpace(Map> receiversMap, TemplateContext templateContext) { - StringBuilder sb = new StringBuilder(); - Space space = null; - String typeSpaceDisplay = (templateContext.getPluginId().equals("PostActivitySpaceStreamPlugin")) ? "space" : "space_members"; - - for (Entry> entry : receiversMap.entrySet()) { - sb.append("
  • "); - String id = entry.getKey(); - try { - space = Utils.getSpaceService().getSpaceById(id); - } catch (Exception e) { - continue; - } - List values = entry.getValue(); - int count = values.size(); - templateContext.put("SPACE", - SocialNotificationUtils.buildRedirecUrl(typeSpaceDisplay, space.getId(), space.getDisplayName())); - - String[] keys = { "USER", "USER_LIST", "LAST3_USERS" }; - String key = ""; - StringBuilder value = new StringBuilder(); - - for (int i = 0; i < count && i < 3; i++) { - Identity identity = - Utils.getIdentityManager().getOrCreateIdentity(OrganizationIdentityProvider.NAME, values.get(i), true); - if (i > 1 && count == 3) { - key = keys[i - 1]; - } else { - key = keys[i]; - } - value.append(SocialNotificationUtils.buildRedirecUrl("user", - identity.getRemoteId(), - identity.getProfile().getFullName())); - if (count > (i + 1) && i < 2) { - value.append(", "); - } - } - templateContext.put(key, value.toString()); - if (count > 3) { - templateContext.put("COUNT", - SocialNotificationUtils.buildRedirecUrl(typeSpaceDisplay, - space.getId(), - String.valueOf((count - 3)))); - } - - String digester = TemplateUtils.processDigest(templateContext.digestType(count)); - sb.append(digester); - sb.append("
    • "); - } - - return sb.toString(); - } - - public static String getMessageByIds(Map> receiversMap, - TemplateContext templateContext) { - return getMessageByIds(receiversMap, new HashMap>>(), templateContext); - } - - /** - * @param receiversMap - * @param activityUserComments - * @param templateContext - * @return - */ - public static String getMessageByIds(Map> receiversMap, - Map>> activityUserComments, - TemplateContext templateContext) { - StringBuilder sb = new StringBuilder(); - ExoSocialActivity activity = null; - Space space = null; - String typeActivityDisplay = (templateContext.getPluginId().equals("LikePlugin")) ? "view_likers_activity" : - "view_full_activity"; - String typeSpaceDisplay = (templateContext.getPluginId().equals("PostActivitySpaceStreamPlugin")) ? "space" : "space_members"; - - for (Entry> entry : receiversMap.entrySet()) { - sb.append("
  • "); - String id = entry.getKey(); - try { - if (templateContext.getPluginId().equals("PostActivitySpaceStreamPlugin")) { - space = Utils.getSpaceService().getSpaceById(id); - } else { - activity = Utils.getActivityManager().getActivity(id); - } - } catch (Exception e) { - continue; - } - List values = entry.getValue(); - int count = values.size(); - if (activity != null) { - String title = activity.getTitle(); - String imagePlaceHolder = getImagePlaceHolder(templateContext.getLanguage()); - title = processImageTitle(title, imagePlaceHolder); - // removes a href link from title. Just for digest building case. - title = title.replaceAll(A_HREF_TAG_REGEX, ""); - templateContext.put("ACTIVITY", - SocialNotificationUtils.buildRedirecActivityUrl(typeActivityDisplay, activity.getId(), title)); - } else { - templateContext.put("SPACE", - SocialNotificationUtils.buildRedirecUrl(typeSpaceDisplay, space.getId(), space.getDisplayName())); - } - - String[] keys = { "USER", "USER_LIST", "LAST3_USERS" }; - String key = ""; - StringBuilder value = new StringBuilder(); - - for (int i = 0; i < count && i < 3; i++) { - Identity identity = - Utils.getIdentityManager().getOrCreateIdentity(OrganizationIdentityProvider.NAME, values.get(i), true); - if (i > 1 && count == 3) { - key = keys[i - 1]; - } else { - key = keys[i]; - } - value.append(SocialNotificationUtils.buildRedirecUrl("user", - identity.getRemoteId(), - identity.getProfile().getFullName())); - if (count > (i + 1) && i < 2) { - value.append(", "); - } - } - templateContext.put(key, value.toString()); - if (count > 3) { - if (activity != null) { - templateContext.put("COUNT", - SocialNotificationUtils.buildRedirecActivityUrl(typeActivityDisplay, - activity.getId(), - String.valueOf((count - 3)))); - } else { - templateContext.put("COUNT", - SocialNotificationUtils.buildRedirecUrl(typeSpaceDisplay, - space.getId(), - String.valueOf((count - 3)))); - } - } - - String digester = TemplateUtils.processDigest(templateContext.digestType(count)); - sb.append(digester); - List> userComments = activityUserComments.get(id); - if (userComments != null && userComments.size() > 0) { - sb.append("
    "); - for (Pair pair : userComments) { - if (userComments.size() > 1) { - sb.append("").append(pair.getKey()).append(" : "); - } - sb.append("
    ") - .append(pair.getValue()); - sb.append("
    "); - if (userComments.size() > 1) { - sb.append("..."); - } - sb.append("
    "); - break; - } - sb.append("
    "); - sb.append("
    "); - } - sb.append("
    • "); - } - - return sb.toString(); - } - - /** - * @param receiversMap - * @param templateContext - * @param type - * @return - */ - public static String getMessageByIds(Map> receiversMap, TemplateContext templateContext, String type) { - StringBuilder sb = new StringBuilder(); - for (Entry> entry : receiversMap.entrySet()) { - sb.append("
  • "); - String targetId = entry.getKey(); - List values = entry.getValue(); - int count = values.size(); - - String[] keys = new String[] { "USER", "USER_LIST", "LAST3_USERS" }; - if ("space".equals(type)) { - keys = new String[] { "SPACE", "SPACE_LIST", "LAST3_SPACES" }; - } - String key = ""; - StringBuilder value = new StringBuilder(); - - for (int i = 0; i < count && i < 3; i++) { - String name = ""; - if ("new_user".equals(type) || "user".equals(type) || "connections_request".equals(type)) { - Identity identity = Utils.getIdentityManager() - .getOrCreateIdentity(OrganizationIdentityProvider.NAME, values.get(i), true); - name = identity.getProfile().getFullName(); - } else { - Space space = Utils.getSpaceService().getSpaceById(values.get(i)); - name = space.getDisplayName(); - } - // - if (i > 1 && count == 3) { - key = keys[i - 1]; - } else { - key = keys[i]; - } - value.append(SocialNotificationUtils.buildRedirecUrl("new_user".equals(type) ? "user" : type, values.get(i), name)); - if (count > (i + 1) && i < 2) { - value.append(", "); - } - } - templateContext.put(key, value.toString()); - if (count > 3) { - if ("user".equals(type)) { - templateContext.put("COUNT", - SocialNotificationUtils.buildRedirecUrl("user_activity_stream", - targetId, - String.valueOf((count - 3)))); - templateContext.put("ACTIVITY_STREAM", LinkProviderUtils.getRedirectUrl("user_activity_stream", targetId)); - } else if ("space".equals(type)) { - templateContext.put("COUNT", - SocialNotificationUtils.buildRedirecUrl("space_invitation", targetId, String.valueOf((count - 3)))); - } else if ("new_user".equals(type)) { - templateContext.put("COUNT", - SocialNotificationUtils.buildRedirecUrl("connections", "all", String.valueOf((count - 3)))); - } else { - templateContext.put("COUNT", - SocialNotificationUtils.buildRedirecUrl("connections_request", - targetId, - String.valueOf((count - 3)))); - } - } else { - if ("user".equals(type)) { - templateContext.put("ACTIVITY_STREAM", LinkProviderUtils.getRedirectUrl("user_activity_stream", targetId)); - } - } - - String digester = TemplateUtils.processDigest(templateContext.digestType(count)); - sb.append(digester); - sb.append("
    • "); - } - - return sb.toString(); - } - - public static void processInforSendTo(Map> map, String key, String value) { - List list = new LinkedList(); - if (map.containsKey(key)) { - list.addAll(map.get(key)); - } - if (list.contains(value) == false) { - list.add(value); - } - map.put(key, new ArrayList(list)); - } - - public static void processInforUserComments(Map>> map, - String key, - Pair value) { - List> list = new ArrayList>(); - if (map.containsKey(key)) { - list.addAll(map.get(key)); - } - list.add(value); - map.put(key, list); - } - - public static String buildRedirecUrl(String type, String id, String name) { - String link = LinkProviderUtils.getRedirectUrl(type, id); - return "" + StringEscapeUtils.escapeHtml4(name) + ""; - } - - public static String buildRedirecActivityUrl(String type, String id, String activityTitle) { - String link = LinkProviderUtils.getRedirectUrl(type, id); - return "" + activityTitle + ""; - } - public static void addFooterAndFirstName(String remoteId, TemplateContext templateContext) { String firstName = ""; String redirectUrl = ""; diff --git a/component/notification/src/test/java/io/meeds/social/notification/digest/SocialDigestLinePluginTest.java b/component/notification/src/test/java/io/meeds/social/notification/digest/SocialDigestLinePluginTest.java new file mode 100644 index 00000000000..333e72ef854 --- /dev/null +++ b/component/notification/src/test/java/io/meeds/social/notification/digest/SocialDigestLinePluginTest.java @@ -0,0 +1,206 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.notification.digest; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.when; + +import java.time.Instant; +import java.time.ZoneId; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.container.xml.ValuesParam; +import org.exoplatform.social.core.activity.model.ExoSocialActivity; +import org.exoplatform.social.core.activity.model.ExoSocialActivityImpl; +import org.exoplatform.social.core.identity.model.Identity; +import org.exoplatform.social.core.identity.model.Profile; +import org.exoplatform.social.core.identity.provider.OrganizationIdentityProvider; +import org.exoplatform.social.core.manager.ActivityManager; +import org.exoplatform.social.core.manager.IdentityManager; +import org.exoplatform.social.core.space.model.Space; +import org.exoplatform.social.core.space.spi.SpaceService; + +import io.meeds.commons.digest.model.DigestItem; +import io.meeds.commons.digest.model.DigestLine; +import io.meeds.commons.digest.plugin.DigestLineContext; + +/** + * One line per social notification type, built from the stored ids; a + * vanished space or activity gives no line. + */ +@RunWith(MockitoJUnitRunner.class) +public class SocialDigestLinePluginTest { + + private static final DigestLineContext CONTEXT = new DigestLineContext("ayoub", Locale.ENGLISH, ZoneId.of("Europe/Paris")); + + @Mock + private SpaceService spaceService; + + @Mock + private ActivityManager activityManager; + + @Mock + private IdentityManager identityManager; + + private SocialDigestLinePlugin plugin; + + @Before + public void setUp() { + InitParams params = new InitParams(); + ValuesParam pluginIds = new ValuesParam(); + pluginIds.setName("pluginIds"); + pluginIds.setValues(new ArrayList<>(List.of(SocialDigestLinePlugin.SPACE_INVITATION_PLUGIN, + SocialDigestLinePlugin.REQUEST_JOIN_SPACE_PLUGIN, + SocialDigestLinePlugin.POST_ACTIVITY_SPACE_PLUGIN, + SocialDigestLinePlugin.ACTIVITY_COMMENT_WATCH_PLUGIN))); + params.addParameter(pluginIds); + // The redirection links need the running platform: a plain marker here + plugin = new SocialDigestLinePlugin(params, spaceService, activityManager, identityManager) { + @Override + protected String redirectUrl(String type, String objectId) { + return "redirect:" + type + ":" + objectId; + } + + @Override + protected String spaceUrl(Space space) { + return "space:" + space.getId(); + } + + @Override + protected String spaceMembersUrl(Space space) { + return "members:" + space.getId(); + } + }; + + Space space = new Space(); + space.setId("42"); + space.setDisplayName("Product team"); + lenient().when(spaceService.getSpaceById("42")).thenReturn(space); + lenient().when(identityManager.getOrCreateUserIdentity("john")).thenReturn(identity("john", "John Smith")); + lenient().when(identityManager.getOrCreateUserIdentity("nameless")).thenReturn(identity("nameless", null)); + } + + @Test + public void testDeclaresTheFourSocialTypes() { + assertEquals(4, plugin.getPluginIds().size()); + } + + @Test + public void testInvitationLinksToTheSpace() { + DigestLine line = plugin.buildLine(item(SocialDigestLinePlugin.SPACE_INVITATION_PLUGIN, "profile", "john", "spaceId", "42"), + CONTEXT); + assertNotNull(line); + assertEquals("digest.line.SpaceInvitationPlugin", line.getLabelKey()); + assertEquals(List.of("John Smith", "Product team"), line.getArgs()); + assertEquals("space:42", line.getUrl()); + } + + @Test + public void testJoinRequestLineLinksToTheMembers() { + DigestLine line = plugin.buildLine(item(SocialDigestLinePlugin.REQUEST_JOIN_SPACE_PLUGIN, "request_from", "john", "spaceId", "42"), + CONTEXT); + assertNotNull(line); + assertEquals(List.of("John Smith", "Product team"), line.getArgs()); + assertEquals("members:42", line.getUrl()); + } + + @Test + public void testVanishedSpaceGivesNoLine() { + assertNull(plugin.buildLine(item(SocialDigestLinePlugin.SPACE_INVITATION_PLUGIN, "profile", "john", "spaceId", "999"), CONTEXT)); + assertNull(plugin.buildLine(item(SocialDigestLinePlugin.SPACE_INVITATION_PLUGIN, "profile", "john"), CONTEXT)); + } + + @Test + public void testPostLineHasTheTextOfTheTitleAndTheSpace() { + ExoSocialActivity activity = new ExoSocialActivityImpl(); + activity.setId("7"); + activity.setTitle("

    Hello world & friends

    "); + activity.setSpaceId("42"); + when(activityManager.getActivity("7")).thenReturn(activity); + + DigestLine line = plugin.buildLine(item(SocialDigestLinePlugin.POST_ACTIVITY_SPACE_PLUGIN, "poster", "john", "activityId", "7"), + CONTEXT); + assertNotNull(line); + assertEquals(List.of("John Smith", "Hello world & friends", "Product team"), line.getArgs()); + assertEquals("redirect:view_full_activity:7", line.getUrl()); + } + + @Test + public void testCommentLineNamesTheWatchedActivity() { + ExoSocialActivity activity = new ExoSocialActivityImpl(); + activity.setId("7"); + activity.setTitle("Release plan"); + when(activityManager.getActivity("7")).thenReturn(activity); + + DigestLine line = plugin.buildLine(item(SocialDigestLinePlugin.ACTIVITY_COMMENT_WATCH_PLUGIN, + "poster", "nameless", "activityId", "7", "commentId", "8"), + CONTEXT); + assertNotNull(line); + // No display name: the username is better than nothing + assertEquals(List.of("nameless", "Release plan"), line.getArgs()); + } + + @Test + public void testVanishedActivityGivesNoLine() { + assertNull(plugin.buildLine(item(SocialDigestLinePlugin.POST_ACTIVITY_SPACE_PLUGIN, "poster", "john", "activityId", "404"), CONTEXT)); + } + + @Test + public void testUnknownTypeGivesNoLine() { + assertNull(plugin.buildLine(item("LikePlugin", "activityId", "7"), CONTEXT)); + } + + @Test + public void testLongTitlesAreShortened() { + String title = SocialDigestLinePlugin.cleanTitle("x".repeat(300)); + assertEquals(100, title.length()); + assertTrue(title.endsWith("...")); + } + + private static DigestItem item(String pluginId, String... params) { + Map map = new java.util.LinkedHashMap<>(); + for (int i = 0; i + 1 < params.length; i += 2) { + map.put(params[i], params[i + 1]); + } + return new DigestItem(1, "ayoub", pluginId, "spaces", Instant.now(), map); + } + + private static Identity identity(String username, String fullName) { + Identity identity = new Identity(OrganizationIdentityProvider.NAME, username); + Profile profile = new Profile(identity); + profile.setProperty(Profile.FULL_NAME, fullName); + identity.setProfile(profile); + return identity; + } + +} diff --git a/component/notification/src/test/java/io/meeds/social/notification/job/SpaceWebNotificationCleanupJobTest.java b/component/notification/src/test/java/io/meeds/social/notification/job/SpaceWebNotificationCleanupJobTest.java new file mode 100644 index 00000000000..b7ab19dabed --- /dev/null +++ b/component/notification/src/test/java/io/meeds/social/notification/job/SpaceWebNotificationCleanupJobTest.java @@ -0,0 +1,82 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.notification.job; + +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.lang.reflect.Field; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import org.exoplatform.social.notification.service.SpaceWebNotificationService; + +/** + * The cleanup job is glue: it asks the service once, with one limit date, to + * mark the old unread items as read, and nothing else. + */ +@RunWith(MockitoJUnitRunner.class) +public class SpaceWebNotificationCleanupJobTest { + + private static final int KEEP_ALIVE_DAYS = 30; + + @Mock + private SpaceWebNotificationService spaceWebNotificationService; + + @InjectMocks + private SpaceWebNotificationCleanupJob job; + + @Before + public void setUp() throws Exception { + // The @Value property, without a Spring context + Field keepAliveDays = SpaceWebNotificationCleanupJob.class.getDeclaredField("keepAliveDays"); + keepAliveDays.setAccessible(true); + keepAliveDays.setInt(job, KEEP_ALIVE_DAYS); + } + + @Test + public void testRunAsksTheServiceOnceWithOneLimitDate() { + when(spaceWebNotificationService.markAllAsReadUntil(anyLong())).thenReturn(3); + + job.run(); + + ArgumentCaptor untilDate = ArgumentCaptor.forClass(Long.class); + verify(spaceWebNotificationService, times(1)).markAllAsReadUntil(untilDate.capture()); + assertTrue(untilDate.getValue() > 0); + } + + @Test + public void testRunWithNothingToMarkStillAsksOnce() { + when(spaceWebNotificationService.markAllAsReadUntil(anyLong())).thenReturn(0); + + job.run(); + + verify(spaceWebNotificationService, times(1)).markAllAsReadUntil(anyLong()); + } + +} diff --git a/component/notification/src/test/java/io/meeds/social/notification/rest/NotificationSettingsRestServiceTest.java b/component/notification/src/test/java/io/meeds/social/notification/rest/NotificationSettingsRestServiceTest.java index 266269791b9..5fb1ae90a3a 100644 --- a/component/notification/src/test/java/io/meeds/social/notification/rest/NotificationSettingsRestServiceTest.java +++ b/component/notification/src/test/java/io/meeds/social/notification/rest/NotificationSettingsRestServiceTest.java @@ -378,14 +378,13 @@ public void testSaveSettings() throws Exception { // NOSONAR path, "", getFormHeaders(), - ("channels=" + CHANNEL_ID + "=true&digest=Weekly").getBytes(), + ("channels=" + CHANNEL_ID + "=true").getBytes(), envctx); // Then assertEquals(String.valueOf(resp.getEntity()), 204, resp.getStatus()); verify(userSettingService, times(1)).save(argThat(userSetting -> - userSetting.isActive(CHANNEL_ID, PLUGIN_ID) && userSetting.isChannelGloballyActive(CHANNEL_ID) - && userSetting.isInWeekly(PLUGIN_ID))); + userSetting.isActive(CHANNEL_ID, PLUGIN_ID) && userSetting.isChannelGloballyActive(CHANNEL_ID))); } private MultivaluedMap getFormHeaders() { diff --git a/component/notification/src/test/java/io/meeds/social/notification/rest/utils/WebNotificationRestEntityBuilderTest.java b/component/notification/src/test/java/io/meeds/social/notification/rest/utils/WebNotificationRestEntityBuilderTest.java new file mode 100644 index 00000000000..6637db6711e --- /dev/null +++ b/component/notification/src/test/java/io/meeds/social/notification/rest/utils/WebNotificationRestEntityBuilderTest.java @@ -0,0 +1,267 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.notification.rest.utils; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.List; +import java.util.Map; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.junit.MockitoJUnitRunner; + +import org.exoplatform.commons.api.notification.model.NotificationInfo; +import org.exoplatform.commons.api.notification.service.WebNotificationService; +import org.exoplatform.social.core.activity.model.ActivityStream; +import org.exoplatform.social.core.activity.model.ExoSocialActivity; +import org.exoplatform.social.core.identity.model.Identity; +import org.exoplatform.social.core.identity.model.Profile; +import org.exoplatform.social.core.manager.ActivityManager; +import org.exoplatform.social.core.manager.IdentityManager; +import org.exoplatform.social.core.space.model.Space; +import org.exoplatform.social.core.space.spi.SpaceService; +import org.exoplatform.social.notification.Utils; +import org.exoplatform.social.rest.api.EntityBuilder; +import org.exoplatform.social.rest.entity.ProfileEntity; +import org.exoplatform.social.rest.entity.SpaceEntity; + +import io.meeds.social.notification.rest.model.WebNotificationListRestEntity; +import io.meeds.social.notification.rest.model.WebNotificationRestEntity; + +/** + * The REST shape of a web notification: who sent it (found in the + * notification itself or in one of the parameter keys the plugins use), the + * space it belongs to (by id, by pretty name, or through its activity), and + * the message built by the service. + */ +@RunWith(MockitoJUnitRunner.class) +public class WebNotificationRestEntityBuilderTest { + + private static final String PLUGIN_ID = "ActivityCommentPlugin"; + + @Mock + private WebNotificationService webNotificationService; + + @Mock + private IdentityManager identityManager; + + @Mock + private SpaceService spaceService; + + @Mock + private ActivityManager activityManager; + + @Mock + private ProfileEntity profileEntity; + + @Mock + private SpaceEntity spaceEntity; + + private Identity identity; + + private Space space; + + private MockedStatic entityBuilder; + + private MockedStatic utils; + + @Before + public void setUp() { + identity = new Identity("7"); + identity.setProfile(new Profile(identity)); + space = new Space(); + space.setId("5"); + entityBuilder = mockStatic(EntityBuilder.class); + entityBuilder.when(() -> EntityBuilder.buildEntityProfile(identity.getProfile(), null)).thenReturn(profileEntity); + entityBuilder.when(() -> EntityBuilder.buildEntityFromSpace(space, null, null, null)).thenReturn(spaceEntity); + utils = mockStatic(Utils.class); + utils.when(Utils::getActivityManager).thenReturn(activityManager); + } + + @After + public void tearDown() { + entityBuilder.close(); + utils.close(); + } + + @Test + public void testSenderFromTheNotificationAndSpaceById() { + NotificationInfo notification = notification().setFrom("john").with("spaceId", "5").setRead(true); + notification.setLastModifiedDate(1234L); + when(identityManager.getOrCreateUserIdentity("john")).thenReturn(identity); + when(spaceService.getSpaceById("5")).thenReturn(space); + when(webNotificationService.getNotificationMessage(notification, true)).thenReturn("hi"); + + WebNotificationRestEntity entity = WebNotificationRestEntityBuilder.toRestEntity(webNotificationService, + identityManager, + spaceService, + notification, + true); + + assertEquals("12", entity.getId()); + assertEquals("A title", entity.getTitle()); + assertEquals(PLUGIN_ID, entity.getPlugin()); + assertSame(profileEntity, entity.getFrom()); + assertSame(spaceEntity, entity.getSpace()); + assertEquals("hi", entity.getHtml()); + assertEquals("5", entity.getParameters().get("spaceId")); + assertTrue(entity.isRead()); + assertEquals(1234L, entity.getCreated()); + } + + @Test + public void testSenderFromAParameterKeyAndSpaceByPrettyName() { + NotificationInfo notification = notification().with("poster", "mary").with("prettyName", "dev_team"); + when(identityManager.getOrCreateUserIdentity("mary")).thenReturn(identity); + when(spaceService.getSpaceByPrettyName("dev_team")).thenReturn(space); + + WebNotificationRestEntity entity = toRestEntity(notification); + + assertSame(profileEntity, entity.getFrom()); + assertSame(spaceEntity, entity.getSpace()); + verify(spaceService, never()).getSpaceById(anyString()); + } + + @Test + public void testSenderByNumericIdentityIdWhenNoUserHasThatName() { + NotificationInfo notification = notification().with("creatorId", "42"); + when(identityManager.getOrCreateUserIdentity("42")).thenReturn(null); + when(identityManager.getIdentity("42")).thenReturn(identity); + + WebNotificationRestEntity entity = toRestEntity(notification); + + assertSame(profileEntity, entity.getFrom()); + assertNull(entity.getSpace()); + } + + @Test + public void testUnknownSenderNameGivesNoSender() { + NotificationInfo notification = notification().with("sender", "ghost"); + when(identityManager.getOrCreateUserIdentity("ghost")).thenReturn(null); + + WebNotificationRestEntity entity = toRestEntity(notification); + + assertNull(entity.getFrom()); + verify(identityManager, never()).getIdentity(anyString()); + } + + @Test + public void testNoSenderKeyAtAllAsksNobody() { + WebNotificationRestEntity entity = toRestEntity(notification()); + + assertNull(entity.getFrom()); + assertNull(entity.getSpace()); + verify(identityManager, never()).getOrCreateUserIdentity(anyString()); + verify(identityManager, never()).getIdentity(anyString()); + } + + @Test + public void testSpaceFoundThroughTheActivityStream() { + NotificationInfo notification = notification().with("activityId", "77"); + ExoSocialActivity activity = mock(ExoSocialActivity.class); + ActivityStream stream = mock(ActivityStream.class); + when(activityManager.getActivity("77")).thenReturn(activity); + when(activity.getActivityStream()).thenReturn(stream); + when(stream.isSpace()).thenReturn(true); + when(activity.getSpaceId()).thenReturn("5"); + when(spaceService.getSpaceById("5")).thenReturn(space); + + assertSame(spaceEntity, toRestEntity(notification).getSpace()); + } + + @Test + public void testActivityOutsideASpaceGivesNoSpace() { + NotificationInfo notification = notification().with("activityId", "77"); + ExoSocialActivity activity = mock(ExoSocialActivity.class); + ActivityStream stream = mock(ActivityStream.class); + when(activityManager.getActivity("77")).thenReturn(activity); + when(activity.getActivityStream()).thenReturn(stream); + when(stream.isSpace()).thenReturn(false); + + assertNull(toRestEntity(notification).getSpace()); + verify(spaceService, never()).getSpaceById(anyString()); + } + + @Test + public void testDeletedActivityGivesNoSpace() { + NotificationInfo notification = notification().with("activityId", "77"); + when(activityManager.getActivity("77")).thenReturn(null); + + assertNull(toRestEntity(notification).getSpace()); + } + + @Test + public void testListCarriesEveryNotificationAndThePaging() { + NotificationInfo first = notification().setId("1").setFrom("john"); + NotificationInfo second = notification().setId("2"); + when(identityManager.getOrCreateUserIdentity("john")).thenReturn(identity); + when(webNotificationService.getNotificationMessage(any(NotificationInfo.class), anyBoolean())).thenReturn("m"); + + WebNotificationListRestEntity list = WebNotificationRestEntityBuilder.toRestEntity(webNotificationService, + identityManager, + spaceService, + List.of(first, second), + false, + 3, + Map.of(PLUGIN_ID, 3), + 10, + 20); + + assertEquals(2, list.getNotifications().size()); + assertEquals("1", list.getNotifications().get(0).getId()); + assertSame(profileEntity, list.getNotifications().get(0).getFrom()); + assertEquals("2", list.getNotifications().get(1).getId()); + assertNull(list.getNotifications().get(1).getFrom()); + assertFalse(list.getNotifications().get(1).isRead()); + assertEquals(3, list.getBadge()); + assertEquals(Integer.valueOf(3), list.getBadgesByPlugin().get(PLUGIN_ID)); + assertEquals(10, list.getOffset()); + assertEquals(20, list.getLimit()); + } + + private WebNotificationRestEntity toRestEntity(NotificationInfo notification) { + return WebNotificationRestEntityBuilder.toRestEntity(webNotificationService, + identityManager, + spaceService, + notification, + false); + } + + private NotificationInfo notification() { + return NotificationInfo.instance().setId("12").key(PLUGIN_ID).setTitle("A title"); + } + +} diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/AbstractPluginTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/AbstractPluginTest.java index a1e5a19f580..9d45cd9959f 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/AbstractPluginTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/AbstractPluginTest.java @@ -20,7 +20,6 @@ import static org.exoplatform.commons.notification.template.TemplateUtils.getExcerptSubject; -import java.io.Writer; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -130,13 +129,13 @@ public void destroyPlugins(BaseNotificationPlugin plugin) { * @return */ protected NotificationInfo getNotificationInfo(String username) { - List list = notificationService.storeDigest(username); + List list = notificationService.storeInstantly(username); assertTrue(list.size() > 0); return list.get(0); } protected List getNotificationInfos(String username) { - return notificationService.storeDigest(username); + return notificationService.storeInstantly(username); } /** @@ -160,16 +159,6 @@ protected void assertBody(MessageInfo message, String includedString) { message.getBody().indexOf(includedString) > 0); } - /** - * Validate the digest email - * - * @param writer - * @param includedString - */ - protected void assertDigest(Writer writer, String includedString) { - assertEquals(includedString, writer.toString().replaceAll("\\<.*?>", "")); - } - /** * Asserts the number of notification what made by the plugins. * @@ -177,8 +166,8 @@ protected void assertDigest(Writer writer, String includedString) { */ protected void assertMadeMailDigestNotifications(int number) { UserSetting setting = userSettingService.get(rootIdentity.getRemoteId()); - if (setting.isInDaily(getPlugin().getKey().getId())) { - assertEquals(number, notificationService.sizeOfStoredDigest()); + if (setting.isActive(MailChannel.ID, getPlugin().getKey().getId())) { + assertEquals(number, notificationService.sizeOfInstantly()); } } @@ -189,9 +178,8 @@ protected void assertMadeMailDigestNotifications(int number) { */ protected List assertMadeMailDigestNotifications(String username, int number) { UserSetting setting = userSettingService.get(username); - List got = notificationService.storeDigest(username); + List got = notificationService.storeInstantly(username); if (setting.isActive(MailChannel.ID, getPlugin().getKey().getId())) { - got = notificationService.storeInstantly(username); assertEquals(number, got.size()); } return got; @@ -372,44 +360,6 @@ protected void setInstantlySettings(String userId, List settings) { userSettingService.save(userSetting); } - /** - * Make Daily setting - * - * @param userId - * @param settings - */ - protected void setDailySetting(String userId, List settings) { - UserSetting userSetting = userSettingService.get(userId); - - if (userSetting == null) { - userSetting = UserSetting.getInstance(); - userSetting.setUserId(userId); - } - userSetting.setChannelActive(MailChannel.ID); - - userSetting.setDailyPlugins(settings); - userSettingService.save(userSetting); - } - - /** - * Make Weekly setting - * - * @param userId - * @param settings - */ - protected void setWeeklySetting(String userId, List settings) { - UserSetting userSetting = userSettingService.get(userId); - - if (userSetting == null) { - userSetting = UserSetting.getInstance(); - userSetting.setUserId(userId); - } - userSetting.setChannelActive(MailChannel.ID); - - userSetting.setWeeklyPlugins(settings); - userSettingService.save(userSetting); - } - private void initUsersSetting() { initSettings(rootIdentity.getRemoteId()); initSettings(maryIdentity.getRemoteId()); @@ -420,26 +370,19 @@ private void initUsersSetting() { private void initSettings(String username) { List instantly = new ArrayList<>(PLUGIN_IDS); instantly.add(NewUserPlugin.ID); - List daily = new ArrayList<>(PLUGIN_IDS); - daily.add(NewUserPlugin.ID); - List weekly = new ArrayList<>(PLUGIN_IDS); List webNotifs = new ArrayList<>(PLUGIN_IDS); webNotifs.add(NewUserPlugin.ID); // root - saveSetting(instantly, daily, weekly, webNotifs, username); + saveSetting(instantly, webNotifs, username); } private void saveSetting(List instantly, - List daily, - List weekly, List webNotifs, String userId) { UserSetting model = UserSetting.getInstance(); model.setUserId(userId); model.setChannelActives(new HashSet<>(Arrays.asList(MailChannel.ID, WebChannel.ID))); - model.setDailyPlugins(daily); - model.setWeeklyPlugins(weekly); model.setChannelPlugins(MailChannel.ID, instantly); model.setChannelPlugins(WebChannel.ID, webNotifs); userSettingService.save(model); @@ -469,13 +412,5 @@ protected MessageInfo buildMessageInfo(NotificationContext ctx) { return massage; } - protected void buildDigest(NotificationContext ctx, Writer writer) { - AbstractTemplateBuilder templateBuilder = getTemplateBuilder(); - if (templateBuilder == null) { - templateBuilder = getTemplateBuilder(ctx); - } - templateBuilder.buildDigest(ctx, writer); - } - public abstract AbstractTemplateBuilder getTemplateBuilder(); } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/InitContainerTestSuite.java b/component/notification/src/test/java/org/exoplatform/social/notification/InitContainerTestSuite.java index d8339ceb89b..08c2234deed 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/InitContainerTestSuite.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/InitContainerTestSuite.java @@ -18,7 +18,10 @@ */ package org.exoplatform.social.notification; +import io.meeds.social.notification.digest.SocialDigestLinePluginTest; +import io.meeds.social.notification.job.SpaceWebNotificationCleanupJobTest; import io.meeds.social.notification.listener.SpaceMembershipNotificationListenerTest; +import io.meeds.social.notification.rest.utils.WebNotificationRestEntityBuilderTest; import io.meeds.social.notification.plugin.JoinedSpaceByInvitationLinkPluginTest; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -54,6 +57,9 @@ @RunWith(Suite.class) @SuiteClasses({ + SocialDigestLinePluginTest.class, + SpaceWebNotificationCleanupJobTest.class, + WebNotificationRestEntityBuilderTest.class, ActivityMentionMailBuilderTest.class, ActivityCommentMailBuilderTest.class, ActivityCommentReplyMailBuilderTest.class, diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/MailTemplateProviderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/MailTemplateProviderTest.java index dbe3dd41bcb..cf511ddbef3 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/MailTemplateProviderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/MailTemplateProviderTest.java @@ -24,8 +24,6 @@ import org.exoplatform.commons.api.notification.model.ChannelKey; import org.exoplatform.commons.api.notification.model.PluginKey; import org.exoplatform.commons.notification.channel.MailChannel; -import org.exoplatform.commons.notification.impl.DigestDailyPlugin; -import org.exoplatform.commons.notification.impl.DigestWeeklyPlugin; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValueParam; import org.exoplatform.social.notification.AbstractCoreTest; @@ -65,14 +63,6 @@ public void testChannelSize() throws Exception { public void testGetChannel() throws Exception { AbstractChannel channel = manager.getChannel(ChannelKey.key(MailChannel.ID)); assertTrue(channel != null); - //check the daily - String actual = channel.getTemplateFilePath(PluginKey.key(DigestDailyPlugin.ID)); - String expected = "war:/notification/templates/DigestDailyPlugin.gtmpl"; - assertEquals(expected, actual); - //check the weekly - actual = channel.getTemplateFilePath(PluginKey.key(DigestWeeklyPlugin.ID)); - expected = "war:/notification/templates/DigestWeeklyPlugin.gtmpl"; - assertEquals(expected, actual); } public void testMailTemplateProvider() throws Exception { diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/AccountDeactivationRequestMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/AccountDeactivationRequestMailBuilderTest.java index 1f838746593..c244d2b4c7d 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/AccountDeactivationRequestMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/AccountDeactivationRequestMailBuilderTest.java @@ -13,9 +13,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.util.Arrays; -import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; import org.exoplatform.commons.api.notification.channel.AbstractChannel; @@ -59,62 +56,6 @@ public void testMakeMessage() { assertTrue(message.getBody().contains("/portal/administration/home/organisation/users?status=DISABLED")); } - public void testMakeDigestWithOneRequester() { - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(List.of(makeNotification(maryIdentity))); - StringWriter writer = new StringWriter(); - - assertTrue(builder.buildDigest(ctx, writer)); - - String digest = writer.toString(); - assertTrue(digest, digest.contains(maryIdentity.getProfile().getFullName())); - assertTrue(digest, digest.contains("has requested to deactivate their account")); - } - - public void testMakeDigestDeduplicatesSameRequester() { - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - // the same account deactivated, reactivated and deactivated again within - // one digest period counts once - ctx.setNotificationInfos(Arrays.asList(makeNotification(maryIdentity), makeNotification(maryIdentity))); - StringWriter writer = new StringWriter(); - - assertTrue(builder.buildDigest(ctx, writer)); - - String digest = writer.toString(); - assertTrue(digest, digest.contains("has requested to deactivate their account")); - } - - public void testMakeDigestWithFewRequesters() { - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(Arrays.asList(makeNotification(maryIdentity), makeNotification(johnIdentity))); - StringWriter writer = new StringWriter(); - - assertTrue(builder.buildDigest(ctx, writer)); - - String digest = writer.toString(); - assertTrue(digest, digest.contains(maryIdentity.getProfile().getFullName())); - assertTrue(digest, digest.contains(johnIdentity.getProfile().getFullName())); - assertTrue(digest, digest.contains("have requested to deactivate their accounts")); - } - - public void testMakeDigestWithManyRequesters() { - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(Arrays.asList(makeNotification(maryIdentity), - makeNotification(johnIdentity), - makeNotification(demoIdentity), - makeNotification(rootIdentity))); - StringWriter writer = new StringWriter(); - - assertTrue(builder.buildDigest(ctx, writer)); - - String digest = writer.toString(); - assertTrue(digest, digest.contains(maryIdentity.getProfile().getFullName())); - assertTrue(digest, digest.contains(johnIdentity.getProfile().getFullName())); - assertTrue(digest, digest.contains(demoIdentity.getProfile().getFullName())); - assertFalse(digest, digest.contains(rootIdentity.getProfile().getFullName())); - assertTrue(digest, digest.contains("more have requested to deactivate their accounts")); - } - private NotificationInfo makeNotification(Identity requesterIdentity) { return NotificationInfo.instance() .key(AccountDeactivationRequestPlugin.ID) diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityCommentMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityCommentMailBuilderTest.java index 8d455245ecf..ff0c356b0dc 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityCommentMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityCommentMailBuilderTest.java @@ -18,9 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -152,68 +149,4 @@ public void testSimpleCaseTwoComments() throws Exception { assertBody(info, "New comment on your activity"); } - public void testDigest() throws Exception { - //mary post activity on root stream ==> notify to root - ExoSocialActivity maryActivity = makeActivity(maryIdentity, ACTIVITY_TITLE); - assertMadeMailDigestNotifications(1); - notificationService.clearAll(); - - List toRoot = new ArrayList(); - - //demo add comment to maryActivity ==> notify to root and mary - makeComment(maryActivity, demoIdentity, "demo add comment"); - assertMadeMailDigestNotifications(2); - List list1 = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 1); - toRoot.add(list1.get(0)); - notificationService.clearAll(); - - makeComment(activityManager.getActivity(maryActivity.getId()), johnIdentity, "john add comment"); - assertMadeMailDigestNotifications(3); - List list2 = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 1); - toRoot.add(list2.get(0)); - notificationService.clearAll(); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - toRoot.set(0, toRoot.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(toRoot); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("demo") + ", " + getFullName("john") + " have commented on your activity: my activity's title post today.demo : demo add comment..."); - } - - public void testDigestWithDeletedComment() throws Exception { - //mary post activity on root stream ==> notify to root - ExoSocialActivity maryActivity = makeActivity(maryIdentity, ACTIVITY_TITLE); - assertMadeMailDigestNotifications(1); - notificationService.clearAll(); - - List toRoot = new ArrayList(); - - //demo add comment to maryActivity ==> notify to root and mary - makeComment(maryActivity, demoIdentity, "demo add comment"); - assertMadeMailDigestNotifications(2); - List list1 = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 1); - toRoot.add(list1.get(0)); - notificationService.clearAll(); - - //john add comment to maryActivity ==> notify to root, mary and demo - ExoSocialActivity johnComment = makeComment(activityManager.getActivity(maryActivity.getId()), johnIdentity, "john add comment"); - assertMadeMailDigestNotifications(3); - List list2 = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 1); - toRoot.add(list2.get(0)); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(toRoot); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("demo") + ", " + getFullName("john") + " have commented on your activity: my activity's title post today.demo : demo add comment..."); - - notificationService.clearAll(); - - //john delete his comment - activityManager.deleteComment(maryActivity, johnComment); - - assertMadeMailDigestNotifications(0); - - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityCommentReplyMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityCommentReplyMailBuilderTest.java index 1c499e1deef..953a9784d91 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityCommentReplyMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityCommentReplyMailBuilderTest.java @@ -18,9 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -94,31 +91,4 @@ public void testSimpleCase() throws Exception { assertBody(info, "New reply on your comment"); } - public void testDigest() throws Exception { - //mary post activity on root stream ==> notify to root - ExoSocialActivity maryActivity = makeActivity(maryIdentity, ACTIVITY_TITLE); - assertMadeMailDigestNotifications(1); - notificationService.clearAll(); - - List toRoot = new ArrayList(); - - //root add comment to maryActivity ==> notify mary - ExoSocialActivity comment = makeComment(maryActivity, rootIdentity, "root add comment"); - - //demo add comment reply to maryActivity ==> notify to root and mary - makeCommentReply(maryActivity, demoIdentity, "demo add reply", comment.getId()); - - restartTransaction(); - - List list1 = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 1); - toRoot.add(list1.get(0)); - notificationService.clearAll(); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - toRoot.set(0, toRoot.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(toRoot); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("demo") + " has replied to your comment: my activity title post today.demo add reply"); - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityMentionMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityMentionMailBuilderTest.java index ea69ab5fff3..8334ba74bd4 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityMentionMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivityMentionMailBuilderTest.java @@ -18,9 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -101,105 +98,4 @@ public void TestCommentMention() throws Exception { assertBody(info, "New mention of you"); } - public void testDigest() throws Exception { - List toJohn = new ArrayList(); - - //mary post activity on root stream and mention john, demo - ExoSocialActivity maryActivity = makeActivity(maryIdentity, "mary mention @john and @demo"); - assertMadeMailDigestNotifications(3); - List list = assertMadeMailDigestNotifications(johnIdentity.getRemoteId(), 1); - toJohn.add(list.get(0)); - notificationService.clearAll(); - - //demo add comment to maryActivity and mention john - makeComment(maryActivity, demoIdentity, "demo mention @john"); - assertMadeMailDigestNotifications(3); - List list1 = assertMadeMailDigestNotifications(johnIdentity.getRemoteId(), 1); - toJohn.add(list1.get(0)); - notificationService.clearAll(); - - //root add comment to maryActivity and mention john - makeComment(activityManager.getActivity(maryActivity.getId()), rootIdentity, "root mention @john"); - assertMadeMailDigestNotifications(3); - List list2 = assertMadeMailDigestNotifications(johnIdentity.getRemoteId(), 1); - toJohn.add(list2.get(0)); - notificationService.clearAll(); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - toJohn.set(0, toJohn.get(0).setTo(johnIdentity.getRemoteId())); - ctx.setNotificationInfos(toJohn); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("mary") + ", " + getFullName("demo") + ", " + getFullName("root") + " have mentioned you in an activity: mary mention " + getFullName("john") + " and " + getFullName("demo") + ""); - } - - public void testDigestWithDuplicateUser() throws Exception { - List toJohn = new ArrayList(); - - //mary post activity on root stream and mention john, demo - ExoSocialActivity maryActivity = makeActivity(maryIdentity, "mary mention @john and @demo"); - assertMadeMailDigestNotifications(3); - List list = assertMadeMailDigestNotifications(johnIdentity.getRemoteId(), 1); - toJohn.add(list.get(0)); - notificationService.clearAll(); - - //demo add comment to maryActivity and mention john - makeComment(maryActivity, demoIdentity, "demo mention @john"); - assertMadeMailDigestNotifications(3); - List list1 = assertMadeMailDigestNotifications(johnIdentity.getRemoteId(), 1); - toJohn.add(list1.get(0)); - notificationService.clearAll(); - - //root add comment to maryActivity and mention john - makeComment(activityManager.getActivity(maryActivity.getId()), demoIdentity, "root mention @john"); - assertMadeMailDigestNotifications(3); - List list2 = assertMadeMailDigestNotifications(johnIdentity.getRemoteId(), 1); - toJohn.add(list2.get(0)); - notificationService.clearAll(); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - toJohn.set(0, toJohn.get(0).setTo(johnIdentity.getRemoteId())); - ctx.setNotificationInfos(toJohn); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("mary") + ", " + getFullName("demo") + " have mentioned you in an activity: mary mention " + getFullName("john") + " and " + getFullName("demo") + ""); - } - - public void testDigestWithDeletedActivity() throws Exception { - List toJohn = new ArrayList(); - - //mary post activity on root stream and mention john, demo - ExoSocialActivity maryActivity = makeActivity(maryIdentity, "mary mention @john and @demo"); - assertMadeMailDigestNotifications(3); - List list = assertMadeMailDigestNotifications(johnIdentity.getRemoteId(), 1); - toJohn.add(list.get(0)); - notificationService.clearAll(); - - //demo add comment to maryActivity and mention john - ExoSocialActivity demoComment = makeComment(maryActivity, demoIdentity, "demo mention @john"); - assertMadeMailDigestNotifications(3); - List list1 = assertMadeMailDigestNotifications(johnIdentity.getRemoteId(), 1); - toJohn.add(list1.get(0)); - notificationService.clearAll(); - - //root add comment to maryActivity and mention john - makeComment(activityManager.getActivity(maryActivity.getId()), rootIdentity, "root mention @john"); - - restartTransaction(); - - assertMadeMailDigestNotifications(3); - List list2 = assertMadeMailDigestNotifications(johnIdentity.getRemoteId(), 1); - toJohn.add(list2.get(0)); - notificationService.clearAll(); - - //demo delete his comment - activityManager.deleteComment(maryActivity, demoComment); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - toJohn.set(0, toJohn.get(0).setTo(johnIdentity.getRemoteId())); - ctx.setNotificationInfos(toJohn); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("mary") + ", " + getFullName("root") + " have mentioned you in an activity: mary mention " + getFullName("john") + " and " + getFullName("demo") + ""); - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivitySpaceStreamMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivitySpaceStreamMailBuilderTest.java index b1ffab99ef0..3e753e2df5a 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivitySpaceStreamMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ActivitySpaceStreamMailBuilderTest.java @@ -18,25 +18,14 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; -import java.util.List; -import org.exoplatform.commons.api.notification.NotificationContext; import org.exoplatform.commons.api.notification.channel.AbstractChannel; import org.exoplatform.commons.api.notification.channel.ChannelManager; import org.exoplatform.commons.api.notification.channel.template.AbstractTemplateBuilder; import org.exoplatform.commons.api.notification.model.ChannelKey; -import org.exoplatform.commons.api.notification.model.NotificationInfo; import org.exoplatform.commons.api.notification.model.PluginKey; import org.exoplatform.commons.api.notification.plugin.BaseNotificationPlugin; import org.exoplatform.commons.notification.channel.MailChannel; -import org.exoplatform.commons.notification.impl.NotificationContextImpl; -import org.exoplatform.social.core.activity.model.ExoSocialActivity; -import org.exoplatform.social.core.activity.model.ExoSocialActivityImpl; -import org.exoplatform.social.core.identity.model.Identity; -import org.exoplatform.social.core.identity.provider.SpaceIdentityProvider; -import org.exoplatform.social.core.space.model.Space; import org.exoplatform.social.notification.AbstractPluginTest; import org.exoplatform.social.notification.plugin.PostActivitySpaceStreamPlugin; @@ -68,41 +57,4 @@ public BaseNotificationPlugin getPlugin() { return pluginService.getPlugin(PluginKey.key(PostActivitySpaceStreamPlugin.ID)); } - public void testDigestWithDeletedActivity() throws Exception { - Space space = getSpaceInstance(1); - spaceService.addMember(space, demoIdentity.getRemoteId()); - spaceService.addMember(space, johnIdentity.getRemoteId()); - spaceService.addMember(space, maryIdentity.getRemoteId()); - - Identity spaceIdentity = identityManager.getOrCreateIdentity(SpaceIdentityProvider.NAME, space.getPrettyName(), true); - - ExoSocialActivity activity = new ExoSocialActivityImpl(); - activity.setTitle("demo post activity on space 1"); - activity.setUserId(demoIdentity.getId()); - activityManager.saveActivityNoReturn(spaceIdentity, activity); - tearDownActivityList.add(activity); - - ExoSocialActivity activity2 = new ExoSocialActivityImpl(); - activity2.setTitle("john post activity on space 1"); - activity2.setUserId(johnIdentity.getId()); - activityManager.saveActivityNoReturn(spaceIdentity, activity2); - tearDownActivityList.add(activity2); - - //Digest - assertMadeMailDigestNotifications(6); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 2); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - - //demo delete his activity - activityManager.deleteActivity(activity); - tearDownActivityList.remove(activity); - - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("john") + " posted in my space 1."); - } - } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/EditActivityMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/EditActivityMailBuilderTest.java index 74705013a82..926e540a575 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/EditActivityMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/EditActivityMailBuilderTest.java @@ -18,8 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -87,23 +85,4 @@ public void testSimpleCase() throws Exception { assertBody(info, "edited activity"); } - public void testDigest() throws Exception { - ExoSocialActivity activity = makeActivity(rootIdentity, "root post an activity"); - makeComment(activity, demoIdentity, "comment"); - activity.setTitle("edited activity"); - - //STEP 2 Edit activity - activityManager.updateActivity(activity); - - // - assertMadeMailDigestNotifications(1); - List list = assertMadeMailDigestNotifications(demoIdentity.getRemoteId(), 1); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(demoIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, "Root Root edited activity:edited activity"); - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/EditCommentMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/EditCommentMailBuilderTest.java index 3f04b5d1cfb..87a498e4142 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/EditCommentMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/EditCommentMailBuilderTest.java @@ -18,8 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -87,24 +85,4 @@ public void testSimpleCase() throws Exception { assertBody(info, "edited comment"); } - public void testDigest() throws Exception { - //STEP 1 post activity - ExoSocialActivity activity = makeActivity(rootIdentity, "root post an activity"); - ExoSocialActivity comment = makeComment(activity, demoIdentity, "comment"); - comment.setTitle("edited comment"); - - //STEP 2 Edit activity - activityManager.saveComment(activity, comment); - - // - assertMadeMailDigestNotifications(1); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 1); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, "Demo exo edited comment:edited comment"); - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/LikeCommentMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/LikeCommentMailBuilderTest.java index c0012303ab8..92046703e85 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/LikeCommentMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/LikeCommentMailBuilderTest.java @@ -18,8 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -86,46 +84,4 @@ public void testSimpleCase() throws Exception { assertBody(info, "New like on your activity stream"); } - public void testDigest() throws Exception { - ExoSocialActivity activity = makeActivity(rootIdentity, "root post an activity"); - ExoSocialActivity comment = makeComment(activity, rootIdentity, getName()); - activityManager.saveLike(comment, maryIdentity); - activityManager.saveLike(comment, demoIdentity); - activityManager.saveLike(comment, johnIdentity); - // - assertMadeMailDigestNotifications(3); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 3); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("mary") + ", " + getFullName("demo") + ", " + getFullName("john") + " have liked your comment: testDigest"); - } - - public void testDigestWithUnLike() throws Exception { - // mary post activity on her stream - ExoSocialActivity activity = makeActivity(rootIdentity, "root post an activity"); - ExoSocialActivity comment = makeComment(activity, rootIdentity, getName()); - notificationService.clearAll(); - - assertMadeMailDigestNotifications(0); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 0); - activityManager.saveLike(comment, demoIdentity); - activityManager.saveLike(comment, johnIdentity); - - assertMadeMailDigestNotifications(2); - list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 2); - - // john unlike - activityManager.deleteLike(comment, johnIdentity); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("demo") + " has liked your comment: testDigestWithUnLike"); - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/LikeMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/LikeMailBuilderTest.java index 388202c5892..c77e42c81a3 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/LikeMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/LikeMailBuilderTest.java @@ -18,8 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -88,23 +86,6 @@ public void testSimpleCase() throws Exception { assertBody(info, "New like on your activity stream"); } - public void testDigest() throws Exception { - ExoSocialActivity activity = makeActivity(rootIdentity, "root post an activity"); - activityManager.saveLike(activity, maryIdentity); - activityManager.saveLike(activity, demoIdentity); - activityManager.saveLike(activity, johnIdentity); - // - assertMadeMailDigestNotifications(3); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 3); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("mary") + ", " + getFullName("demo") + ", " + getFullName("john") + " like your activity: root post an activity"); - } - public void testLikeLinkActivity() throws Exception { ExoSocialActivity activity = new ExoSocialActivityImpl(); activity.setTitle("Link Activity"); @@ -135,27 +116,4 @@ public void testLikeLinkActivity() throws Exception { assertBody(info, "New like on your activity stream"); } - public void testDigestWithUnLike() throws Exception { - // mary post activity on her stream - ExoSocialActivity activity = makeActivity(rootIdentity, "root post an activity"); - notificationService.clearAll(); - - assertMadeMailDigestNotifications(0); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 0); - activityManager.saveLike(activity, demoIdentity); - activityManager.saveLike(activity, johnIdentity); - - assertMadeMailDigestNotifications(2); - list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 2); - - // john unlike - activityManager.deleteLike(activity, johnIdentity); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("demo") + " likes your activity: root post an activity"); - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/NewUserMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/NewUserMailBuilderTest.java index 75c719425fe..9a41db5831c 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/NewUserMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/NewUserMailBuilderTest.java @@ -18,10 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; -import java.util.LinkedHashSet; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -158,35 +154,6 @@ public void testFeatureONOFF() throws Exception { removeUser("user_234"); } - public void testDigest() throws Exception { - createUser("user_111"); - createUser("user_222"); - createUser("user_333"); - - //Digest will sent 12 mails to 4 users existing. - assertMadeMailDigestNotifications("root", 3); - assertMadeMailDigestNotifications("john", 3); - assertMadeMailDigestNotifications("mary", 3); - assertMadeMailDigestNotifications("demo", 3); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 3); - - // - removeUser("user_111"); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - // remove duplicate message - list = new ArrayList(new LinkedHashSet(list)); - - list.get(0).setTo(rootIdentity.getRemoteId()); - - ctx.setNotificationInfos(list); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, "USER_222 gtn, USER_333 gtn have joined " + MailUtils.getSenderName() + "."); - removeUser("user_222"); - removeUser("user_333"); - } - private void createUser(String userName) throws Exception { UserHandler userHandler = getUserHandler(); User user = userHandler.createUserInstance(userName); diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/PostActivityMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/PostActivityMailBuilderTest.java index 4402b7a438e..aea35d91ba7 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/PostActivityMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/PostActivityMailBuilderTest.java @@ -18,9 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; -import java.util.Arrays; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -31,12 +28,9 @@ import org.exoplatform.commons.api.notification.model.MessageInfo; import org.exoplatform.commons.api.notification.model.NotificationInfo; import org.exoplatform.commons.api.notification.model.PluginKey; -import org.exoplatform.commons.api.notification.model.UserSetting; import org.exoplatform.commons.api.notification.plugin.BaseNotificationPlugin; import org.exoplatform.commons.notification.channel.MailChannel; import org.exoplatform.commons.notification.impl.NotificationContextImpl; -import org.exoplatform.social.core.activity.model.ExoSocialActivity; -import org.exoplatform.social.core.identity.model.Identity; import org.exoplatform.social.notification.AbstractPluginTest; import org.exoplatform.social.notification.plugin.PostActivityPlugin; @@ -85,69 +79,4 @@ public void testSimpleCase() throws Exception { assertBody(info, "demo post activity on activity stream of root"); } - public void testDigest() throws Exception { - //config setting of root to receive notification daily - UserSetting rootSetting = new UserSetting(); - rootSetting.setUserId(rootIdentity.getRemoteId()); - rootSetting.setDailyPlugins(Arrays.asList(getPlugin().getId())); - userSettingService.save(rootSetting); - - //create new user - Identity ghostIdentity = identityManager.getOrCreateUserIdentity("ghost"); - notificationService.clearAll(); - - makeActivity(demoIdentity, "demo post activity on activity stream of root"); - makeActivity(maryIdentity, "mary post activity on activity stream of root"); - makeActivity(johnIdentity, "john post activity on activity stream of root"); - makeActivity(ghostIdentity, "ghost post activity on activity stream of root"); - - //Digest - assertMadeMailDigestNotifications(4); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 4); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("demo") + ", " + getFullName("mary") + ", " + getFullName("john") + " and 1 others posted on your activity stream."); - - tearDownIdentityList.add(ghostIdentity); - } - - public void testDigestWithSameUser() throws Exception { - makeActivity(demoIdentity, "demo post activity on activity stream of root"); - makeActivity(demoIdentity, "mary post activity on activity stream of root"); - makeActivity(johnIdentity, "john post activity on activity stream of root"); - - //Digest - assertMadeMailDigestNotifications(3); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 3); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("demo") + ", " + getFullName("john") + " posted on your activity stream."); - } - - public void testDigestWithDeletedActivity() throws Exception { - ExoSocialActivity demoActivity = makeActivity(demoIdentity, "demo post activity on activity stream of root"); - makeActivity(johnIdentity, "john post activity on activity stream of root"); - - //Digest - assertMadeMailDigestNotifications(2); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 2); - - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - list.set(0, list.get(0).setTo(rootIdentity.getRemoteId())); - ctx.setNotificationInfos(list); - - //demo delete his activity - activityManager.deleteActivity(demoActivity); - tearDownActivityList.remove(demoActivity); - Writer writer = new StringWriter(); - buildDigest(ctx, writer); - assertDigest(writer, getFullName("john") + " posted on your activity stream."); - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ReceiveRequestMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ReceiveRequestMailBuilderTest.java index e89a068662e..c22a9f3c8b5 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ReceiveRequestMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/ReceiveRequestMailBuilderTest.java @@ -18,9 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -81,97 +78,5 @@ public void testSimpleCase() throws Exception { notificationService.clearAll(); } - public void testDigestWithPluginON() throws Exception { - // - turnOFF(getPlugin()); - // - makeRelationship(johnIdentity, rootIdentity); - assertMadeMailDigestNotifications(0); - - //ON - turnON(getPlugin()); - - //Make more relationship - makeRelationship(demoIdentity, rootIdentity); - makeRelationship(maryIdentity, rootIdentity); - // - List messages = new ArrayList(); - assertMadeMailDigestNotifications(2); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 2); - for (NotificationInfo m : list) { - m.setTo(rootIdentity.getRemoteId()); - messages.add(m); - } - - Writer writer = new StringWriter(); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(messages); - buildDigest(ctx, writer); - - assertDigest(writer, "You've received a connection request from " + getFullName("demo") + ", " + getFullName("mary") + "."); - notificationService.clearAll(); - - } - - public void testDigestWithFeatureON() throws Exception { - // - turnFeatureOff(); - // - makeRelationship(demoIdentity, rootIdentity); - assertMadeMailDigestNotifications(0); - - //ON - turnFeatureOn(); - - //Make more relationship - makeRelationship(johnIdentity, rootIdentity); - makeRelationship(maryIdentity, rootIdentity); - // - List messages = new ArrayList(); - assertMadeMailDigestNotifications(2); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 2); - for (NotificationInfo m : list) { - m.setTo(rootIdentity.getRemoteId()); - messages.add(m); - } - - Writer writer = new StringWriter(); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(messages); - buildDigest(ctx, writer); - - assertDigest(writer, "You've received a connection request from " + getFullName("john") + ", " + getFullName("mary") + "."); - notificationService.clearAll(); - - } - - public void testDigestCancelRequest() throws Exception { - //Make more relationship - makeRelationship(demoIdentity, rootIdentity); - makeRelationship(maryIdentity, rootIdentity); - makeRelationship(johnIdentity, rootIdentity); - - // - List messages = new ArrayList(); - assertMadeMailDigestNotifications(3); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 3); - for (NotificationInfo m : list) { - m.setTo(rootIdentity.getRemoteId()); - messages.add(m); - } - - //cancel 2 request - cancelRelationship(rootIdentity, demoIdentity); - cancelRelationship(rootIdentity, johnIdentity); - - Writer writer = new StringWriter(); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(messages); - buildDigest(ctx, writer); - - assertDigest(writer, "You've received a connection request from " + getFullName("mary") + "."); - notificationService.clearAll(); - } - } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/RequestJoinSpaceMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/RequestJoinSpaceMailBuilderTest.java index 62733c17e83..a41a302b8fa 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/RequestJoinSpaceMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/RequestJoinSpaceMailBuilderTest.java @@ -18,9 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -86,95 +83,4 @@ public void testSimpleCase() throws Exception { notificationService.clearAll(); } - public void testDigestWithPluginON() throws Exception { - //OFF - turnOFF(getPlugin()); - - // - Space space = getSpaceInstance(1); - //Make requests to join space - spaceService.addPendingUser(space, demoIdentity.getRemoteId()); - assertMadeMailDigestNotifications(0); - - //ON - turnON(getPlugin()); - - //make requests - spaceService.addPendingUser(space, johnIdentity.getRemoteId()); - spaceService.addPendingUser(space, maryIdentity.getRemoteId()); - - assertMadeMailDigestNotifications(2); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 2); - List messages = new ArrayList(); - for (NotificationInfo m : list) { - m.setTo(rootIdentity.getRemoteId()); - messages.add(m); - } - Writer writer = new StringWriter(); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(messages); - buildDigest(ctx, writer); - - assertDigest(writer, "The following users have asked to join the my space 1 space: " + getFullName("john") + ", " + getFullName("mary") + "."); - notificationService.clearAll(); - - } - - public void testDigestWithFeatureON() throws Exception { - // - turnFeatureOff(); - // - Space space = getSpaceInstance(1); - //Make requests to join space - spaceService.addPendingUser(space, demoIdentity.getRemoteId()); - assertMadeMailDigestNotifications(0); - - //ON - turnFeatureOn(); - spaceService.addPendingUser(space, johnIdentity.getRemoteId()); - spaceService.addPendingUser(space, maryIdentity.getRemoteId()); - - assertMadeMailDigestNotifications(2); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 2); - List messages = new ArrayList(); - for (NotificationInfo m : list) { - m.setTo(rootIdentity.getRemoteId()); - messages.add(m); - } - Writer writer = new StringWriter(); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(messages); - buildDigest(ctx, writer); - - assertDigest(writer, "The following users have asked to join the my space 1 space: " + getFullName("john") + ", " + getFullName("mary") + "."); - notificationService.clearAll(); - - } - - public void testDigestCancelRequest() throws Exception { - Space space = getSpaceInstance(1); - spaceService.addPendingUser(space, demoIdentity.getRemoteId()); - spaceService.addPendingUser(space, johnIdentity.getRemoteId()); - spaceService.addPendingUser(space, maryIdentity.getRemoteId()); - - assertMadeMailDigestNotifications(3); - List list = assertMadeMailDigestNotifications(rootIdentity.getRemoteId(), 3); - List messages = new ArrayList(); - for (NotificationInfo m : list) { - m.setTo(rootIdentity.getRemoteId()); - messages.add(m); - } - - //john cancel his request to join space - spaceService.removePendingUser(space, johnIdentity.getRemoteId()); - - Writer writer = new StringWriter(); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(messages); - buildDigest(ctx, writer); - - assertDigest(writer, "The following users have asked to join the my space 1 space: " + getFullName("demo") + ", " + getFullName("mary") + "."); - notificationService.clearAll(); - - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/SpaceInvitationMailBuilderTest.java b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/SpaceInvitationMailBuilderTest.java index ad6ef7dcc37..5b3e56b1f16 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/SpaceInvitationMailBuilderTest.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/channel/template/SpaceInvitationMailBuilderTest.java @@ -18,9 +18,6 @@ */ package org.exoplatform.social.notification.channel.template; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; import java.util.List; import org.exoplatform.commons.api.notification.NotificationContext; @@ -86,118 +83,4 @@ public void testSimpleCase() throws Exception { notificationService.clearAll(); } - public void testDigestWithPluginON() throws Exception { - //OFF - turnOFF(getPlugin()); - // - Space space = getSpaceInstance(1); - space.setEditor(rootIdentity.getRemoteId()); - //Invite user to join space - spaceService.addInvitedUser(space, maryIdentity.getRemoteId()); - assertMadeMailDigestNotifications(0); - - //ON - turnON(getPlugin()); - - //Make more invitations - Space space2 = getSpaceInstance(2); - space2.setEditor(rootIdentity.getRemoteId()); - Space space3 = getSpaceInstance(3); - space3.setEditor(rootIdentity.getRemoteId()); - spaceService.addInvitedUser(space2, maryIdentity.getRemoteId()); - spaceService.addInvitedUser(space3, maryIdentity.getRemoteId()); - - //assert Digest message - assertMadeMailDigestNotifications(2); - List ntfs = assertMadeMailDigestNotifications(maryIdentity.getRemoteId(), 2); - List messages = new ArrayList(); - for (NotificationInfo m : ntfs) { - m.setTo(maryIdentity.getRemoteId()); - messages.add(m); - } - Writer writer = new StringWriter(); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(messages); - buildDigest(ctx, writer); - - assertDigest(writer, "You have been asked to joing the following spaces: my space 2, my space 3."); - notificationService.clearAll(); - - } - - public void testDigestWithFeatureON() throws Exception { - // - turnFeatureOff(); - - //Make invitation - Space space1 = getSpaceInstance(1); - space1.setEditor(rootIdentity.getRemoteId()); - spaceService.addInvitedUser(space1, maryIdentity.getRemoteId()); - assertMadeMailDigestNotifications(0); - - //ON - turnFeatureOn(); - - Space space2 = getSpaceInstance(2); - space2.setEditor(rootIdentity.getRemoteId()); - Space space3 = getSpaceInstance(3); - space3.setEditor(rootIdentity.getRemoteId()); - spaceService.addInvitedUser(space2, maryIdentity.getRemoteId()); - spaceService.addInvitedUser(space3, maryIdentity.getRemoteId()); - //assert Digest message - assertMadeMailDigestNotifications(2); - List ntfs = assertMadeMailDigestNotifications(maryIdentity.getRemoteId(), 2); - List messages = new ArrayList(); - for (NotificationInfo m : ntfs) { - m.setTo(maryIdentity.getRemoteId()); - messages.add(m); - } - Writer writer = new StringWriter(); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(messages); - buildDigest(ctx, writer); - - assertDigest(writer, "You have been asked to joing the following spaces: my space 2, my space 3."); - notificationService.clearAll(); - - } - public void testDigestCancelInvitation() throws Exception { - //Make more invitations - Space space1 = getSpaceInstance(1); - Space space2 = getSpaceInstance(2); - Space space3 = getSpaceInstance(3); - Space space4 = getSpaceInstance(4); - Space space5 = getSpaceInstance(5); - space1.setEditor(rootIdentity.getRemoteId()); - space2.setEditor(rootIdentity.getRemoteId()); - space3.setEditor(rootIdentity.getRemoteId()); - space4.setEditor(rootIdentity.getRemoteId()); - space5.setEditor(rootIdentity.getRemoteId()); - spaceService.addInvitedUser(space1, demoIdentity.getRemoteId()); - spaceService.addInvitedUser(space2, demoIdentity.getRemoteId()); - spaceService.addInvitedUser(space3, demoIdentity.getRemoteId()); - spaceService.addInvitedUser(space4, demoIdentity.getRemoteId()); - spaceService.addInvitedUser(space5, demoIdentity.getRemoteId()); - - //assert Digest message - assertMadeMailDigestNotifications(5); - List ntfs = assertMadeMailDigestNotifications(demoIdentity.getRemoteId(), 5); - List messages = new ArrayList(); - for (NotificationInfo m : ntfs) { - m.setTo(demoIdentity.getRemoteId()); - messages.add(m); - } - - //space2 cancel invitation to demo - spaceService.removeInvitedUser(space2, demoIdentity.getRemoteId()); - - Writer writer = new StringWriter(); - NotificationContext ctx = NotificationContextImpl.cloneInstance(); - ctx.setNotificationInfos(messages); - buildDigest(ctx, writer); - - assertDigest(writer, "You have been asked to joing the following spaces: my space 1, my space 3, my space 4 and 1 others."); - notificationService.clearAll(); - - } } diff --git a/component/notification/src/test/java/org/exoplatform/social/notification/mock/MockNotificationService.java b/component/notification/src/test/java/org/exoplatform/social/notification/mock/MockNotificationService.java index de23b7cb903..a36996dd364 100644 --- a/component/notification/src/test/java/org/exoplatform/social/notification/mock/MockNotificationService.java +++ b/component/notification/src/test/java/org/exoplatform/social/notification/mock/MockNotificationService.java @@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils; -import org.exoplatform.commons.api.notification.NotificationContext; import org.exoplatform.commons.api.notification.model.NotificationInfo; import org.exoplatform.commons.api.notification.model.UserSetting; import org.exoplatform.commons.api.notification.service.setting.PluginSettingService; @@ -43,7 +42,6 @@ public class MockNotificationService implements NotificationService { - private Map> storedDigest = new HashMap<>(); private Map> storeInstantly = new HashMap<>(); private Map> storeWebNotifs = new HashMap<>(); @@ -55,24 +53,11 @@ public int sizeOfWebNotifs() { return this.storeWebNotifs.values().stream().mapToInt(List::size).sum(); } - public int sizeOfStoredDigest() { - return this.storedDigest.values().stream().mapToInt(List::size).sum(); - } - - public int sizeOfStoredDigest(String username) { - return this.storedDigest.containsKey(username) ? this.storedDigest.get(username).size() : 0; - } - public void clearAll() { - clearOfStoredDigest(); clearOfInstantly(); clearOfWebNotifs(); } - public void clearOfStoredDigest() { - this.storedDigest.clear(); - } - public void clearOfInstantly() { this.storeInstantly.clear(); } @@ -81,10 +66,6 @@ public void clearOfWebNotifs() { this.storeWebNotifs.clear(); } - public List storeDigest(String username) { - return this.storedDigest.containsKey(username) ? this.storedDigest.get(username) : Collections.emptyList(); - } - public List storeInstantly(String username) { return this.storeInstantly.containsKey(username) ? this.storeInstantly.get(username) : Collections.emptyList(); } @@ -148,12 +129,6 @@ public void process(NotificationInfo notification) throws Exception { } this.storeWebNotifs.get(userId).add(notification); } - if (userSetting.isInDaily(pluginId) || userSetting.isInWeekly(pluginId)) { - if (!this.storedDigest.containsKey(userId)) { - this.storedDigest.put(userId, new ArrayList<>()); - } - this.storedDigest.get(userId).add(notification); - } } } @@ -164,9 +139,4 @@ public void process(Collection messages) throws Exception { process(message); } } - - @Override - public void digest(NotificationContext context) throws Exception { - // TODO Auto-generated method stub - } } diff --git a/component/notification/src/test/resources/conf/exo.social.component.notification-configuration.xml b/component/notification/src/test/resources/conf/exo.social.component.notification-configuration.xml index 97022aedede..87415b228f8 100644 --- a/component/notification/src/test/resources/conf/exo.social.component.notification-configuration.xml +++ b/component/notification/src/test/resources/conf/exo.social.component.notification-configuration.xml @@ -54,11 +54,6 @@ org.exoplatform.commons.notification.impl.PluginStatisticService - - org.exoplatform.commons.api.notification.service.template.DigestorService - org.exoplatform.commons.notification.impl.service.template.DigestorServiceImpl - - org.exoplatform.commons.api.notification.service.setting.PluginContainer org.exoplatform.commons.notification.impl.setting.NotificationPluginContainer @@ -156,7 +151,6 @@ Instantly - daily @@ -191,7 +185,6 @@ Instantly - daily @@ -226,7 +219,6 @@ Instantly - daily @@ -262,11 +254,6 @@ 9 - - - weekly - - activity_stream @@ -383,9 +370,6 @@ Instantly - - daily - @@ -427,9 +411,6 @@ Instantly - - daily - @@ -541,11 +522,6 @@ 1 - - - daily - - general @@ -622,7 +598,6 @@ Instantly - daily @@ -661,7 +636,6 @@ Instantly - weekly @@ -700,7 +674,6 @@ Instantly - weekly diff --git a/component/notification/src/test/resources/conf/exo.social.component.notification-local-configuration.xml b/component/notification/src/test/resources/conf/exo.social.component.notification-local-configuration.xml index e98f30f91f4..f95aa43a387 100644 --- a/component/notification/src/test/resources/conf/exo.social.component.notification-local-configuration.xml +++ b/component/notification/src/test/resources/conf/exo.social.component.notification-local-configuration.xml @@ -52,17 +52,6 @@ org.exoplatform.commons.api.notification.channel.ChannelManager - - mail.channel.template - registerTemplateProvider - org.exoplatform.commons.notification.channel.template.DigestMailTemplateProvider - - - channel-id - MAIL_CHANNEL - - - mail.channel.social.template registerTemplateProvider diff --git a/component/notification/src/test/resources/locale/notification/template/Notification_en.properties b/component/notification/src/test/resources/locale/notification/template/Notification_en.properties index f37f8a5b54f..921e37a16ef 100644 --- a/component/notification/src/test/resources/locale/notification/template/Notification_en.properties +++ b/component/notification/src/test/resources/locale/notification/template/Notification_en.properties @@ -26,9 +26,6 @@ Notification.label.AccountDeactivationRequestPlugin.loggedOut=The user is now lo Notification.label.AccountDeactivationRequestPlugin.reactivate=If needed, you can activate it again from the platform users management. Notification.label.AccountDeactivationRequestPlugin.seeMore=See More Notification.label.AccountDeactivationRequestPlugin.thanks=Thanks -Notification.digest.one.AccountDeactivationRequestPlugin=$USER has requested to deactivate their account. -Notification.digest.three.AccountDeactivationRequestPlugin=$USER_LIST have requested to deactivate their accounts. -Notification.digest.more.AccountDeactivationRequestPlugin=$LAST3_USERS and $COUNT more have requested to deactivate their accounts. ############################################################################# # NewUserPlugin # ############################################################################# @@ -42,9 +39,6 @@ Notification.title.NewUserPlugin=New user on {0} Notification.message.NewUserPlugin={0} has joined {1}. Interested to connect and start collaborate with {0}? Notification.intranet.message.NewUserPlugin={0} has joined {1} # For Digest -Notification.digest.one.NewUserPlugin=$USER has joined $PORTAL_NAME -Notification.digest.three.NewUserPlugin=$USER_LIST have joined $PORTAL_NAME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS and $COUNT more have joined $PORTAL_NAME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -61,9 +55,6 @@ Notification.feedback.RelationshipReceivedRequestPlugin=You refused {0} connecti Notification.intranet.message.RelationshipReceivedRequestPlugin={0} wants to connect with you Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=You are connected with {0} # For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=You've received a connection request from $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=You've received a connection request from $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=You've received a connection request from $LAST3_USERS and $COUNT others. ############################################################################# # SpaceInvitationPlugin # @@ -80,9 +71,6 @@ Notification.feedback.SpaceInvitationPlugin=You refused to join {0}. Notification.intranet.message.SpaceInvitationPlugin=You're invited to join {0} space Notification.intranet.message.accept.SpaceInvitationPlugin=You joined {0} space # For Digest -Notification.digest.one.SpaceInvitationPlugin=You have been asked to join the following space: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=You have been asked to joing the following spaces: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=You have been asked to joing the following spaces: $LAST3_SPACES and $COUNT others. ############################################################################# # RequestJoinSpacePlugin # @@ -101,9 +89,6 @@ Notification.feedback-nok.RequestJoinSpacePlugin=You refused {0} to join the spa Notification.intranet.message.RequestJoinSpacePlugin={0} has requested access to {1} space Notification.intranet.message.accept.RequestJoinSpacePlugin={0} joined {1} space # For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER has asked to join the $SPACE space. -Notification.digest.three.RequestJoinSpacePlugin=The following users have asked to join the $SPACE space: $USER_LIST. -Notification.digest.more.RequestJoinSpacePlugin=The following users have asked to join the $SPACE space: $LAST3_USERS with $COUNT others. ############################################################################# # ActivityMentionPlugin # @@ -118,9 +103,6 @@ Notification.title.ActivityMentionPlugin=New mention of you Notification.message.ActivityMentionPlugin={0} has mentioned you in the following post Notification.intranet.message.ActivityMentionPlugin={0} has mentioned you # For Digest -Notification.digest.one.ActivityMentionPlugin=$USER has mentioned you in an activity: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST have mentioned you in an activity: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS and $COUNT others have mentioned you in an activity: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -137,9 +119,6 @@ Notification.intranet.message.one.ActivityCommentPlugin={0} has commented on you Notification.intranet.message.two.ActivityCommentPlugin={0} and {1} have commented on your activity Notification.intranet.message.more.ActivityCommentPlugin={0}, {1} and {2} more have commented # For Digest -Notification.digest.one.ActivityCommentPlugin=$USER has commented on your activity: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST have commented on your activity: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS with $COUNT others have commented on your activity: $ACTIVITY ############################################################################# # ActivityReplyToCommentPlugin # @@ -158,9 +137,6 @@ Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} has replied t Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} and {1} have replied to your comment. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} and {2} more have replied to your comment. # For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER has replied to your comment: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST have replied to your comment: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS and $COUNT other(s) have replied to your comment: $ACTIVITY ############################################################################# # LikePlugin # @@ -177,9 +153,6 @@ Notification.intranet.message.one.LikePlugin={0} likes your activity Notification.intranet.message.two.LikePlugin={0} and {1} like your activity Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more like your activity # For Digest -Notification.digest.one.LikePlugin=$USER likes your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST like your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT others like your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -196,9 +169,6 @@ Notification.intranet.message.one.LikeCommentPlugin={0} likes your comment. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} like your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} more like your comment. # For Digest -Notification.digest.one.LikeCommentPlugin=$USER has liked your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST have liked your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) have liked your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -213,9 +183,6 @@ Notification.title.PostActivityPlugin=New post on your activity stream Notification.message.PostActivityPlugin={0} posted on your activity stream. See the post below Notification.intranet.message.PostActivityPlugin={0} has posted on your activity stream # For Digest -Notification.digest.one.PostActivityPlugin=$USER posted on your activity stream. -Notification.digest.three.PostActivityPlugin=$USER_LIST posted on your activity stream. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS and $COUNT others posted on your activity stream. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -230,17 +197,8 @@ Notification.title.PostActivitySpaceStreamPlugin=New post on your activity strea Notification.message.PostActivitySpaceStreamPlugin={0} posted an activity in the {1}. See the post below Notification.intranet.message.PostActivitySpaceStreamPlugin={0} has posted an activity in the {1} space # For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER posted in $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST posted in $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS and $COUNT others posted in $SPACE. -Notification.digest.one.EditActivityPlugin=$USER edited activity: -Notification.digest.three.EditActivityPlugin=$USER_LIST edited their activities: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS and $COUNT other(s) edited activities: -Notification.digest.one.EditCommentPlugin=$USER edited comment: -Notification.digest.three.EditCommentPlugin=$USER_LIST edited comments: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS and $COUNT other(s) edited comments: ############################################################################# # SharedActivitySpacePlugin # @@ -255,9 +213,6 @@ Notification.title.SharedActivitySpaceStreamPlugin=New post on your activity str Notification.message.SharedActivitySpaceStreamPlugin={0} has shared an activity in the {1} space. See the post below Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} has shared an activity in the {1} space # For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER shared in $SPACE. -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER_LIST shared in $SPACE. -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS and $COUNT others shared in $SPACE. ############################################################################# # NotificationByActivityType # diff --git a/component/notification/src/test/resources/notification/templates/DigestDailyPlugin.gtmpl b/component/notification/src/test/resources/notification/templates/DigestDailyPlugin.gtmpl deleted file mode 100644 index 948af4004e7..00000000000 --- a/component/notification/src/test/resources/notification/templates/DigestDailyPlugin.gtmpl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - -
    - - - - -
    - <%=_ctx.appRes("Notification.title.DigestProvider", PORTAL_NAME, _ctx.appRes("Notification.label.Today"))%> -
    -
    - - - - -
    - - - - -
    -

    <%=_ctx.appRes("Notification.label.SayHello")%> <%=FIRSTNAME%>,

    -

    <%=_ctx.appRes("Notification.message.DigestProvider", PORTAL_NAME, _ctx.appRes("Notification.label.Daily"))%> -

    - <%=DIGEST_MESSAGES_LIST%> - <% - String footerLink = "" + _ctx.appRes("Notification.label.ClickHere") + ""; - %> -

    - <%=_ctx.appRes("Notification.footer.DigestProvider", footerLink)%> -

    -
    -
    -
    - - - - -
    -

    - <%=_ctx.appRes("Notification.label.CompanyName")%> -

    -
    -
    \ No newline at end of file diff --git a/component/notification/src/test/resources/notification/templates/DigestWeeklyPlugin.gtmpl b/component/notification/src/test/resources/notification/templates/DigestWeeklyPlugin.gtmpl deleted file mode 100644 index 4c9d0d01bb5..00000000000 --- a/component/notification/src/test/resources/notification/templates/DigestWeeklyPlugin.gtmpl +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - -
    - - - - -
    - <% - def nowCal = Calendar.instance; - def y = nowCal.get(Calendar.YEAR); - Date nowDate = nowCal.time; - def m = nowDate[Calendar.MONTH] + 1; - def d = nowDate[Calendar.DATE]; - - int cdow = nowCal.get(Calendar.DAY_OF_WEEK); - Calendar lastFri = (Calendar) nowCal.clone(); - lastFri.add(Calendar.DATE, -7 - (cdow - Calendar.FRIDAY)); - - def lastFriYear = lastFri.get(Calendar.YEAR); - Date lastFriDate = lastFri.time; - def lastFriMonth = lastFriDate[Calendar.MONTH] + 1; - def lastFriDay = lastFriDate[Calendar.DATE]; - - String dateTime = lastFriMonth + "/" + lastFriDay + "/" + lastFriYear + " - " + m + "/" + d + "/" + y; - %> - <%=_ctx.appRes("Notification.title.DigestProvider", PORTAL_NAME, dateTime)%> -
    -
    - - - - -
    - - - - -
    -

    <%=_ctx.appRes("Notification.label.SayHello")%> <%=FIRSTNAME%>,

    -

    <%=_ctx.appRes("Notification.message.DigestProvider", PORTAL_NAME)%> <%=_ctx.appRes("Notification.label.Weekly")%>. -

    - <%=DIGEST_MESSAGES_LIST%> - <% - String footerLink = "" + _ctx.appRes("Notification.label.ClickHere") + ""; - %> -

    - <%=_ctx.appRes("Notification.footer.DigestProvider", footerLink)%> -

    -
    -
    -
    - - - - -
    -

    - <%=_ctx.appRes("Notification.label.CompanyName")%> -

    -
    -
    \ No newline at end of file diff --git a/component/service/src/main/java/io/meeds/social/digest/rest/DigestRest.java b/component/service/src/main/java/io/meeds/social/digest/rest/DigestRest.java new file mode 100644 index 00000000000..82eabedb9eb --- /dev/null +++ b/component/service/src/main/java/io/meeds/social/digest/rest/DigestRest.java @@ -0,0 +1,132 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.digest.rest; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.security.access.annotation.Secured; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; + +import io.meeds.commons.digest.DigestService; +import io.meeds.commons.digest.model.DigestCategory; +import io.meeds.commons.digest.model.DigestUserSettings; +import io.meeds.social.digest.rest.model.DigestCategoryEntity; +import io.meeds.social.digest.rest.model.DigestSettingsEntity; +import io.meeds.social.digest.rest.model.DigestUserSettingsEntity; +import io.meeds.social.timezone.service.UserTimeZoneService; + +import jakarta.servlet.http.HttpServletRequest; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; + +@RestController +@RequestMapping("notifications/digest") +@Tag(name = "/social/rest/notifications/digest", description = "Managing digest mail notification settings") +public class DigestRest { + + @Autowired + private DigestService digestService; + + @Autowired + private UserTimeZoneService userTimeZoneService; + + @GetMapping("settings") + @Secured("users") + @Operation(summary = "Retrieves the digest mail notification settings", method = "GET", + description = "Retrieves the platform-wide administrator switch state, the categories offered by the installed addons and the choices of the current user") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Request fulfilled"), + @ApiResponse(responseCode = "403", description = "Forbidden"), + }) + public DigestSettingsEntity getSettings(HttpServletRequest request) { + boolean digestAllowed = digestService.isDigestAllowed(); + if (!digestAllowed) { + // Nothing to display, the categories and the user choices are useless + return new DigestSettingsEntity(false, List.of(), false, List.of(), false, List.of()); + } + DigestUserSettings userSettings = digestService.getUserSettings(request.getRemoteUser()); + return new DigestSettingsEntity(true, + toCategoryEntities(digestService.getCategories(request.getLocale())), + userSettings.isDaily(), + userSettings.getDailyCategories(), + userSettings.isWeekly(), + userSettings.getWeeklyCategories()); + } + + @PatchMapping(path = "settings", consumes = MediaType.APPLICATION_JSON_VALUE) + @Secured("users") + @Operation(summary = "Saves the digest mail notification choices of the current user", method = "PATCH", + description = "Saves the frequencies and the categories the current user chose, and enrolls him in the digest sending") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Request fulfilled"), + @ApiResponse(responseCode = "400", description = "Invalid query input"), + @ApiResponse(responseCode = "403", description = "Forbidden, or digest mail notifications not allowed by the administrator"), + }) + public void saveUserSettings(HttpServletRequest request, + @RequestBody + DigestUserSettingsEntity settings) { + String username = request.getRemoteUser(); + try { + digestService.saveUserSettings(username, + new DigestUserSettings(settings.isDaily(), + settings.getDailyCategories(), + settings.isWeekly(), + settings.getWeeklyCategories()), + userTimeZoneService.getUserTimeZone(username)); + } catch (IllegalAccessException e) { + throw new ResponseStatusException(HttpStatus.FORBIDDEN, e.getMessage()); + } catch (IllegalArgumentException e) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); + } + } + + @PatchMapping(path = "allowed", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE) + @Secured("administrators") + @Operation(summary = "Saves the administrator switch allowing users to set digest mail notifications", method = "PATCH", + description = "Saves the administrator switch allowing users to set digest mail notifications. Administrators only.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Request fulfilled"), + @ApiResponse(responseCode = "403", description = "Forbidden"), + }) + public void saveDigestAllowed(@Parameter(description = "true to allow users to set digest mail notifications", required = true) + @RequestParam("allowed") + boolean allowed) { + digestService.saveDigestAllowed(allowed); + } + + private List toCategoryEntities(List categories) { + return categories.stream() + .map(category -> new DigestCategoryEntity(category.getId(), category.getLabel())) + .toList(); + } + +} diff --git a/component/service/src/main/java/io/meeds/social/digest/rest/model/DigestCategoryEntity.java b/component/service/src/main/java/io/meeds/social/digest/rest/model/DigestCategoryEntity.java new file mode 100644 index 00000000000..431e44422fb --- /dev/null +++ b/component/service/src/main/java/io/meeds/social/digest/rest/model/DigestCategoryEntity.java @@ -0,0 +1,39 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.digest.rest.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * A category the user can pick in the digest settings drawer. Only the + * categories of the installed addons are sent. + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DigestCategoryEntity { + + private String id; + + /** Already translated in the language of the user */ + private String label; + +} diff --git a/component/service/src/main/java/io/meeds/social/digest/rest/model/DigestSettingsEntity.java b/component/service/src/main/java/io/meeds/social/digest/rest/model/DigestSettingsEntity.java new file mode 100644 index 00000000000..eea62423488 --- /dev/null +++ b/component/service/src/main/java/io/meeds/social/digest/rest/model/DigestSettingsEntity.java @@ -0,0 +1,49 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.digest.rest.model; + +import java.util.List; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * Everything the digest settings drawer needs in one call: whether the + * administrator allows the digest, the categories the installed addons offer, + * and the choices of the current user. + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DigestSettingsEntity { + + private boolean digestAllowed; + + private List categories; + + private boolean daily; + + private List dailyCategories; + + private boolean weekly; + + private List weeklyCategories; + +} diff --git a/component/service/src/main/java/io/meeds/social/digest/rest/model/DigestUserSettingsEntity.java b/component/service/src/main/java/io/meeds/social/digest/rest/model/DigestUserSettingsEntity.java new file mode 100644 index 00000000000..32726601348 --- /dev/null +++ b/component/service/src/main/java/io/meeds/social/digest/rest/model/DigestUserSettingsEntity.java @@ -0,0 +1,43 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.digest.rest.model; + +import java.util.List; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * The digest choices sent by the settings drawer. + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DigestUserSettingsEntity { + + private boolean daily; + + private List dailyCategories; + + private boolean weekly; + + private List weeklyCategories; + +} diff --git a/component/service/src/main/java/io/meeds/social/timezone/rest/TimeZoneRest.java b/component/service/src/main/java/io/meeds/social/timezone/rest/TimeZoneRest.java new file mode 100644 index 00000000000..c48574e86bf --- /dev/null +++ b/component/service/src/main/java/io/meeds/social/timezone/rest/TimeZoneRest.java @@ -0,0 +1,66 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.timezone.rest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.security.access.annotation.Secured; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; + +import io.meeds.social.timezone.service.UserTimeZoneService; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("timezone") +@Tag(name = "/social/rest/timezone", description = "Keeps the timezone of the current user up to date") +public class TimeZoneRest { + + @Autowired + private UserTimeZoneService userTimeZoneService; + + @PostMapping(consumes = MediaType.TEXT_PLAIN_VALUE) + @Secured("users") + @Operation(summary = "Saves the timezone the browser of the current user lives in", method = "POST", + description = "Saves the timezone the browser of the current user lives in, so that everything sent to him on a schedule goes out at the right local hour") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Request fulfilled"), + @ApiResponse(responseCode = "400", description = "Unknown timezone"), + @ApiResponse(responseCode = "403", description = "Forbidden"), + }) + public void saveUserTimeZone(HttpServletRequest request, + @RequestBody + String timeZone) { + try { + userTimeZoneService.saveUserTimeZone(request.getRemoteUser(), timeZone); + } catch (IllegalArgumentException e) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); + } + } + +} diff --git a/component/service/src/test/java/io/meeds/social/digest/rest/DigestRestTest.java b/component/service/src/test/java/io/meeds/social/digest/rest/DigestRestTest.java new file mode 100644 index 00000000000..cb6e9ec3358 --- /dev/null +++ b/component/service/src/test/java/io/meeds/social/digest/rest/DigestRestTest.java @@ -0,0 +1,210 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2026 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.digest.rest; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; +import org.springframework.http.MediaType; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.ResultActions; +import org.springframework.test.web.servlet.request.RequestPostProcessor; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import io.meeds.commons.digest.DigestService; +import io.meeds.commons.digest.model.DigestCategory; +import io.meeds.commons.digest.model.DigestUserSettings; +import io.meeds.social.timezone.service.UserTimeZoneService; +import io.meeds.spring.web.security.PortalAuthenticationManager; +import io.meeds.spring.web.security.WebSecurityConfiguration; + +import jakarta.servlet.Filter; + +@SpringBootTest(classes = { DigestRest.class, PortalAuthenticationManager.class, }) +@ContextConfiguration(classes = { WebSecurityConfiguration.class }) +@AutoConfigureWebMvc +@AutoConfigureMockMvc(addFilters = false) +@RunWith(SpringRunner.class) +public class DigestRestTest { + + private static final String SIMPLE_USER = "simple"; + + private static final String ADMIN_USER = "admin"; + + private static final String TEST_PASSWORD = "testPassword"; + + private static final String SETTINGS_BODY = "{\"daily\":true,\"dailyCategories\":[\"spaces\"],\"weekly\":false,\"weeklyCategories\":[]}"; + + @Autowired + private SecurityFilterChain filterChain; + + @Autowired + private WebApplicationContext context; + + @MockitoBean + private DigestService digestService; + + @MockitoBean + private UserTimeZoneService userTimeZoneService; + + private MockMvc mockMvc; + + @Before + public void setup() { + mockMvc = MockMvcBuilders.webAppContextSetup(context) + .addFilters(filterChain.getFilters().toArray(new Filter[0])) + .build(); + } + + @Test + public void getSettingsAnonymously() throws Exception { + ResultActions response = mockMvc.perform(get("/notifications/digest/settings")); + response.andExpect(status().isForbidden()); + } + + @Test + public void getSettingsWithUser() throws Exception { + when(digestService.getUserSettings(anyString())).thenReturn(new DigestUserSettings(false, List.of(), false, List.of())); + when(digestService.getCategories(any())).thenReturn(List.of(new DigestCategory("spaces", "Spaces"))); + when(digestService.isDigestAllowed()).thenReturn(true); + ResultActions response = mockMvc.perform(get("/notifications/digest/settings").with(testSimpleUser())); + response.andExpect(status().isOk()) + .andExpect(jsonPath("$.digestAllowed").value(true)) + .andExpect(jsonPath("$.categories[0].id").value("spaces")) + .andExpect(jsonPath("$.categories[0].label").value("Spaces")); + + when(digestService.isDigestAllowed()).thenReturn(false); + response = mockMvc.perform(get("/notifications/digest/settings").with(testSimpleUser())); + response.andExpect(status().isOk()) + .andExpect(jsonPath("$.digestAllowed").value(false)); + } + + @Test + public void saveUserSettingsAnonymously() throws Exception { + ResultActions response = mockMvc.perform(patch("/notifications/digest/settings").contentType(MediaType.APPLICATION_JSON) + .content(SETTINGS_BODY)); + response.andExpect(status().isForbidden()); + verify(digestService, never()).saveUserSettings(anyString(), any(), any()); + } + + @Test + public void saveUserSettingsWithUserEnrollsTheCallerWithHisProfileTimeZone() throws Exception { + // The owner is the authenticated user, the timezone comes from his profile, + // never from the request + when(userTimeZoneService.getUserTimeZone(SIMPLE_USER)).thenReturn("Europe/Paris"); + + ResultActions response = mockMvc.perform(patch("/notifications/digest/settings").contentType(MediaType.APPLICATION_JSON) + .content(SETTINGS_BODY) + .with(testSimpleUser())); + + response.andExpect(status().isOk()); + verify(digestService).saveUserSettings(eq(SIMPLE_USER), + eq(new DigestUserSettings(true, List.of("spaces"), false, List.of())), + eq("Europe/Paris")); + } + + @Test + public void saveUserSettingsRefusedByTheAdministratorSwitchIs403() throws Exception { + doThrow(new IllegalAccessException("digest.notAllowed")).when(digestService).saveUserSettings(anyString(), any(), any()); + + ResultActions response = mockMvc.perform(patch("/notifications/digest/settings").contentType(MediaType.APPLICATION_JSON) + .content(SETTINGS_BODY) + .with(testSimpleUser())); + + response.andExpect(status().isForbidden()); + } + + @Test + public void saveUserSettingsWithAFrequencyAndNoCategoryIs400() throws Exception { + doThrow(new IllegalArgumentException("digest.noCategory")).when(digestService).saveUserSettings(anyString(), any(), any()); + + ResultActions response = mockMvc.perform(patch("/notifications/digest/settings").contentType(MediaType.APPLICATION_JSON) + .content("{\"daily\":true,\"dailyCategories\":[],\"weekly\":false,\"weeklyCategories\":[]}") + .with(testSimpleUser())); + + response.andExpect(status().isBadRequest()); + } + + @Test + public void saveDigestAllowedAnonymously() throws Exception { + ResultActions response = mockMvc.perform(patch("/notifications/digest/allowed").contentType(MediaType.APPLICATION_FORM_URLENCODED) + .content("allowed=true")); + response.andExpect(status().isForbidden()); + } + + @Test + public void saveDigestAllowedWithUser() throws Exception { + ResultActions response = mockMvc.perform(patch("/notifications/digest/allowed").contentType(MediaType.APPLICATION_FORM_URLENCODED) + .content("allowed=true") + .with(testSimpleUser())); + response.andExpect(status().isForbidden()); + } + + @Test + public void saveDigestAllowedWithAdmin() throws Exception { + // Same wire format as the real frontend call: form-encoded PATCH body + ResultActions response = mockMvc.perform(patch("/notifications/digest/allowed").contentType(MediaType.APPLICATION_FORM_URLENCODED) + .content("allowed=true") + .with(testAdminUser())); + response.andExpect(status().isOk()); + verify(digestService).saveDigestAllowed(true); + + response = mockMvc.perform(patch("/notifications/digest/allowed").contentType(MediaType.APPLICATION_FORM_URLENCODED) + .content("allowed=false") + .with(testAdminUser())); + response.andExpect(status().isOk()); + verify(digestService).saveDigestAllowed(false); + } + + private RequestPostProcessor testSimpleUser() { + return user(SIMPLE_USER).password(TEST_PASSWORD) + .authorities(new SimpleGrantedAuthority("users")); + } + + private RequestPostProcessor testAdminUser() { + return user(ADMIN_USER).password(TEST_PASSWORD) + .authorities(new SimpleGrantedAuthority("administrators")); + } + +} diff --git a/component/service/src/test/java/org/exoplatform/social/service/test/InitContainerTestSuite.java b/component/service/src/test/java/org/exoplatform/social/service/test/InitContainerTestSuite.java index 35fcecc2835..01d6eef288f 100644 --- a/component/service/src/test/java/org/exoplatform/social/service/test/InitContainerTestSuite.java +++ b/component/service/src/test/java/org/exoplatform/social/service/test/InitContainerTestSuite.java @@ -54,6 +54,7 @@ @RunWith(Suite.class) @SuiteClasses({ + io.meeds.social.digest.rest.DigestRestTest.class, VersionResourcesTest.class, RestCheckerTest.class, UtilTest.class, diff --git a/component/service/src/test/resources/conf/exo.social.component.service-local-configuration.xml b/component/service/src/test/resources/conf/exo.social.component.service-local-configuration.xml index 092f324ff50..e6ecdf8a411 100644 --- a/component/service/src/test/resources/conf/exo.social.component.service-local-configuration.xml +++ b/component/service/src/test/resources/conf/exo.social.component.service-local-configuration.xml @@ -68,7 +68,6 @@ Instantly - weekly @@ -107,7 +106,6 @@ Instantly - weekly @@ -146,7 +144,6 @@ Instantly - weekly diff --git a/webapp/src/main/java/io/meeds/social/SocialApplication.java b/webapp/src/main/java/io/meeds/social/SocialApplication.java index 6d0ce122993..61cdf097b14 100644 --- a/webapp/src/main/java/io/meeds/social/SocialApplication.java +++ b/webapp/src/main/java/io/meeds/social/SocialApplication.java @@ -30,6 +30,7 @@ SocialApplication.MODULE_NAME, SocialApplication.PORTAL_WEB_SECURITY_MODULE_NAME, SocialApplication.PORTAL_MODULE_NAME, + SocialApplication.COMMONS_DIGEST_MODULE_NAME, AvailableIntegration.KERNEL_MODULE, AvailableIntegration.JPA_MODULE, AvailableIntegration.WEB_MODULE, @@ -40,6 +41,7 @@ SocialApplication.MODULE_NAME, SocialApplication.PORTAL_MODULE_NAME, SocialApplication.PORTAL_WEB_SECURITY_MODULE_NAME, + SocialApplication.COMMONS_DIGEST_MODULE_NAME, }) @PropertySource("classpath:application.properties") @PropertySource("classpath:application-common.properties") @@ -52,4 +54,6 @@ public class SocialApplication extends PortalApplicationContextInitializer { public static final String PORTAL_WEB_SECURITY_MODULE_NAME = "io.meeds.web.security"; + public static final String COMMONS_DIGEST_MODULE_NAME = "io.meeds.commons.digest"; + } diff --git a/webapp/src/main/resources/locale/notification/template/Notification_ar.properties b/webapp/src/main/resources/locale/notification/template/Notification_ar.properties index 542490ee528..a24f5bd9fc8 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_ar.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_ar.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=USER$ انضمّ الى PORTAL_NAME$ Notification.title.NewUserPlugin=مستخدم جديد في {0} Notification.message.NewUserPlugin={0} قد انضمّ إلى {1}. هل أنت مهتم(ة) بالاتصال وبدء التعاون مع {0}؟ Notification.intranet.message.NewUserPlugin={0} قد انضمّ(ت) إلى {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER قد انضمّ(ت) إلى $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST قد انضمّ(ت) إلى $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS و $COUNT آخرين قد انضمّوا الى $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} أرسل لك طلب Notification.feedback.RelationshipReceivedRequestPlugin=لقد قمت برفض طلب اتصال المرسل من قبل {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} يرغب بالاتصال بك Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=أنت متصل(ـة) مع {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=لقد تلقيت طلب اتصال من طرف $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=لقد تلقيت طلب اتصال من طرف لقد تلقيت طلب اتصال من $LAST3_USERS و $COUNT آخر(ين). ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=لقد تلقيت دعوة للانض Notification.intranet.message.SpaceInvitationPlugin={0} دعاك للانضمام إلى الفضاء {1}. Notification.intranet.message.accept.SpaceInvitationPlugin=انضممت الآن إلى الفضاء {0}. Notification.feedback.SpaceInvitationPlugin=لقد رفضت الانضمام إلى {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=تمّت دعوتك للانضمام إلى الفضاء التالي: $SPACE. -Notification.digest.three.SpaceInvitationPlugin= تمّت دعوتك للانضمام إلى الفضاءات التالية: $SPACE. -Notification.digest.more.SpaceInvitationPlugin= تمّت دعوتك للانضمام إلى الفضاءات التالية: $LAST3_SPACES و $COUNTآخرين. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} انضم إلى Notification.feedback-ok.RequestJoinSpacePlugin=لقد وافقت على طلب الانضمام إلى الفضاء. Notification.feedback-exist.RequestJoinSpacePlugin={0} هو بالفعل عضو من أعضاء {1}. Notification.feedback-nok.RequestJoinSpacePlugin=لقد قمت برفض طلب {0} للانضمام إلى الفضاء. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER قد طلب الانضمام إلى $SPACE -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST قد طلبوا الانضمام إلى $SPACE الفضاء. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS و $COUNT آخرون قد طلبوا الانضمام إلى $SPACE الفضاء. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=تمّت الاشارة إليك من Notification.title.ActivityMentionPlugin=إشارة جديدة تخصّك Notification.message.ActivityMentionPlugin=تمّت الاشارة لك من طرف {0} في المراسلة التالية Notification.intranet.message.ActivityMentionPlugin={0} قام بالاشارة لك. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER قام بالاشارة لك في: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER قام بالاشارة لك في: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS و $COUNT (s) أخرون قاموا بالاشارة لك أو ذكرك في: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} و {1} قاما بتعد Notification.intranet.message.more.EditCommentPlugin={0}و {1} و {2} قاموا بتعديل التعليقات. Notification.intranet.message.one.EditActivityPlugin=تم تحرير مشاركة {0}. Notification.label.readMore=اقرأ المزيد -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER قد علّق على النشاط الخاصّ بك: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST قد علّقوا على النشاط الخاصّ بك: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS و $COUNT آخرين قاموا باضافة تعليقات على النشاط الخاصّ بك: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER حررت المشاركة: -Notification.digest.three.EditActivityPlugin=$USER_LIST تحرير المشاركات: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS و $COUNT تم تحرير مشاركة أخرى: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER أعجب بتعليقك: $ACTIVITY -Notification.digest.three.EditCommentPlugin=$USER سجّل إعجابه بالنشاط الخاص بك: $ACTIVITY -Notification.digest.more.EditCommentPlugin=$LAST3_USERS و $COUNT آخرين قاموا بتسجيل اعجابهم بالنشاط الخاصّ بك: $ACTIVITY ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} رد على تعليقك. Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} رد على تعليقك. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} و {1} ردوا على تعليقك. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} و {2} آخرون ردوا على تعليقك. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER رد على تعليقك: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST رد على تعليقك: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS و $COUNT اخرون ردوا على تعليقك: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER قام بنشر رسالة على Notification.title.PostActivityPlugin=رسالة جديدة في تيارالنشاط الخاصّ بك Notification.message.PostActivityPlugin={0} قام بنشر رسالة على تيار النشاط الخاص بك. انظرالى المحتوى أدناه Notification.intranet.message.PostActivityPlugin={0} قام بنشر رسالة على تـيّار النشاط الخاصّ بك. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER قام بنشر رسالة على تيار النشاط الخاص بك. -Notification.digest.three.PostActivityPlugin=$USER_LIST قام بنشر رسالة على النشاط الخاصّ بك. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS و $COUNT آخرون قاموا بنشر رسائل على النشاط الخاصّ بك. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER قام بنشر رسا Notification.title.PostActivitySpaceStreamPlugin=رسالة جديدة في {0} Notification.message.PostActivitySpaceStreamPlugin={0} قام بنشر رسالة على تـيّار النشاط الخاصّ بالفضاء {1}. أنظر الرسالة أدناه Notification.intranet.message.PostActivitySpaceStreamPlugin={0} قام بنشر رسالة على تـيّار النشاط الخاصّ بالفضاء {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER قام بنشر رسالة في الفضاء $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST قاموا بنشر رسائل في الفضاء $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS و $COUNT آخرون قاموا بنشر رسائل في $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=شارك $USER نشاطا Notification.title.SharedActivitySpaceStreamPlugin=رسالة جديدة في تيارالنشاط الخاصّ بك Notification.message.SharedActivitySpaceStreamPlugin={0} نشر رسالة على تـيّار النشاط الخاصّ بالفضاء {1}. أنظر الرسالة أدناه Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} نشر رسالة على تـيّار النشاط الخاصّ بالفضاء {1}. -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER شارك في $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER شارك في $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS و $COUNT آخرين شاركوا في $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_aro.properties b/webapp/src/main/resources/locale/notification/template/Notification_aro.properties index 728d9b7a4f4..0180b3b8383 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_aro.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_aro.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=USER$ انضمّ الى PORTAL_NAME$ Notification.title.NewUserPlugin=مستخدم جديد في {0} Notification.message.NewUserPlugin={0} قد انضمّ إلى {1}. هل أنت مهتم(ة) بالاتصال وبدء التعاون مع {0}؟ Notification.intranet.message.NewUserPlugin={0} قد انضمّ(ت) إلى {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER قد انضمّ(ت) إلى $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST قد انضمّ(ت) إلى $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS و $COUNT آخرين قد انضمّوا الى $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} أرسل لك طلب Notification.feedback.RelationshipReceivedRequestPlugin=لقد قمت برفض طلب اتصال المرسل من قبل {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} يرغب بالاتصال بك Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=أنت متصل(ـة) مع {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=لقد تلقيت طلب اتصال من طرف $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=لقد تلقيت طلب اتصال من طرف لقد تلقيت طلب اتصال من $LAST3_USERS و $COUNT آخر(ين). ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=لقد تلقيت دعوة للانض Notification.intranet.message.SpaceInvitationPlugin={0} دعاك للانضمام إلى الفضاء {1}. Notification.intranet.message.accept.SpaceInvitationPlugin=انضممت الآن إلى مساحة {0}. Notification.feedback.SpaceInvitationPlugin=لقد رفضت الانضمام إلى {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=تمّت دعوتك للانضمام إلى المساحة التالية: $SPACE. -Notification.digest.three.SpaceInvitationPlugin= تمّت دعوتك للانضمام إلى المساحات التالية: $SPACE. -Notification.digest.more.SpaceInvitationPlugin= تمّت دعوتك للانضمام إلى المساحات التالية: $LAST3_SPACES و $COUNTآخرين. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} انضم إلى Notification.feedback-ok.RequestJoinSpacePlugin=لقد وافقت على طلب الانضمام إلى المساحة. Notification.feedback-exist.RequestJoinSpacePlugin={0} هو بالفعل عضو من أعضاء {1}. Notification.feedback-nok.RequestJoinSpacePlugin=لقد قمت برفض طلب {0} للانضمام إلى المساحة. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER قد طلب الانضمام إلى $SPACE -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST قد طلبوا الانضمام إلى $SPACE المساحة. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS و $COUNT آخرون قد طلبوا الانضمام إلى $SPACE المساحة. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=تمّت الاشارة إليك من Notification.title.ActivityMentionPlugin=إشارة جديدة تخصّك Notification.message.ActivityMentionPlugin=تمّت الاشارة لك من طرف {0} في المراسلة التالية Notification.intranet.message.ActivityMentionPlugin={0} قام بالاشارة لك. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER قام بالاشارة لك في: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER قام بالاشارة لك في: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS و $COUNT (s) أخرون قاموا بالاشارة لك أو ذكرك في: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} و {1} قاما بتعد Notification.intranet.message.more.EditCommentPlugin={0}و {1} و {2} قاموا بتعديل التعليقات. Notification.intranet.message.one.EditActivityPlugin=تم تحرير مشاركة {0}. Notification.label.readMore=اقرأ المزيد -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER قد علّق على النشاط الخاصّ بك: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST قد علّقوا على النشاط الخاصّ بك: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS و $COUNT آخرين قاموا باضافة تعليقات على النشاط الخاصّ بك: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER حررت المشاركة: -Notification.digest.three.EditActivityPlugin=$USER_LIST تحرير المشاركات: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS و $COUNT تم تحرير مشاركة أخرى: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER أعجب بتعليقك: $ACTIVITY -Notification.digest.three.EditCommentPlugin=$USER سجّل إعجابه بالنشاط الخاص بك: $ACTIVITY -Notification.digest.more.EditCommentPlugin=$LAST3_USERS و $COUNT آخرين قاموا بتسجيل اعجابهم بالنشاط الخاصّ بك: $ACTIVITY ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} رد على تعليقك. Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} رد على تعليقك. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} و {1} ردوا على تعليقك. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} و {2} آخرون ردوا على تعليقك. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER رد على تعليقك: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST رد على تعليقك: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS و $COUNT اخرون ردوا على تعليقك: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER قام بنشر رسالة على Notification.title.PostActivityPlugin=رسالة جديدة في تيارالنشاط الخاصّ بك Notification.message.PostActivityPlugin={0} قام بنشر رسالة على تيار النشاط الخاص بك. انظرالى المحتوى أدناه Notification.intranet.message.PostActivityPlugin={0} قام بنشر رسالة على تـيّار النشاط الخاصّ بك. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER قام بنشر رسالة على تيار النشاط الخاص بك. -Notification.digest.three.PostActivityPlugin=$USER_LIST قام بنشر رسالة على النشاط الخاصّ بك. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS و $COUNT آخرون قاموا بنشر رسائل على النشاط الخاصّ بك. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER قام بنشر رسا Notification.title.PostActivitySpaceStreamPlugin=رسالة جديدة في {0} Notification.message.PostActivitySpaceStreamPlugin={0} قام بنشر رسالة على تـيّار النشاط الخاصّ بالمساحة {1}. أنظر الرسالة أدناه Notification.intranet.message.PostActivitySpaceStreamPlugin={0} قام بنشر رسالة على تـيّار النشاط الخاصّ بالمساحة {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER قام بنشر رسالة في المساحة $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST قاموا بنشر رسائل في المساحة $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS و $COUNT آخرون قاموا بنشر رسائل في $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=شارك $USER نشاطا Notification.title.SharedActivitySpaceStreamPlugin=رسالة جديدة في تيارالنشاط الخاصّ بك Notification.message.SharedActivitySpaceStreamPlugin={0} نشر رسالة على تـيّار النشاط الخاصّ بالفضاء {1}. أنظر الرسالة أدناه Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} نشر رسالة على تـيّار النشاط الخاصّ بالفضاء {1}. -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER شارك في $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER شارك في $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS و $COUNT آخرين شاركوا في $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_ca.properties b/webapp/src/main/resources/locale/notification/template/Notification_ca.properties index aaa41bfb6d3..449cc68fc40 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_ca.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_ca.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER s'ha incorporat a $PORTAL_NAME Notification.title.NewUserPlugin=Nou usuari a {0} Notification.message.NewUserPlugin={0} s'ha incorporat {1}. Interessat en connectar i començar a col·laborar amb {0}? Notification.intranet.message.NewUserPlugin={0} s'ha unit {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER s'ha incorportat $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST s'han incorporat $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS i $COUNT més s'han incorporat $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} ha enviat una sol·li Notification.feedback.RelationshipReceivedRequestPlugin=Ha refusat la sol·licitud de connexió de {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} vol connectar amb tu Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Estàs connectat amb {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Has rebut una sol·licitud de connexió de $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Has rebut una sol·licitud de connexió de $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Has rebut una sol·licitud de connexió de $LAST3_USERS i $COUNT més. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Has rebut una invitació per unir-te Notification.intranet.message.SpaceInvitationPlugin={0} t'ha convidat a unir-te a l'espai {1} Notification.intranet.message.accept.SpaceInvitationPlugin=T'has unit a l'espai {0}. Notification.feedback.SpaceInvitationPlugin=Ha negat a unir-se a {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Ha estat convidat a unir-se a l'espai següent: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Ha estat convidat a unir-se als espais següents: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Ha estat convidat a unir-se als espais següents: $LAST3_SPACES i $COUNT més. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} es va unir a l'e Notification.feedback-ok.RequestJoinSpacePlugin=S'ha aprovat la sol·licitud a unir-se a l'espai. Notification.feedback-exist.RequestJoinSpacePlugin={0} ja és membre de {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Ha refusat a {0} per unir-se a l'espai. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER ha demanat unir-se al espai $SPACE . -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST han demanat unir-se al espai $SPACE . -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS i $COUNT més, t'han demanat unir-se al espai $SPACE . ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Ha estat esmentat per $USER Notification.title.ActivityMentionPlugin=Nova menció seva Notification.message.ActivityMentionPlugin={0} l'ha esmentat en el següent missatge Notification.intranet.message.ActivityMentionPlugin={0} t'ha esmentat. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER t'ha mencionat en: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST t'ha mencionat en: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS i $COUNT més, t'han esmenta en: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} i {1} comentaris editats Notification.intranet.message.more.EditCommentPlugin={0}, {1} i {2} han editat comentaris. Notification.intranet.message.one.EditActivityPlugin=S'ha editat la publicació de {0}. Notification.label.readMore=Llegeix més -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER ha comentat aquesta publicació: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST han comentat aquesta publicació: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS i $COUNT més han comentat en la teva activitat: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER publicació editada: -Notification.digest.three.EditActivityPlugin=$USER_LIST publicacions editades: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS i $COUNT altres publicacions editades: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER comentari editat: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST comentaris editats: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS i $COUNT altres comentaris editats: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} ha respost al seu comentar Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} ha respost al seu comentari. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} i {1} han respost al seu comentari. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} i {2} persones més han respost al seu comentari. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER ha respost al seu comentari: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST ha respost al seu comentari: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS i $COUNT persona(es) més ha(n) respost al seu comentari: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER ha publicat el teu flux d'activita Notification.title.PostActivityPlugin=Nova entrada en el teu flux d'activitat Notification.message.PostActivityPlugin={0} ha publicat el teu flux d'activitat. Mira el missatge a sota Notification.intranet.message.PostActivityPlugin={0} ha publicat al teu flux d'activitat. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER ha publicat al teu flux d'activitat. -Notification.digest.three.PostActivityPlugin=$USER_LIST ha publicat al teu flux d'activitat. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS i $COUNT més, han publicat el al seu fil d'activitat. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER ha publicat una activit Notification.title.PostActivitySpaceStreamPlugin=Nova entrada a {0} Notification.message.PostActivitySpaceStreamPlugin={0} ha publicat una activitat a l'espai {1}. Mira el missatge a sota Notification.intranet.message.PostActivitySpaceStreamPlugin={0} ha publicat una activitat a l'espai {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER ha publicat a $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST han publicat en $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS i $COUNT més han publicat en $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER ha compartit una acti Notification.title.SharedActivitySpaceStreamPlugin=Nova entrada en el teu flux d'activitat Notification.message.SharedActivitySpaceStreamPlugin={0} ha compartit un article "{1}" a l'espai {2}. Vegeu la publicació a continuació Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} ha compartit una activitat a l'espai {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER compartit a $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER compartit a $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS i $COUNT més s'han compartit a $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_co.properties b/webapp/src/main/resources/locale/notification/template/Notification_co.properties index 8f3d63e2b96..1be27de7e5e 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_co.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_co.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER hà unitu à $PORTAL_NAME Notification.title.NewUserPlugin=Novu utilizatore nantu à {0} Notification.message.NewUserPlugin={0} hà unitu à {1}. Interessatu à cunnette è cumincià à cullaburazione cù {0}? Notification.intranet.message.NewUserPlugin={0} hà unitu à {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER hè unitu $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST anu unitu $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS è $COUNT altri anu unitu $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} vi hà mandatu una du Notification.feedback.RelationshipReceivedRequestPlugin=Avete rifiutatu {0} dumanda di cunnessione. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} vole cunnetta cun voi Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Sò cunnessu cù {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Avete ricevutu una dumanda di cunnessione da $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Avete ricevutu una dumanda di cunnessione da $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Avete ricevutu una dumanda di cunnessione da $LAST3_USERS è $COUNT altri. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Avete ricevutu un invitu à unisce à Notification.intranet.message.SpaceInvitationPlugin={0} vi hà invitatu à unisce à {1} spaziu Notification.intranet.message.accept.SpaceInvitationPlugin=Avete unitu à {0} spaziu. Notification.feedback.SpaceInvitationPlugin=Avete ricusatu di unisce à {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Avete statu invitatu à unisce à u seguente spaziu: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Avete statu invitatu à unisce à i seguenti spazii: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Avete statu invitatu à unisce à i seguenti spazii: $LAST3_SPACES è $COUNT altri. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} hà unitu à {1} Notification.feedback-ok.RequestJoinSpacePlugin=Avete appruvatu a dumanda di unisce à u spaziu. Notification.feedback-exist.RequestJoinSpacePlugin={0} hè digià un membru di {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Avete ricusatu {0} di unisce à u spaziu. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER hà dumandatu à unisce à u $SPACE spaziu. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST anu dumandatu à unisce à u $SPACE u spaziu. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS è $COUNT altri anu dumandatu à unisce à $SPACE spaziu. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Avete statu mintuatu da $USER Notification.title.ActivityMentionPlugin=Una nova menzione di voi Notification.message.ActivityMentionPlugin={0} vi hà mintuatu in u post dopu Notification.intranet.message.ActivityMentionPlugin={0} t'hà citatu. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER ti hà mintuatu in: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST ti anu mintuatu in: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS è $COUNT altri vi anu citatu in: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} è {1} cumenti editati. Notification.intranet.message.more.EditCommentPlugin={0}, {1} è {2} cumenti editati. Notification.intranet.message.one.EditActivityPlugin=U postu di {0} hè statu editatu. Notification.label.readMore=Leghjite più -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER hà cummentatu stu postu: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST anu cummentatu stu post: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS è $COUNT altri anu cummentatu à a vostra attività: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER post editatu: -Notification.digest.three.EditActivityPlugin=$USER_LIST publicazioni editate: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS è $COUNT altri post editati: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER cumentu editatu: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST Cumenti editati: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS è $COUNT altri cumenti editati: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} hà rispostu à u vostru c Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} hà rispostu à u vostru cumentu. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} è {1} anu rispostu à u vostru cumentu. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} è {2} altri anu rispostu à u vostru cumentu. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER hà rispostu à u vostru cumentu: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST hà rispostu à u vostru cumentu: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS è $COUNT altri anu rispostu à u vostru cumentu: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER hà publicatu nantu à u vostru fe Notification.title.PostActivityPlugin=Postu novu nantu à u vostru feed Notification.message.PostActivityPlugin={0} hà publicatu nantu à u vostru feed. Vede u post sottu. Notification.intranet.message.PostActivityPlugin={0} hà publicatu nantu à u vostru feed. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER hà publicatu u vostru feed. -Notification.digest.three.PostActivityPlugin=$USER_LIST anu publicatu in u vostru feed. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS è $COUNT altri anu publicatu in u vostru feed. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER hà publicatu una attiv Notification.title.PostActivitySpaceStreamPlugin=Postu novu in {0} Notification.message.PostActivitySpaceStreamPlugin={0} hà publicatu una attività in u spaziu {1}. Vede u post sottu Notification.intranet.message.PostActivitySpaceStreamPlugin={0} hà publicatu una attività in u spaziu {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER hà publicatu in $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST anu publicatu in $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS è $COUNT altri anu publicatu in $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER hà spartutu una atti Notification.title.SharedActivitySpaceStreamPlugin=Postu novu nantu à u vostru flussu di attività Notification.message.SharedActivitySpaceStreamPlugin={0} hà spartutu un articulu "{1}" in u spaziu {2}. Vede u post sottu Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} hà spartutu una attività in u spaziu {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER hà spartutu in $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER hà spartutu in $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS è $COUNT altri anu spartutu in $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_cs.properties b/webapp/src/main/resources/locale/notification/template/Notification_cs.properties index 6136f67424c..62fab7b4158 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_cs.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_cs.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER se připojil k $PORTAL_NAME Notification.title.NewUserPlugin=Nový uživatel na {0} Notification.message.NewUserPlugin={0} se připojil k {1}. Máte zájem se připojit a začít spolupracovat s {0}? Notification.intranet.message.NewUserPlugin={0} se připojil k {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER se připojil $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST se připojili k $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS a $COUNT další(ch)se připojilo k $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} vám poslal žádost Notification.feedback.RelationshipReceivedRequestPlugin=You refused {0} connection request. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} se chce s vámi spojit Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Jste propojeni s {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Obdrželi jste žádost o spojení od $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Obdrželi jste žádost o spojení od $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Obdrželi jste žádost o spojení od $LAST3_USERS a od dalších $COUNT. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Obdrželi jste pozvánku do skupiny { Notification.intranet.message.SpaceInvitationPlugin={0} vás pozval do skupiny {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Připojili jste se k {0} místnosti. Notification.feedback.SpaceInvitationPlugin=Odmítli jste se přidat k {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Byli jste pozváni do následující skupiny: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Byli jste pozváni do následujících skupin: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Byli jste pozváni do následujících skupin: $LAST3_SPACES a $COUNT dalších. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} se připojil k { Notification.feedback-ok.RequestJoinSpacePlugin=Schválil(a) jste žádost o přidání do skupiny. Notification.feedback-exist.RequestJoinSpacePlugin={0} je již členem {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Odmítli jste {0} připojit se ke skupině. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER požádal(a) o připojení ke skupině $SPACE . -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST požádal o připojení ke skupině $SPACE . -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS a $COUNT další(ch) zažádali o připojení ke skupině $SPACE . ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Byl jste zmíněn uživatelem $USER Notification.title.ActivityMentionPlugin=Nová zmínka o Vás Notification.message.ActivityMentionPlugin={0} Vás uvedl v následujícím příspěvku Notification.intranet.message.ActivityMentionPlugin={0} se o vás zmínil. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER Vás zmínil v: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST Vás zmínili v: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS a $COUNT další(ch) Vás zmínili v: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} a {1} upravily komentá Notification.intranet.message.more.EditCommentPlugin={0}, {1} a {2} upravily komentáře. Notification.intranet.message.one.EditActivityPlugin=Příspěvek {0}byl upraven. Notification.label.readMore=Číst více -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER okomentoval tento příspěvek: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST okomentoval tento příspěvek: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS a $COUNT další(ch) okomentovali Váš příspěvek: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER upravený příspěvek: -Notification.digest.three.EditActivityPlugin=$USER_LIST upravované příspěvky: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS a $COUNT další upravili příspěvek: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER upravil komentář: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST upravil komentář: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS a $COUNT další upravili komentář: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} odpověděl na váš komen Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} odpověděl na váš komentář. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} a {1} odpověděli na váš komentář. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} a {2} další odpověděli na váš komentář. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER odpověděl na váš komentář: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST odpověděl na váš komentář: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS a $COUNT ostatní odpověděli na váš komentář: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER přidal příspěvek na Váš sled Notification.title.PostActivityPlugin=Nový příspěvek na sledu událostí Notification.message.PostActivityPlugin={0} přidal příspěvek do Vašeho sledu událostí. Viz příspěvek níže Notification.intranet.message.PostActivityPlugin={0} zveřejnil příspěvek ve vašem stromu aktivit. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER přidal příspěvek do Vašeho sledu událostí. -Notification.digest.three.PostActivityPlugin=$USER_LIST přidal příspěvek do Vašeho sledu událostí. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS a $COUNT další(ch) přidali příspěvek do Vašeho sledu událostí. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER přidal příspěvek ve Notification.title.PostActivitySpaceStreamPlugin=Nový příspěvek v {0} Notification.message.PostActivitySpaceStreamPlugin={0} přidal příspěvek do skupiny {1}. Viz příspěvek níže Notification.intranet.message.PostActivitySpaceStreamPlugin={0} zveřejnil příspěvek k aktivitě v {1} místnosti. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER přidal příspěvek do $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST přidali příspěvky do $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS a $COUNT další(ch) přidali příspěvek do $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER sdílel aktivitu v $S Notification.title.SharedActivitySpaceStreamPlugin=Nový příspěvek na sledu událostí Notification.message.SharedActivitySpaceStreamPlugin={0} sdílel článek "{1}" v prostoru {2} . Viz příspěvek níže Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} sdílel aktivitu ve skupině {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER sdíleno v $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER sdíleno v $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS a $COUNT další sdíleli v $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_de.properties b/webapp/src/main/resources/locale/notification/template/Notification_de.properties index 4fba40aa266..939f2e20e09 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_de.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_de.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER ist $PORTAL_NAME beigetreten Notification.title.NewUserPlugin=Neuer Benutzer auf {0} Notification.message.NewUserPlugin={0} ist {1} beigetreten. Wollen Sie sich mit {0} verbinden und zusammenarbeiten? Notification.intranet.message.NewUserPlugin={0} ist {1} beigetreten. -# For Digest -Notification.digest.one.NewUserPlugin=$USER ist $PORTAL_HOME beigetreten -Notification.digest.three.NewUserPlugin=$USER_LIST sind $PORTAL_HOME beigetreten. -Notification.digest.more.NewUserPlugin=$LAST3_USERS und $COUNT weitere sind $PORTAL_HOMEbeigetreten. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} hat Ihnen eine Verbin Notification.feedback.RelationshipReceivedRequestPlugin=Sie haben die Verbindungsanfrage von {0} abgelehnt. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} möchte mit Ihnen eine Verbindung herstellen Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Sie sind mit {0} verbunden -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin= du hast eine Verbindungsanforderung von $USER bekommen. -Notification.digest.three.RelationshipReceivedRequestPlugin= du hast eine Verbindungsanforderung von $USER_LIST bekommen. -Notification.digest.more.RelationshipReceivedRequestPlugin= Sie haben eine Verbindungsanfrage von $LAST3_USERS erhalten und $COUNT andere (s). ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Sie haben eine Einladung für den Rau Notification.intranet.message.SpaceInvitationPlugin={0} hat Sie eingeladen den Raum {1} beizutreten. Notification.intranet.message.accept.SpaceInvitationPlugin=Sie sind dem {0} Raum beigetreten. Notification.feedback.SpaceInvitationPlugin=Sie verweigerte {0} den Zutritt. -# For Digest -Notification.digest.one.SpaceInvitationPlugin= Sie wurden eingeladen folgenden Raum zubetreten: $SPACE. -Notification.digest.three.SpaceInvitationPlugin= Sie wurden eingeladen, die folgenden Räume beizutreten: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin= Sie wurden eingeladen, die folgenden Räume beizutreten: $LAST3_SPACES und andere $COUNT (s). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} betrat den Raum Notification.feedback-ok.RequestJoinSpacePlugin=Sie genehmigen die Anforderung an den Raum beizutreten. Notification.feedback-exist.RequestJoinSpacePlugin={0} ist bereits ein Mitglied des {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Sie weigerte sich {0} um den Raum zu verbinden. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER hat sie gebeten $SPACE Platz. beizutreten -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST haben sie gebeten Mitglied der $SPACE Platz. zu werden -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS und $COUNT andere haben gebeten Mitglied des $SPACE Platz. zuwerden ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Sie wurden durch $Benutzer erwähnt Notification.title.ActivityMentionPlugin=Neue Erwähnung Notification.message.ActivityMentionPlugin={0} hat Sie in folgendem Post erwähnt Notification.intranet.message.ActivityMentionPlugin={0} hat Sie erwähnt. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER hat Sie erwähnt in: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST haben Sie erwähnt in: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS und $COUNT andere erwähnten Sie: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} und {1} haben einen Beit Notification.intranet.message.more.EditCommentPlugin={0}, {1} und {2} haben Kommentare bearbeitet. Notification.intranet.message.one.EditActivityPlugin=Der Beitrag von {0} wurde bearbeitet. Notification.label.readMore=Weiterlesen -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER hat Ihre Aktivität kommentiert: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST haben Ihre Aktivität kommentierte: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS und $COUNT andere (n) haben Ihre Aktivität kommentierte: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER bearbeitete die Veröffentlichung: -Notification.digest.three.EditActivityPlugin=$USER_LIST hat Veröffentlichungen bearbeitet: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS und $COUNT andere bearbeiteten die Veröffentlichung: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER bearbeiteter Kommentar: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST bearbeiteter Kommentare: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS und $COUNT andere bearbeiteten die Aktivität: $ACTIVITY ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} hat auf deinen Kommentar g Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} hat auf deinen Kommentar geantwortet. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} und {1} haben auf deinen Kommentar geantwortet. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} und {2} weitere haben auf deinen Kommentar geantwortet. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER haben auf deinen Kommentar geantwortet: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST haben auf deinen Kommentar geantwortet: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS und $COUNT haben auf deinen Kommentar geantwortet.: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER hat in Ihrem Aktivitätsfluss gepo Notification.title.PostActivityPlugin=Neuer Beitrag auf Ihrem Aktivitätsfluss Notification.message.PostActivityPlugin={0} hat etwas in Ihrem Aktivitätsfluss veröffentlicht. Siehe Beitrag unten Notification.intranet.message.PostActivityPlugin={0} hat in Ihrem Aktivitätsfluss veröffentlicht. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER veröffentliche in your activity stream. -Notification.digest.three.PostActivityPlugin=$USER_LIST veröffentlichte Aktivitätsfluss. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS und $COUNT andere (s) haben geschrieben am Ihre Aktivitätsfluss. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER hat eine Aktivität in$ Notification.title.PostActivitySpaceStreamPlugin=Neuer Beitrag im {0} Notification.message.PostActivitySpaceStreamPlugin={0} hat eine Aktivität im Raum {1} gepostet. Siehe Beitrag unten Notification.intranet.message.PostActivitySpaceStreamPlugin={0} hat eine Aktivität in Raum {1} gepostet. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER veröffentlichte in $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST veröffentlichte in $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS und $COUNT andere (s) haben in $SPACE veröffentlicht. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER hat eine Aktivität i Notification.title.SharedActivitySpaceStreamPlugin=Neuer Beitrag auf Ihrem Aktivitätsfluss Notification.message.SharedActivitySpaceStreamPlugin={0} hat einen Artikel "{1}" im {2} Raum freigegeben. Siehe den Beitrag unten Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} hat eine Aktivität im {1} Raum geteilt -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$Benutzer hat im $Raum geteilt. -Notification.digest.three.SharedActivitySpaceStreamPlugin=$BENUTZER_LISTE im $RAUM geteilt. -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LETZTE3_NUTZER und $COUNT andere haben $RAUM geteilt. ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_el.properties b/webapp/src/main/resources/locale/notification/template/Notification_el.properties index c8fe7cf7240..25e0779b6ff 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_el.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_el.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=Ο χρήστης $USER έχει ενταχθ Notification.title.NewUserPlugin=Νέος χρήστης στο {0} Notification.message.NewUserPlugin=Ο χρήστης {0} έχει ενταχθεί στο {1}. Μήπως επιθυμείτε να συνδεθείτε και να ξεκινήσετε να συνεργάζεστε με το χρήστη {0}; Notification.intranet.message.NewUserPlugin={0} συμμετέχει στο {1}. -# For Digest -Notification.digest.one.NewUserPlugin=Ο χρήστης $USER έχει ενταχθεί στο $PORTAL_HOME -Notification.digest.three.NewUserPlugin=Οι χρήστες $USER _LIST έχουν ενταχθεί στο $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=Οι χρήστες $LAST3_USERS και $COUNT ακόμη έχουν ενταχθεί στο $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin=Ο χρήστης {0} έ Notification.feedback.RelationshipReceivedRequestPlugin=Αρνηθήκατε αίτηση σύνδεσης του/της {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} θέλει να συνδεθεί μαζί σας Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Είστε συνδεδεμένοι με {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Έχετε λάβει μια αίτηση σύνδεσης από $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Έχετε λάβει αίτηση σύνδεσης από $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Έχετε λάβει μια αίτηση σύνδεσης από $LAST3_USERS και $COUNT ακόμα χρήστες. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Έχετε λάβει πρόσκλη Notification.intranet.message.SpaceInvitationPlugin=Ο χρήστης {0} σας προσκάλεσε να εγγραφείτε στο {1} space Notification.intranet.message.accept.SpaceInvitationPlugin=Συμμετέχετε στο Χώρο {0}. Notification.feedback.SpaceInvitationPlugin=Αρνηθήκατε να ενταχθείτε στο {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Έχετε προσκληθεί να συμμετάσχετε στον παρακάτω χώρο: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Έχετε προσκληθεί να συμμετάσχετε στους παρακάτω χώρους: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Έχετε προσκληθεί να συμμετάσχετε στους εξής χώρους: $LAST3_SPACES και σε $COUNT ακόμα. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} συμμετέχ Notification.feedback-ok.RequestJoinSpacePlugin=Εγκρίνατε την αίτηση ένταξής στον χώρο. Notification.feedback-exist.RequestJoinSpacePlugin=Το {0} είναι ήδη μέλος του {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Αρνηθήκατε {0} να ενταχθείτε στο χώρο. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER ζήτησε να ενταχθεί στο χώρο $SPACE . -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST ζήτησαν να ενταχθούν στο χώρο $SPACE . -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS και $COUNT ακόμα χρήστες ζήτησαν να ενταχθούν στο χώρο $SPACE . ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Ο χρήστης $USER αναφέρ Notification.title.ActivityMentionPlugin=Κάποιος σας ανέφερε Notification.message.ActivityMentionPlugin={0} αναφέρθηκε σε σας στην ακόλουθη ανάρτηση Notification.intranet.message.ActivityMentionPlugin={0} έχει αναφερθεί σε σας. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER σας ανέφερε στο: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST σας ανέφεραν στο: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS και $COUNT ακόμα χρήστες σας ανέφεραν στο: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} και {1} επεξερ Notification.intranet.message.more.EditCommentPlugin={0}, {1} και {2} επεξεργασμένα σχόλια. Notification.intranet.message.one.EditActivityPlugin=Η δημοσίευση {0}επεξεργάστηκε. Notification.label.readMore=Διαβάστε Περισσότερα -# For Digest -Notification.digest.one.ActivityCommentPlugin=Το $USER σχολίασε αυτό το post: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST σχολίασαν αυτή τη δημοσίευση: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS και $COUNT ακόμα χρήστες έχουν σχολιάσει σχετικά με τη δραστηριότητά σας: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER επεξεργασία ανάρτησης: -Notification.digest.three.EditActivityPlugin=$USER_LIST επεξεργασμένες αναρτήσεις: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS and $COUNT other(s) edited post: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER επεξεργασία σχολίου: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST επεξεργασμένα σχόλια: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS and $COUNT other(s) edited comments: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin=Το {0} απάντησε στ Notification.intranet.message.one.ActivityReplyToCommentPlugin=Το {0} απάντησε στο σχόλιό σας. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} και {1} απάντησαν στο σχόλιό σας. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} και {2} άλλοι απάντησαν στο σχόλιό σας. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=Το $USER απάντησε στο σχόλιό σας: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=Το $USER_LIST απάντησε στο σχόλιό σας: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS and $COUNT other(s) replied to your comment: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER ανάρτησε στο ρεύμα Notification.title.PostActivityPlugin=Νέα ανάρτηση στο ρεύμα δραστηριοτήτων σας Notification.message.PostActivityPlugin={0} ανάρτησε στο ρεύμα δραστηριοτήτων σας. Δείτε την ανάρτηση παρακάτω Notification.intranet.message.PostActivityPlugin={0} έκανε ανάρτηση στο ρεύμα δραστηριότητας σας. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER ανάρτησε στο ρεύμα δραστηριοτήτων σας. -Notification.digest.three.PostActivityPlugin=$USER_LIST ανάρτησαν στο ρεύμα δραστηριοτήτων σας. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS και $COUNT ακόμα έχουν αναρτήσει στο ρεύμα δραστηριοτήτων σας. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER έχει αναρτήσ Notification.title.PostActivitySpaceStreamPlugin=Νέα ανάρτηση στο {0} Notification.message.PostActivitySpaceStreamPlugin={0} έχει δημοσιεύσει μια δραστηριότητα στο χώρο {1}. Δείτε την παρακάτω ανάρτηση Notification.intranet.message.PostActivitySpaceStreamPlugin={0} έχει δημοσιεύσει μια δραστηριότητα στο χώρο {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER έχει δημοσιεύσει στο $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST δημοσίευσαν στο $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS και $COUNT ακόμα έχουν δημοσιεύσει στο $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=Ο $USER κοινοποίη Notification.title.SharedActivitySpaceStreamPlugin=Νέα ανάρτηση στο ρεύμα δραστηριοτήτων σας Notification.message.SharedActivitySpaceStreamPlugin=Το {0} κοινοποίησε ένα άρθρο "{1}" στο χώρο {2} . Δείτε την παρακάτω ανάρτηση Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} έχει κοινοποιήσει μια δραστηριότητα στο χώρο {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=Ο χρήστης $USER κοινοποιήθηκε στο $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=Ο χρήστης $USER κοινοποιήθηκε στο $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS και $COUNT άλλοι μοιράστηκαν στο $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_en.properties b/webapp/src/main/resources/locale/notification/template/Notification_en.properties index d14c7951ca1..a02fac6d104 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_en.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_en.properties @@ -18,9 +18,6 @@ Notification.label.AccountDeactivationRequestPlugin.reactivate=If needed, you ca Notification.label.AccountDeactivationRequestPlugin.seeMore=See More Notification.label.AccountDeactivationRequestPlugin.thanks=Thanks Notification.intranet.message.AccountDeactivationRequestPlugin=Account Deactivation Request by {0} -Notification.digest.one.AccountDeactivationRequestPlugin=$USER has requested to deactivate their account. -Notification.digest.three.AccountDeactivationRequestPlugin=$USER_LIST have requested to deactivate their accounts. -Notification.digest.more.AccountDeactivationRequestPlugin=$LAST3_USERS and $COUNT more have requested to deactivate their accounts. Notification.label.ConnectNow=Connect now Notification.label.Confirm=Confirm Notification.label.Accept=Accept @@ -50,9 +47,6 @@ Notification.title.NewUserPlugin=New user on {0} Notification.message.NewUserPlugin={0} has joined {1}. Interested to connect and start collaborate with {0}? Notification.intranet.message.NewUserPlugin={0} has joined {1}. # For Digest -Notification.digest.one.NewUserPlugin=$USER has joined $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST have joined $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS and $COUNT more have joined $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -69,9 +63,6 @@ Notification.feedback.RelationshipReceivedRequestPlugin=You refused {0} connecti Notification.intranet.message.RelationshipReceivedRequestPlugin={0} wants to connect with you Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=You are connected with {0} # For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=You've received a connection request from $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=You've received a connection request from $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=You've received a connection request from $LAST3_USERS and $COUNT other(s). ############################################################################# # SpaceInvitationPlugin # @@ -88,9 +79,6 @@ Notification.intranet.message.SpaceInvitationPlugin={0} invited you to join {1} Notification.intranet.message.accept.SpaceInvitationPlugin=You joined {0} space. Notification.feedback.SpaceInvitationPlugin=You refused to join {0}. # For Digest -Notification.digest.one.SpaceInvitationPlugin=You have been invited to join the following space: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=You have been invited to join the following spaces: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=You have been invited to join the following spaces: $LAST3_SPACES and $COUNT other(s). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -123,9 +111,6 @@ Notification.feedback-ok.RequestJoinSpacePlugin=You approved the request to join Notification.feedback-exist.RequestJoinSpacePlugin={0} is already a member of {1}. Notification.feedback-nok.RequestJoinSpacePlugin=You refused {0} to join the space. # For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER has asked to join the $SPACE space. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST have asked to join the $SPACE space. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS and $COUNT other(s) have asked to join the $SPACE space. ############################################################################# # ActivityMentionPlugin # @@ -140,9 +125,6 @@ Notification.title.ActivityMentionPlugin=New mention of you Notification.message.ActivityMentionPlugin={0} has mentioned you in the following post Notification.intranet.message.ActivityMentionPlugin={0} has mentioned you. # For Digest -Notification.digest.one.ActivityMentionPlugin=$USER has mentioned you in: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST have mentioned you in: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS and $COUNT other(s) have mentioned you in: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -174,17 +156,8 @@ Notification.intranet.message.more.EditCommentPlugin={0}, {1} and {2} edited com Notification.intranet.message.one.EditActivityPlugin={0}'s post was edited. Notification.label.readMore=Read More # For Digest -Notification.digest.one.ActivityCommentPlugin=$USER has commented on this post: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST have commented this post: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS and $COUNT other(s) have commented on your activity: $ACTIVITY -Notification.digest.one.EditActivityPlugin=$USER edited post: -Notification.digest.three.EditActivityPlugin=$USER_LIST edited posts: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS and $COUNT other(s) edited post: $ACTIVITY -Notification.digest.one.EditCommentPlugin=$USER edited comment: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST edited comments: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS and $COUNT other(s) edited comments: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -203,9 +176,6 @@ Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} replied to yo Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} and {1} replied to your comment. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} and {2} others replied to your comment. # For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER replied to your comment: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST replied to your comment: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS and $COUNT other(s) replied to your comment: $ACTIVITY ############################################################################# # LikePlugin # @@ -228,9 +198,6 @@ Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. # For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -253,9 +220,6 @@ Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. # For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -270,9 +234,6 @@ Notification.title.PostActivityPlugin=New post on your feed Notification.message.PostActivityPlugin={0} has posted on your feed. See the post below. Notification.intranet.message.PostActivityPlugin={0} has posted on your feed. # For Digest -Notification.digest.one.PostActivityPlugin=$USER has posted on your feed. -Notification.digest.three.PostActivityPlugin=$USER_LIST have posted on your feed. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS and $COUNT others have posted on your feed. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -287,9 +248,6 @@ Notification.title.PostActivitySpaceStreamPlugin=New post in {0} Notification.message.PostActivitySpaceStreamPlugin={0} has posted an activity in the {1} space. See the post below Notification.intranet.message.PostActivitySpaceStreamPlugin={0} has posted an activity in the {1} space. # For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER has posted in $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST have posted in $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS and $COUNT other(s) have posted in $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -305,9 +263,6 @@ Notification.title.SharedActivitySpaceStreamPlugin=New post on your activity str Notification.message.SharedActivitySpaceStreamPlugin={0} has shared an article "{1}" in the {2} space. See the post below Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} has shared an activity in the {1} space # For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER shared in $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER shared in $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS and $COUNT others shared in $SPACE ############################################################################# # NotificationByActivityType # @@ -370,3 +325,11 @@ Notification.report.reason.hateSpeechOrDiscrimination=Hate Speech or Discriminat Notification.report.reason.violenceOrThreats=Violence or Threats Notification.report.reason.falseInformation=False Information Notification.report.reason.intellectualPropertyViolation=Intellectual Property Violation +# Digest mail notifications: labels of the categories social contributes +digest.category.spaces=Spaces +digest.category.feed=Feed +# Digest mail notifications: one line per notification type. {0} is who did it +digest.line.SpaceInvitationPlugin={0} invited you to join {1} +digest.line.RequestJoinSpacePlugin={0} requested to join {1} +digest.line.PostActivitySpaceStreamPlugin={0} posted "{1}" in {2} +digest.line.ActivityCommentWatchPlugin={0} commented on "{1}" you're watching diff --git a/webapp/src/main/resources/locale/notification/template/Notification_es_ES.properties b/webapp/src/main/resources/locale/notification/template/Notification_es_ES.properties index 4a7803076bf..f80f2201bb1 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_es_ES.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_es_ES.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER se ha unido a $PORTAL_NAME Notification.title.NewUserPlugin=Nuevo usuario en {0} Notification.message.NewUserPlugin={0} se ha unido a {1}. ¿Te interesa conectar y empezar a colaborar con {0}? Notification.intranet.message.NewUserPlugin={0} se ha unido a {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER se ha unido a $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST se incorporaron $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS y $COUNT más se han incorporado $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} te ha enviado una sol Notification.feedback.RelationshipReceivedRequestPlugin=Has rechazado la solicitud de conexión de {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} quiere conectar contigo Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Está conectado con {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Has recibido una solicitud de conexión de $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Has recibido una solicitud de conexión de $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Has recibido una solicitud de conexión de $LAST3_USERS y $COUNT más. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Has recibido una invitación para uni Notification.intranet.message.SpaceInvitationPlugin={0} te ha invitado a unirte al espacio {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Se unió al espacio {0}. Notification.feedback.SpaceInvitationPlugin=Has rechazado unirte {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Has sido invitado a unirse al espacio siguiente: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Has sido invitado a unirse a los espacios siguientes: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Has sido invitado a unirse los espacio siguientes: LAST3_SPACES y $COUNT más. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} se unió al espa Notification.feedback-ok.RequestJoinSpacePlugin=Ha aprobado la petición de acceso al espacio. Notification.feedback-exist.RequestJoinSpacePlugin={0} es ya miembro de {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Has rechazado a {0} para unirse al espacio. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER ha pedido unirse al espacio $SPACE . -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST ha pedido unirse al espacio $SPACE . -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS y $COUNT más, le han solicitado unirse al espacio $SPACE . ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Ha sido mencionado por $USER Notification.title.ActivityMentionPlugin=Nueva mención suya Notification.message.ActivityMentionPlugin={0} le ha mencionado en el siguiente mensaje Notification.intranet.message.ActivityMentionPlugin={0} te ha mencionado. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER le ha mencionado en: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST le han mencionado en: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS y $COUNT más, le mencionaron en: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} y {1} han modificado com Notification.intranet.message.more.EditCommentPlugin={0}, {1} y {2} han modificado comentarios. Notification.intranet.message.one.EditActivityPlugin=Se ha modificado la publicación de {0}. Notification.label.readMore=Leer más -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER ha comentado en esta publicación: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST han comentado en esta publicación: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS y $COUNT más han comentado en su actividad: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER ha editado la publicación: -Notification.digest.three.EditActivityPlugin=$USER_LIST ha editado publicaciones: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS y $COUNT publicación(es) editada(s): - -Notification.digest.one.EditCommentPlugin=$USER ha editado el comentario: -Notification.digest.three.EditCommentPlugin=$USER_LIST ha editado los comentarios: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS y $COUNT comentario(s) editado(s): ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} ha respondido a tu comenta Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} ha respondido a tu comentario. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} y {1} han respondido a tu comentario. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} y {2} más han respondido a tu comentario. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USERha respondido a tu comentario:$ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LISThan respondido a tu comentario:$ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERSy$COUNTotro (s) han respondido a tu comentario$ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER ha publicado en su flujo de activi Notification.title.PostActivityPlugin=Nueva entrada en su flujo de actividad Notification.message.PostActivityPlugin={0} ha publicado en su flujo de actividad. Consulta el mensaje abajo Notification.intranet.message.PostActivityPlugin={0} ha publicado en su flujo de actividad. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER ha publicado el tu flujo de actividad. -Notification.digest.three.PostActivityPlugin=$USER_LIST han publicado el tu flujo de actividad. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS y $COUNT más, han publicado el en su flujo de actividad. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER ha publicado una activi Notification.title.PostActivitySpaceStreamPlugin=Nueva entrada en {0} Notification.message.PostActivitySpaceStreamPlugin={0} ha publicado una actividad en el espacio {1}. Consulta el mensaje abajo Notification.intranet.message.PostActivitySpaceStreamPlugin={0} ha publicado una actividad en el espacio {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER ha publicado en $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST han publicado en $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS y $COUNT más han publicado en $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER ha compartido una act Notification.title.SharedActivitySpaceStreamPlugin=Nueva entrada en su flujo de actividad Notification.message.SharedActivitySpaceStreamPlugin={0} ha compartido un artículo «{1}» en el espacio {2}. Véase la siguiente publicación Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} ha compartido una actividad en el espacio {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER ha compartido en $SPACE. -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER_LIST ha compartido en $SPACE. -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS y $COUNT más han compartido en $SPACE. ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_et.properties b/webapp/src/main/resources/locale/notification/template/Notification_et.properties index 068c39b227f..2629b38cab4 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_et.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_et.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER liitus portaaliga $PORTAL_NAME Notification.title.NewUserPlugin=Uus kasutaja teenuses {0} Notification.message.NewUserPlugin={0} on liitunud teenusega {1}. Kas soovite luua ühenduse ja alustada koostööd kasutajaga {0}? Notification.intranet.message.NewUserPlugin={0} on liitunud kasutajaga {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER liitus $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST liitunud $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS ja $COUNT veel on liitunud $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} saatis teile ühendus Notification.feedback.RelationshipReceivedRequestPlugin=Keeldusite kasutaja {0} ühenduse loomise taotlusest. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} soovib teiega ühendust võtta Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Olete ühendatud kasutajaga {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Saite ühenduse loomise taotluse kasutajalt $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Saite ühenduse loomise taotluse kasutajalt $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Saite ühenduse loomise taotluse kasutajalt $LAST3_USERS ja veel $COUNT. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Olete saanud kutse liituda ruumiga {0 Notification.intranet.message.SpaceInvitationPlugin={0} kutsus teid liituma ruumiga {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Liitusite {0} ruumiga. Notification.feedback.SpaceInvitationPlugin=Keeldusite liitumast teenusega {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Teid kutsuti liituma järgmise ruumiga: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Teid on kutsutud liituma järgmiste ruumidega: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Teid on kutsutud liituma järgmiste ruumidega: $LAST3_SPACES ja veel $COUNT. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} liitus {1} ruumi Notification.feedback-ok.RequestJoinSpacePlugin=Kiitsite ruumiga liitumise taotluse heaks. Notification.feedback-exist.RequestJoinSpacePlugin={0} on juba rühma {1} liige. Notification.feedback-nok.RequestJoinSpacePlugin=Keeldusite kasutajal {0} ruumiga liitumast. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER soovib liituda $SPACE ruumiga. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST on palunud liituda $SPACE ruumiga. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS ja $COUNT veel(ed) on taotlenud liitumist ruumiga $SPACE tühik. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Teid mainis $USER Notification.title.ActivityMentionPlugin=Sinu uus mainimine Notification.message.ActivityMentionPlugin={0} mainis teid järgmises postituses Notification.intranet.message.ActivityMentionPlugin={0} on teid maininud. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER maininud teid: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST on teid maininud: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS ja $COUNT veel(ed) on teid maininud: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} ja {1} muutsid kommentaa Notification.intranet.message.more.EditCommentPlugin={0}, {1} ja {2} muutsid kommentaare. Notification.intranet.message.one.EditActivityPlugin=Kasutaja {0} postitust muudeti. Notification.label.readMore=Loe edasi -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER kommenteeris seda postitust: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST kommenteerisid seda postitust: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS ja $COUNT veel(t) on kommenteerinud teie tegevust: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER muutis postitust: -Notification.digest.three.EditActivityPlugin=$USER_LIST muudetud postitused: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS ja $COUNT teine ​​muudetud postitus: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER muutis kommentaari: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST muudetud kommentaarid: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS ja $COUNT veel(ed) muudetud kommentaarid: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} vastas teie kommentaarile. Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} vastas teie kommentaarile. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} ja {1} vastasid teie kommentaarile. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} ja veel {2} inimest vastasid teie kommentaarile. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER vastas teie kommentaarile: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST vastas teie kommentaarile: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS ja $COUNT teine(d) vastas(id) teie kommentaarile: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER on postitanud teie voogu: $SUBJECT Notification.title.PostActivityPlugin=Uus postitus teie voos Notification.message.PostActivityPlugin={0} on teie voogu postitanud. Vaata allolevat postitust. Notification.intranet.message.PostActivityPlugin={0} on teie voogu postitanud. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER postitas teie voogu. -Notification.digest.three.PostActivityPlugin=$USER_LIST on postitanud teie voog. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS ja $COUNT teised on postitanud teie voog. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER on postitanud ruumi $SP Notification.title.PostActivitySpaceStreamPlugin=Uus postitus domeenis {0} Notification.message.PostActivitySpaceStreamPlugin={0} on postitanud ruumi {1} tegevuse. Vaata postitust allpool Notification.intranet.message.PostActivitySpaceStreamPlugin={0} on postitanud ruumi {1} tegevuse. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER on postitanud ruumi $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST on postitanud ruumi $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS ja $COUNT teised on postitanud ruumi $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER jagas tegevust ruumis Notification.title.SharedActivitySpaceStreamPlugin=Uus postitus teie tegevuste voos Notification.message.SharedActivitySpaceStreamPlugin={0} on jaganud artiklit "{1}" ruumis {2}. Vaata postitust allpool Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} jagas tegevust ruumis {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER jagas ruumis $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER jagas ruumis $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS ja veel $COUNT inimest jagasid ruumis $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_fa.properties b/webapp/src/main/resources/locale/notification/template/Notification_fa.properties index 3b6083e2ab9..6d9d356d546 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_fa.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_fa.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER به $PORTAL_NAME پیوست Notification.title.NewUserPlugin=کاربران جدید در {0} Notification.message.NewUserPlugin={0} به {1} پیوست. آیا مایلید به {0} متصل شوید و آغاز به همکاری کنید؟ Notification.intranet.message.NewUserPlugin={0} به {1} پیوست. -# For Digest -Notification.digest.one.NewUserPlugin=$USER متصل شده است به $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST متصل شده است به $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS و $COUNT نفرات دیگری متصل شدند به $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} برای شما در Notification.feedback.RelationshipReceivedRequestPlugin=شما درخواست برقراری ارتباط با {0} را رد کردید. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} می خواهد به شما متصل شود Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=شما به {0} متصل شدید -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=شما از $USER یک درخواست اتصال دریافت کرده اید. -Notification.digest.three.RelationshipReceivedRequestPlugin=شما از $USER_LIST درخواست اتصال دریافت کرده اید. -Notification.digest.more.RelationshipReceivedRequestPlugin= شما از $LAST3_USERS و $COUNT نفر دیگر، درخواست اتصال دریافت کرده اید. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=شما دعوتنامه ای برای Notification.intranet.message.SpaceInvitationPlugin={0} از شما دعوت کرد به فضای {1} بپیوندید Notification.intranet.message.accept.SpaceInvitationPlugin=شما به فضایی به نام {0} پیوستید. Notification.feedback.SpaceInvitationPlugin=شما از پیوستن به {0} امتناع ورزیدید. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=شما برای پیوستن به این فضا دعوت شده اید: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=شما برای پیوستن به این فضا دعوت شده اید: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=شما برای پیوستن به این فضاها و $COUNT فضای دیگر دعوت شده اید: $LAST3_SPACES. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} به فضای {1 Notification.feedback-ok.RequestJoinSpacePlugin=شما درخواست پبوستن به فضا را تأیید کردید. Notification.feedback-exist.RequestJoinSpacePlugin={0} در حال حاضر عضو {1} است. Notification.feedback-nok.RequestJoinSpacePlugin=شما پیوستن {0} به فضا را رد کرد. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER از شما خواسته است تا به فضای $SPACE بپیوندید. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST از شما خواسته است تا به فضای $SPACE بپیوندید. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS و $COUNT نفر دیگر می خواهند به فضای $SPACE بپیوندند. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=شما توسط $USER ذکر شده Notification.title.ActivityMentionPlugin=کسی شما را ذکر کرده است Notification.message.ActivityMentionPlugin={0} شما را در این مطلب ذکر کرده است Notification.intranet.message.ActivityMentionPlugin={0} شما را ذکر کرده است. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER شما را در این جا ذکر کرده است: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST شما را در این جا ذکر کرده اند: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS و $COUNT نفر دیگر، شما را در این جا ذکر کرده اند:$ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} و {1} نظرات را Notification.intranet.message.more.EditCommentPlugin={0}، {1} و {2} نظرات را ویرایش کردند. Notification.intranet.message.one.EditActivityPlugin=پست {0} ویرایش شد. Notification.label.readMore=ادامه مطلب -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER در مورد این پست نظر داده است: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST این پست را نظر داده است: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS و $COUNT نفر دیگر درباره فعالیت شما نظر داده اند: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER پست ویرایش شده: -Notification.digest.three.EditActivityPlugin=$USER_LIST پست های ویرایش شده: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS و $COUNT دیگر پست ویرایش شده: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER نظر ویرایش شده: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST نظرات ویرایش شده: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS و $COUNT سایر نظرات ویرایش شده: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} به نظر شما پاس Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} به نظر شما پاسخ داد. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} و {1} به نظر شما پاسخ دادند. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}، {1} و {2} نفر دیگر به نظر شما پاسخ دادند. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER به نظر شما پاسخ داد: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST به نظر شما پاسخ داد: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS و $COUNT دیگر به نظر شما پاسخ دادند: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER بر شرح حال شما ارسا Notification.title.PostActivityPlugin=روی صفحه شرح حال شما، چیزهای جدیدی ارسال شده است Notification.message.PostActivityPlugin={0} چیزی را به صفحه شرح حال شما ارسال کرده است. ببینید Notification.intranet.message.PostActivityPlugin={0} جیزی را به صفحه شرح حال شما ارسال کرده است. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER بر صفحه شرح حال شما چیزی را ارسال کرده است. -Notification.digest.three.PostActivityPlugin=$USER_LIST بر صفحه شرح حال شما چیزهایی را ارسال کرده اند. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS و $COUNT نفر دیگر چیزهایی را بر صفحه شرح حال شما ارسال کرده اند. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER یک فعالیت در Notification.title.PostActivitySpaceStreamPlugin=پست جدید در {0} Notification.message.PostActivitySpaceStreamPlugin={0} فعالیتی را در فضای {1} فرستاده است. ببینید Notification.intranet.message.PostActivitySpaceStreamPlugin={0} فعالیتی در فضای {1} فرستاده است. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER در فضای $SPACE، چیزی ارسال کرده است. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST در فضای $SPACE، چیزهایی ارسال کرده اند. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS و $COUNT نفر دیگر، در فضای $SPACE، چیزهایی را ارسال کرده اند. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER یک فعالیت ر Notification.title.SharedActivitySpaceStreamPlugin=روی صفحه شرح حال شما، چیزهای جدیدی ارسال شده است Notification.message.SharedActivitySpaceStreamPlugin={0} یک مقاله "{1}" را در فضای {2} به اشتراک گذاشته است. پست زیر را ببینید Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} یک فعالیت را در فضای {1} به اشتراک گذاشته است -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER در $SPACE به اشتراک گذاشته شد -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER در $SPACE به اشتراک گذاشته شد -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS و $COUNT نفر دیگر در $SPACE به اشتراک گذاشتند ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_fi.properties b/webapp/src/main/resources/locale/notification/template/Notification_fi.properties index 8f7ab640d49..20ad9a440b7 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_fi.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_fi.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER on liittynyt portaaliin $PORTAL_NAME Notification.title.NewUserPlugin=Uusi käyttäjä {0} Notification.message.NewUserPlugin={0} on liittynyt {1}. Haluatko muodostaa yhteyden ja aloittaa yhteistyön {0} kanssa? Notification.intranet.message.NewUserPlugin={0} on liittynyt {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER on liittynyt $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST on liittynyt $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS ja $COUNT muuta on liittynyt $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} on lähettänyt sinul Notification.feedback.RelationshipReceivedRequestPlugin=Kieltäydyit {0}:n yhteyspyynnöstä. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} haluaa olla yhteydessä kanssasi Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Olet yhteydessä {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Olet saanut yhteyspyynnön käyttäjältä $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Olet saanut yhteyspyynnön käyttäjältä $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Olet saanut yhteyspyynnön käyttäjältä $LAST3_USERS ja $COUNT muulta. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Olet saanut kutsun liittyä {0} tilaa Notification.intranet.message.SpaceInvitationPlugin={0} kutsui sinut liittymään {1} -tilaan Notification.intranet.message.accept.SpaceInvitationPlugin=Liityit {0} tilaan. Notification.feedback.SpaceInvitationPlugin=Sinä kieltäydyit liittymästä {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Sinut on kutsuttu liittymään seuraavaan tilaan: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Sinut on kutsuttu liittymään seuraaviin tiloihin: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Sinut on kutsuttu liittymään seuraaviin tiloihin: $LAST3_SPACES ja $COUNT muuta. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} liittyi {1} tila Notification.feedback-ok.RequestJoinSpacePlugin=Olet hyväksynyt pyynnön liittyä tilaan. Notification.feedback-exist.RequestJoinSpacePlugin={0} on jo {1} jäsen. Notification.feedback-nok.RequestJoinSpacePlugin=Sinä kieltäydyit {0} :lta liittyäksesi tilaan. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER on pyytänyt liittymään $SPACE -tilaan. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST on pyytänyt liittymään $SPACE -tilaan. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS ja $COUNT muu(t) ovat pyytäneet liittyä $SPACE välilyönti. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Sinut on maininnut $USER Notification.title.ActivityMentionPlugin=Uusi maininta teistä Notification.message.ActivityMentionPlugin={0} on maininnut sinut seuraavassa viestissä Notification.intranet.message.ActivityMentionPlugin={0} on maininnut sinut. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER on maininnut sinut kohteessa: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST on maininnut sinut kohteessa: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS ja $COUNT muuta ovat maininneet sinut kohteessa: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} ja {1} muokkasivat komme Notification.intranet.message.more.EditCommentPlugin={0}, {1} ja {2} muokkasivat kommentteja. Notification.intranet.message.one.EditActivityPlugin={0}n postia muokattiin. Notification.label.readMore=Lue Lisää -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER on kommentoinut tätä viestiä: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST kommentoivat tätä viestiä: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS ja $COUNT muuta on kommentoinut toimintaasi: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER muokattu viesti: -Notification.digest.three.EditActivityPlugin=$USER_LIST muokattu viestiä: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS ja $COUNT muuta muokattua viestiä: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER muokattu kommenttia: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST muokannut kommentteja: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS ja $COUNT muuta muokattua kommenttia: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} vastasi kommenttisi. Katso Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} vastasi kommenttisi. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} ja {1} vastasivat kommenttisi. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} ja {2} muut vastasivat kommenttisi. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER vastasi kommenttiisi: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST vastasi kommenttiisi: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS ja $COUNT muuta(t) vastasivat kommenttiisi: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER on lähettänyt syötteeseesi: $SU Notification.title.PostActivityPlugin=Uusi viesti aktiviteettivirrastasi Notification.message.PostActivityPlugin={0} on lähettänyt lähetyksen aktiviteettivirtaan. Katso alla oleva viesti Notification.intranet.message.PostActivityPlugin={0} on lähettänyt lähetyksesi suoratoistoon. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER on lähetetty aktiivisuusvirralla. -Notification.digest.three.PostActivityPlugin=$USER_LIST on lähetetty aktiivisuusvirralla. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS ja $COUNT other(s) ovat lähettäneet viestin aktiivisuutesi streamiin. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER on lähettänyt toiminn Notification.title.PostActivitySpaceStreamPlugin=Uusi viesti {0} Notification.message.PostActivitySpaceStreamPlugin={0} on lähettänyt aktiviteetin {1} -tilassa. Katso alla oleva viesti Notification.intranet.message.PostActivitySpaceStreamPlugin={0} on lähettänyt aktiviteetin {1} tilassa. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER on lähettänyt viestejä tilaan $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST on lähettänyt viestejä tilaan $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS ja $COUNT muuta on lähettänyt osoitteeseen $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER jakoi toiminnon tilas Notification.title.SharedActivitySpaceStreamPlugin=Uusi viesti aktiviteettivirrastasi Notification.message.SharedActivitySpaceStreamPlugin={0} on jakanut artikkelin "{1}" {2} tilassa. Katso alla oleva viesti Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} on jakanut aktiviteetin {1} tilassa -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER jakoi tilassa $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER jakoi tilassa $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS ja $COUNT muuta jakoivat tilassa $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_fil.properties b/webapp/src/main/resources/locale/notification/template/Notification_fil.properties index 07b331b2f61..292e72be80f 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_fil.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_fil.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER ay sumali $PORTAL_NAME Notification.title.NewUserPlugin=Bagong tagagamit sa {0} Notification.message.NewUserPlugin={0} ay sumali {1}. Interesado na kumonekta at mag umpisa ng kolaborasyon kay {0}? Notification.intranet.message.NewUserPlugin={0} ay kakasali {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER ay sumali $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST ay sumali $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS at $COUNT marami pa ang sumali $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} ay nagpadala ng kahil Notification.feedback.RelationshipReceivedRequestPlugin=Tinanggihan mo {0}'s ang kahilingan sa koneksyon. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} gustong kumonekta saiyo Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Ikaw ay konektado na kay {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Nakatanggap ka ng kahilingan sa koneksyon mula kay $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Nakatanggap ka ng kahilingan sa koneksyon galing kay $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Nakatanggap ka ng kahilingan sa koneksyon mula kay $LAST3_USERS at $COUNT sa (mga) iba pa. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Nakatanggap ka ng imbitasyo na sumila Notification.intranet.message.SpaceInvitationPlugin=Inimbitahan ka ni {0} na sumali sa {1} space Notification.intranet.message.accept.SpaceInvitationPlugin=Ikaw ay sumali sa {0} espasyo. Notification.feedback.SpaceInvitationPlugin=Tinanggihan mo ang pagsali sa {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Ikaw ay naimbitahang sumali sa mga sumunod na espasyo $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Ikaw ay naimbitahang sumali sa mga sumunod na espasyo: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Ikaw ay naimbitahan na sumali sa mga sumunod naespasyo: $LAST3_SPACES at $COUNT (mga) iba pa. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} sumali {1} sa es Notification.feedback-ok.RequestJoinSpacePlugin=Inaprubahan mo ang kahilingan na sumali sa espasyo. Notification.feedback-exist.RequestJoinSpacePlugin={0} ay kasalukuyan ng myembro {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Tinanggihan mo {0} ang pagsali sa espasyo. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER humiling na sumali sa $SPACE espasyo. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST humiling na sumali sa $SPACE espasyo. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS at $COUNT iba pang (mga) nagtanong na gusto sumali $SPACE espasyo. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Ikaw ay binaggit ni $USER Notification.title.ActivityMentionPlugin=May bagong nagbanggit sa iyo Notification.message.ActivityMentionPlugin={0} may nagbanggit sa iyo sa sumunod na post Notification.intranet.message.ActivityMentionPlugin={0} may nag banggit saiyo. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER may nagbanggit sa iyo sa: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST may nagbanggit sa iyo sa: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS at $COUNT may iba pang (mga) nagbanggit sa iyo sa: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} at {1} ang na-edit na mg Notification.intranet.message.more.EditCommentPlugin={0}, {1} at {2} ang na-edit na mga komento. Notification.intranet.message.one.EditActivityPlugin=Ang post ni {0} ay na-edit. Notification.label.readMore=Magbasa pa -# For Digest -Notification.digest.one.ActivityCommentPlugin=Nagkomento si $USER sa post na ito: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=Si $USER_LIST ay nagkomento sa post na ito: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS at $COUNT may (mga) nagkomento sa iyong aktibidad: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER na-edit na post: -Notification.digest.three.EditActivityPlugin=$USER_LIST mga na-edit na post: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS at $COUNT iba pang (mga) na-edit na post: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER na-edit na komento: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST mga na-edit na komento: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS at $COUNT iba pang (mga) na-edit na komento: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} may tumugon sa iyong komen Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} tumugon sa iyong komento. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} at {1} tumugon sa iyong komento. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} at {2} may ibang tumugon sa iyong komento. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER may tumugon sa iyong komento: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST tumugon sa iyong komento: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS at $COUNT (mga) iba pang tumugon sa iyong komento: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER nag post sa iyong aktibidad sa str Notification.title.PostActivityPlugin=Bagong post sa iyong aktibidad sa stream Notification.message.PostActivityPlugin={0} may nagmpost sa iyong aktibidad sa stream. Tingnan ang post sa ibaba Notification.intranet.message.PostActivityPlugin={0} may nag post sa iyong aktibidad sa stream. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER nag post sa ang iyong aktibidad sa stream. -Notification.digest.three.PostActivityPlugin=$USER_LIST nag post sa ang iyong aktibidad sa stream. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS at $COUNT (mga) iba pa ay nag post iyong aktibidad sa stream. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER ay nag post ng aktibida Notification.title.PostActivitySpaceStreamPlugin=Ang Bagong post sa {0} Notification.message.PostActivitySpaceStreamPlugin={0} ay nagpost ng aktibidad sa loob ng {1} espasyo. Tingnan ang post sa baba Notification.intranet.message.PostActivitySpaceStreamPlugin={0} nagpost ng aktibidad sa {1} espasyo. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER nag post sa $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST nag post sa $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS at $COUNT (mga) iba pang nag post sa $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=Nagbahagi si $USER ng aktib Notification.title.SharedActivitySpaceStreamPlugin=Bagong post sa iyong aktibidad sa stream Notification.message.SharedActivitySpaceStreamPlugin=Nagbahagi si {0} ng artikulong "{1}" sa {2} space. Tingnan ang post sa ibaba Notification.intranet.message.SharedActivitySpaceStreamPlugin=Nagbahagi si {0} ng aktibidad sa {1} space -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=Ibinahagi ni $USER sa $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=Ibinahagi ni $USER sa $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=Ibinahagi ni $LAST3_USERS at $COUNT iba pa sa $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_fr.properties b/webapp/src/main/resources/locale/notification/template/Notification_fr.properties index b91a213d944..d40773d3149 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_fr.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_fr.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER a rejoint $PORTAL_NAME Notification.title.NewUserPlugin=Nouvel utilisateur dans {0} Notification.message.NewUserPlugin={0} a rejoint {1}. Souhaitez-vous entrer en contact et commencer à collaborer avec {0} ? Notification.intranet.message.NewUserPlugin={0} a rejoint {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER a rejoint $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST ont rejoint $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS et $COUNT autre(s) ont rejoint $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} vous a envoyé une de Notification.feedback.RelationshipReceivedRequestPlugin=Vous avez refusé la demande de contact de {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} souhaite entrer en contact avec vous Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Vous êtes en contact avec {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin= vous avez reçu une demande de contact de $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin= vous avez reçu une demande de contact de $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin= que vous avez reçu une demande de contact de $LAST3_USERS et $COUNT autres. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Vous avez reçu une invitation à rej Notification.intranet.message.SpaceInvitationPlugin={0} Vous a invité(e) à rejoindre l'espace {1}. Notification.intranet.message.accept.SpaceInvitationPlugin=Vous avez rejoint l'espace {0}. Notification.feedback.SpaceInvitationPlugin=Vous avez refusé de rejoindre {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin= vous avez été invité à rejoindre l'espace : $SPACE. -Notification.digest.three.SpaceInvitationPlugin= vous avez été invité à rejoindre les espaces suivants : $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin= vous avez été invité à rejoindre les espaces : $LAST3_SPACES et $COUNT autres. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} a rejoint l'espa Notification.feedback-ok.RequestJoinSpacePlugin=Vous avez approuvé la demande d'adhésion à l'espace. Notification.feedback-exist.RequestJoinSpacePlugin={0} est déjà membre de {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Vous avez refusé à {0} de rejoindre l'espace. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER a demandé à rejoindre l'espace $SPACE . -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST ont demandé à rejoindre l'espace $SPACE . -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS et $COUNT autres ont demandé à rejoindre l'espace $SPACE . ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Vous avez été mentionné par $USER Notification.title.ActivityMentionPlugin=Nouvelle mention de vous Notification.message.ActivityMentionPlugin={0} vous a mentionné dans le message suivant Notification.intranet.message.ActivityMentionPlugin={0} vous a mentionné. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER vous a mentionné dans: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST vous ont mentionné dans: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS et $COUNT autres vous ont mentionné dans : $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} et {1} ont modifié des Notification.intranet.message.more.EditCommentPlugin={0}, {1} et {2} ont modifié des commentaires sur votre publication. Notification.intranet.message.one.EditActivityPlugin=La publication de {0} a été modifiée. Notification.label.readMore=En savoir plus -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER a commenté ce post: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST ont commenté ce post: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS et $COUNT autres ont commenté votre activité : $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER a modifié la publication: $ACTIVITY -Notification.digest.three.EditActivityPlugin=$USER_LIST ont modifié des publications: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS et $COUNT autres ont modifié des publications : - -Notification.digest.one.EditCommentPlugin=$USER_LIST ont modifié des commentaires: -Notification.digest.three.EditCommentPlugin=$USER_LIST ont modifié des commentaires: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS et $COUNT autres ont modifié des commentaires : ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} a répondu à votre commen Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} a répondu à votre commentaire. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} et {1} ont répondu à votre commentaire. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} et {2} autres ont répondu à votre commentaire. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER a répondu à votre commentaire : $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST ont répondu à votre commentaire : $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS et $COUNT autre(s) ont répondu à votre commentaire : $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} trouve votre message triste Notification.intranet.message.one.LikePlugin.funny={0} trouve votre message drôle. Notification.intranet.message.two.LikePlugin={0} et {1} réagissent à votre activité. Notification.intranet.message.more.LikePlugin={0}, {1} et {2} autres réagissent à votre activité. -# For Digest -Notification.digest.one.LikePlugin=$USER a réagi à votre activité : $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST a réagi à votre activité : $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS et $COUNT autre(s) ont réagi à votre activité: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} trouve votre comment Notification.intranet.message.one.LikeCommentPlugin.funny={0} trouve votre commentaire drôle. Notification.intranet.message.two.LikeCommentPlugin={0} et {1} réagissent à votre commentaire. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} et {2} autres réagissent à votre commentaire. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER réagit à votre commentaire : $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST réagit à votre commentaire: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS et $COUNT autre(s) réagissent à votre commentaire: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER a publié sur votre fil d'activit Notification.title.PostActivityPlugin=Nouveau message sur votre fil d'activités Notification.message.PostActivityPlugin={0} a publié sur votre fil d'activités. Voyez la publication ci-dessous Notification.intranet.message.PostActivityPlugin={0} a publié votre fil d'activités. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER a publié sur votre fil d'activités. -Notification.digest.three.PostActivityPlugin=$USER_LIST ont publié sur votre fil d'activités. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS et $COUNT autre(s) ont déposé un message sur votre fil d'activités. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER a publié dans l'espace Notification.title.PostActivitySpaceStreamPlugin=Nouvelle publication dans {0} Notification.message.PostActivitySpaceStreamPlugin={0} a publié dans l'espace {1}. Voyez la publication ci-dessous Notification.intranet.message.PostActivitySpaceStreamPlugin={0} a publié dans l'espace {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER a déposé une activité dans $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST ont déposé une activité dans $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS et $COUNT autre(s) ont déposé un message dans $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER a partagé une activi Notification.title.SharedActivitySpaceStreamPlugin=Nouveau message sur votre fil d'activités Notification.message.SharedActivitySpaceStreamPlugin={0} a partagé un article "{1}" dans l'espace {2}. Voyez la publication ci-dessous Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} a partagé une activité dans l'espace {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER a partagé dans $SPACE. -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER a partagé dans $SPACE. -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS et $COUNT autres ont partagé dans $SPACE. ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_he.properties b/webapp/src/main/resources/locale/notification/template/Notification_he.properties index f309d5216c4..18cddcf787d 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_he.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_he.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER הצטרף ל-$PORTAL_NAME Notification.title.NewUserPlugin=משתמש חדש ב-{0} Notification.message.NewUserPlugin={0} הצטרף ל-{1}. מעוניין להתחבר ולהתחיל לשתף פעולה עם {0}? Notification.intranet.message.NewUserPlugin={0} הצטרף ל-{1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER הצטרף ל $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST הצטרפו ל $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS ו $COUNT נוספים הצטרפו ל $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} שלח לך בקשת Notification.feedback.RelationshipReceivedRequestPlugin=סירבת לבקשת החיבור של {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} רוצה ליצור איתך קשר Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=אתה מחובר עם {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=קיבלת בקשת חיבור מ $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=קיבלת בקשת חיבור מ $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=קיבלת בקשת חיבור מ $LAST3_USERS ו $COUNT אחרים. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=קיבלת הזמנה להצטרף ל Notification.intranet.message.SpaceInvitationPlugin=You're invited to join {0} space. Notification.intranet.message.accept.SpaceInvitationPlugin=הצטרפת למרחב {0}. Notification.feedback.SpaceInvitationPlugin=סירבת להצטרף ל-{0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=הוזמנת להצטרף למרחב הבא: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=הוזמנת להצטרף למרחבים הבאים: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=הוזמנת להצטרף למרחבים הבאים: $LAST3_SPACES ו $COUNT נוספים. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} הצטרף למ Notification.feedback-ok.RequestJoinSpacePlugin=אישרת את הבקשה להצטרף למרחב. Notification.feedback-exist.RequestJoinSpacePlugin={0} כבר חבר ב-{1}. Notification.feedback-nok.RequestJoinSpacePlugin=סירבת ל-{0} להצטרף למרחב. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER ביקש להצטרף ל $SPACE מרחב. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST ביקשו להצטרף ל $SPACE מרחב. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS ו $COUNT אחר(ים) ביקשו להצטרף ל $SPACE רווח. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=הוזכרת על ידי $USER Notification.title.ActivityMentionPlugin=אזכור חדש שלך Notification.message.ActivityMentionPlugin={0} הזכיר אותך בפוסט הבא Notification.intranet.message.ActivityMentionPlugin={0} הזכיר אותך. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER הזכיר אותך ב: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST הזכירו אותך ב: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS ו $COUNT אחר(ים) הזכירו אותך ב: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} ו-{1} הערות ערכ Notification.intranet.message.more.EditCommentPlugin={0}, {1} ו-{2} הערות ערכו. Notification.intranet.message.one.EditActivityPlugin=הפוסט של {0} נערך. Notification.label.readMore=קרא עוד -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER has commented on your activity: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST have commented on your activity: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS ו $COUNT אחר(ים) הגיבו על הפעילות שלך: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER ערך ערוך: -Notification.digest.three.EditActivityPlugin=$USER_LIST פוסטים שערכו: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS ו $COUNT פוסטים ערוכים נוספים: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER ערוך תגובה: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST הערות ערוכות: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS ו $COUNT הערות ערוכות אחרות: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} השיב לתגובה של Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} השיב לתגובה שלך. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} ו-{1} השיבו לתגובה שלך. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} ו-{2} אחרים השיבו לתגובה שלך. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER השיב לתגובה שלך: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST השיב לתגובה שלך: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS ו $COUNT אחר(ים) השיבו לתגובה שלך: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER פרסם בפיד שלך: $SUBJECT Notification.title.PostActivityPlugin=פוסט חדש בפיד שלך Notification.message.PostActivityPlugin={0} פרסם בעדכון שלך. ראה את הפוסט למטה. Notification.intranet.message.PostActivityPlugin={0} פרסם בעדכון שלך. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER פרסם ב העדכון שלך. -Notification.digest.three.PostActivityPlugin=$USER_LIST פרסמו ב העדכון שלך. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS ו $COUNT אחרים פרסמו ב הפיד שלך. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER פרסם פעילות Notification.title.PostActivitySpaceStreamPlugin=פוסט חדש ב-{0} Notification.message.PostActivitySpaceStreamPlugin={0} פרסם פעילות במרחב {1}. ראה את הפוסט למטה Notification.intranet.message.PostActivitySpaceStreamPlugin={0} פרסם פעילות במרחב {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER פרסם ב $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST פרסמו ב $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS ו $COUNT אחר(ים) פרסמו ב $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER שיתף פעילות Notification.title.SharedActivitySpaceStreamPlugin=פוסט חדש בזרם הפעילות שלך Notification.message.SharedActivitySpaceStreamPlugin={0} שיתף מאמר "{1}" במרחב {2}. ראה את הפוסט למטה Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} שיתף פעילות במרחב {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER שיתף ב-$SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER שיתף ב-$SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS ו-$COUNT אחרים שיתפו ב-$SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_hr.properties b/webapp/src/main/resources/locale/notification/template/Notification_hr.properties index b760a36bc35..00d43ddd184 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_hr.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_hr.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER se pridružio $PORTAL_NAME Notification.title.NewUserPlugin=Novi korisnik na {0} Notification.message.NewUserPlugin={0} se pridružio {1}. Jeste li zainteresirani za povezivanje i početak suradnje s {0}? Notification.intranet.message.NewUserPlugin={0} se pridružio {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER se pridružio $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER se pridružio $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS i $COUNT još su se pridružili $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} vam je poslao zahtjev Notification.feedback.RelationshipReceivedRequestPlugin=Odbili ste {0} zahtjev za povezivanje. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} želi se povezati s vama Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Povezani ste s {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Primili ste zahtjev za povezivanje od $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Primili ste zahtjev za povezivanje od $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Primili ste zahtjev za povezivanje od $LAST3_USERS i još $COUNT. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Primili ste poziv da se pridružite p Notification.intranet.message.SpaceInvitationPlugin={0} vas je pozvao da se pridružite prostoru {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Pridružili ste se prostoru {0}. Notification.feedback.SpaceInvitationPlugin=Odbili ste pridružiti se {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Pozvani ste da se pridružite sljedećem prostoru: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Pozvani ste da se pridružite sljedećim prostorima: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Pozvani ste da se pridružite sljedećim prostorima: $LAST3_SPACES i još $COUNT. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} pridružio se pr Notification.feedback-ok.RequestJoinSpacePlugin=Odobrili ste zahtjev za pridruživanje prostoru. Notification.feedback-exist.RequestJoinSpacePlugin={0} je već član {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Odbili ste {0} da se pridruži prostoru. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER tražio je pridruživanje $SPACE prostoru. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST tražili su da se pridruže $SPACE prostoru. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS i $COUNT ostalih su zatražili da se pridruže $SPACE razmak. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Spomenuo vas je $USER Notification.title.ActivityMentionPlugin=Novo spominjanje tebe Notification.message.ActivityMentionPlugin={0} vas je spomenuo u sljedećem postu Notification.intranet.message.ActivityMentionPlugin={0} vas je spomenuo. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER spomenuo vas je u: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST spomenuli su vas u: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS i $COUNT drugih(a) spomenuli su vas u: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} i {1} uređeni komentari Notification.intranet.message.more.EditCommentPlugin={0}, {1} i {2} uredili su komentare. Notification.intranet.message.one.EditActivityPlugin=Post korisnika {0} je uređen. Notification.label.readMore=Pročitajte više -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER komentirao je ovaj post: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST su komentirali ovaj post: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS i $COUNT ostalih komentirali su vašu aktivnost: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER uredio je post: -Notification.digest.three.EditActivityPlugin=$USER_LIST uredio postove: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS i $COUNT drugi(i) uredili su post: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER uredio komentar: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST uredio komentare: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS i $COUNT ostalih(ih) uređenih komentara: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} je odgovorio na vaš komen Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} je odgovorio na vaš komentar. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} i {1} odgovorili su na vaš komentar. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} i još {2} odgovorili su na vaš komentar. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER odgovorio je na vaš komentar: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST odgovorio je na vaš komentar: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS i $COUNT ostali su odgovorili na vaš komentar: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER je objavio na vašem feedu: $SUBJE Notification.title.PostActivityPlugin=Nova objava na vašem feedu Notification.message.PostActivityPlugin={0} je objavio na vašem feedu. Pogledajte objavu ispod. Notification.intranet.message.PostActivityPlugin={0} je objavio na vašem feedu. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER je objavio na vašem feedu. -Notification.digest.three.PostActivityPlugin=$USER_LIST objavili su na vaš feed. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS i $COUNT ostali su objavili na vaš feed. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER je objavio aktivnost u Notification.title.PostActivitySpaceStreamPlugin=Novi post u {0} Notification.message.PostActivitySpaceStreamPlugin={0} je objavio aktivnost u prostoru {1}. Pogledajte objavu ispod Notification.intranet.message.PostActivitySpaceStreamPlugin={0} je objavio aktivnost u prostoru {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER je objavio u $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST objavili su u $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS i $COUNT ostali su objavili u $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER dijeli aktivnost u $S Notification.title.SharedActivitySpaceStreamPlugin=Nova objava u vašem streamu aktivnosti Notification.message.SharedActivitySpaceStreamPlugin={0} je podijelio članak "{1}" u prostoru {2}. Pogledajte objavu ispod Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} je podijelio aktivnost u prostoru {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER dijeli u $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER dijeli u $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS i još $COUNT dijele u $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_hu.properties b/webapp/src/main/resources/locale/notification/template/Notification_hu.properties index 5d8d71f4f91..9400d8ca17f 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_hu.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_hu.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER csatlakozott a $PORTAL_NAME webhelyhez Notification.title.NewUserPlugin=Új felhasználó itt: {0} Notification.message.NewUserPlugin={0} csatlakozott a következőhöz: {1}. Szeretne kapcsolatba lépni vele, és együttműködni vele: {0}? Notification.intranet.message.NewUserPlugin={0} csatlakozott a következőhöz: {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER csatlakozott $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST csatlakozott $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS és $COUNT továbbiak csatlakoztak $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} csatlakozási kérelm Notification.feedback.RelationshipReceivedRequestPlugin=Elutasítottad a(z) {0} csatlakozási kérelmet. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} kapcsolatba szeretne lépni Önnel Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Ön kapcsolatban áll a következővel: {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Kapcsolódási kérelmet kapott a következőtől: $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Kapcsolódási kérelmet kapott a következőtől: $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Kapcsolódási kérelmet kapott a következőtől: $LAST3_USERS és $COUNT másik személy. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Meghívást kapott, hogy csatlakozzon Notification.intranet.message.SpaceInvitationPlugin={0} meghívott egy {1} térbe Notification.intranet.message.accept.SpaceInvitationPlugin=Ön csatlakozott a(z) {0} térhez. Notification.feedback.SpaceInvitationPlugin=Ön megtagadta a csatlakozást a következőhöz: {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Meghívtak, hogy csatlakozzon a következő térhez: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Meghívtak, hogy csatlakozzon a következő terekhez: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Meghívtak, hogy csatlakozzon a következő terekhez: $LAST3_SPACES és további $COUNT terekhez. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} csatlakozott a(z Notification.feedback-ok.RequestJoinSpacePlugin=Jóváhagytad a térhez való csatlakozási kérelmet. Notification.feedback-exist.RequestJoinSpacePlugin={0} már tagja a következőnek: {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Megtagadtad, hogy {0} csatlakozzon a térhez. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER csatlakozást kért a $SPACE térhez. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST csatlakozást kért a $SPACE térhez. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS és $COUNT másik személy kérte, hogy csatlakozzanak a $SPACE szóköz. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=$USER megemlítette Önt Notification.title.ActivityMentionPlugin=Új említés rólad Notification.message.ActivityMentionPlugin={0} megemlítette Önt a következő bejegyzésben Notification.intranet.message.ActivityMentionPlugin={0} megemlítette Önt. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER említett téged a következőben: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST említettek Önt a következőben: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS és $COUNT másik személy megemlítette Önt a következőben: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} és {1} megjegyzést sze Notification.intranet.message.more.EditCommentPlugin={0}, {1} és {2} megjegyzéseket szerkesztett. Notification.intranet.message.one.EditActivityPlugin={0} bejegyzése szerkesztve. Notification.label.readMore=Olvasson tovább -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER megjegyzést fűzött ehhez a bejegyzéshez: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST megjegyzést fűzött ehhez a bejegyzéshez: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS és $COUNT másik személy megjegyzést fűzött az Ön tevékenységéhez: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER szerkesztette a bejegyzést: -Notification.digest.three.EditActivityPlugin=$USER_LIST szerkesztett bejegyzések: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS és $COUNT további szerkesztett bejegyzés: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER szerkesztett megjegyzés: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST szerkesztett megjegyzések: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS és $COUNT további szerkesztett megjegyzés: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} válaszolt a megjegyzésé Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} válaszolt a megjegyzésére. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} és {1} válaszolt a megjegyzésére. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} és további {2} személy válaszolt a megjegyzésedre. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER válaszolt a megjegyzésedre: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST válaszolt a megjegyzésedre: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS és $COUNT másik válaszolt az Ön megjegyzésére: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER közzétette a hírfolyamodban: $S Notification.title.PostActivityPlugin=Új bejegyzés a hírfolyamodban Notification.message.PostActivityPlugin={0} közzétett a hírfolyamodban. Lásd az alábbi bejegyzést. Notification.intranet.message.PostActivityPlugin={0} közzétett a hírfolyamodban. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER közzétette a az Ön hírcsatornáján. -Notification.digest.three.PostActivityPlugin=$USER_LIST közzététel itt: a hírfolyamod. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS and $COUNT others have posted on your feed. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER közzétett egy tevéke Notification.title.PostActivitySpaceStreamPlugin=Új bejegyzés itt: {0} Notification.message.PostActivitySpaceStreamPlugin={0} tevékenységet tett közzé a(z) {1} térben. Lásd az alábbi bejegyzést Notification.intranet.message.PostActivitySpaceStreamPlugin={0} tevékenységet tett közzé a(z) {1} térben. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER bejegyzést tett közzé itt: $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST bejegyzéseket tett közzé a $SPACE helyén. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS és $COUNT másik bejegyzést tett közzé itt: $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER megosztott egy tevék Notification.title.SharedActivitySpaceStreamPlugin=Új bejegyzés a tevékenységfaladon Notification.message.SharedActivitySpaceStreamPlugin={0} megosztott egy cikket "{1}" a(z) {2} területen. Lásd az alábbi bejegyzést Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} megosztott egy tevékenységet a(z) {1} térben -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER megosztotta itt: $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER megosztotta itt: $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS és $COUNT másik személy megosztotta a következőt: $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_id.properties b/webapp/src/main/resources/locale/notification/template/Notification_id.properties index 7cc92d10a08..025c2e08cee 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_id.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_id.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER telah bergabung $PORTAL_NAME Notification.title.NewUserPlugin=Pengguna baru pada {0} Notification.message.NewUserPlugin={0} telah bergabung {1}. Tertarik untuk menghubungkan dan mulai berkolaborasi dengan {0}? Notification.intranet.message.NewUserPlugin={0} telah bergabung {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER telah bergabung $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST telah bergabung $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS dan $COUNT lebih banyak yang telah bergabung $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} permintaan koneksi te Notification.feedback.RelationshipReceivedRequestPlugin=Anda telah menolak {0}'s permintaan koneksi. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} ingin terhubung dengan Anda Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Anda sedang terhubung dengan {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Anda telah menerima permintaan koneksi dari $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin= Anda menerima permintaan koneksi dari $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin= Anda telah menerima permintaan koneksi dari $LAST3_USERS dan $COUNT lain (s). ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Anda telah menerima undangan untuk be Notification.intranet.message.SpaceInvitationPlugin=Anda telah diundang untuk bergabung ruang {0}. Notification.intranet.message.accept.SpaceInvitationPlugin=Anda telah bergabung ke ruang {0}. Notification.feedback.SpaceInvitationPlugin=Anda telah menolak bergabung ke {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Anda telah diundang untuk bergabung dengan ruang berikut ini: $SPACE. -Notification.digest.three.SpaceInvitationPlugin= Anda telah diundang untuk bergabung dengan ruang berikut: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin= Anda telah diundang untuk bergabung dengan ruang berikut ini:$LAST3_SPACESdan$COUNT lainnya(s). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} bergabung dengan Notification.feedback-ok.RequestJoinSpacePlugin=Anda menyetujui permintaan untuk bergabung dengan ruang. Notification.feedback-exist.RequestJoinSpacePlugin={0} telah siap menjadi anggota dari {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Anda telah menolak bergabung dengan ruang {0}. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER telah meminta untuk bergabung di $SPACE ruang. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LISTtelah meminta bergabung di$SPACEruang. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERSdan$COUNTother(s) telah meminta bergabung di$SPACEruang. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Anda telah disebut oleh $USER Notification.title.ActivityMentionPlugin=Panggilan Baru Anda Notification.message.ActivityMentionPlugin={0} anda telah disebut di postingan berikut Notification.intranet.message.ActivityMentionPlugin={0} sudah menyebut anda. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USERtelah memanggil anda di:$ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST telah menyebut anda di: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERSdan$COUNTlainnya(s) telah menyebut anda di: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin=Komentar {0} dan {1} telah d Notification.intranet.message.more.EditCommentPlugin=Komentar {0},{1} dan {2} telah diedit. Notification.intranet.message.one.EditActivityPlugin=Postingan {0} telah diedit. Notification.label.readMore=Baca lebih lanjut -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER telah berkomentar di aktifitas anda: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LISTtelah berkomentar di aktifitas anda;$ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS dan $COUNTlainnya(s) telah berkomentar pada aktifitas anda: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER postingan diedit: -Notification.digest.three.EditActivityPlugin=$USER_LIST Postingan diedit: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS dan $COUNT beberapa postingan lainnya telah diedit: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER Komentar diedit: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST beberapa komentar diedit: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS dan $COUNT Beberapa komentar lainnya telah diedit: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} balasan untuk komentar and Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} balasan untuk komentar anda. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} dan {1} balasan untuk komentar anda. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} dan {2} yang lain membalas komentar anda. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER telah membalas komentar anda: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST telah membalas komentar anda: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS dan $COUNT lainnya(s) telah membalas komentar anda: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER telah memposting pada aliran aktif Notification.title.PostActivityPlugin=Posting baru pada aliran aktifitas anda Notification.message.PostActivityPlugin={0} telah diposting pada aliran aktifitas anda. Lihat pos dibawah ini Notification.intranet.message.PostActivityPlugin={0} telah memposting pada aliran aktifitas anda. -# For Digest -Notification.digest.one.PostActivityPlugin=$USERtelah memposting padaaliran aktifitas anda. -Notification.digest.three.PostActivityPlugin=$USER_LISTtelah memposting padaaliran aktifitas anda. -Notification.digest.more.PostActivityPlugin=$LAST3_USERSdan$COUNTyang lain(s) telah memposting padaaliran aktifitas anda. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER telah memposting aktifi Notification.title.PostActivitySpaceStreamPlugin=Postingan baru di {0} Notification.message.PostActivitySpaceStreamPlugin={0} telah memposting aktifitas di {1} ruang. Lihat postingan dibawah Notification.intranet.message.PostActivitySpaceStreamPlugin={0} telah memposting aktifitas di {1} ruang. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER telah memposting pada $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST telah memposting pada $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS dan $COUNT lebih telah bergabung $PORTAL_HOME. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER membagikan sebuah akt Notification.title.SharedActivitySpaceStreamPlugin=Posting baru pada aliran aktifitas anda Notification.message.SharedActivitySpaceStreamPlugin={0} telah membagikan sebuah artikel "{1}" di forum {2}. Lihat postingan di bawah ini.\n\n\n\n\n Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} telah membagikan sebuah aktivitas di forum {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER Dibagikan di $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER dibagikan di $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS dan $COUNT lainnya dibagikan di $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_in.properties b/webapp/src/main/resources/locale/notification/template/Notification_in.properties index 1d8a3f0cf1d..b5051971ddb 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_in.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_in.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER telah bergabung $PORTAL_NAME Notification.title.NewUserPlugin=Pengguna baru pada {0} Notification.message.NewUserPlugin={0} telah bergabung {1}. Tertarik untuk menghubungkan dan mulai berkolaborasi dengan {0}? Notification.intranet.message.NewUserPlugin={0} telah bergabung {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER telah bergabung $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST telah bergabung $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS dan $COUNT lebih banyak yang telah bergabung $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} permintaan koneksi te Notification.feedback.RelationshipReceivedRequestPlugin=Anda telah menolak {0}'s permintaan koneksi. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} ingin terhubung dengan Anda Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Anda sedang terhubung dengan {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Anda telah menerima permintaan koneksi dari $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin= Anda menerima permintaan koneksi dari $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin= Anda telah menerima permintaan koneksi dari $LAST3_USERS dan $COUNT lain (s). ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Anda telah menerima undangan untuk be Notification.intranet.message.SpaceInvitationPlugin={0} invited you to join {1} space Notification.intranet.message.accept.SpaceInvitationPlugin=Anda telah bergabung ke ruang {0}. Notification.feedback.SpaceInvitationPlugin=Anda telah menolak bergabung ke {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Anda telah diundang untuk bergabung dengan ruang berikut ini: $SPACE. -Notification.digest.three.SpaceInvitationPlugin= Anda telah diundang untuk bergabung dengan ruang berikut: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin= Anda telah diundang untuk bergabung dengan ruang berikut ini:$LAST3_SPACESdan$COUNT lainnya(s). ############################################################################# # RequestJoinSpacePlugin # @@ -89,10 +77,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} bergabung dengan Notification.feedback-ok.RequestJoinSpacePlugin=Anda menyetujui permintaan untuk bergabung dengan ruang. Notification.feedback-exist.RequestJoinSpacePlugin={0} telah siap menjadi anggota dari {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Anda telah menolak bergabung dengan ruang {0}. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER telah meminta untuk bergabung di $SPACE ruang. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LISTtelah meminta bergabung di$SPACEruang. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERSdan$COUNTother(s) telah meminta bergabung di$SPACEruang. ############################################################################# # ActivityMentionPlugin # @@ -106,10 +90,6 @@ Notification.subject.ActivityMentionPlugin=Anda telah disebut oleh $USER Notification.title.ActivityMentionPlugin=Panggilan Baru Anda Notification.message.ActivityMentionPlugin={0} anda telah disebut di postingan berikut Notification.intranet.message.ActivityMentionPlugin={0} sudah menyebut anda. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USERtelah memanggil anda di:$ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST telah menyebut anda di: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERSdan$COUNTlainnya(s) telah menyebut anda di: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -140,18 +120,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} and {1} edited comments. Notification.intranet.message.more.EditCommentPlugin={0}, {1} and {2} edited comments. Notification.intranet.message.one.EditActivityPlugin={0}'s post was edited. Notification.label.readMore=Read More -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER has commented on this post: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST have commented this post: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS dan $COUNTlainnya(s) telah berkomentar pada aktifitas anda: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER edited post: -Notification.digest.three.EditActivityPlugin=$USER_LIST edited posts: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS and $COUNT other(s) edited post: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER edited comment: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST edited comments: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS and $COUNT other(s) edited comments: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -169,10 +137,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} balasan untuk komentar and Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} balasan untuk komentar anda. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} dan {1} balasan untuk komentar anda. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} dan {2} yang lain membalas komentar anda. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER telah membalas komentar anda: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST telah membalas komentar anda: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS dan $COUNT lainnya(s) telah membalas komentar anda: $ACTIVITY ############################################################################# # LikePlugin # @@ -188,10 +152,6 @@ Notification.message.LikePlugin={0} menyukai aktivitas anda Notification.intranet.message.one.LikePlugin={0} menyukai aktifitas kamu. Notification.intranet.message.two.LikePlugin={0} dan {1} menyukai aktifitas anda. Notification.intranet.message.more.LikePlugin={0}, {1} dan {2} lainnya menyukai aktifitas kamu. -# For Digest -Notification.digest.one.LikePlugin=$USERtelah menyukai aktifitas anda:$ACTIVITY -Notification.digest.three.LikePlugin=$USER_LISTtelah menyukai aktifitas anda:$ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERSdan$COUNTother(s) telah menyukai aktifitas anda:$ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -207,10 +167,6 @@ Notification.message.LikeCommentPlugin={0} menyukai komentar anda Notification.intranet.message.one.LikeCommentPlugin={0} suka komentar anda. Notification.intranet.message.two.LikeCommentPlugin={0} dan {1} suka komentar anda. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} dan {2} lainnya menyukai komentar anda. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER suka komentar anda: $KEGIATAN -Notification.digest.three.LikeCommentPlugin=$USER suka komentar anda: $KEGIATAN -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS dan $COUNT other(s) telah menjawab komentar anda: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -224,10 +180,6 @@ Notification.subject.PostActivityPlugin=$USER telah memposting pada aliran aktif Notification.title.PostActivityPlugin=Posting baru pada aliran aktifitas anda Notification.message.PostActivityPlugin={0} telah diposting pada aliran aktifitas anda. Lihat pos dibawah ini Notification.intranet.message.PostActivityPlugin={0} telah memposting pada aliran aktifitas anda. -# For Digest -Notification.digest.one.PostActivityPlugin=$USERtelah memposting padaaliran aktifitas anda. -Notification.digest.three.PostActivityPlugin=$USER_LISTtelah memposting padaaliran aktifitas anda. -Notification.digest.more.PostActivityPlugin=$LAST3_USERSdan$COUNTyang lain(s) telah memposting padaaliran aktifitas anda. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -241,10 +193,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER telah memposting aktifi Notification.title.PostActivitySpaceStreamPlugin=Postingan baru di {0} Notification.message.PostActivitySpaceStreamPlugin={0} telah memposting aktifitas di {1} ruang. Lihat postingan dibawah Notification.intranet.message.PostActivitySpaceStreamPlugin={0} telah memposting aktifitas di {1} ruang. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER telah memposting pada $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST telah memposting pada $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS dan $COUNT lebih telah bergabung $PORTAL_HOME. ############################################################################# # SharedActivitySpacePlugin # @@ -259,10 +207,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER shared an activity in Notification.title.SharedActivitySpaceStreamPlugin=Posting baru pada aliran aktifitas anda Notification.message.SharedActivitySpaceStreamPlugin={0} has shared an article "{1}" in the {2} space. See the post below Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} has shared an activity in the {1} space -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER shared in $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER shared in $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS and $COUNT others shared in $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_it.properties b/webapp/src/main/resources/locale/notification/template/Notification_it.properties index 4b542cf3a03..2c7ecec7ad3 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_it.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_it.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER ha aderito a $PORTAL_NAME Notification.title.NewUserPlugin=Nuovo utente su {0} Notification.message.NewUserPlugin={0} ha aderito {1}. Se interessato a collegarti e iniziare a collaborare con {0}? Notification.intranet.message.NewUserPlugin={0} è stato ammesso <strong> {1} </ strong>. -# For Digest -Notification.digest.one.NewUserPlugin=$USER ha aderito a $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST hanno aderito a $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS e $COUNT altri hanno aderito a $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} ti ha inviato una ric Notification.feedback.RelationshipReceivedRequestPlugin=Ha rifiutato la richiesta di connessione di {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} vuole connettersi con te Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Sei connesso con {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin= hai ricevuto una richiesta di connessione da $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin= hai ricevuto una richiesta di connessione da $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin= Hai ricevuto una richiesta di connessione da $LAST3_USERS e $COUNT altri. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Hai ricevuto un invito ad aderire lo Notification.intranet.message.SpaceInvitationPlugin={0} La ha invitato allo spazio {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Ti sei unito allo spazio {0}. Notification.feedback.SpaceInvitationPlugin=Hai rifiutato di aderire a {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin= Sei stato invitato ad aderire al seguente spazio: $SPACE. -Notification.digest.three.SpaceInvitationPlugin= Sei stato invitato a partecipare ai seguenti spazi: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin= Sei stato invitato a partecipare ai seguenti spazi: $LAST3_SPACES e $COUNT altri (s). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} si è unito allo Notification.feedback-ok.RequestJoinSpacePlugin=Hai approvato la richiesta di ammissione allo spazio. Notification.feedback-exist.RequestJoinSpacePlugin={0} è già un membro di {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Hai rifiutato la richiesta di {0} di unirsi allo spazio. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER <span style="color:#333333">ha chiesto di essere ammesso allo spazio</span> $SPACE <span style="color:#333333">.</span> -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST <span style="color:#333333">ha chiesto di essere ammesso allo spazio</span> $SPACE <span style="color:#333333">.</span> -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS <span style="color:#333333">e</span> $COUNT <span style="color:#333333">altri hanno chiesto di essere ammessi al</span> $SPACE <span style="color:#333333">spazio.</span> ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Sei stato menzionato da $USER Notification.title.ActivityMentionPlugin=Sei stato menzionato nuovamente Notification.message.ActivityMentionPlugin={0} ti ha menzionato nel seguente post Notification.intranet.message.ActivityMentionPlugin={0} ti ha menzionato. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER <span style="color:#333333">ti ha menzionato in:</span> $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST <span style="color:#333333">ti ha menzionato in:</span> $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS <span style="color:#333333">e</span> $COUNT <span style="color:#333333">altri ti hanno menzionato in:</span> $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} e {1} hanno modificato i Notification.intranet.message.more.EditCommentPlugin={0}, {1} e {2} hanno modificato i loro commenti sulla Sua attività. Notification.intranet.message.one.EditActivityPlugin=Il post di {0} è stato modificato. Notification.label.readMore=Per saperne di più -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER <span style="color:#333333">ha commentato la tua attività:</span> $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST <span style="color:#333333">hanno commentato la tua attività:</span> $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS <span style="color:#333333">e</span> $COUNT <span style="color:#333333">altri hanno commentato la tua attività:</span> $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER ha modificato l'attività: -Notification.digest.three.EditActivityPlugin=$USER_LIST hanno modificato le loro attività: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS et $COUNT gli altri hanno modificato le loro attività: - -Notification.digest.one.EditCommentPlugin=$USER ha modificato il commento: -Notification.digest.three.EditCommentPlugin=$USER_LIST ha modificato i commenti: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS and $COUNT altro/i commenti modificati: ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} ha risposto al tuo comment Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} ha risposto al tuo commento. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} e {1} ha risposto al tuo commento. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0},{1} e {2} altri hanno risposto al tuo commento. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USERha risposto al tuo commento:$ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LISTha risposto al tuo commento:$ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERSe$COUNTaltro (i) ha risposto al tuo commento:$ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER ha pubblicato qualcosa sul tuo flu Notification.title.PostActivityPlugin=Nuovo post sul tuo flusso di attività Notification.message.PostActivityPlugin={0} ha pubblicato qualcosa sul tuo flusso di attività. Guarda il post qui sotto Notification.intranet.message.PostActivityPlugin={0} ha pubblicato qualcosa sul tuo flusso attività. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER <span style="color:#333333">ha pubblicato qualcosa sul</span> <a href="$ACTIVITY_STREAM" style="text-decoration: none; color: #2F5E92;">tuo flusso attività</a>. -Notification.digest.three.PostActivityPlugin=$USER_LIST <span style="color:#333333">ha pubblicato qualcosa sul</span> <a href="$ACTIVITY_STREAM" style="text-decoration: none; color: #2F5E92; font-weight: bold;">tuo flusso attività</a>. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS <span style="color:#333333">e</span> $COUNT <span style="color:#333333">altri hanno pubblicato qualcosa sul</span> <a href="$ACTIVITY_STREAM" style="text-decoration: none; color: #2F5E92; font-weight: bold;">tuo flusso attività</a>. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER ha pubblicato un'attivi Notification.title.PostActivitySpaceStreamPlugin=Nuovo post in {0} Notification.message.PostActivitySpaceStreamPlugin={0} ha pubblicato un'attività nello spazio {1} ​. Guarda il post qui sotto Notification.intranet.message.PostActivitySpaceStreamPlugin={0} ha pubblicato un'attività nello spazio {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER <span style="color:#333333">ha pubblicato qualcosa in</span> $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST <span style="color:#333333">ha pubblicato qualcosa in</span> $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS <span style="color:#333333">e</span> $COUNT <span style="color:#333333">altri hanno pubblicato qualcosa in</span> $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER ha condiviso un'attiv Notification.title.SharedActivitySpaceStreamPlugin=Nuovo post sul tuo flusso di attività Notification.message.SharedActivitySpaceStreamPlugin={0} ha condiviso un articolo "{1}" nello spazio {2}. Vedere il post qui sotto Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} ha condiviso un'attività nello spazio {1}. -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER ha condiviso nello $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER ha condiviso nello $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS e altri $COUNT hanno condiviso nello $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_ja.properties b/webapp/src/main/resources/locale/notification/template/Notification_ja.properties index 407dd8ebddd..e45ef885b8b 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_ja.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_ja.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER が $PORTAL_NAME に参加しました Notification.title.NewUserPlugin={0} に新しいユーザー Notification.message.NewUserPlugin={0} が {1} に参加しました。{0} と つながる ならびに 共同作業を開始しますか? Notification.intranet.message.NewUserPlugin={0} が {1} に参加しました。 -# For Digest -Notification.digest.one.NewUserPlugin=$USER が $PORTAL_HOME に 参加しました -Notification.digest.three.NewUserPlugin=$USER_LIST が $PORTAL_HOME に 参加しました -Notification.digest.more.NewUserPlugin=$LAST3_USERS ならびに $COUNT が、$PORTAL_HOME に参加しました。 ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} が コネクト・ Notification.feedback.RelationshipReceivedRequestPlugin=あなたは {0} のコネクト・リクエストを拒否しました。 Notification.intranet.message.RelationshipReceivedRequestPlugin={0} は、あなたにコネクトを求めています。 Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=あなたは、{0} とコネクトされました。 -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=$USER から コネクト・リクエストを受信しました。 -Notification.digest.three.RelationshipReceivedRequestPlugin=$USER_LIST から コネクト・リクエストを受信しました。 -Notification.digest.more.RelationshipReceivedRequestPlugin=$LAST3_USERS および 他の $COUNT 人から コネクト・リクエストを受信しました。 ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin={0} スペースへの招待状を受 Notification.intranet.message.SpaceInvitationPlugin={0} があなたを {1} スペースに招待しました Notification.intranet.message.accept.SpaceInvitationPlugin={0} スペースに参加しました。 Notification.feedback.SpaceInvitationPlugin={0} への参加を拒否しました。 -# For Digest -Notification.digest.one.SpaceInvitationPlugin= 次のスペースへの参加に招待されています: $SPACE -Notification.digest.three.SpaceInvitationPlugin= 次のスペースへの参加に招待されています: $SPACE_LIST -Notification.digest.more.SpaceInvitationPlugin= 次のスペースへの参加に招待されています: $LAST3_SPACES および 他 $COUNT 個 ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} は {1} スペ Notification.feedback-ok.RequestJoinSpacePlugin=スペースへの参加要求を承認できます。 Notification.feedback-exist.RequestJoinSpacePlugin={0} は既に {1} のメンバーです。 Notification.feedback-nok.RequestJoinSpacePlugin=あなたはスペースに参加する {0} を拒否しました。 -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER が $SPACE スペース に 参加を求めています。 -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST が $SPACE スペース に 参加を求めています。 -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS および $COUNT 人が $SPACE スペース に 参加を求めています。 ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=$USER にメンションされてい Notification.title.ActivityMentionPlugin=新しいのあなたへのメンション Notification.message.ActivityMentionPlugin={0} は、次の記事でメンションされました Notification.intranet.message.ActivityMentionPlugin={0} はあなたにメンションしています。 -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER が メンションしています: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST が メンションしています: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS および $COUNT 人が メンションしています: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} と {1} がコメント Notification.intranet.message.more.EditCommentPlugin={0}, {1} と {2} がコメントを編集しました。 Notification.intranet.message.one.EditActivityPlugin={0}の投稿が編集されました。 Notification.label.readMore=続きを読む -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER has commented on this post: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST has commented this post: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS および $COUNT 人があなたのアクティビティにコメントしています: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER が投稿を編集しました: -Notification.digest.three.EditActivityPlugin=$USER_LIST 編集された投稿: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS and $COUNT other(s) edited post: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER がコメントを編集しました: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST がコメントを編集しました: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS と $COUNT other(s) edited comments: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0}　が、あなたのコメ Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} が、あなたのコメントに返信しました。 Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} および {1} が、あなたのコメントに返信しました。 Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} および {2} が、あなたのコメントに返信しました。 -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER が、あなたのコメントに返信しました: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST あなたのコメントに返信しました: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS および $COUNT 人があなたのコメントに返信しました: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER が、あなたのアクティビ Notification.title.PostActivityPlugin=あなたのアクティビティ・ストリームへの新規投稿 Notification.message.PostActivityPlugin={0} が、あなたのアクティビティ・ストリームに投稿しました。以下を参照してください。 Notification.intranet.message.PostActivityPlugin={0} が、あなたのアクティビティ・ストリームに投稿しました。 -# For Digest -Notification.digest.one.PostActivityPlugin=$USER が アクティビティ・ストリーム に投稿しました。 -Notification.digest.three.PostActivityPlugin=$USER_LIST が アクティビティ・ストリーム に投稿しました。 -Notification.digest.more.PostActivityPlugin=$LAST3_USERS および $COUNT 人が アクティビティ・ストリーム に投稿しました。 > ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER は スペース $SPACE Notification.title.PostActivitySpaceStreamPlugin={0} に新しい投稿 Notification.message.PostActivitySpaceStreamPlugin={0} は スペース {1} にアクティビティを投稿しました。以下を参照して下さい。 Notification.intranet.message.PostActivitySpaceStreamPlugin={0} は スペース {1} にアクティビティを投稿しました。 -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER は $SPACE に 投稿しました。 -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST は $SPACE に 投稿しました。 -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS および $COUNT 人が、$SPACE に投稿しました。 ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER が $SPACE でアク Notification.title.SharedActivitySpaceStreamPlugin=あなたのアクティビティ・ストリームへの新規投稿 Notification.message.SharedActivitySpaceStreamPlugin={0} は{1}スペースで記事「 {2} 」を共有しています．下の記事を参照してください Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} は {1} スペースでアクティビティを共有しています -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER が $SPACE で共有されました -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER が $SPACE で共有されました -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS と $COUNT が $SPACEでシェアしました ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_ko.properties b/webapp/src/main/resources/locale/notification/template/Notification_ko.properties index 79aa411d926..0e279cb5a8b 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_ko.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_ko.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER님이 $PORTAL_NAME에 가입했습니 Notification.title.NewUserPlugin={0} 의 새 사용자 Notification.message.NewUserPlugin={0} 님이 {1} 에 가입했습니다. {0} 과(와) 연결하고 공동작업을 시작하고 싶으십니까? Notification.intranet.message.NewUserPlugin={0} 님이 {1}에 가입했습니다. -# For Digest -Notification.digest.one.NewUserPlugin=$USER 가입했습니다 $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST $PORTAL_HOME에 가입했습니다. -Notification.digest.more.NewUserPlugin=$LAST3_USERS 외 $COUNT 추가 $PORTAL_HOME에 가입했습니다. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} 님이 연결 요청 Notification.feedback.RelationshipReceivedRequestPlugin={0} 연결 요청을 거부했습니다. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} 님이 귀하와 소통하고 싶어합니다 Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=귀하는 {0} 과(와) 연결되어 있습니다 -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=$USER님으로부터 연결 요청을 받았습니다. -Notification.digest.three.RelationshipReceivedRequestPlugin=$USER_LIST로부터 연결 요청을 받았습니다. -Notification.digest.more.RelationshipReceivedRequestPlugin=You've received a connection request from $LAST3_USERS and $COUNT other(s). ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin={0} 스페이스에 참여하라는 Notification.intranet.message.SpaceInvitationPlugin={0} 님이 귀하를 {1} 스페이스에 참여하도록 초대했습니다. Notification.intranet.message.accept.SpaceInvitationPlugin={0} 스페이스에 참여하셨습니다. Notification.feedback.SpaceInvitationPlugin=귀하는 {0} 가입을 거부했습니다. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=다음 공간에 참여하도록 초대되셨습니다: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=다음 공간에 참여하도록 초대되셨습니다: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=다음 공간에 참여하도록 초대되셨습니다: $LAST3_SPACES 외 $COUNT개. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} 님이 {1} 스 Notification.feedback-ok.RequestJoinSpacePlugin=스페이스 참여 요청을 승인하셨습니다. Notification.feedback-exist.RequestJoinSpacePlugin={0} 은(는) 이미 {1} 의 회원입니다. Notification.feedback-nok.RequestJoinSpacePlugin=귀하는 {0} 님의 스페이스 참여를 거부했습니다. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER $SPACE 스페이스 참여를 요청했습니다. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST 님이 $SPACE 공간에 참여를 요청했습니다. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS 및 $COUNT 다른 사람들이 $SPACE 공간. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=$USER님이 나를 멘션했습니다 Notification.title.ActivityMentionPlugin=당신에 대한 새로운 언급 Notification.message.ActivityMentionPlugin={0} 님이 다음 게시물에서 귀하를 멘션했습니다. Notification.intranet.message.ActivityMentionPlugin={0} 님이 귀하를 멘션했습니다. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER 다음에서 나를 멘션했습니다: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST 다음에서 나를 멘션했습니다: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS 그리고 $COUNT 다른 사람들이 다음에서 나를 멘션했습니다: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} 님과 {1} 님이 댓글 Notification.intranet.message.more.EditCommentPlugin={0}, {1} 및 {2} 님이 댓글을 수정했습니다. Notification.intranet.message.one.EditActivityPlugin={0} 님의 게시물이 수정되었습니다. Notification.label.readMore=더 읽기 -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER 이 게시물에 댓글을 달았습니다: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST 이 게시물에 댓글을 달았습니다: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS 그리고 $COUNT 다른 사람들이 귀하의 활동에 댓글을 달았습니다: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER 게시물을 편집했습니다: -Notification.digest.three.EditActivityPlugin=$USER_LIST 수정된 게시물: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS 그리고 $COUNT 다른 사람들이 게시물을 편집했습니다: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER 편집된 댓글: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST 편집된 댓글: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS 그리고 $COUNT 다른(들) 이 댓글을 편집했습니다: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} 님이 귀하의 댓글에 Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} 님이 귀하의 댓글에 답변했습니다. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} 과 {1} 이 귀하의 댓글에 답변했습니다. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} 및 {2} 명이 귀하의 댓글에 답변했습니다. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER 귀하의 댓글에 답변했습니다: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST 귀하의 댓글에 답변했습니다: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS 및 $COUNT 다른 사용자가 귀하의 댓글에 답글을 남겼습니다. $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER님이 피드에 게시했습니다 Notification.title.PostActivityPlugin=피드의 새 게시물 Notification.message.PostActivityPlugin={0} 님이 피드에 게시했습니다. 아래 게시물을 참조하세요. Notification.intranet.message.PostActivityPlugin={0} 님이 피드에 게시했습니다. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER가 귀하의 피드에 글을 올렸습니다. -Notification.digest.three.PostActivityPlugin=$USER_LIST 게시한 날짜 귀하의 피드. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS and $COUNT others have posted on your feed. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER님이 $SPACE 공간에 Notification.title.PostActivitySpaceStreamPlugin={0} 의 새 게시물 Notification.message.PostActivitySpaceStreamPlugin={0} 님이 {1} 공간에 활동을 게시했습니다. 아래 포스팅을 참고하세요 Notification.intranet.message.PostActivitySpaceStreamPlugin={0} 님이 {1} 공간에 활동을 게시했습니다. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER가 $SPACE에 게시했습니다. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST는 $SPACE에 게시했습니다. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS 그리고 $COUNT 다른 사람들이 $SPACE에 게시했습니다. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER님이 $SPACE에서 Notification.title.SharedActivitySpaceStreamPlugin=활동 스트림의 새 게시물 Notification.message.SharedActivitySpaceStreamPlugin={0} 님이 {2} 스페이스에서 "{1}" 기사를 공유했습니다. 아래 포스팅을 참고하세요 Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} 님이 {1} 스페이스에서 활동을 공유했습니다. -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER님이 $SPACE에서 공유됨 -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER님이 $SPACE에서 공유됨 -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS님 외 $COUNT명이 $SPACE에서 공유함 ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_lt.properties b/webapp/src/main/resources/locale/notification/template/Notification_lt.properties index 64729226ce8..7ecb07f1d5a 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_lt.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_lt.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER prisijungė prie $PORTAL_NAME Notification.title.NewUserPlugin=Naujas vartotojas {0} Notification.message.NewUserPlugin={0} ką tik prisijungė prie {1}. Ar norėtumėte prisijungti ir pradėti bendradarbiauti su {0}? Notification.intranet.message.NewUserPlugin={0} prisijungė prie {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER prisijungė $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST prisijungė $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS ir $COUNT dar prisijungė $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} atsiuntė jums prisij Notification.feedback.RelationshipReceivedRequestPlugin=Jūs atmetėte {0} prisijungimo užklausą. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} nori susisiekti su jumis Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Esate prisijungę su {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Gavote prisijungimo užklausą iš $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Gavote prisijungimo užklausą iš $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Gavote prisijungimo užklausą iš $LAST3_USERS ir dar $COUNT. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Gavote kvietimą prisijungti prie {0} Notification.intranet.message.SpaceInvitationPlugin={0} pakvietė jus prisijungti prie {1} erdvės Notification.intranet.message.accept.SpaceInvitationPlugin=Prisijungėte prie {0} erdvės. Notification.feedback.SpaceInvitationPlugin=Jūs atsisakėte prisijungti prie {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Buvote pakviesti prisijungti prie šios erdvės: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Buvote pakviesti prisijungti prie šių erdvių: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Buvote pakviesti prisijungti prie šių erdvių: $LAST3_SPACES ir dar $COUNT. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} prisijungė prie Notification.feedback-ok.RequestJoinSpacePlugin=Patvirtinote prašymą prisijungti prie erdvės. Notification.feedback-exist.RequestJoinSpacePlugin={0} jau yra {1} narys. Notification.feedback-nok.RequestJoinSpacePlugin=Jūs atsisakėte {0} prisijungti prie erdvės. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER paprašė prisijungti prie $SPACE erdvės. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST paprašė prisijungti prie $SPACE erdvės. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS ir $COUNT dar (-i) paprašė prisijungti prie $SPACE tarpas. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Jus paminėjo $USER Notification.title.ActivityMentionPlugin=Naujas jūsų paminėjimas Notification.message.ActivityMentionPlugin={0} paminėjo jus šiame įraše Notification.intranet.message.ActivityMentionPlugin={0} paminėjo jus. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER paminėjo jus: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST paminėjo jus: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS ir $COUNT dar (-i) paminėjo jus: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} ir {1} redagavo komentar Notification.intranet.message.more.EditCommentPlugin={0}, {1} ir {2} redagavo komentarus. Notification.intranet.message.one.EditActivityPlugin={0} įrašas buvo redaguotas. Notification.label.readMore=Skaityti Daugiau -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER pakomentavo šį įrašą: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER pakomentavo šį įrašą: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS ir $COUNT dar (-i) pakomentavo jūsų veiklą: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER redagavo įrašą: -Notification.digest.three.EditActivityPlugin=$USER_LIST redaguoti įrašai: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS ir $COUNT kitas (-i) redaguotas (-i) įrašas (-ai): $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER redagavo komentarą: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST redaguoti komentarai: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS ir $COUNT kitų redaguotų komentarų: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} atsakė į jūsų komentar Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} atsakė į jūsų komentarą. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} ir {1} atsakė į jūsų komentarą. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} ir dar {2} žmonės atsakė į jūsų komentarą. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER atsakė į jūsų komentarą: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST atsakė į jūsų komentarą: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS ir $COUNT dar (-i) atsakė į jūsų komentarą: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER paskelbė jūsų sklaidos kanale: Notification.title.PostActivityPlugin=Naujas įrašas jūsų sklaidos kanale Notification.message.PostActivityPlugin={0} paskelbė jūsų sklaidos kanale. Žiūrėkite žemiau esantį įrašą. Notification.intranet.message.PostActivityPlugin={0} paskelbė jūsų sklaidos kanale. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER paskelbė jūsų sklaidos kanale. -Notification.digest.three.PostActivityPlugin=$USER_LIST paskelbė jūsų sklaidos kanalas. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS ir $COUNT kiti paskelbė jūsų sklaidos kanalas. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER paskelbė veiklą $SPAC Notification.title.PostActivitySpaceStreamPlugin=Naujas įrašas {0} Notification.message.PostActivitySpaceStreamPlugin={0} paskelbė veiklą {1} erdvėje. Žiūrėkite žemiau esantį įrašą Notification.intranet.message.PostActivitySpaceStreamPlugin={0} paskelbė veiklą {1} erdvėje. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER paskelbė $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST paskelbė $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS ir $COUNT dar vienas (-i) paskelbė (-ų) $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER bendrino veiklą $SPA Notification.title.SharedActivitySpaceStreamPlugin=Naujas įrašas jūsų veiklos sraute Notification.message.SharedActivitySpaceStreamPlugin={0} bendrino straipsnį „{1}“ erdvėje {2}. Žiūrėkite žemiau esantį įrašą Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} bendrino veiklą {1} erdvėje -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER bendrino $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER bendrino $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS ir $COUNT kiti bendrino $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_nl.properties b/webapp/src/main/resources/locale/notification/template/Notification_nl.properties index 92f4a1e457a..ad5fe63ff9a 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_nl.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_nl.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER heeft zich aangesloten bij $PORTAL_NAME Notification.title.NewUserPlugin=Nieuwe gebruiker op {0} Notification.message.NewUserPlugin={0} heeft zich aangesloten bij {1}. Geïnteresseerd om verbinding maken met en start samenwerken met {0}? Notification.intranet.message.NewUserPlugin={0} heeft zich aangesloten bij {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER heeft zich aangesloten bij $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST zijn toegetreden tot $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS en $COUNT meer bijgekomen $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} heeft u een verbindin Notification.feedback.RelationshipReceivedRequestPlugin=U heeft {0} de verbindingsaanvraag geweigerd. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} want verbinden met u Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=U bent verbonden met {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin= je hebt ontvangen een verbindingsaanvraag van $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin= je hebt ontvangen een verbindingsaanvraag van $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin= dat je hebt ontvangen een verbindingsaanvraag van $LAST3_USERS en $COUNT andere (s). ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Je hebt ontvangen een uitnodiging om Notification.intranet.message.SpaceInvitationPlugin={0} heeft u uitgenodigd om toe te treden tot {1} ruimte Notification.intranet.message.accept.SpaceInvitationPlugin=Je lid van {0} ruimte. Notification.feedback.SpaceInvitationPlugin=U heeft geweigerd aan {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin= u bent uitgenodigd om toe te treden de volgende ruimte: $SPACE. -Notification.digest.three.SpaceInvitationPlugin= u bent uitgenodigd om toe te treden de volgende ruimten: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin= u bent uitgenodigd om toe te treden de volgende ruimten: $LAST3_SPACES en $COUNT andere (s). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} lid van {1} ruim Notification.feedback-ok.RequestJoinSpacePlugin=U willigt het verzoek om toe te treden van de ruimte. Notification.feedback-exist.RequestJoinSpacePlugin={0} is reeds een lid van {1}. Notification.feedback-nok.RequestJoinSpacePlugin=U {0} om toetreding tot de ruimte heeft geweigerd. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER heeft gevraagd om toetreding tot de $SPACE ruimte. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST hebben gevraagd om toetreding tot de $SPACE ruimte. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS en $COUNT (s) hebben gevraagd om toetreding tot de $SPACE ruimte. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=U hebt gezegd door $USER Notification.title.ActivityMentionPlugin=Nieuwe vermelding van u Notification.message.ActivityMentionPlugin={0} heeft u vermeld in de volgende post Notification.intranet.message.ActivityMentionPlugin={0} heeft u genoemd. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER u in heeft genoemd: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST u in heb genoemd: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS en $COUNT (s) u in heb genoemd: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} en {1} bewerkte reacties Notification.intranet.message.more.EditCommentPlugin={0}, {1} en {2} bewerkte reacties. Notification.intranet.message.one.EditActivityPlugin={0}'s post is bijgewerkt. Notification.label.readMore=Meer informatie -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER heeft commentaar gegeven op dit bericht: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST hebben commentaar gegeven op dit bericht: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS en $COUNT (s) hebben gereageerd op uw activiteit: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER bewerkte post: -Notification.digest.three.EditActivityPlugin=$USER_LIST bewerkte berichten: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS en $COUNT andere(n) bewerkte post: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER bewerkte opmerking: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST bewerkte reacties: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS en $COUNT andere(n) bewerkte reacties: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} heeft op uw opmerking gere Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} heeft op uw opmerking gereageerd. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} en {1} hebben op uw opmerking gereageerd. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} en {2} anderen hebben op uw opmerking gereageerd. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER antwoordde op uw opmerking: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST antwoordde op uw opmerking: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS en $COUNT andere(n) antwoordde(n) op uw opmerking: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER heeft gepost op uw activiteit stre Notification.title.PostActivityPlugin=Nieuwe post op uw activiteit stream Notification.message.PostActivityPlugin={0} heeft gepost op uw activiteit stream. Zie de post hieronder Notification.intranet.message.PostActivityPlugin={0} heeft gepost op uw activiteit stream. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER heeft gepost op uw activiteit stream. -Notification.digest.three.PostActivityPlugin=$USER_LIST heb gepost op uw activiteit stream. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS en $COUNT (s) hebben gepost op uw activiteit stream. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER heeft gepost een activi Notification.title.PostActivitySpaceStreamPlugin=Nieuwe post in {0} Notification.message.PostActivitySpaceStreamPlugin={0} heeft gepost een activiteit in de {1} ruimte. Zie de post hieronder Notification.intranet.message.PostActivitySpaceStreamPlugin={0} heeft gepost een activiteit in de {1} ruimte. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER heeft geplaatst $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST hebben Gepost in $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS en $COUNT (s) hebben Gepost in $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER heeft een activiteit Notification.title.SharedActivitySpaceStreamPlugin=Nieuwe post op uw activiteit stream Notification.message.SharedActivitySpaceStreamPlugin={0} heeft een artikel "{1}" in de {2} ruimte gedeeld. Zie de post hieronder Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} heeft een activiteit gedeeld in de ruimte {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER gedeeld in $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER gedeeld in $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS en $COUNT anderen gedeeld in $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_no.properties b/webapp/src/main/resources/locale/notification/template/Notification_no.properties index 3c5dd24448e..4d17d531b9d 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_no.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_no.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER blitt med i $PORTAL_NAME Notification.title.NewUserPlugin=Ny bruker på {0} Notification.message.NewUserPlugin={0} har blitt med i {1}. Interessert i å koble til og starte samarbeid med {0}? Notification.intranet.message.NewUserPlugin={0} har blitt medlem i {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER har blitt medlem i $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST har blitt medlem i $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS og $COUNT flere har sluttet seg til $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} har sendt deg en tilk Notification.feedback.RelationshipReceivedRequestPlugin=You refused {0}'s connection request. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} ønsker å få kontakt med deg Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Du er koblet til med {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Du har mottatt en tilkoblingsforespørsel fra $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Du har mottatt en tilkoblingsforespørsel fra $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Du har mottatt en tilkoblingsforespørsel fra $LAST3_USERS og $COUNT andre(r). ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Du har mottatt en invitasjon om å bl Notification.intranet.message.SpaceInvitationPlugin={0} inviterte deg til å bli medlem av {1} fellesskapet Notification.intranet.message.accept.SpaceInvitationPlugin=Du ble medlem av {0} fellesskapet. Notification.feedback.SpaceInvitationPlugin=Du nektet å bli med i {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Du har blitt invitert til å bli med i følgende område: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Du er invitert til å delta i følgende lokaler: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Du har blitt invitert til å delta i følgende lokaler: $LAST3_SPACES og $COUNT andre(er). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} ble med i {1} fe Notification.feedback-ok.RequestJoinSpacePlugin=Du har godkjent forespørselen om å delta i fellesskapet. Notification.feedback-exist.RequestJoinSpacePlugin={0} er allerede medlem av {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Du avslo {0} for å bli med i fellesskapet. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER har bedt om å bli med i $SPACE området. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST har bedt om å bli med i $SPACE området. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS og $COUNT andre(e) har bedt om å delta i $SPACE mellomrom. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Du har blitt omtalt av $USER Notification.title.ActivityMentionPlugin=Ny omtale av deg Notification.message.ActivityMentionPlugin={0} har omtalt deg i følgende innlegg Notification.intranet.message.ActivityMentionPlugin={0} har nevnt deg. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER har omtalt deg i: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST har nevnt deg: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS og $COUNT andre har nevnt deg: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} og {1} redigerte komment Notification.intranet.message.more.EditCommentPlugin={0}, {1} og {2} redigerte kommentarer. Notification.intranet.message.one.EditActivityPlugin={0}sitt innlegg ble redigert. Notification.label.readMore=Les mer -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER har kommentert dette innlegget: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST har kommentert innlegget: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS og $COUNT andre har kommentert din aktivitet: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER redigerte innlegg: -Notification.digest.three.EditActivityPlugin=$USER_LIST redigerte innlegg: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS og $COUNT andre(e) redigerte innlegg: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER redigert kommentar: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST redigerte kommentarer: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS og $COUNT andre(e) redigerte kommentarer: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} svarte på kommentaren din Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} svarte på kommentaren din. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} og {1} svarte på din kommentar. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} og {2} andre svarte på kommentaren din. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER har svart på din kommentar: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST har svart på din kommentar: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS og $COUNT andre har svart på din kommentar: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER har postet på din aktivitet strea Notification.title.PostActivityPlugin=Nytt innlegg i aktivitetsstrømmen Notification.message.PostActivityPlugin={0} har postet på din aktivitet strømmen. Se innlegget nedenfor Notification.intranet.message.PostActivityPlugin={0} har postet på din aktivitet strømmen. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER har postet på din aktivitetsstrøm. -Notification.digest.three.PostActivityPlugin=$USER_LIST har postet på din aktivitetsstrøm. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS og $COUNT andre(e) har postet på din aktivitetsstrøm. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER har lagt ut en aktivite Notification.title.PostActivitySpaceStreamPlugin=Nytt innlegg i {0} Notification.message.PostActivitySpaceStreamPlugin={0} har postet en aktivitet i {1} fellesskapet. Se innlegget under Notification.intranet.message.PostActivitySpaceStreamPlugin={0} har lagt ut en aktivitet i {1} fellesskapet. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER har postet i $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST har postet i $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS og $COUNT andre(r) har postet i $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER delte en aktivitet i Notification.title.SharedActivitySpaceStreamPlugin=Nytt innlegg i aktivitetsstrømmen Notification.message.SharedActivitySpaceStreamPlugin={0} har delt en artikkel "{1}" i {2} -området. Se innlegget nedenfor Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} har delt en aktivitet i {1} mellomrom -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER delt i $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER delt i $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS og $COUNT andre delte i $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_pl.properties b/webapp/src/main/resources/locale/notification/template/Notification_pl.properties index 7bfc9445d07..c4ef82e8278 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_pl.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_pl.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER dołączył do $PORTAL_NAME Notification.title.NewUserPlugin=Nowy użytkownik {0} Notification.message.NewUserPlugin={0} dołączył do {1}. Zainteresowany połączeniem i rozpoczęciem współpracy z {0}? Notification.intranet.message.NewUserPlugin={0} dołączył do {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER dołączył(-a) do $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST dołączyli do $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS i $COUNT innych dołączyli do $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} wysłał Ci żądanie Notification.feedback.RelationshipReceivedRequestPlugin=Odrzuciłeś {0} żądania połączenia. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} chce się z tobą połączyć Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Jesteś połczony z {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Otrzymałeś żądanie połączenia od $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Otrzymałeś żądanie połączenia od $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Otrzymałeś żądanie połączenia od $LAST3_USERS i $COUNT innych. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Otrzymałeś(-aś) zaproszenie do prz Notification.intranet.message.SpaceInvitationPlugin={0} zaprosił(a) Cię do dołączenia do przestrzeni {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Dołączyłeś do miejsca {0}. Notification.feedback.SpaceInvitationPlugin=Odmówiłeś dołączenia się do {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Zostałeś(-aś) zaproszony(-a) do przyłączenia się do następującej przestrzeni: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Zostałeś(-aś) zaproszony(-a) do przyłączenia się do następujących przestrzeni: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Zostałeś(-aś) zaproszony(-a) do przyłączenia się do następujących przestrzeni: $LAST3_SPACES i $COUNT innych. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} dołączył do { Notification.feedback-ok.RequestJoinSpacePlugin=Zatwierdziłeś(-aś) wniosek o przyłączenie się do przestrzeni. Notification.feedback-exist.RequestJoinSpacePlugin={0} jest już członkiem {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Odmówiłeś(-aś) {0} przyłączenia się do przestrzeni. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER poprosił(-a) o dołączenie doprzestrzeni $SPACE -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST poprosili o dołączenie do przestrzeni $SPACE -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS i $COUNT innych poprosili o dołączenie do przestrzeni $SPACE ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=$USER zamieścił wzmiankę o tobie Notification.title.ActivityMentionPlugin=Nowa wzmianka o tobie Notification.message.ActivityMentionPlugin={0} wspomniał(-a) o tobie w następującym poście Notification.intranet.message.ActivityMentionPlugin={0} wspomniał o tobie. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER wspomniał(-a) o tobie w: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST zamieścili wzmiankę o tobie w: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS i $COUNT innych zamieścili wzmiankę o tobie w: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} i {1} edytowały komenta Notification.intranet.message.more.EditCommentPlugin={0}, {1} i {2} edytowały komentarze. Notification.intranet.message.one.EditActivityPlugin=Post {0}został edytowany. Notification.label.readMore=Przeczytaj więcej -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER skomentował ten post: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST skomentował ten post: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS i $COUNT innych skomentowali twoją aktywność: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER edytował post: -Notification.digest.three.EditActivityPlugin=$USER_LIST edytowane posty: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS i $COUNT inne edytowane posty: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER edytował komentarz: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST edytował komentarze: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS i $COUNT inne edytowały komentarze: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} odpowiedział na Twój kom Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} odpowiedział na Twój komentarz. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} i {1} odpowiedzieli na Twój komentarz. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} i inni {2} odpowiedzieli na Twój komentarz. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER odpowiedział na Twój komentarz: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST odpowiedział na Twój komentarz: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS i $COUNT inne osoby odpowiedziały na Twój komentarz: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER opublikował(-a) post na twoim str Notification.title.PostActivityPlugin=Nowy post na twoim strumieniu aktywności Notification.message.PostActivityPlugin={0} opublikował(-a) post na twoim strumieniu aktywności. Patrz post poniżej Notification.intranet.message.PostActivityPlugin={0} opublikował na twoim strumieniu aktywności. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER opublikował(-a) post na twoim strumieniu aktywności. -Notification.digest.three.PostActivityPlugin=$USER_LIST opublikowali post na twoim strumieniu aktywności. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS i $COUNT innych opublikowali post na twoim strumieniu aktywności. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER opublikował(-a) aktywn Notification.title.PostActivitySpaceStreamPlugin=Nowy post w {0} Notification.message.PostActivitySpaceStreamPlugin={0} opublikował aktywność w przestrzeni {1}. Patrz post poniżej Notification.intranet.message.PostActivitySpaceStreamPlugin={0} opublikował w działaniach w miejscu{1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER opublikował w $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST napisali w $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS i $COUNT innych napisali w $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER podzielił się aktyw Notification.title.SharedActivitySpaceStreamPlugin=Nowy post na twoim strumieniu aktywności Notification.message.SharedActivitySpaceStreamPlugin={0} podzielił się artykułem "{1}" w przestrzeni {2} . Zobacz post poniżej Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} podzielił się aktywnością w przestrzeni {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER udostępniony w $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER udostępniony w $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS i $COUNT innych udostępnionych w $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_pt_BR.properties b/webapp/src/main/resources/locale/notification/template/Notification_pt_BR.properties index b803511e94d..509f40f429b 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_pt_BR.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_pt_BR.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER ingressou-se $PORTAL_NAME Notification.title.NewUserPlugin=Novo usuário em {0} Notification.message.NewUserPlugin={0} ingressou-se {1}. Interessado em conectar e começar a colaborar com {0}? Notification.intranet.message.NewUserPlugin={0} entrou {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER ingressou-se a $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER ingressou-se a $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS e $COUNT ingressaram-se $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} lhe enviou um pedido Notification.feedback.RelationshipReceivedRequestPlugin=Você recusou o pedido de conexão de {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} deseja se conectar com você Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Você está conectado com {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=<span style="color:#333333">Você recebeu um pedido de conexão de</span> $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=<span style="color:#333333">Você recebeu um pedido de conexão de</span> $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=<span style="color:#333333">Você recebeu um pedido de conexão de</span> $LAST3_USERS <span style="color:#333333">e</span> outro(s) $COUNT. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Você recebeu um convite para ingress Notification.intranet.message.SpaceInvitationPlugin=Você está convidado a ingressar no espaço {0}. Notification.intranet.message.accept.SpaceInvitationPlugin=Você ingressou no espaço {0}. Notification.feedback.SpaceInvitationPlugin=Você recusou a ingressar-se ao {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Você foi convidado para se ingressar o seguinte espaço: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Você foi convidado para ingressar-se ao seguinte espaço: $SPACE. -Notification.digest.more.SpaceInvitationPlugin= ter sido convidado para ingressar-se aos seguintes espaços: $LAST3_SPACES e $COUNT outro(s). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} ingressou no esp Notification.feedback-ok.RequestJoinSpacePlugin=Você aprovou a solicitação para ingressar-se ao espaço. Notification.feedback-exist.RequestJoinSpacePlugin={0} é já um membro de {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Você recusou a {0} para ingressar no espaço. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER pediu para ingressar-se ao espaço $SPACE -Notification.digest.three.RequestJoinSpacePlugin=$USER pediu para ingressar-se ao espaço $SPACE -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS e $COUNT outro(s) pediram para ingressar-se ao espaço $SPACE. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Você foi mencionado por $USER Notification.title.ActivityMentionPlugin=Nova menção de você Notification.message.ActivityMentionPlugin={0} foi mencionado no seguinte post Notification.intranet.message.ActivityMentionPlugin={0} mencionou você. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER mencionou você em: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST mencionaram você em: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS e $COUNT outro(s) mencionaram você em: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} e {1} editaram comentár Notification.intranet.message.more.EditCommentPlugin={0}, {1} e {2} editaram comentários. Notification.intranet.message.one.EditActivityPlugin={0} editou uma publicação. Notification.label.readMore=Ler Mais -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER comentou sobre esta publicação: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER comentou sobre esta publicação: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS e $COUNT outro(s) comentaram sobre sua atividade: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER editou a postagem: -Notification.digest.three.EditActivityPlugin=$USER_LIST publicações editadas: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS e $COUNT outro(s) editaram a postagem: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER comentário editado: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST comentários editados: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS e $COUNT outro(s) comentários(s) editados: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} respondeu ao seu comentár Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} respondeu ao seu comentário. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} e {1} responderam ao seu comentário. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} e {2} outras pessoas responderam ao seu comentário. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER respondeu ao seu comentário: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST responderam ao seu comentário: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS e $COUNT outra(s) pessoa(s) responderam ao seu comentário: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER postou no seu fluxo de atividade: Notification.title.PostActivityPlugin=Novo post no seu fluxo de atividade Notification.message.PostActivityPlugin={0} postou no seu fluxo de atividade. Veja o post abaixo Notification.intranet.message.PostActivityPlugin={0} postaram no seu fluxo de atividades. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER postou no seu fluxo de atividade. -Notification.digest.three.PostActivityPlugin=$USER_LIST postou no seu fluxo de atividade. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS e $COUNT outro(s) postaram no seu fluxo de atividade. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER postou uma atividade no Notification.title.PostActivitySpaceStreamPlugin=Novo post em {0} Notification.message.PostActivitySpaceStreamPlugin={0} postou uma atividade no espaço {1}. Veja o post abaixo Notification.intranet.message.PostActivitySpaceStreamPlugin={0} postou uma atividade no espaço {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER postou em $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST postaram em $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS e $COUNT outro(s) postaram em $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER compartilhou uma ativ Notification.title.SharedActivitySpaceStreamPlugin=Novo post no seu fluxo de atividade Notification.message.SharedActivitySpaceStreamPlugin={0} compartilhou um artigo "{1}" no espaço {2} . Veja o post abaixo Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} compartilhou uma atividade no espaço {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER compartilhado em $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER compartilhado em $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS e $COUNT outros compartilharam em $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_pt_PT.properties b/webapp/src/main/resources/locale/notification/template/Notification_pt_PT.properties index dcabd2f5875..f6864ab24e4 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_pt_PT.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_pt_PT.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER ingressou-se $PORTAL_NAME Notification.title.NewUserPlugin=Novo usuário em {0} Notification.message.NewUserPlugin={0} ingressou-se {1}. Interessado em conectar e começar a colaborar com {0}? Notification.intranet.message.NewUserPlugin={0} entrou {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER ingressou-se a $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER ingressou-se a $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS e $COUNT ingressaram-se $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} lhe enviou um pedido Notification.feedback.RelationshipReceivedRequestPlugin=Você recusou o pedido de conexão de {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} deseja se conectar com você Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Você está conectado com {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=<span style="color:#333333">Você recebeu um pedido de conexão de</span> $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=<span style="color:#333333">Você recebeu um pedido de conexão de</span> $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=<span style="color:#333333">Você recebeu um pedido de conexão de</span> $LAST3_USERS <span style="color:#333333">e</span> outro(s) $COUNT. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Você recebeu um convite para ingress Notification.intranet.message.SpaceInvitationPlugin={0} convidou você para participar do espaço {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Você ingressou no espaço {0}. Notification.feedback.SpaceInvitationPlugin=Você recusou a ingressar-se ao {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Você foi convidado para se ingressar o seguinte espaço: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Você foi convidado para ingressar-se ao seguinte espaço: $SPACE. -Notification.digest.more.SpaceInvitationPlugin= ter sido convidado para ingressar-se aos seguintes espaços: $LAST3_SPACES e $COUNT outro(s). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} ingressou no esp Notification.feedback-ok.RequestJoinSpacePlugin=Você aprovou a solicitação para ingressar-se ao espaço. Notification.feedback-exist.RequestJoinSpacePlugin={0} é já um membro de {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Você recusou a {0} para ingressar no espaço. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER pediu para ingressar-se ao espaço $SPACE -Notification.digest.three.RequestJoinSpacePlugin=$USER pediu para ingressar-se ao espaço $SPACE -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS e $COUNT outro(s) pediram para ingressar-se ao espaço $SPACE. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Você foi mencionado por $USER Notification.title.ActivityMentionPlugin=Nova menção de você Notification.message.ActivityMentionPlugin={0} foi mencionado no seguinte post Notification.intranet.message.ActivityMentionPlugin={0} mencionou você. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER mencionou você em: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST mencionaram você em: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS e $COUNT outro(s) mencionaram você em: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} e {1} editaram comentár Notification.intranet.message.more.EditCommentPlugin={0}, {1} e {2} editou comentários. Notification.intranet.message.one.EditActivityPlugin=Publicação {0}foi editada. Notification.label.readMore=Ler Mais -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER comentou sobre este post: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST comentou este post: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS e $COUNT outro(s) comentaram sobre sua atividade: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER publicação editada: -Notification.digest.three.EditActivityPlugin=$USER_LIST publicações editadas: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS e $COUNT outro post editado: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER comentário editado: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST Comentários editados: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS e $COUNT outros comentários editados: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} respondeu ao seu comentár Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} respondeu ao seu comentário. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} e {1} responderam ao seu comentário. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} e mais {2} pessoas responderam ao seu comentário. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER respondeu ao seu comentário: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LISTresponderam ao seu comentário:$ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERSe $COUNToutras pessoas responderam ao seu comentário: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER postou no seu fluxo de atividade: Notification.title.PostActivityPlugin=Novo post no seu fluxo de atividade Notification.message.PostActivityPlugin={0} postou no seu fluxo de atividade. Veja o post abaixo Notification.intranet.message.PostActivityPlugin={0} postaram no seu fluxo de atividades. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER postou no seu fluxo de atividade. -Notification.digest.three.PostActivityPlugin=$USER_LIST postou no seu fluxo de atividade. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS e $COUNT outro(s) postaram no seu fluxo de atividade. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER postou uma atividade no Notification.title.PostActivitySpaceStreamPlugin=Novo post em {0} Notification.message.PostActivitySpaceStreamPlugin={0} postou uma atividade no espaço {1}. Veja o post abaixo Notification.intranet.message.PostActivitySpaceStreamPlugin={0} postou uma atividade no espaço {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER postou em $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST postaram em $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS e $COUNT outro(s) postaram em $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER compartilhou uma ativ Notification.title.SharedActivitySpaceStreamPlugin=Novo post no seu fluxo de atividade Notification.message.SharedActivitySpaceStreamPlugin={0} compartilhou um artigo "{1}" no espaço {2} . Veja o post abaixo Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} compartilhou uma atividade no espaço {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER compartilhado em $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER compartilhado em $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS e $COUNT outros compartilharam em $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_ro.properties b/webapp/src/main/resources/locale/notification/template/Notification_ro.properties index f58efad3204..dce206afd82 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_ro.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_ro.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER s-a alaturat $PORTAL_NAME Notification.title.NewUserPlugin=Utilizator nou {0} Notification.message.NewUserPlugin={0} a aderat {1}. Ești interesat(ă) să te conectezi şi să începi să colaborezi cu {0}? Notification.intranet.message.NewUserPlugin={0} s-a alăturat {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER s-a alăturat $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST s-au alăturat $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS şi $COUNT s-au mai alăturat $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} a trimis o cerere de Notification.feedback.RelationshipReceivedRequestPlugin=Ai refuzat cererea lui {0} de conectare. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} vrea să se conecteze cu tine Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Ești conectat cu {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin= ai primit o cerere de conexiune de la $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin= Ai primit o cerere de conexiune de la $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin= Ai primit o cerere de conexiune de la $LAST3_USERS şi alți $COUNT (s). ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Ați primit o invitație de colaborar Notification.intranet.message.SpaceInvitationPlugin={0} te-a invitat să te alături spațiului {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Te-ai alăturat spațiului {0}. Notification.feedback.SpaceInvitationPlugin=Ai refuzat conectarea la spațiul {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin= aţi fost invitat să colaborați în următorul Spațiu: $SPACE. -Notification.digest.three.SpaceInvitationPlugin= aţi fost invitat să colaborați în următoarele Spații: $SPACE. -Notification.digest.more.SpaceInvitationPlugin= aţi fost invitat să colaborați în următoarele spaţii: $LAST3_SPACES şi în alte $COUNT (s). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} s-a alăturat sp Notification.feedback-ok.RequestJoinSpacePlugin=Ați aprobat cererea de conectare la spațiu. Notification.feedback-exist.RequestJoinSpacePlugin={0} este deja membru al {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Ai refuzat ca {0} să adere la spațiu. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER a cerut să se alăture spațiului $SPACE /span> -Notification.digest.three.RequestJoinSpacePlugin=$USER au cerut să se alăture spațiului $SPACE /span> -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS și alți $COUNT au cerut să se alăture spațiului $SPACE . ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Ai fost menţionat(ă) de $USER Notification.title.ActivityMentionPlugin=O nouă menționare a ta Notification.message.ActivityMentionPlugin={0} te-a menţionat în următoarea postare Notification.intranet.message.ActivityMentionPlugin={0} te-a menționat. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER te-a menţionat în: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER te-au menţionat în: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS şi $COUNT alții te-au menţionat în: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} și {1} au editat coment Notification.intranet.message.more.EditCommentPlugin={0}, {1} și {2} au editat comentarii. Notification.intranet.message.one.EditActivityPlugin=Postarea lui {0}a fost editată. Notification.label.readMore=Citește mai mult -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER a comentat la această postare: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST au comentat acest post: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS şi $COUNT alții au comentat activitatea: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER a editat postul: -Notification.digest.three.EditActivityPlugin=$USER_LIST a editat postări: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS și $COUNT alt(e) au editat postul: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER a editat comentariu: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST a editat comentarii: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS și $COUNT alt(e) au editat comentarii: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} a răspuns la comentariul Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} a răspuns la comentariul tău. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} și {1} au răspuns la comentariul tău. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} și {2} alții au răspuns la comentariul tău. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER a răspuns la comentariul tău: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST au răspuns la comentariul tău: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS și $COUNT alții au răspuns la comentariul tău: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER a postat pe fluxul de activitate: Notification.title.PostActivityPlugin=Nou post pe fluxul de activitate Notification.message.PostActivityPlugin={0} a postat pe fluxul de activitate. Vezi mai jos Notification.intranet.message.PostActivityPlugin={0} a postat pe pagina ta de activități. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER a postat în fluxul tău de activități. -Notification.digest.three.PostActivityPlugin=$USER_LIST au postat în fluxul tău de activități. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS și alți $COUNT au postat în fluxul tău de activități. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER a postat o activitate Notification.title.PostActivitySpaceStreamPlugin=Nouă postare în {0} Notification.message.PostActivitySpaceStreamPlugin={0} a postat o activitate în spaţiul {1}. A se vedea postarea de mai jos Notification.intranet.message.PostActivitySpaceStreamPlugin={0} a postat o activitate în spațiul {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER a postat în $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST au postat în $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS și alți $COUNT au postat în $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER a distribuit o activi Notification.title.SharedActivitySpaceStreamPlugin=Nou post pe fluxul de activitate Notification.message.SharedActivitySpaceStreamPlugin={0} a distribuit un articol "{1}" în spațiul {2} . Vezi postarea de mai jos Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} a partajat o activitate în spațiul {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER partajate în $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER partajate în $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS și $COUNT alții au distribuit în $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_ru.properties b/webapp/src/main/resources/locale/notification/template/Notification_ru.properties index 44061eb98c8..7c08735d490 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_ru.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_ru.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER присоединился к $PORTAL_N Notification.title.NewUserPlugin=Новый пользователь на {0} Notification.message.NewUserPlugin={0} присоединился к {1}. Заинтересованы в подключении и началу совместной работы с {0}? Notification.intranet.message.NewUserPlugin={0} присоединился к {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER присоединился $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST присоединились $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS и более $COUNT участников присоединились $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} отправил ва Notification.feedback.RelationshipReceivedRequestPlugin=Вы отклонили {0} запрос (ов) на подключение. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} хочет связаться с вами Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Вы связаны с {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Вы получили запрос на присоединение от $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Вы получили запросы на присоединение от $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Вы получили запросы на присоединение от $LAST3_USERS и еще $COUNT других участников. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Вы получили приглаш Notification.intranet.message.SpaceInvitationPlugin={0} пригласил вас присоединиться к пространству {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Вы присоединились к {0} группе. Notification.feedback.SpaceInvitationPlugin=Вы отказались вступить в {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Вы были приглашены вступить в следующую группу: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Вы были приглашены вступить в следующие группы: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Вы были приглашены вступить в следующую группу: $LAST3_SPACES и еще в $COUNT других. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} присоеди Notification.feedback-ok.RequestJoinSpacePlugin=Вы одобрили запрос на вступление в группу. Notification.feedback-exist.RequestJoinSpacePlugin={0} уже является членом {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Вы отказались {0} присоединиться. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER запросил вступление в группу $SPACE. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST запросили вступление в группу $SPACE. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS и еще $COUNT других запросили вступление в группу $SPACE. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Вас упомянул пользо Notification.title.ActivityMentionPlugin=Для вас новое уведомление Notification.message.ActivityMentionPlugin={0} упомянул вас в следующем посте Notification.intranet.message.ActivityMentionPlugin={0} упомянул вас. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER упомянул вас в: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST упомянули вас в: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS и еще $COUNT других упомянули вас в: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} и {1} отредакт Notification.intranet.message.more.EditCommentPlugin={0}, {1} и {2} редактировали комментарии. Notification.intranet.message.one.EditActivityPlugin=Запись {0}была отредактирована. Notification.label.readMore=Читать далее -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER прокомментировал это сообщение: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST прокомментировал это сообщение: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS и еще $COUNT других прокомментировали вашу активность: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER отредактировал сообщение: -Notification.digest.three.EditActivityPlugin=$USER_LIST отредактировал записи: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS и $COUNT другие(ие) редактированное сообщение: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER отредактировал комментарий: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST отредактировал комментарии: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS и $COUNT другие(ие) редактированные комментарии: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} ответил на Ваш Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} ответил(а) на ваш комментарий. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} и {1} ответили на ваш комментарий. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} и {2} других ответили на ваш комментарий. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER ответили на Ваш комментарий: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST ответили на Ваш комментарий: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS и еще $COUNT другой(-ие) ответили на Ваш комментарий: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER оставил пост в ваш Notification.title.PostActivityPlugin=Новый пост в вашей ленте активностей Notification.message.PostActivityPlugin={0} оставил пост в вашей ленте активностей. Смотрите пост ниже Notification.intranet.message.PostActivityPlugin={0} разместил на вашей ленте сообщение. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER оставил пост в вашей ленте активностей. -Notification.digest.three.PostActivityPlugin=$USER_LIST оставил пост в вашей ленте активностей. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS и еще $COUNT других оставили пост в ленте ваших активностей. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER разместил ак Notification.title.PostActivitySpaceStreamPlugin=Новый пост в {0} Notification.message.PostActivitySpaceStreamPlugin={0} разместил активность в группе {1}. Смотрите пост ниже Notification.intranet.message.PostActivitySpaceStreamPlugin={0} опубликовал сообщение в {1} группе. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER разместил пост в группе $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST разместили пост в группе $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS и $COUNT других разместили пост в группе $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER поделился а Notification.title.SharedActivitySpaceStreamPlugin=Новый пост в вашей ленте активностей Notification.message.SharedActivitySpaceStreamPlugin={0} опубликовал статью "{1}" в космосе {2} . Смотрите сообщение ниже Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} поделился активностью в пространстве {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER поделился в $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER поделился в $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS и $COUNT другие поделились в $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_sk.properties b/webapp/src/main/resources/locale/notification/template/Notification_sk.properties index cabb9e4c540..04983093281 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_sk.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_sk.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER sa pripojil k $PORTAL_NAME Notification.title.NewUserPlugin=Nový používateľ na {0} Notification.message.NewUserPlugin={0} sa pripojil k {1}. Chcete sa spojiť a začať spolupracovať s používateľom {0}? Notification.intranet.message.NewUserPlugin={0} sa pripojil k {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER sa pripojil k $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST sa pripojili $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS a $COUNT ďalší sa pripojili $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} vám poslal žiadosť Notification.feedback.RelationshipReceivedRequestPlugin=Odmietli ste {0} žiadosť o pripojenie. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} sa s vami chce spojiť Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Ste v spojení s používateľom {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Dostali ste žiadosť o pripojenie od $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Dostali ste žiadosť o pripojenie od $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Dostali ste žiadosť o pripojenie od $LAST3_USERS a $COUNT ďalších. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Dostali ste pozvánku do priestoru {0 Notification.intranet.message.SpaceInvitationPlugin={0} vás pozval, aby ste sa pripojili k priestoru {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Pripojili ste sa k priestoru {0}. Notification.feedback.SpaceInvitationPlugin=Odmietli ste sa pripojiť k {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Dostali ste pozvánku do tohto priestoru: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Dostali ste pozvánku do nasledujúcich priestorov: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Dostali ste pozvánku do nasledujúcich priestorov: $LAST3_SPACES a $COUNT ďalších. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} sa pripojil(a) k Notification.feedback-ok.RequestJoinSpacePlugin=Schválili ste žiadosť o pripojenie k priestoru. Notification.feedback-exist.RequestJoinSpacePlugin={0} je už členom skupiny {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Odmietli ste {0} pripojiť sa k priestoru. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER požiadal o pripojenie k $SPACE priestoru. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST požiadali o vstup do $SPACE priestoru. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS a $COUNT ďalší požiadali o vstup do $SPACE medzera. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Spomenul vás $USER Notification.title.ActivityMentionPlugin=Nová zmienka o tebe Notification.message.ActivityMentionPlugin={0} sa o vás zmienil v nasledujúcom príspevku Notification.intranet.message.ActivityMentionPlugin={0} sa o vás zmienil. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER sa o vás zmienil v: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST sa o vás zmienili v: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS a $COUNT ďalší sa o vás zmienili v: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} a {1} upravili komentár Notification.intranet.message.more.EditCommentPlugin={0}, {1} a {2} upravili komentáre. Notification.intranet.message.one.EditActivityPlugin=Príspevok používateľa {0} bol upravený. Notification.label.readMore=Prečítajte si viac -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER komentoval tento príspevok: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST komentovali tento príspevok: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS a $COUNT ďalší komentovali vašu aktivitu: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER upravil príspevok: -Notification.digest.three.EditActivityPlugin=$USER_LIST upravil príspevky: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS a $COUNT ďalší upravili príspevok: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER upravil komentár: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST upravil komentáre: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS a $COUNT ďalší upravili komentáre: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} odpovedal na váš koment Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} odpovedal na váš komentár. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} a {1} odpovedali na váš komentár. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} a ďalší ({2}) odpovedali na váš komentár. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER odpovedal na váš komentár: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST odpovedal na váš komentár: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS a $COUNT ďalší odpovedali na váš komentár: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER uverejnil vo vašom informačnom k Notification.title.PostActivityPlugin=Nový príspevok vo vašom informačnom kanáli Notification.message.PostActivityPlugin=Používateľ {0} uverejnil príspevok vo vašom informačnom kanáli. Pozri príspevok nižšie. Notification.intranet.message.PostActivityPlugin=Používateľ {0} uverejnil príspevok vo vašom informačnom kanáli. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER uverejnil v vašom informačnom kanáli . -Notification.digest.three.PostActivityPlugin=$USER_LIST uverejnili na váš informačný kanál. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS and $COUNT others have posted on your feed. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER uverejnil aktivitu v pr Notification.title.PostActivitySpaceStreamPlugin=Nový príspevok v {0} Notification.message.PostActivitySpaceStreamPlugin=Používateľ {0} uverejnil aktivitu v priestore {1}. Pozri príspevok nižšie Notification.intranet.message.PostActivitySpaceStreamPlugin=Používateľ {0} uverejnil aktivitu v priestore {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER uverejnil príspevok v $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST uverejnili v $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS a $COUNT ďalší príspevok v $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER zdieľal aktivitu v p Notification.title.SharedActivitySpaceStreamPlugin=Nový príspevok vo vašom streame aktivít Notification.message.SharedActivitySpaceStreamPlugin={0} zdieľa článok „{1}“ v priestore {2}. Pozri príspevok nižšie Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} zdieľa aktivitu v priestore {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER zdieľal v $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER zdieľal v $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS a ďalší ($COUNT) zdieľali v $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_sl.properties b/webapp/src/main/resources/locale/notification/template/Notification_sl.properties index 3593443ff3f..05994a97cbe 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_sl.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_sl.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER se je pridružil $PORTAL_NAME Notification.title.NewUserPlugin=Nov uporabnik v {0} Notification.message.NewUserPlugin={0} se je pridružil {1}. Ali ste zainteresirani, da se povežete in začnete sodelovati s/z {0}? Notification.intranet.message.NewUserPlugin={0} se je pridružil {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER se je pridružil $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST so se pridružili $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS in še $COUNT so se pridružili $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} je poslal(a) prošnjo Notification.feedback.RelationshipReceivedRequestPlugin=Zavrnili ste prošnjo za povezavo {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} želi vzpostaviti povezavo z vami Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Povezani ste z {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Prejeli ste prošnjo za povezavo od $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Prejeli ste prošnjo za povezavo od $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Prejeli ste prošnjo za povezavo od $LAST3_USERS in $COUNT drugih. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Prejeli ste povabilo za pridružitev Notification.intranet.message.SpaceInvitationPlugin={0} vas vabi, da se pridružite prostoru {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Pridružili ste se prostoru {0}. Notification.feedback.SpaceInvitationPlugin=Zavrnili ste, da se pridružite {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin= Povabljeni ste, da se pridružite prostoru: $SPACE. -Notification.digest.three.SpaceInvitationPlugin= Povabljeni ste, da se pridružite naslednjim prostorom: $SPACE. -Notification.digest.more.SpaceInvitationPlugin= Povabljeni ste, da se pridružite naslednjim prostorom: $LAST3_SPACES in $COUNT drugim. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} se je pridružil Notification.feedback-ok.RequestJoinSpacePlugin=Odobrili ste prošnjo za priključitev prostoru. Notification.feedback-exist.RequestJoinSpacePlugin={0} je že član {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Zavrnili ste prošnjo {0}, da bi se pridružil(a) prostoru. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER je zaprosil(a), da se pridruži prostoru $SPACE. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST so zaprosili, da se pridružijo prostoru $SPACE. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS in $COUNT drugih je zaprosilo, da se pridružijo prostoru $SPACE. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Omenil(a) vas je $USER Notification.title.ActivityMentionPlugin=Nova omemba vas Notification.message.ActivityMentionPlugin={0} vas je omenil(a) v naslednji objavi Notification.intranet.message.ActivityMentionPlugin={0} vas je omenil(a). -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER vas je omenil(a) v: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST so vas omenili v: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS in $COUNT drugih vas je omenilo v: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} in {1} urejenih komentar Notification.intranet.message.more.EditCommentPlugin={0}, {1} in {2} urejenih komentarjev. Notification.intranet.message.one.EditActivityPlugin={0} je uredil(a) objavo. Notification.label.readMore=Preberi več -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER je komentiral to objavo: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST so komentirali to objavo: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS in $COUNT drugih je komentiralo vašo dejavnost: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER je uredil objavo: -Notification.digest.three.EditActivityPlugin=$USER_LIST uredil objave: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS in $COUNT drugi(-i) so uredili objavo: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER urejen komentar: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST urejeni komentarji: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS in $COUNT drugih urejenih komentarjev: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} je odgovoril na tvoj komen Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} je odgovoril na tvoj komentar. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} in {1} sta odgovorila na tvoj komentar. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} in {2} drugih je odgovorilo na tvoj komentar. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER je odgovoril na tvoj komentar: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST so odgovorili na tvoj komentar: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS in $COUNT drugih je odgovorilo na tvoj komentar: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER je objavil(a) na vašem toku dejav Notification.title.PostActivityPlugin=Novo obvestilo na vaši časovnici Notification.message.PostActivityPlugin={0} je objavil na vaš tok dejavnosti. Glej objavo spodaj Notification.intranet.message.PostActivityPlugin={0} je objavil na vaš tok dejavnosti. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER je objavil(a) na vaš tok dejavnosti. -Notification.digest.three.PostActivityPlugin=$USER_LIST so objavili na vaš tok dejavnosti. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS in $COUNT drugih je objavilo na vaš tok dejavnosti. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER je objavil(a) dejavnost Notification.title.PostActivitySpaceStreamPlugin=Nova objava v {0} Notification.message.PostActivitySpaceStreamPlugin={0} je objavil(a) dejavnost v prostoru {1}. Glej objavo spodaj Notification.intranet.message.PostActivitySpaceStreamPlugin={0} je objavil dejavnost v prostoru {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER je objavil(a) v $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST so objavili v $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS in $COUNT drugih je objavilo v $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER je delil dejavnost v Notification.title.SharedActivitySpaceStreamPlugin=Novo obvestilo na vaši časovnici Notification.message.SharedActivitySpaceStreamPlugin={0} je delil članek »{1}« v prostoru {2}. Glej objavo spodaj Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} je delil dejavnost v prostoru {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER deli v $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER deli v $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS in $COUNT drugih so delili v $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_sq.properties b/webapp/src/main/resources/locale/notification/template/Notification_sq.properties index 88ee6a0af04..e73650b026b 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_sq.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_sq.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=crwdns44040:0$USERcrwdnd44040:0$PORTAL_NAMEcr Notification.title.NewUserPlugin=crwdns44042:0{0}crwdne44042:0 Notification.message.NewUserPlugin=crwdns44044:0{0}crwdnd44044:0{1}crwdnd44044:0{0}crwdne44044:0 Notification.intranet.message.NewUserPlugin=crwdns44046:0{0}crwdnd44046:0{1}crwdne44046:0 -# For Digest -Notification.digest.one.NewUserPlugin=crwdns44048:0$USERcrwdnd44048:0$PORTAL_HOMEcrwdne44048:0 -Notification.digest.three.NewUserPlugin=crwdns44050:0$USER_LISTcrwdnd44050:0$PORTAL_HOMEcrwdne44050:0 -Notification.digest.more.NewUserPlugin=crwdns44052:0$LAST3_USERScrwdnd44052:0$COUNTcrwdnd44052:0$PORTAL_HOMEcrwdne44052:0 ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin=crwdns44062:0{0}crwdnd440 Notification.feedback.RelationshipReceivedRequestPlugin=crwdns44064:0{0}crwdne44064:0 Notification.intranet.message.RelationshipReceivedRequestPlugin=crwdns44066:0{0}crwdne44066:0 Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=crwdns44068:0{0}crwdne44068:0 -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=crwdns44070:0$USERcrwdne44070:0 -Notification.digest.three.RelationshipReceivedRequestPlugin=crwdns44072:0$USER_LISTcrwdne44072:0 -Notification.digest.more.RelationshipReceivedRequestPlugin=crwdns44074:0$LAST3_USERScrwdnd44074:0$COUNTcrwdne44074:0 ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=crwdns44084:0{0}crwdne44084:0 Notification.intranet.message.SpaceInvitationPlugin=crwdns44086:0{0}crwdnd44086:0{1}crwdne44086:0 Notification.intranet.message.accept.SpaceInvitationPlugin=crwdns44088:0{0}crwdne44088:0 Notification.feedback.SpaceInvitationPlugin=crwdns44090:0{0}crwdne44090:0 -# For Digest -Notification.digest.one.SpaceInvitationPlugin=crwdns44092:0$SPACEcrwdne44092:0 -Notification.digest.three.SpaceInvitationPlugin=crwdns44094:0$SPACE_LISTcrwdne44094:0 -Notification.digest.more.SpaceInvitationPlugin=crwdns44096:0$LAST3_SPACEScrwdnd44096:0$COUNTcrwdne44096:0 ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin=crwdns44110:0{0}crwd Notification.feedback-ok.RequestJoinSpacePlugin=crwdns44112:0crwdne44112:0 Notification.feedback-exist.RequestJoinSpacePlugin=crwdns44114:0{0}crwdnd44114:0{1}crwdne44114:0 Notification.feedback-nok.RequestJoinSpacePlugin=crwdns44116:0{0}crwdne44116:0 -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=crwdns44118:0$USERcrwdnd44118:0$SPACEcrwdne44118:0 -Notification.digest.three.RequestJoinSpacePlugin=crwdns44120:0$USER_LISTcrwdnd44120:0$SPACEcrwdne44120:0 -Notification.digest.more.RequestJoinSpacePlugin=crwdns44122:0$LAST3_USERScrwdnd44122:0$COUNTcrwdnd44122:0$SPACEcrwdne44122:0 ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=crwdns44128:0$USERcrwdne44128:0 Notification.title.ActivityMentionPlugin=crwdns44130:0crwdne44130:0 Notification.message.ActivityMentionPlugin=crwdns44132:0{0}crwdne44132:0 Notification.intranet.message.ActivityMentionPlugin=crwdns44134:0{0}crwdne44134:0 -# For Digest -Notification.digest.one.ActivityMentionPlugin=crwdns44136:0$USERcrwdnd44136:0$ACTIVITYcrwdne44136:0 -Notification.digest.three.ActivityMentionPlugin=crwdns44138:0$USER_LISTcrwdnd44138:0$ACTIVITYcrwdne44138:0 -Notification.digest.more.ActivityMentionPlugin=crwdns44140:0$LAST3_USERScrwdnd44140:0$COUNTcrwdnd44140:0$ACTIVITYcrwdne44140:0 ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin=crwdns44180:0{0}crwdnd44180: Notification.intranet.message.more.EditCommentPlugin=crwdns44182:0{0}crwdnd44182:0{1}crwdnd44182:0{2}crwdne44182:0 Notification.intranet.message.one.EditActivityPlugin=crwdns44184:0{0}crwdne44184:0 Notification.label.readMore=crwdns44186:0crwdne44186:0 -# For Digest -Notification.digest.one.ActivityCommentPlugin=crwdns44188:0$USERcrwdnd44188:0$ACTIVITYcrwdne44188:0 -Notification.digest.three.ActivityCommentPlugin=crwdns44190:0$USER_LISTcrwdnd44190:0$ACTIVITYcrwdne44190:0 -Notification.digest.more.ActivityCommentPlugin=crwdns44192:0$LAST3_USERScrwdnd44192:0$COUNTcrwdnd44192:0$ACTIVITYcrwdne44192:0 - -Notification.digest.one.EditActivityPlugin=crwdns44194:0$USERcrwdne44194:0 -Notification.digest.three.EditActivityPlugin=crwdns44196:0$USER_LISTcrwdne44196:0 -Notification.digest.more.EditActivityPlugin=crwdns44198:0$LAST3_USERScrwdnd44198:0$COUNTcrwdnd44198:0$ACTIVITYcrwdne44198:0 - -Notification.digest.one.EditCommentPlugin=crwdns44200:0$USERcrwdnd44200:0$COMMENTcrwdne44200:0 -Notification.digest.three.EditCommentPlugin=crwdns44202:0$USER_LISTcrwdne44202:0 -Notification.digest.more.EditCommentPlugin=crwdns44204:0$LAST3_USERScrwdnd44204:0$COUNTcrwdnd44204:0$COMMENTcrwdne44204:0 ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin=crwdns44218:0{0}crwdne44218:0 Notification.intranet.message.one.ActivityReplyToCommentPlugin=crwdns44220:0{0}crwdne44220:0 Notification.intranet.message.two.ActivityReplyToCommentPlugin=crwdns44222:0{0}crwdnd44222:0{1}crwdne44222:0 Notification.intranet.message.more.ActivityReplyToCommentPlugin=crwdns44224:0{0}crwdnd44224:0{1}crwdnd44224:0{2}crwdne44224:0 -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=crwdns44226:0$USERcrwdnd44226:0$ACTIVITYcrwdne44226:0 -Notification.digest.three.ActivityReplyToCommentPlugin=crwdns44228:0$USER_LISTcrwdnd44228:0$ACTIVITYcrwdne44228:0 -Notification.digest.more.ActivityReplyToCommentPlugin=crwdns44230:0$LAST3_USERScrwdnd44230:0$COUNTcrwdnd44230:0$ACTIVITYcrwdne44230:0 ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad=crwdns118499:0{0}crwdne118499:0 Notification.intranet.message.one.LikePlugin.funny=crwdns118501:0{0}crwdne118501:0 Notification.intranet.message.two.LikePlugin=crwdns44244:0{0}crwdnd44244:0{1}crwdne44244:0 Notification.intranet.message.more.LikePlugin=crwdns44246:0{0}crwdnd44246:0{1}crwdnd44246:0{2}crwdne44246:0 -# For Digest -Notification.digest.one.LikePlugin=crwdns44248:0$USERcrwdnd44248:0$ACTIVITYcrwdne44248:0 -Notification.digest.three.LikePlugin=crwdns44250:0$USER_LISTcrwdnd44250:0$ACTIVITYcrwdne44250:0 -Notification.digest.more.LikePlugin=crwdns44252:0$LAST3_USERScrwdnd44252:0$COUNTcrwdnd44252:0$ACTIVITYcrwdne44252:0 ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad=crwdns118511:0{0}crwdne1 Notification.intranet.message.one.LikeCommentPlugin.funny=crwdns118513:0{0}crwdne118513:0 Notification.intranet.message.two.LikeCommentPlugin=crwdns44266:0{0}crwdnd44266:0{1}crwdne44266:0 Notification.intranet.message.more.LikeCommentPlugin=crwdns44268:0{0}crwdnd44268:0{1}crwdnd44268:0{2}crwdne44268:0 -# For Digest -Notification.digest.one.LikeCommentPlugin=crwdns44270:0$USERcrwdnd44270:0$ACTIVITYcrwdne44270:0 -Notification.digest.three.LikeCommentPlugin=crwdns44272:0$USER_LISTcrwdnd44272:0$ACTIVITYcrwdne44272:0 -Notification.digest.more.LikeCommentPlugin=crwdns44274:0$LAST3_USERScrwdnd44274:0$COUNTcrwdnd44274:0$ACTIVITYcrwdne44274:0 ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=crwdns44280:0$USERcrwdnd44280:0$SUBJECTc Notification.title.PostActivityPlugin=crwdns44282:0crwdne44282:0 Notification.message.PostActivityPlugin=crwdns44284:0{0}crwdne44284:0 Notification.intranet.message.PostActivityPlugin=crwdns44286:0{0}crwdne44286:0 -# For Digest -Notification.digest.one.PostActivityPlugin=crwdns44288:0$USERcrwdnd44288:0$ACTIVITY_STREAMcrwdne44288:0 -Notification.digest.three.PostActivityPlugin=crwdns44290:0$USER_LISTcrwdnd44290:0$ACTIVITY_STREAMcrwdne44290:0 -Notification.digest.more.PostActivityPlugin=crwdns44292:0$LAST3_USERScrwdnd44292:0$COUNTcrwdnd44292:0$ACTIVITY_STREAMcrwdne44292:0 ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=crwdns44298:0$USERcrwdnd44298 Notification.title.PostActivitySpaceStreamPlugin=crwdns44300:0{0}crwdne44300:0 Notification.message.PostActivitySpaceStreamPlugin=crwdns44302:0{0}crwdnd44302:0{1}crwdne44302:0 Notification.intranet.message.PostActivitySpaceStreamPlugin=crwdns44304:0{0}crwdnd44304:0{1}crwdne44304:0 -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=crwdns44306:0$USERcrwdnd44306:0$SPACEcrwdne44306:0 -Notification.digest.three.PostActivitySpaceStreamPlugin=crwdns44308:0$USER_LISTcrwdnd44308:0$SPACEcrwdne44308:0 -Notification.digest.more.PostActivitySpaceStreamPlugin=crwdns44310:0$LAST3_USERScrwdnd44310:0$COUNTcrwdnd44310:0$SPACEcrwdne44310:0 ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=crwdns44318:0$USERcrwdnd443 Notification.title.SharedActivitySpaceStreamPlugin=crwdns44320:0crwdne44320:0 Notification.message.SharedActivitySpaceStreamPlugin=crwdns44322:0{0}crwdnd44322:0{1}crwdnd44322:0{2}crwdne44322:0 Notification.intranet.message.SharedActivitySpaceStreamPlugin=crwdns44324:0{0}crwdnd44324:0{1}crwdne44324:0 -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=crwdns44326:0$USERcrwdnd44326:0$SPACEcrwdne44326:0 -Notification.digest.three.SharedActivitySpaceStreamPlugin=crwdns44328:0$USERcrwdnd44328:0$SPACEcrwdne44328:0 -Notification.digest.more.SharedActivitySpaceStreamPlugin=crwdns44330:0$LAST3_USERScrwdnd44330:0$COUNTcrwdnd44330:0$SPACEcrwdne44330:0 ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_sv_SE.properties b/webapp/src/main/resources/locale/notification/template/Notification_sv_SE.properties index e0e46d64a47..3d0f26f3cff 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_sv_SE.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_sv_SE.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER har anslutit till $PORTAL_NAME Notification.title.NewUserPlugin=Ny användare på {0} Notification.message.NewUserPlugin={0} har anslutit sig till {1}. Intresserad av att ansluta och börja samarbeta med {0}? Notification.intranet.message.NewUserPlugin={0} har gått med i {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER har anslutit sig till $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST har anslutit till $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS och $COUNT fler har gått med i $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} har skickat en kontak Notification.feedback.RelationshipReceivedRequestPlugin=Du vägrade {0}kontaktförfrågan. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} vill ansluta till dig Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Du är ansluten till {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Du har fått en kontaktförfrågan från $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Du har fått en kontaktförfrågan från $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Du har fått en kontaktförfrågan från $LAST3_USERS och $COUNT andra. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Du har fått en inbjudan att gå med Notification.intranet.message.SpaceInvitationPlugin={0} bjöd in dig att gå med i {1} utrymme Notification.intranet.message.accept.SpaceInvitationPlugin=Du gick med i {0} webb-ytan. Notification.feedback.SpaceInvitationPlugin=Du vägrade att gå med i {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Du har blivit inbjuden att gå med i följande utrymme: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Du har blivit inbjuden att gå med i följande platser: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Du har blivit inbjuden att gå med i följande utrymmen: $LAST3_SPACES och $COUNT andra(er). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} anslöt till {1} Notification.feedback-ok.RequestJoinSpacePlugin=Du godkände begäran att gå med i webb-ytan. Notification.feedback-exist.RequestJoinSpacePlugin={0} är redan medlem i {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Du vägrade {0} att gå med i webb-ytan. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER har bett att gå med i $SPACE rymden. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST har bett att gå med i $SPACE utrymme. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS och $COUNT andra (er) har bett att gå med i $SPACE utrymme. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Du har nämnts av $USER Notification.title.ActivityMentionPlugin=Nytt omnämnande av dig Notification.message.ActivityMentionPlugin={0} har nämnt dig i följande inlägg Notification.intranet.message.ActivityMentionPlugin={0} har nämnt dig. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER har nämnt dig i: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST har nämnt dig i: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS och $COUNT har nämnt dig i: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} och {1} redigerade komme Notification.intranet.message.more.EditCommentPlugin={0}, {1} och {2} redigerade kommentarer. Notification.intranet.message.one.EditActivityPlugin={0}'s inlägg redigerades. Notification.label.readMore=Läs mer -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER har kommenterat detta inlägg: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST har kommenterat detta inlägg: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS och $COUNT andra (er) har kommenterat din aktivitet: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER redigerat inlägg: -Notification.digest.three.EditActivityPlugin=$USER_LIST redigerade inlägg: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS och $COUNT andra redigerade inlägg: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER redigerad kommentar: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST redigerade kommentarer: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS och $COUNT andra redigerade kommentarer: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} svarade på din kommentar. Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} svarade på din kommentar. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} och {1} svarade på din kommentar. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} och {2} andra svarade på din kommentar. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER svarade på din kommentar: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST svarade på din kommentar: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS och $COUNT andra (er) svarade på din kommentar: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER har skrivit på din aktivitetsstr Notification.title.PostActivityPlugin=Nytt inlägg på din aktivitetsström Notification.message.PostActivityPlugin={0} har postat på din aktivitets ström. Se inlägget nedan Notification.intranet.message.PostActivityPlugin={0} har postat på din aktivitets ström. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER har skrivit på din aktivitetsström. -Notification.digest.three.PostActivityPlugin=$USER_LIST har skrivit på din aktivitetsström. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS och $COUNT andra (er) har skrivit på din aktivitetsström. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER har lagt upp en aktivit Notification.title.PostActivitySpaceStreamPlugin=Nytt inlägg i {0} Notification.message.PostActivitySpaceStreamPlugin={0} har postat en aktivitet i {1} webb-ytan. Se inlägget nedan Notification.intranet.message.PostActivitySpaceStreamPlugin={0} har postat en aktivitet i {1} webb-ytan. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER har postat i $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST har postat i $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS och $COUNT har skrivit i $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER delade en aktivitet i Notification.title.SharedActivitySpaceStreamPlugin=Nytt inlägg på din aktivitetsström Notification.message.SharedActivitySpaceStreamPlugin={0} har delat en artikel "{1}" i utrymmet {2} . Se inlägget nedan Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} har delat en aktivitet i utrymmet {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER delat i $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER delat i $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS och $COUNT andra delade i $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_th.properties b/webapp/src/main/resources/locale/notification/template/Notification_th.properties index b89e429f704..22595fd3c48 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_th.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_th.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER เข้าร่วม $PORTAL_NAME Notification.title.NewUserPlugin=ผู้ใช้ใหม่ใน {0} Notification.message.NewUserPlugin={0} ได้เข้าร่วม {1} สนใจที่จะเชื่อมต่อและเริ่มทำงานร่วมกับ {0} หรือไม่ Notification.intranet.message.NewUserPlugin={0} ได้เข้าร่วม {1} -# For Digest -Notification.digest.one.NewUserPlugin=$USER ได้เข้าร่วม $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST ได้เข้าร่วม $PORTAL_HOME -Notification.digest.more.NewUserPlugin=$LAST3_USERS และ อีก $COUNT ได้เข้าร่วมแล้ว $PORTAL_HOME ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} ได้ส่งค Notification.feedback.RelationshipReceivedRequestPlugin=คุณปฏิเสธคำขอเชื่อมต่อ {0} Notification.intranet.message.RelationshipReceivedRequestPlugin={0} ต้องการเชื่อมต่อกับคุณ Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=คุณเชื่อมต่อกับ {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=คุณได้รับคำขอเชื่อมต่อจาก $USER -Notification.digest.three.RelationshipReceivedRequestPlugin=คุณได้รับคำขอเชื่อมต่อจาก $USER_LIST -Notification.digest.more.RelationshipReceivedRequestPlugin=คุณได้รับคำขอเชื่อมต่อจาก $LAST3_USERS และอื่นๆ อีก $COUNT รายการ ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=คุณได้รับคำเ Notification.intranet.message.SpaceInvitationPlugin={0} เชิญคุณเข้าร่วมพื้นที่ {1} Notification.intranet.message.accept.SpaceInvitationPlugin=คุณได้เข้าร่วมพื้นที่ {0} แห่ง Notification.feedback.SpaceInvitationPlugin=คุณปฏิเสธที่จะเข้าร่วม {0} -# For Digest -Notification.digest.one.SpaceInvitationPlugin=คุณได้รับเชิญให้เข้าร่วมพื้นที่ต่อไปนี้: $SPACE -Notification.digest.three.SpaceInvitationPlugin=คุณได้รับเชิญให้เข้าร่วมพื้นที่ต่อไปนี้: $SPACE_LIST -Notification.digest.more.SpaceInvitationPlugin=คุณได้รับเชิญให้เข้าร่วมพื้นที่ต่อไปนี้: $LAST3_SPACES และ อีก $COUNT แห่ง ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} เข้าร Notification.feedback-ok.RequestJoinSpacePlugin=คุณได้อนุมัติคำขอเข้าร่วมพื้นที่แล้ว Notification.feedback-exist.RequestJoinSpacePlugin={0} เป็นสมาชิกของ {1} แล้ว Notification.feedback-nok.RequestJoinSpacePlugin=คุณปฏิเสธ {0} ที่จะเข้าร่วมในพื้นที่ -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER ได้ขอเข้าร่วม $SPACE พื้นที่ -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST ได้ขอเข้าร่วม $SPACE ช่องว่าง -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS และ $COUNT อื่นๆ ได้ขอเข้าร่วม $SPACE ช่องว่าง ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=คุณได้รับการ Notification.title.ActivityMentionPlugin=การกล่าวถึงคุณครั้งใหม่ Notification.message.ActivityMentionPlugin={0} ได้กล่าวถึงคุณในโพสต์ต่อไปนี้ Notification.intranet.message.ActivityMentionPlugin={0} ได้กล่าวถึงคุณ -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER ได้กล่าวถึงคุณใน: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST ได้กล่าวถึงคุณใน: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS และ $COUNT อื่นๆ กล่าวถึงคุณใน: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} และ {1} แก้ Notification.intranet.message.more.EditCommentPlugin={0}, {1} และ {2} แก้ไขความคิดเห็น Notification.intranet.message.one.EditActivityPlugin=โพสต์ของ {0} ได้รับการแก้ไข Notification.label.readMore=อ่านเพิ่มเติม -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER ได้แสดงความคิดเห็นในโพสต์นี้: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST ได้แสดงความคิดเห็นโพสต์นี้: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS และ $COUNT อื่นๆ ได้แสดงความคิดเห็นเกี่ยวกับกิจกรรมของคุณ: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER แก้ไขโพสต์: -Notification.digest.three.EditActivityPlugin=$USER_LIST แก้ไขโพสต์: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS และ $COUNT โพสต์ที่แก้ไขอื่นๆ: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER แก้ไขความคิดเห็น: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST แก้ไขความคิดเห็น: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS และ $COUNT ความคิดเห็นที่แก้ไขอื่นๆ: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} ตอบกลับค Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} ตอบกลับความคิดเห็นของคุณ Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} และ {1} ตอบกลับความคิดเห็นของคุณ Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} และอีก {2} คนตอบกลับความคิดเห็นของคุณ -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER ตอบกลับความคิดเห็นของคุณ: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST ตอบกลับความคิดเห็นของคุณ: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS และ $COUNT อื่นๆ ตอบกลับความคิดเห็นของคุณ: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER ได้โพสต์บนฟ Notification.title.PostActivityPlugin=โพสต์ใหม่บนฟีดของคุณ Notification.message.PostActivityPlugin={0} ได้โพสต์บนฟีดของคุณแล้ว ดูโพสต์ด้านล่าง Notification.intranet.message.PostActivityPlugin={0} ได้โพสต์บนฟีดของคุณแล้ว -# For Digest -Notification.digest.one.PostActivityPlugin=$USER ได้โพสต์บน ฟีดของคุณ -Notification.digest.three.PostActivityPlugin=$USER_LIST ได้โพสต์บน ฟีดของคุณ แล้ว -Notification.digest.more.PostActivityPlugin=$LAST3_USERS and $COUNT others have posted on your feed. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER ได้โพสต Notification.title.PostActivitySpaceStreamPlugin=โพสต์ใหม่ใน {0} Notification.message.PostActivitySpaceStreamPlugin={0} ได้โพสต์กิจกรรมในพื้นที่ {1} ดูโพสต์ด้านล่าง Notification.intranet.message.PostActivitySpaceStreamPlugin={0} ได้โพสต์กิจกรรมในพื้นที่ {1} -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER ได้โพสต์ใน $SPACE -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST ได้โพสต์ใน $SPACE แล้ว -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS และ $COUNT อื่นๆ ได้โพสต์ใน $SPACE ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER แชร์กิจ Notification.title.SharedActivitySpaceStreamPlugin=โพสต์ใหม่บนสตรีมกิจกรรมของคุณ Notification.message.SharedActivitySpaceStreamPlugin={0} ได้แชร์บทความ "{1}" ในพื้นที่ {2} ดูโพสต์ด้านล่าง Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} ได้แบ่งปันกิจกรรมในพื้นที่ {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER แชร์ใน $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER แชร์ใน $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS และอีก $COUNT คนแชร์ใน $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_tr.properties b/webapp/src/main/resources/locale/notification/template/Notification_tr.properties index 36cfe101b8d..9adf55e3228 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_tr.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_tr.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER $PORTAL_NAME katıldı Notification.title.NewUserPlugin={0} Yeni kullanıcı Notification.message.NewUserPlugin={0} {1}'e katıldı. {0} ile işbirliği başlatmak ve iletişim kurmaya ne dersiniz? Notification.intranet.message.NewUserPlugin={0} <strong>{1}</strong>'e katıldı. -# For Digest -Notification.digest.one.NewUserPlugin=$USER $PORTAL_HOME katıldı -Notification.digest.three.NewUserPlugin=$USER $PORTAL_HOME katıldı. -Notification.digest.more.NewUserPlugin=$LAST3_USERS ve $COUNT daha katılmış $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} size bir bağlanma is Notification.feedback.RelationshipReceivedRequestPlugin={0} kişisinin bağlantı isteğini reddettiniz. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} sizinle bağlantı kurmak istiyor Notification.intranet.message.accept.RelationshipReceivedRequestPlugin={0} ile bağlantınız sağlandı -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=$USER <span style="color:#333333">kullanıcısından bir bağlantı talebi geldi</span>. -Notification.digest.three.RelationshipReceivedRequestPlugin=$USER_LIST\nkullanıcılarından bağlantı talepleri geldi. -Notification.digest.more.RelationshipReceivedRequestPlugin=$LAST3_USERS <span style="color:#333333">ile</span> $COUNT kişiden <span style="color:#333333">bağlantı talebi var</span>. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin={0} alanına katılmak üzere davet e Notification.intranet.message.SpaceInvitationPlugin={0} sizi {1} alanına katılmaya davet etti Notification.intranet.message.accept.SpaceInvitationPlugin={0} alanına katıldınız. Notification.feedback.SpaceInvitationPlugin={0} alanına katılmayı reddettiniz. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=<span style="color:#333333">Şu alana katılmak üzere davet edildiniz:</span> $SPACE. -Notification.digest.three.SpaceInvitationPlugin=<span style="color:#333333">Şu alanlara katılmak üzere davet aldınız:</span> $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=<span style="color:#333333">Şu alanlara katılmak üzere davet edildiniz:</span> $LAST3_SPACES <span style="color:#333333">ve</span> $COUNT başka alan. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0}, {1} alanına ka Notification.feedback-ok.RequestJoinSpacePlugin=Alana katılma talebini onayladınız. Notification.feedback-exist.RequestJoinSpacePlugin={0} zaten {1}'in üyesidir. Notification.feedback-nok.RequestJoinSpacePlugin={0}'ın alana katılmasını reddettiniz. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER $SPACE alanına katılmak istedi. -Notification.digest.three.RequestJoinSpacePlugin=$USER $SPACE alanına katılmak istedi. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS ve $COUNT kişi $SPACE alanına katılmak istedi. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=$USER sizden bahsetti. Notification.title.ActivityMentionPlugin=Senden bahsedildi Notification.message.ActivityMentionPlugin={0} şu gönderide senden bahsetti Notification.intranet.message.ActivityMentionPlugin={0} sizden bahsetti. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER şurada sizden bahsetti: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST <span style="color:#333333">sizden bahsetti:</span> $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS <span style="color:#333333">ile</span> $COUNT <span style="color:#333333"> kişişurada sizden bahsetti:</span> $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} ve {1} yorumları düzen Notification.intranet.message.more.EditCommentPlugin={0}, {1} ve {2} yorumları düzenledi. Notification.intranet.message.one.EditActivityPlugin={0} adlı kişinin mesajı düzenlendi. Notification.label.readMore=Devamını oku -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER <span style="color:#333333">şu etkinliğiniz ile ilgili yorum yaptı:</span> $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST <span style="color:#333333">şu etkinliğiniz ile ilgili yorum yaptılar:</span> $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS <span style="color:#333333">ile</span> $COUNT <span style="color:#333333">kişi şu etkinliğinize yorum yaptılar:</span> $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER gönderiyi düzenledi: -Notification.digest.three.EditActivityPlugin=$USER_LIST düzenlenen gönderiler: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS ve $COUNT diğer(ler) gönderiyi düzenledi: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER yorumu düzenledi: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST yorumları düzenledi: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS ve $COUNT başka kişi yorumları düzenledi: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} yorumunuza cevap vermiş. Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} yorumunuza cevap vermiş. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} ve {1} senin yorumun için cevap verdiler. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} ve {2} kişi daha etkinliğinize yorum yaptı. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER yorumunuza cevap verdi: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST yorumunuza cevap verdi: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS ve $COUNT yorumunuza cevap verdi: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER etkinlik akışınızda bir gönde Notification.title.PostActivityPlugin=Etkinlik akışınızda yeni gönderi Notification.message.PostActivityPlugin={0} etkinlik akışınızda bir paylaşımda bulundu. Aşağıdaki gönderiye bakabilirsiniz Notification.intranet.message.PostActivityPlugin={0} etkinlik akışınızda paylaşımda bulundu. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER <span style="color:#333333"> </span> <a href="$ACTIVITY_STREAM" style="text-decoration: none; color: #2F5E92;">etkinlik akışınızda paylaşımda bulundu</a>. -Notification.digest.three.PostActivityPlugin=$USER_LIST <span style="color:#333333"></span> <a href="$ACTIVITY_STREAM" style="text-decoration: none; color: #2F5E92; font-weight: bold;">etkinlik akışınızda paylaşımda bulundurlar</a>. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS <span style="color:#333333">ile</span> $COUNT <span style="color:#333333">kişi</span> <a href="$ACTIVITY_STREAM" style="text-decoration: none; color: #2F5E92; font-weight: bold;">etkinlik akışınızda paylaşımda bulundu</a>. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER , $SPACE alanında bir Notification.title.PostActivitySpaceStreamPlugin={0}da yeni paylaşım Notification.message.PostActivitySpaceStreamPlugin={0}, {1} alanında bir etkinlik paylaştı. Aşağıdaki paylaşıma bakabilirsiniz Notification.intranet.message.PostActivitySpaceStreamPlugin={0}, {1} alanında bir etkinlik paylaşımında bulundular. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER, $SPACE alanında <span style="color:#333333">paylaşımda bulundu</span>. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST <span style="color:#333333">gönderiyayınladılar</span> $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS <span style="color:#333333">ile</span> $COUNT <span style="color:#333333">kişi şurada paylaşımda bulundu</span> $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER, $SPACE'de bir etkinl Notification.title.SharedActivitySpaceStreamPlugin=Etkinlik akışınızda yeni gönderi Notification.message.SharedActivitySpaceStreamPlugin={0}, {2} alanında "{1}" adlı bir makale paylaştı. Aşağıdaki gönderiye bakın Notification.intranet.message.SharedActivitySpaceStreamPlugin={0}, {1} alanında bir etkinlik paylaştı -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER, $SPACE'de paylaşıldı -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER, $SPACE'de paylaşıldı -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS ve $COUNT kişi daha $SPACE'de paylaştı ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_uk.properties b/webapp/src/main/resources/locale/notification/template/Notification_uk.properties index 14dd79d6b86..cc7f80d6878 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_uk.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_uk.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER приєднався до $PORTAL_NAME Notification.title.NewUserPlugin=Новий користувач {0} Notification.message.NewUserPlugin={0} приєднався до {1}. Зацікавлені підключитися, і почати співпрацю з {0}? Notification.intranet.message.NewUserPlugin={0} приєднався до {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER приєднався до $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST приєдналися до $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS та $COUNT більш приєдналися $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} послав вам Notification.feedback.RelationshipReceivedRequestPlugin=Ви відхилили запит {0} на підключення. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} хоче зв'язатися з вами Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Ви пов'язані з {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Ви отримали запит на підключення від $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Ви отримали запит на підключення від $USER. -Notification.digest.more.RelationshipReceivedRequestPlugin=Ви отримали запит на підключення від $LAST3_USERS та $COUNT іншого(их) учасників. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Ви отримали запроше Notification.intranet.message.SpaceInvitationPlugin={0} запросив вас приєднатися до групи {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Ви приєдналися до {0} групи. Notification.feedback.SpaceInvitationPlugin=Ви відмовилися приєднатися до {0}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Ви були запрошені приєднатися до наступного простору: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Ви були запрошені приєднатися до наступних просторів: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Ви були запрошені приєднатися до наступних просторів: $LAST3_SPACES та $COUNT іншого(их). ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} приєднав Notification.feedback-ok.RequestJoinSpacePlugin=Ви затвердили запит приєднатися до простору. Notification.feedback-exist.RequestJoinSpacePlugin={0} уже член {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Ви відмовили {0} в приєднанні до простору. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER попросив приєднатися $SPACE простір. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST запропонували приєднатися $SPACE простір. -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS та $COUNT інший(і) попросили приєднатися $SPACE простір. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Вас згадав $USER Notification.title.ActivityMentionPlugin=Нова згадка про вас Notification.message.ActivityMentionPlugin={0} згадав вас в наступному пості Notification.intranet.message.ActivityMentionPlugin={0} згадав вас. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER згадав вас в: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST згадали вас в: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS та $COUNT інший(і) згадали вас в: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} та {1} відреда Notification.intranet.message.more.EditCommentPlugin={0}, {1} та {2} відредаговані коментарі. Notification.intranet.message.one.EditActivityPlugin=Повідомлення користувача {0} було відредаговано. Notification.label.readMore=Читати більше -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER прокоментував у вашій діяльності: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST прокоментували у вашій діяльності: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS та $COUNT інший(і) прокоментували у вашій діяльності: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER редагував допис: -Notification.digest.three.EditActivityPlugin=відредаговано $USER_LIST повідомлення: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS і ще $COUNT редагували допис: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER відредагував(-ла) коментар: -Notification.digest.three.EditCommentPlugin=$USER_LIST редагували коментарі: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS та $COUNT інший(і) редагував(-ли) коментарі: ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} відповів на ва Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} відповів на ваш коментар. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} та {1} відповіли на ваш коментар. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} та {2} інших відповіли на ваш коментар. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER відповів на ваш коментар: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST відповіли на ваш коментар: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS та $COUNT інші(ших) відповіли на ваш коментар: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER опублікував повід Notification.title.PostActivityPlugin=Нове повідомлення на вашій стрічці діяльності Notification.message.PostActivityPlugin={0} розмістив повідомлення на вашій стрічці діяльності. Див повідомлення нижче Notification.intranet.message.PostActivityPlugin={0} опублікував на вашому потоку діяльності повідомлення. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER опублікував на вашої стрічки діяльності. -Notification.digest.three.PostActivityPlugin=$USER_LIST опублікували на вашої стрічки дяльності. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS та $COUNT інші(их) розмістили на вашої стрічки діяльності. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER розмістив ді Notification.title.PostActivitySpaceStreamPlugin=Нове повідомлення в {0} Notification.message.PostActivitySpaceStreamPlugin={0} розмістив діяльність в {1} просторі. Див повідомлення нижче Notification.intranet.message.PostActivitySpaceStreamPlugin={0} опублікував повідомлення в {1} групі. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER розмістив у $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST розмістили у $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS та $COUNT інший(і) розмістили у $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER поділився д Notification.title.SharedActivitySpaceStreamPlugin=Нове повідомлення на вашій стрічці діяльності Notification.message.SharedActivitySpaceStreamPlugin={0} опублікував статтю "{1}" в просторі {2} . Див повідомлення нижче Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} поділився діяльністю в просторі {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER поділився в $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER поділився в $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS та $COUNT інші поділилися $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_vi.properties b/webapp/src/main/resources/locale/notification/template/Notification_vi.properties index 154bd0a03a3..0756fca57eb 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_vi.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_vi.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER đã tham gia $PORTAL_NAME Notification.title.NewUserPlugin=Người dùng mới vào {0} Notification.message.NewUserPlugin={0} đã gia nhập {1}. Bạn có muốn kết nối và hợp tác với {0} không? Notification.intranet.message.NewUserPlugin={0} đã tham gia {1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER đã tham gia $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST đã tham gia $PORTAL_HOME. -Notification.digest.more.NewUserPlugin=$LAST3_USERS và $COUNT người khác đã tham gia $PORTAL_HOME. ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} vừa gửi cho bạn Notification.feedback.RelationshipReceivedRequestPlugin=Bạn từ chối yêu cầu kết nối của {0}. Notification.intranet.message.RelationshipReceivedRequestPlugin={0} muốn kết nối với bạn Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=Bạn đã kết nối với {0} -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=Bạn vừa nhận được một yêu cầu kết nối từ $USER. -Notification.digest.three.RelationshipReceivedRequestPlugin=Bạn vừa nhận được yêu cầu kết nối từ $USER_LIST. -Notification.digest.more.RelationshipReceivedRequestPlugin=Bạn vừa nhận được yêu cầu kết nối từ $LAST3_USERS và $COUNT người khác. ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=Bạn vừa nhận được một l Notification.intranet.message.SpaceInvitationPlugin={0} đã mời bạn tham gia không gian {1} Notification.intranet.message.accept.SpaceInvitationPlugin=Bạn đã tham gia nhóm {0}. Notification.feedback.SpaceInvitationPlugin=Bạn đã từ chối gia nhập {1}. -# For Digest -Notification.digest.one.SpaceInvitationPlugin=Bạn được mời tham gia nhóm: $SPACE. -Notification.digest.three.SpaceInvitationPlugin=Bạn được mời tham gia các nhóm: $SPACE_LIST. -Notification.digest.more.SpaceInvitationPlugin=Bạn được mời tham gia các nhóm sau: $LAST3_SPACES và $COUNT nhóm khác. ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} gia nhập nhóm Notification.feedback-ok.RequestJoinSpacePlugin=Bạn đã chấp nhận yêu cầu tham gia nhóm. Notification.feedback-exist.RequestJoinSpacePlugin={0} đã là thành viên của {1}. Notification.feedback-nok.RequestJoinSpacePlugin=Bạn từ chối {0} tham gia nhóm. -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER yêu cầu tham gia nhóm $SPACE. -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST yêu cầu tham gia nhóm $SPACE -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS và $COUNT người khác đã yêu cầu để tham gia nhóm $SPACE. ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=Bạn đã được $USER nhắc đ Notification.title.ActivityMentionPlugin=Nhắc đến bạn trong một hoạt động Notification.message.ActivityMentionPlugin={0} đã nhắc đến bạn trong bài sau đây Notification.intranet.message.ActivityMentionPlugin={0} đã nhắc đến bạn. -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER đã nhắc đến bạn trong: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER_LIST nhắc đến bạn trong: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS và $COUNT người khác nhắc đến bạn trong: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} và {1} đã chỉnh s Notification.intranet.message.more.EditCommentPlugin={0}, {1} và {2} đã chỉnh sửa bình luận. Notification.intranet.message.one.EditActivityPlugin=Bài viết của {0} đã được chỉnh sửa. Notification.label.readMore=Đọc thêm -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER đã bình luận về bài đăng này: $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST đã bình luận bài đăng này: $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS và $COUNT người khác bình luận về hoạt động của bạn: $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER đã chỉnh sửa bài đăng: -Notification.digest.three.EditActivityPlugin=$USER_LIST bài viết đã chỉnh sửa: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS và $COUNT người khác đã chỉnh sửa bài đăng: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER đã chỉnh sửa bình luận: $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST bình luận đã chỉnh sửa: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS và $COUNT bình luận đã chỉnh sửa khác: $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} đã trả lời bình lu Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} đã trả lời bình luận của bạn. Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} và {1} đã trả lời bình luận của bạn. Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}, {1} và {2} người khác đã trả lời bình luận của bạn. -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER đã trả lời bình luận của bạn: $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST đã trả lời bình luận của bạn: $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS và $COUNT người khác đã trả lời bình luận của bạn: $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER đã đăng trả lời trên dòn Notification.title.PostActivityPlugin=Các bài viết mới trên dòng hoạt động của bạn Notification.message.PostActivityPlugin={0} đã đăng bài viết trên dòng hoạt động của bạn. Xem bài dưới đây. Notification.intranet.message.PostActivityPlugin={0} đã đăng trên dòng hoạt động của bạn. -# For Digest -Notification.digest.one.PostActivityPlugin=$USER đã đăng trên dòng hoạt động của bạn. -Notification.digest.three.PostActivityPlugin=$USER_LIST đã đăng bài viết trên dòng hoạt động của bạn. -Notification.digest.more.PostActivityPlugin=$LAST3_USERS và $COUNT người khác đã đăng trên dòng hoạt động của bạn. ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER đã đăng một hoạ Notification.title.PostActivitySpaceStreamPlugin=Bài viết mới trong {0} Notification.message.PostActivitySpaceStreamPlugin={0} đã có một hoạt động trong nhóm {1}. Xem chi tiết dưới đây. Notification.intranet.message.PostActivitySpaceStreamPlugin={0} đã đăng một hoạt động trong không gian {1}. -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER đã đăng trong $SPACE. -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST đã đăng trong $SPACE. -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS và $COUNT người khác đã đăng bài viết trong $SPACE. ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER đã chia sẻ một Notification.title.SharedActivitySpaceStreamPlugin=Các bài viết mới trên dòng hoạt động của bạn Notification.message.SharedActivitySpaceStreamPlugin={0} đã chia sẻ bài viết "{1}" trong không gian {2}. Xem bài đăng bên dưới Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} đã chia sẻ một hoạt động trong không gian {1} -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER được chia sẻ trong $SPACE -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER được chia sẻ trong $SPACE -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS và $COUNT người khác được chia sẻ trong $SPACE ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_zh_CN.properties b/webapp/src/main/resources/locale/notification/template/Notification_zh_CN.properties index d06080ae442..68cce794baa 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_zh_CN.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_zh_CN.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER 加入了 $PORTAL_NAME Notification.title.NewUserPlugin={0} 有新用户 Notification.message.NewUserPlugin={0} 加入了 {1}。有兴趣与 {0} 成为好友并开始协作吗？ Notification.intranet.message.NewUserPlugin={0} 加入了 {1}。 -# For Digest -Notification.digest.one.NewUserPlugin=$USER 加入了 $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER_LIST 加入了 $PORTAL_HOME。 -Notification.digest.more.NewUserPlugin=$LAST3_USERS 以及另外 $COUNT 个人加入了 $PORTAL_HOME。 ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} 向您发送了好友 Notification.feedback.RelationshipReceivedRequestPlugin=您拒绝了 {0} 的好友请求。 Notification.intranet.message.RelationshipReceivedRequestPlugin={0} 想要与您建立联系 Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=你与 {0} 之间有连接 -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin= 您收到一个来自$USER 的好友请求。 -Notification.digest.three.RelationshipReceivedRequestPlugin= 您收到一个来自$USER 的好友请求。 -Notification.digest.more.RelationshipReceivedRequestPlugin= 您收到了来自 $LAST3_USERS 和另外 $COUNT 个人的好友请求。 ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=您收到了加入 {0} 小组的邀 Notification.intranet.message.SpaceInvitationPlugin={0}邀请您加入{1}空间 Notification.intranet.message.accept.SpaceInvitationPlugin=你加入了 {0} 空间。 Notification.feedback.SpaceInvitationPlugin=您拒绝加入 {0}。 -# For Digest -Notification.digest.one.SpaceInvitationPlugin= 您被邀请加入以下小组： $SPACE。 -Notification.digest.three.SpaceInvitationPlugin= 您被邀请加入以下小组： $SPACE。 -Notification.digest.more.SpaceInvitationPlugin= 您已被邀请加入下列小组： $LAST3_SPACES 和另外 $COUNT 个。 ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0} 加入了 {1} Notification.feedback-ok.RequestJoinSpacePlugin=你同意了加入小组的请求。 Notification.feedback-exist.RequestJoinSpacePlugin={0} 已经是 {1} 的成员。 Notification.feedback-nok.RequestJoinSpacePlugin=你拒绝 {0} 加入小组。 -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER 要求加入 $SPACE 小组。 -Notification.digest.three.RequestJoinSpacePlugin=$USER_LIST 请求加入 $SPACE 小组。 -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS 和另外 $COUNT 个人请求加入 $SPACE 小组。 ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=$USER @了您 Notification.title.ActivityMentionPlugin=有人@您 Notification.message.ActivityMentionPlugin={0} 在下列发言中@了您 Notification.intranet.message.ActivityMentionPlugin={0} 提到了你。 -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER 在 $ACTIVITY 中@了您 -Notification.digest.three.ActivityMentionPlugin=$USER 在 $ACTIVITY 中@了您 -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS 和另外 $COUNT 个人在 $ACTIVITY 中@了您 ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0} 和 {1} 编辑了评论 Notification.intranet.message.more.EditCommentPlugin={0}、 {1} 和 {2} 编辑了评论。 Notification.intranet.message.one.EditActivityPlugin={0}的帖子已被编辑。 Notification.label.readMore=阅读更多 -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER 已评论此帖子： $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST 已评论此帖： $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS 和另外 $COUNT 个人评论了您的新鲜事： $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER 编辑了帖子: -Notification.digest.three.EditActivityPlugin=$USER_LIST 编辑的帖子: -Notification.digest.more.EditActivityPlugin=$LAST3_USERS and $COUNT other(s) edited post: $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER 编辑评论： $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST 已编辑的评论: -Notification.digest.more.EditCommentPlugin=$LAST3_USERS 和 $COUNT 其他人编辑了评论： $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0} 回复了您的评论。 Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} 回复了您的评论。 Notification.intranet.message.two.ActivityReplyToCommentPlugin={0} 和 {1} 回复了您的评论。 Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}、 {1} 和 {2} 其他人回复了您的评论。 -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER 回复了你的评论： $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST 回复了您的评论： $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS 和 $COUNT 其他人回复了您的评论： $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=$USER 发布了新鲜事： $SUBJECT Notification.title.PostActivityPlugin=新鲜事 Notification.message.PostActivityPlugin={0} 发布了新鲜事。请看下面的内容 Notification.intranet.message.PostActivityPlugin={0} 已发贴在您的活动流。 -# For Digest -Notification.digest.one.PostActivityPlugin=$USER 发布了 新鲜事 。 -Notification.digest.three.PostActivityPlugin=$USER_LIST 发布了 新鲜事 。 -Notification.digest.more.PostActivityPlugin=$LAST3_USERS 和其他 $COUNT 个人发布了 新鲜事 。 ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER 在 $SPACE 中发布了 Notification.title.PostActivitySpaceStreamPlugin=在 {0} 中的新鲜事 Notification.message.PostActivitySpaceStreamPlugin={0} 在 {1} 小组中发布了新鲜事。请看下面的内容 Notification.intranet.message.PostActivitySpaceStreamPlugin={0} 已在 {1} 空间发了活动贴。 -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER 在 $SPACE 中发布了新鲜事 -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST 在 $SPACE 中发布了新鲜事 -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS 和另外 $COUNT 个人在 $SPACE 中发布了新鲜事。 ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER 在 $SPACE 中分享 Notification.title.SharedActivitySpaceStreamPlugin=新鲜事 Notification.message.SharedActivitySpaceStreamPlugin={0} 在 {2} 空间中分享了一篇文章 "{1}"。请参阅下面的帖子 Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} 在 {1} 空间中共享了一个活动 -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER 在 $SPACE 中共享 -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER 在 $SPACE 中共享 -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS 和 $COUNT 其他人在 $SPACE 中分享 ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/notification/template/Notification_zh_TW.properties b/webapp/src/main/resources/locale/notification/template/Notification_zh_TW.properties index cf1854f462d..69910858f40 100644 --- a/webapp/src/main/resources/locale/notification/template/Notification_zh_TW.properties +++ b/webapp/src/main/resources/locale/notification/template/Notification_zh_TW.properties @@ -30,10 +30,6 @@ Notification.subject.NewUserPlugin=$USER 加入了 $PORTAL_NAME Notification.title.NewUserPlugin=新使用者{0} Notification.message.NewUserPlugin={0}已加入{1}。有興趣的連接，並開始與{0}合作？ Notification.intranet.message.NewUserPlugin={0}已加入{1}. -# For Digest -Notification.digest.one.NewUserPlugin=$USER 加入了 $PORTAL_HOME -Notification.digest.three.NewUserPlugin=$USER 加入了 $PORTAL_HOME -Notification.digest.more.NewUserPlugin=$LAST3_USERS 和 $COUNT 更加入了 $PORTAL_HOME。 ############################################################################# # RelationshipReceivedRequestPlugin # @@ -49,10 +45,6 @@ Notification.message.RelationshipReceivedRequestPlugin={0} 已向您發送連線 Notification.feedback.RelationshipReceivedRequestPlugin=您拒絕了{0}的連線請求。 Notification.intranet.message.RelationshipReceivedRequestPlugin={0}想與您聯繫 Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=您已與 {0} 連接 -# For Digest -Notification.digest.one.RelationshipReceivedRequestPlugin=您已收到來自 $USER 的連線要求。 -Notification.digest.three.RelationshipReceivedRequestPlugin=您已收到來自 $USER_LIST 的連線要求。 -Notification.digest.more.RelationshipReceivedRequestPlugin=您已收到來自 $LAST3_USERS 和 $COUNT 個其他人的連接請(求)。 ############################################################################# # SpaceInvitationPlugin # @@ -68,10 +60,6 @@ Notification.message.SpaceInvitationPlugin=您已收到加入 {0} 空間的邀 Notification.intranet.message.SpaceInvitationPlugin={0}邀請您加入{1}空間 Notification.intranet.message.accept.SpaceInvitationPlugin=您已加入 {0} 空間。 Notification.feedback.SpaceInvitationPlugin=你拒絕加入 {0}。 -# For Digest -Notification.digest.one.SpaceInvitationPlugin= 您已被邀請加入以下空間： $SPACE。 -Notification.digest.three.SpaceInvitationPlugin= 您已被邀請加入以下空間： $SPACE。 -Notification.digest.more.SpaceInvitationPlugin= 您已被邀請加入下列空格： $LAST3_SPACES 和 $COUNT 其他 (s)。 ############################################################################# # JoinedSpaceByInvitationLinkPlugin # @@ -103,10 +91,6 @@ Notification.intranet.message.accept.RequestJoinSpacePlugin={0}加入了{1}空 Notification.feedback-ok.RequestJoinSpacePlugin=你批准加入空間的請求。 Notification.feedback-exist.RequestJoinSpacePlugin={0} 已是成員的 {1}。 Notification.feedback-nok.RequestJoinSpacePlugin=你拒絕 {0} 加入空間。 -# For Digest -Notification.digest.one.RequestJoinSpacePlugin=$USER 已要求加入 $SPACE 空間。 -Notification.digest.three.RequestJoinSpacePlugin=$USER 已要求加入 $SPACE 空間。 -Notification.digest.more.RequestJoinSpacePlugin=$LAST3_USERS 和 $COUNT 其他 (s) 都要求加入 $SPACE 空間。 ############################################################################# # ActivityMentionPlugin # @@ -120,10 +104,6 @@ Notification.subject.ActivityMentionPlugin=你已經提到的 $USER Notification.title.ActivityMentionPlugin=你的新消息 Notification.message.ActivityMentionPlugin={0}在下列張貼中提到你 Notification.intranet.message.ActivityMentionPlugin={0}有提到您。 -# For Digest -Notification.digest.one.ActivityMentionPlugin=$USER 已經提到你在: $ACTIVITY -Notification.digest.three.ActivityMentionPlugin=$USER 已經提到你在: $ACTIVITY -Notification.digest.more.ActivityMentionPlugin=$LAST3_USERS 和 $COUNT 其他 (s) 有提到你在: $ACTIVITY ############################################################################# # ActivityCommentPlugin # @@ -154,18 +134,6 @@ Notification.intranet.message.two.EditCommentPlugin={0}和{1}編輯了評論。 Notification.intranet.message.more.EditCommentPlugin={0}、{1} 和 {2} 已編輯評論。 Notification.intranet.message.one.EditActivityPlugin={0}的貼文已編輯。 Notification.label.readMore=閱讀更多 -# For Digest -Notification.digest.one.ActivityCommentPlugin=$USER 已評論此貼文： $ACTIVITY -Notification.digest.three.ActivityCommentPlugin=$USER_LIST 已評論此貼文： $ACTIVITY -Notification.digest.more.ActivityCommentPlugin=$LAST3_USERS 和 $COUNT 其他 (s) 有評論您的活動： $ACTIVITY - -Notification.digest.one.EditActivityPlugin=$USER 編輯的貼文： -Notification.digest.three.EditActivityPlugin=$USER_LIST 編輯的貼文： -Notification.digest.more.EditActivityPlugin=$LAST3_USERS 和 $COUNT 其他已編輯的貼文： $ACTIVITY - -Notification.digest.one.EditCommentPlugin=$USER 編輯的評論： $COMMENT -Notification.digest.three.EditCommentPlugin=$USER_LIST 編輯的評論： -Notification.digest.more.EditCommentPlugin=$LAST3_USERS 和 $COUNT 其他編輯評論： $COMMENT ############################################################################# # ActivityReplyToCommentPlugin # @@ -183,10 +151,6 @@ Notification.message.ActivityReplyToCommentPlugin={0}回覆了您的評論。見 Notification.intranet.message.one.ActivityReplyToCommentPlugin={0} 回覆了您的評論。 Notification.intranet.message.two.ActivityReplyToCommentPlugin={0}和{1}回覆了您的評論。 Notification.intranet.message.more.ActivityReplyToCommentPlugin={0}、{1} 和另外 {2} 個人回覆了您的評論。 -# For Digest -Notification.digest.one.ActivityReplyToCommentPlugin=$USER 回覆了您的評論： $ACTIVITY -Notification.digest.three.ActivityReplyToCommentPlugin=$USER_LIST 回覆了您的評論： $ACTIVITY -Notification.digest.more.ActivityReplyToCommentPlugin=$LAST3_USERS 和 $COUNT 其他人回覆了您的評論： $ACTIVITY ############################################################################# # LikePlugin # @@ -208,10 +172,6 @@ Notification.intranet.message.one.LikePlugin.sad={0} finds your post sad. Notification.intranet.message.one.LikePlugin.funny={0} finds your post funny. Notification.intranet.message.two.LikePlugin={0} and {1} react to your activity. Notification.intranet.message.more.LikePlugin={0}, {1} and {2} more react to your activity. -# For Digest -Notification.digest.one.LikePlugin=$USER has reacted to your activity: $ACTIVITY -Notification.digest.three.LikePlugin=$USER_LIST have reacted to your activity: $ACTIVITY -Notification.digest.more.LikePlugin=$LAST3_USERS and $COUNT other(s) have reacted to your activity: $ACTIVITY ############################################################################# # LikeCommentPlugin # @@ -233,10 +193,6 @@ Notification.intranet.message.one.LikeCommentPlugin.sad={0} finds your comment s Notification.intranet.message.one.LikeCommentPlugin.funny={0} finds your comment funny. Notification.intranet.message.two.LikeCommentPlugin={0} and {1} react to your comment. Notification.intranet.message.more.LikeCommentPlugin={0}, {1} and {2} others react to your comment. -# For Digest -Notification.digest.one.LikeCommentPlugin=$USER reacts to your comment: $ACTIVITY -Notification.digest.three.LikeCommentPlugin=$USER_LIST react to your comment: $ACTIVITY -Notification.digest.more.LikeCommentPlugin=$LAST3_USERS and $COUNT other(s) react to your comment: $ACTIVITY ############################################################################# # PostActivityPlugin # @@ -250,10 +206,6 @@ Notification.subject.PostActivityPlugin=在您的活動流上張貼了 $USER: $S Notification.title.PostActivityPlugin=張貼新的在你的活動趨勢上 Notification.message.PostActivityPlugin={0} 已貼在你的活動流上。請看下面的張貼 Notification.intranet.message.PostActivityPlugin={0} 已發佈到您的 Feed 上。 -# For Digest -Notification.digest.one.PostActivityPlugin=$USER 已張貼在 您的活動流。 -Notification.digest.three.PostActivityPlugin=$USER_LIST 上發佈 您的活動流。 -Notification.digest.more.PostActivityPlugin=$LAST3_USERS 和 $COUNT 其他 (s) 上發佈 您的活動流。 ############################################################################# # PostActivitySpaceStreamPlugin # @@ -267,10 +219,6 @@ Notification.subject.PostActivitySpaceStreamPlugin=$USER $SPACE 空間中張貼 Notification.title.PostActivitySpaceStreamPlugin=新張貼在 {0} Notification.message.PostActivitySpaceStreamPlugin={0} {1} 空間中張貼了一項活動。請看下面的張貼 Notification.intranet.message.PostActivitySpaceStreamPlugin={0} 已在 {1} 空間中發布了一項活動。 -# For Digest -Notification.digest.one.PostActivitySpaceStreamPlugin=$USER 已張貼在 $SPACE。 -Notification.digest.three.PostActivitySpaceStreamPlugin=$USER_LIST 已張貼在 $SPACE。 -Notification.digest.more.PostActivitySpaceStreamPlugin=$LAST3_USERS 和 $COUNT 其他 (s) 已張貼在 $SPACE。 ############################################################################# # SharedActivitySpacePlugin # @@ -285,10 +233,6 @@ Notification.subject.SharedActivitySpaceStreamPlugin=$USER 在 $SPACE 中分享 Notification.title.SharedActivitySpaceStreamPlugin=張貼新的在你的活動趨勢上 Notification.message.SharedActivitySpaceStreamPlugin={0} 在 {2} 空間中分享了一篇文章「{1}」。請參閱下面的帖子 Notification.intranet.message.SharedActivitySpaceStreamPlugin={0} 在 {1} 空間中分享了一個活動 -# For Digest -Notification.digest.one.SharedActivitySpaceStreamPlugin=$USER 在 $SPACE 中共享 -Notification.digest.three.SharedActivitySpaceStreamPlugin=$USER 在 $SPACE 中共享 -Notification.digest.more.SharedActivitySpaceStreamPlugin=$LAST3_USERS 和另外 $COUNT 個人在 $SPACE 中共享 ############################################################################# # NotificationByActivityType # diff --git a/webapp/src/main/resources/locale/portlet/NotificationAdministration_en.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_en.properties index b7059f2af0a..a9c217d8ee2 100644 --- a/webapp/src/main/resources/locale/portlet/NotificationAdministration_en.properties +++ b/webapp/src/main/resources/locale/portlet/NotificationAdministration_en.properties @@ -6,6 +6,8 @@ NotificationAdmin.sender.drawer.name=Name NotificationAdmin.sender.drawer.address=Address NotificationAdmin.allowedNotifications.title=Allowed notification channels NotificationAdmin.allowedNotifications.subtitle=Precise notification channels that users would be allowed to use. +NotificationAdmin.allowDigest.title=Allow users to set digest mail notification +NotificationAdmin.allowDigest.savingError=An error happened while saving the digest option, please retry NotificationAdmin.MAIL_CHANNEL.title=Allow users to receive email notifications NotificationAdmin.WEB_CHANNEL.title=Allow users to receive onsite notifications NotificationAdmin.SPACE_WEB_CHANNEL.title=Allow users to get notified for unread activities diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ar.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ar.properties index 781d48ba81e..4bc0e91dcd9 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ar.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ar.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=كيفية الحصول على إشع UINotification.label.NoNotifications=لا توجد إشعارات UINotification.label.checkbox-mail=أرسل إليّ حالاّ بريدا إلكترونيّا -UINotification.label.selectBox-mail=أرسل لي بريد إلكتروني تلخيصي UINotification.label.checkbox-web=عرض الاشعار في الموقع UINotification.label.checkbox.default=عرضه في {0} -UINotification.label.Never=أبدا -UINotification.label.Daily=يوميا -UINotification.description.Daily=اشعارات البريد اليومية -UINotification.label.Weekly=أسبوعي -UINotification.description.Weekly=تنبيه الاسبوعي للبريد الإلكتروني -UINotification.label.Monthly=كل شهر -UINotification.description.Monthly=إشعار شهري لخلاصة البريد الإلكتروني - UINotification.title.Information=معلومات: UINotification.title.Confirmation=تأكيد diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_aro.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_aro.properties index 781d48ba81e..4bc0e91dcd9 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_aro.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_aro.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=كيفية الحصول على إشع UINotification.label.NoNotifications=لا توجد إشعارات UINotification.label.checkbox-mail=أرسل إليّ حالاّ بريدا إلكترونيّا -UINotification.label.selectBox-mail=أرسل لي بريد إلكتروني تلخيصي UINotification.label.checkbox-web=عرض الاشعار في الموقع UINotification.label.checkbox.default=عرضه في {0} -UINotification.label.Never=أبدا -UINotification.label.Daily=يوميا -UINotification.description.Daily=اشعارات البريد اليومية -UINotification.label.Weekly=أسبوعي -UINotification.description.Weekly=تنبيه الاسبوعي للبريد الإلكتروني -UINotification.label.Monthly=كل شهر -UINotification.description.Monthly=إشعار شهري لخلاصة البريد الإلكتروني - UINotification.title.Information=معلومات: UINotification.title.Confirmation=تأكيد diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ca.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ca.properties index 5d0170b85f9..7f5238cf890 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ca.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ca.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Com ser notificat UINotification.label.NoNotifications=Sense notificacions UINotification.label.checkbox-mail=Envia'm un correu electrònic immediatament -UINotification.label.selectBox-mail=Envia'm un correu electrònic resumit UINotification.label.checkbox-web=Veure-ho al lloc web UINotification.label.checkbox.default=Veure-ho a {0} -UINotification.label.Never=Mai -UINotification.label.Daily=Diàriament -UINotification.description.Daily=Notificació per correu electrònic de resum diari -UINotification.label.Weekly=Setmanalment -UINotification.description.Weekly=Notificació per correu electrònic de resum setmanal -UINotification.label.Monthly=Mensualment -UINotification.description.Monthly=Notificació per correu electrònic de resum mensual - UINotification.title.Information=Informació UINotification.title.Confirmation=Confirmació diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_co.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_co.properties index b60b71782fb..62d9459c8ef 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_co.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_co.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Cumu uttene notificazioni UINotification.label.NoNotifications=Nisuna notificazione UINotification.label.checkbox-mail=Mandami un email subitu -UINotification.label.selectBox-mail=Mandami un email digest UINotification.label.checkbox-web=Vede nantu à u situ UINotification.label.checkbox.default=Vede nantu à {0} -UINotification.label.Never=Mai -UINotification.label.Daily=Ogni ghjornu -UINotification.description.Daily=Notificazione di e-mail digest ogni ghjornu -UINotification.label.Weekly=Ogni settimana -UINotification.description.Weekly=Notificazione per e-mail di digest settimanale -UINotification.label.Monthly=Mensili -UINotification.description.Monthly=Notificazione di e-mail digest mensile - UINotification.title.Information=infurmazione UINotification.title.Confirmation=Cunfirmazione diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_cs.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_cs.properties index 73a840dc7e0..37d15bafbcc 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_cs.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_cs.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Jak dostávat upozornění UINotification.label.NoNotifications=Žádná upozornění UINotification.label.checkbox-mail=Pošlete mi email ihned -UINotification.label.selectBox-mail=Pošlete mi e-mail s přehledem UINotification.label.checkbox-web=Zobrazit na stránce UINotification.label.checkbox.default=Zobrazit na {0} -UINotification.label.Never=Nikdy -UINotification.label.Daily=Denně -UINotification.description.Daily=E-mailová upozornění na denní digest -UINotification.label.Weekly=Týdně -UINotification.description.Weekly=Týdenní e-mailové oznámení -UINotification.label.Monthly=Měsíčně -UINotification.description.Monthly=Měsíční souhrn e-mailových oznámení - UINotification.title.Information=Informace UINotification.title.Confirmation=Potvrzení diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_de.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_de.properties index 77e8c3fa025..44666a90ed9 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_de.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_de.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Wie Sie Benachrichtigungen erhalten UINotification.label.NoNotifications=Keine Benachrichtigungen UINotification.label.checkbox-mail=Senden Sie mir sofort eine e-Mail -UINotification.label.selectBox-mail=Senden Sie mir eine e-mail digest UINotification.label.checkbox-web=Finden Sie auf der Website UINotification.label.checkbox.default=Finden Sie auf {0} -UINotification.label.Never=Niemals -UINotification.label.Daily=Täglich -UINotification.description.Daily=Tägliche E-Mail-Benachrichtigungen -UINotification.label.Weekly=Wöchentlich -UINotification.description.Weekly=Wöchentliche E-Mail Benachrichtigung -UINotification.label.Monthly=Monatlich -UINotification.description.Monthly=Monatliche E-Mail-Benachrichtigung - UINotification.title.Information=Informationen UINotification.title.Confirmation=Bestätigung diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_el.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_el.properties index 2d229107f08..e2fb3aa4532 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_el.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_el.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Πώς θα λαμβάνετε τις UINotification.label.NoNotifications=Καμία ειδοποίηση UINotification.label.checkbox-mail=Στείλτε μου ένα μήνυμα ηλεκτρονικού ταχυδρομείου αμέσως -UINotification.label.selectBox-mail=Στείλτε μου μια σύνοψη μέσω ηλεκτρονικού ταχυδρομείου UINotification.label.checkbox-web=Προβολή στην Πύλη UINotification.label.checkbox.default=Προβολή στο {0} -UINotification.label.Never=Ποτέ -UINotification.label.Daily=Καθημερινά -UINotification.description.Daily=Ημερήσια ειδοποίηση ηλεκτρονικού ταχυδρομείου digest -UINotification.label.Weekly=Εβδομαδιαία -UINotification.description.Weekly=Εβδομαδιαία ειδοποίηση χώνευσης email -UINotification.label.Monthly=Μηνιαία -UINotification.description.Monthly=Μηνιαία ειδοποίηση ηλεκτρονικού ταχυδρομείου digest - UINotification.title.Information=Πληροφορίες UINotification.title.Confirmation=Επιβεβαίωση diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties index 3993fa2b0d0..3a51b67b158 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=How to get notifications UINotification.label.NoNotifications=No notifications UINotification.label.checkbox-mail=Send me an email right away -UINotification.label.selectBox-mail=Send me a digest email UINotification.label.checkbox-web=See on site UINotification.label.checkbox.default=See on {0} -UINotification.label.Never=Never -UINotification.label.Daily=Daily -UINotification.description.Daily=Daily digest email notification -UINotification.label.Weekly=Weekly -UINotification.description.Weekly=Weekly digest email notification -UINotification.label.Monthly=Monthly -UINotification.description.Monthly=Monthly digest email notification - UINotification.title.Information=Information UINotification.title.Confirmation=Confirmation diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_es_ES.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_es_ES.properties index 3289d4d7f90..cbd076e0263 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_es_ES.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_es_ES.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Cómo ser notificado UINotification.label.NoNotifications=Sin Notificaciones UINotification.label.checkbox-mail=Envíame un email inmediatamente -UINotification.label.selectBox-mail=Enviarme un correo electrónico resumido UINotification.label.checkbox-web=Ver en el sitio UINotification.label.checkbox.default=Ver en {0} -UINotification.label.Never=Nunca -UINotification.label.Daily=Diario -UINotification.description.Daily=Notificación por email del resumen diario -UINotification.label.Weekly=Semanalmente -UINotification.description.Weekly=Notificación por email del resumen semanal -UINotification.label.Monthly=Mensualmente -UINotification.description.Monthly=Notificación por email del resumen anual - UINotification.title.Information=Información UINotification.title.Confirmation=Confirmación diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_et.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_et.properties index af363ea1366..2bd7449bfd5 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_et.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_et.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Kuidas saada teateid UINotification.label.NoNotifications=Märguandeid pole UINotification.label.checkbox-mail=Saatke mulle kohe e-kiri -UINotification.label.selectBox-mail=Saada mulle kokkuvõtte meil UINotification.label.checkbox-web=Vaata kohapeal UINotification.label.checkbox.default=Vaata saidil {0} -UINotification.label.Never=Mitte kunagi -UINotification.label.Daily=Igapäevane -UINotification.description.Daily=Igapäevane kokkuvõtte meilimärguanne -UINotification.label.Weekly=Nädalane -UINotification.description.Weekly=Nädala kokkuvõtte meiliteatis -UINotification.label.Monthly=Kuine -UINotification.description.Monthly=Igakuine kokkuvõtte meiliteatis - UINotification.title.Information=Teave UINotification.title.Confirmation=Kinnitamine diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fa.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fa.properties index ab70a224548..9bbf686446b 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fa.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fa.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=چگونگی دریافت اطلاعی UINotification.label.NoNotifications=بدون اطلاعیه UINotification.label.checkbox-mail=همان لحظه برای من ایمیل بفرست -UINotification.label.selectBox-mail=برای من یک ایمیل خلاصه شده بفرست UINotification.label.checkbox-web=روی سایت می بینم UINotification.label.checkbox.default=روی {0} می بینم -UINotification.label.Never=هرگز -UINotification.label.Daily=روزانه -UINotification.description.Daily=اعلان ایمیل خلاصه روزانه -UINotification.label.Weekly=هفتگی -UINotification.description.Weekly=اعلان ایمیل خلاصه هفتگی -UINotification.label.Monthly=ماهانه -UINotification.description.Monthly=اعلان ایمیل خلاصه ماهانه - UINotification.title.Information=اطلاعات UINotification.title.Confirmation=تاییدیه diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fi.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fi.properties index d04708a1783..e413dbd6228 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fi.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fi.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Kuinka saada ilmoituksia UINotification.label.NoNotifications=Ei ilmoituksia UINotification.label.checkbox-mail=Lähetä minulle sähköpostia heti -UINotification.label.selectBox-mail=Lähetä minulle kooste sähköposti UINotification.label.checkbox-web=Katso paikan päällä UINotification.label.checkbox.default=Katso {0} -UINotification.label.Never=Ei Koskaan -UINotification.label.Daily=Päivittäin -UINotification.description.Daily=Päivittäinen tiivisteilmoitus sähköpostista -UINotification.label.Weekly=Viikoittain -UINotification.description.Weekly=Viikottainen tiivisteilmoitus sähköpostilla -UINotification.label.Monthly=Kuukausittain -UINotification.description.Monthly=Kuukausittainen digest sähköposti-ilmoitus - UINotification.title.Information=Tiedot UINotification.title.Confirmation=Vahvistus diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fil.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fil.properties index e5cafe20a28..faf6aab9dc3 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fil.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fil.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Papano kumuha ng mga notipikasyon UINotification.label.NoNotifications=Walang mga notipikasyon UINotification.label.checkbox-mail=Padalhan mo ako kaagad ng email -UINotification.label.selectBox-mail=Padalhan mo ako ng buod ng email UINotification.label.checkbox-web=Tignan ang sayt UINotification.label.checkbox.default=Tignan sa {0} -UINotification.label.Never=Hindi Kailanman -UINotification.label.Daily=Araw-araw -UINotification.description.Daily=Araw-araw na digest email notification -UINotification.label.Weekly=Linggo-linggo -UINotification.description.Weekly=Lingguhang digest na abiso sa email -UINotification.label.Monthly=Buwanan -UINotification.description.Monthly=Buwanang digest na abiso sa email - UINotification.title.Information=Ang Impormasyon UINotification.title.Confirmation=Ang kompirmasyon diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fr.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fr.properties index 165abc3bee6..61fafd2e785 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fr.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fr.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Comment être notifié ? UINotification.label.NoNotifications=Ne pas me notifier UINotification.label.checkbox-mail=Envoyez moi un email immédiatement -UINotification.label.selectBox-mail=Envoyez-moi un email résumé UINotification.label.checkbox-web=Affichez la notification sur le site UINotification.label.checkbox.default=Voir sur {0} -UINotification.label.Never=Jamais -UINotification.label.Daily=Quotidien -UINotification.description.Daily=Récapitulatif quotidien des notifications par email -UINotification.label.Weekly=Hebdomadaire -UINotification.description.Weekly=Récapitulatif hebdomadaire des notifications par email -UINotification.label.Monthly=Mensuel -UINotification.description.Monthly=Récapitulatif mensuel des notifications par email - UINotification.title.Information=Information: UINotification.title.Confirmation=Confirmation diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_he.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_he.properties index 34368309972..78cfef9cd8b 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_he.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_he.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=כיצד לקבל התראות UINotification.label.NoNotifications=אין הודעות UINotification.label.checkbox-mail=שלח לי מייל מיד -UINotification.label.selectBox-mail=שלח לי אימייל תקציר UINotification.label.checkbox-web=ראה באתר UINotification.label.checkbox.default=ראה ב-{0} -UINotification.label.Never=לְעוֹלָם לֹא -UINotification.label.Daily=יומי -UINotification.description.Daily=הודעת דוא"ל תקציר יומי -UINotification.label.Weekly=שבועית -UINotification.description.Weekly=הודעת דוא"ל תקציר שבועי -UINotification.label.Monthly=חודשי -UINotification.description.Monthly=הודעת דוא"ל תקציר חודשי - UINotification.title.Information=מֵידָע UINotification.title.Confirmation=אישור diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hr.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hr.properties index ba4a79c9ab2..98589f91f6f 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hr.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hr.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Kako dobiti obavijesti UINotification.label.NoNotifications=Nema obavijesti UINotification.label.checkbox-mail=Odmah mi pošalji e-mail -UINotification.label.selectBox-mail=Pošalji mi sažetak e-pošte UINotification.label.checkbox-web=Pogledajte na licu mjesta UINotification.label.checkbox.default=Pogledajte na {0} -UINotification.label.Never=Nikada -UINotification.label.Daily=Dnevno -UINotification.description.Daily=Obavijest e-poštom o dnevnom sažetku -UINotification.label.Weekly=Tjedno -UINotification.description.Weekly=Obavijest e-poštom o tjednom sažetku -UINotification.label.Monthly=Mjesečno -UINotification.description.Monthly=Obavijest e-poštom o mjesečnom sažetku - UINotification.title.Information=Informacija UINotification.title.Confirmation=Potvrda diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hu.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hu.properties index 394d08afaec..97346e8e594 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hu.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hu.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Hogyan kaphat értesítéseket UINotification.label.NoNotifications=Nincsenek értesítések UINotification.label.checkbox-mail=Azonnal küldj egy emailt -UINotification.label.selectBox-mail=Küldj egy összefoglaló e-mailt UINotification.label.checkbox-web=Lásd a helyszínen UINotification.label.checkbox.default=Lásd itt: {0} -UINotification.label.Never=Soha -UINotification.label.Daily=Napi -UINotification.description.Daily=Napi kivonat e-mail értesítés -UINotification.label.Weekly=Heti -UINotification.description.Weekly=Heti kivonat e-mail értesítés -UINotification.label.Monthly=Havi -UINotification.description.Monthly=Havi kivonat e-mail értesítés - UINotification.title.Information=Információ UINotification.title.Confirmation=Megerősítés diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_id.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_id.properties index 2ced469ffe4..a1da31bb0e1 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_id.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_id.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Cara untuk mendapatkan pemberitahuan UINotification.label.NoNotifications=Tidak ada pemberitahuan UINotification.label.checkbox-mail=Segera kirimkan saya email -UINotification.label.selectBox-mail=Kirimkan saya ringkasan email UINotification.label.checkbox-web=Lihat di situs UINotification.label.checkbox.default=Lihat di {0} -UINotification.label.Never=Tidak pernah -UINotification.label.Daily=Harian -UINotification.description.Daily=Pemberitahuan email intisari harian -UINotification.label.Weekly=Mingguan -UINotification.description.Weekly=Pemberitahuan email intisari mingguan -UINotification.label.Monthly=Bulanan -UINotification.description.Monthly=Pemberitahuan email intisari bulanan - UINotification.title.Information=Informasi UINotification.title.Confirmation=Konfirmasi diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_in.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_in.properties index c2e25d8c458..0cb784b1c22 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_in.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_in.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Cara untuk mendapatkan pemberitahuan UINotification.label.NoNotifications=Tidak ada pemberitahuan UINotification.label.checkbox-mail=Segera kirimkan saya email -UINotification.label.selectBox-mail=Kirimkan saya ringkasan email UINotification.label.checkbox-web=Lihat di situs UINotification.label.checkbox.default=Lihat di {0} -UINotification.label.Never=Tidak pernah -UINotification.label.Daily=Harian -UINotification.description.Daily=Daily digest email notification -UINotification.label.Weekly=Mingguan -UINotification.description.Weekly=Weekly digest email notification -UINotification.label.Monthly=Bulanan -UINotification.description.Monthly=Monthly digest email notification - UINotification.title.Information=Informasi UINotification.title.Confirmation=Konfirmasi diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_it.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_it.properties index 3edceeb0c12..e064d9cd9e8 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_it.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_it.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Come ricevere le notifiche UINotification.label.NoNotifications=Nessuna notifica UINotification.label.checkbox-mail=Inviami subito una email -UINotification.label.selectBox-mail=Inviami una email informativa UINotification.label.checkbox-web=Guarda on-site UINotification.label.checkbox.default=Guarda su {0} -UINotification.label.Never=Mai -UINotification.label.Daily=Quotidianamente -UINotification.description.Daily=Notifica email riepilogo giornaliero -UINotification.label.Weekly=Settimanalmente -UINotification.description.Weekly=Notifica email riepilogo settimanale -UINotification.label.Monthly=Mensilmente -UINotification.description.Monthly=Notifica email riepilogo mensile - UINotification.title.Information=Informazione UINotification.title.Confirmation=Conferma diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ja.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ja.properties index 3e937e4558b..d38e299ddd7 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ja.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ja.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=通知を取得する方法 UINotification.label.NoNotifications=通知なし UINotification.label.checkbox-mail=すぐにメールを送信 -UINotification.label.selectBox-mail=ダイジェスト メールを送信 UINotification.label.checkbox-web=サイト上に通知 UINotification.label.checkbox.default={0} を参照 -UINotification.label.Never=しない -UINotification.label.Daily=毎日 -UINotification.description.Daily=デイリーダイジェストメール通知 -UINotification.label.Weekly=毎週 -UINotification.description.Weekly=Weekly digest email notification -UINotification.label.Monthly=毎月 -UINotification.description.Monthly=月間ダイジェストメール通知 - UINotification.title.Information=情報 UINotification.title.Confirmation=確認 diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ko.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ko.properties index 6bb2c7befa5..c8090a83812 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ko.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ko.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=알림을 받는 방법 UINotification.label.NoNotifications=알림 없음 UINotification.label.checkbox-mail=지금 바로 이메일을 보내주세요 -UINotification.label.selectBox-mail=나에게 요약 이메일 보내기 UINotification.label.checkbox-web=현장에서 확인하세요 UINotification.label.checkbox.default={0} 에서 보기 -UINotification.label.Never=절대 -UINotification.label.Daily=일일 -UINotification.description.Daily=일일 요약 이메일 알림 -UINotification.label.Weekly=주간 -UINotification.description.Weekly=주간 요약 이메일 알림 -UINotification.label.Monthly=월간 간행물 -UINotification.description.Monthly=월별 요약 이메일 알림 - UINotification.title.Information=정보 UINotification.title.Confirmation=확인 diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_lt.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_lt.properties index 027ba3feac9..7a87633030c 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_lt.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_lt.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Kaip gauti pranešimus UINotification.label.NoNotifications=Jokių pranešimų UINotification.label.checkbox-mail=Nedelsdami atsiųskite man el -UINotification.label.selectBox-mail=Atsiųskite man santraukos el. laišką UINotification.label.checkbox-web=Žiūrėti vietoje UINotification.label.checkbox.default=Žiūrėti {0} -UINotification.label.Never=Niekada -UINotification.label.Daily=Kasdien -UINotification.description.Daily=Kasdieninis santraukos pranešimas el. paštu -UINotification.label.Weekly=Kas savaitę -UINotification.description.Weekly=Savaitės santraukos pranešimas el. paštu -UINotification.label.Monthly=Kas mėnesį -UINotification.description.Monthly=Mėnesio santraukos pranešimas el. paštu - UINotification.title.Information=Informacija UINotification.title.Confirmation=Patvirtinimas diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_nl.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_nl.properties index 603e964689b..009494140a9 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_nl.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_nl.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Hoe krijg ik meldingen UINotification.label.NoNotifications=Geen meldingen UINotification.label.checkbox-mail=Stuur me een e-mail meteen -UINotification.label.selectBox-mail=Stuur me een e-mail digest UINotification.label.checkbox-web=Zie op site UINotification.label.checkbox.default=Zie op {0} -UINotification.label.Never=Nooit -UINotification.label.Daily=Dagelijks -UINotification.description.Daily=Dagelijkse melding digest e-mail -UINotification.label.Weekly=Wekelijks -UINotification.description.Weekly=Wekelijks overzicht e-mail bericht -UINotification.label.Monthly=Maandelijkse -UINotification.description.Monthly=Maandelijkse e-mailmelding digest - UINotification.title.Information=Informatie UINotification.title.Confirmation=Bevestiging diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_no.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_no.properties index 9fbc433c47e..129bc7d1738 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_no.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_no.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Hvordan få varsler UINotification.label.NoNotifications=Ingen varsler UINotification.label.checkbox-mail=Send meg en epost straks -UINotification.label.selectBox-mail=Send meg en sammendrag på e-post UINotification.label.checkbox-web=Se på nettstedet UINotification.label.checkbox.default=Se på {0} -UINotification.label.Never=Aldri -UINotification.label.Daily=Daglig -UINotification.description.Daily=Daglig sammendrag av e-post -UINotification.label.Weekly=Ukentlig -UINotification.description.Weekly=Ukentlig sammendrag av e-postvarsler -UINotification.label.Monthly=Månedlig -UINotification.description.Monthly=Månedlig sammendrag av e-postvarsling - UINotification.title.Information=Informasjon UINotification.title.Confirmation=Bekreftelse diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pl.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pl.properties index 130a6298965..056582bf784 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pl.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pl.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Jak odebrać powiadomienia UINotification.label.NoNotifications=Brak powiadomień UINotification.label.checkbox-mail=Wyślij mi e-mail od razu -UINotification.label.selectBox-mail=Wyślij mi email zbiorczy UINotification.label.checkbox-web=Zobacz na stronie UINotification.label.checkbox.default=Zobacz w {0} -UINotification.label.Never=Nigdy -UINotification.label.Daily=Co dzień -UINotification.description.Daily=Codzienne powiadomienia e-mail -UINotification.label.Weekly=Co tydzień -UINotification.description.Weekly=Cotygodniowe powiadomienia e-mail -UINotification.label.Monthly=Co miesiąc -UINotification.description.Monthly=Miesięczne powiadomienie e-mail - UINotification.title.Information=Informacje UINotification.title.Confirmation=Potwierdzenie diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_BR.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_BR.properties index 18e128e4b57..63a04593e94 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_BR.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_BR.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Como obter notificações UINotification.label.NoNotifications=Sem notificações UINotification.label.checkbox-mail=Me envie um e-mail agora -UINotification.label.selectBox-mail=Envie-me um e-mail com as discussões consolidadas UINotification.label.checkbox-web=Consulte no site UINotification.label.checkbox.default=Veja em {0} -UINotification.label.Never=Nunca -UINotification.label.Daily=Diariamente -UINotification.description.Daily=Notificação de e-mail de resumo diário -UINotification.label.Weekly=Semanalmente -UINotification.description.Weekly=Notificação de e-mail do resumo semanal -UINotification.label.Monthly=Mensalmente -UINotification.description.Monthly=Notificação de e-mail resumo mensal - UINotification.title.Information=Informação UINotification.title.Confirmation=Confirmação diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_PT.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_PT.properties index 3604d1fed58..50a13ef6812 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_PT.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_PT.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Como obter notificações UINotification.label.NoNotifications=Sem notificações UINotification.label.checkbox-mail=Enviar e-mail imediatamente -UINotification.label.selectBox-mail=Enviar e-mail resumo UINotification.label.checkbox-web=Consultar no portal UINotification.label.checkbox.default=Veja em {0} -UINotification.label.Never=Nunca -UINotification.label.Daily=Diariamente -UINotification.description.Daily=Notificação de e-mail de resumo diário -UINotification.label.Weekly=Semanalmente -UINotification.description.Weekly=Notificação de e-mail do resumo semanal -UINotification.label.Monthly=Mensalmente -UINotification.description.Monthly=Notificação de e-mail resumo mensal - UINotification.title.Information=Informação UINotification.title.Confirmation=Confirmação diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ro.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ro.properties index 744914e5903..606daf306a6 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ro.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ro.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Cum să fiți notificat(ă) UINotification.label.NoNotifications=Nici o notificare UINotification.label.checkbox-mail=Trimite-mi un email imediat -UINotification.label.selectBox-mail=Trimite-mi un rezumat pe e-mail UINotification.label.checkbox-web=Vezi pe site UINotification.label.checkbox.default=Vezi pe {0} -UINotification.label.Never=Niciodată -UINotification.label.Daily=Zilnic -UINotification.description.Daily=Notificare zilnică pentru digerare e-mail -UINotification.label.Weekly=Săptămânal -UINotification.description.Weekly=digerați săptămânal notificarea prin e-mail -UINotification.label.Monthly=Lunar -UINotification.description.Monthly=Notificare lunară prin e-mail - UINotification.title.Information=Informaţii UINotification.title.Confirmation=Confirmare diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ru.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ru.properties index 0b647336f81..555ca999044 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ru.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ru.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Как получать уведомл UINotification.label.NoNotifications=Нет уведомлений UINotification.label.checkbox-mail=Отправить мне электронное письмо прямо сейчас -UINotification.label.selectBox-mail=Пришлите мне электронной почте дайджест UINotification.label.checkbox-web=Смотрите на сайте UINotification.label.checkbox.default=Смотреть на {0} -UINotification.label.Never=Никогда -UINotification.label.Daily=Ежедневно -UINotification.description.Daily=Ежедневный дайджест уведомления по электронной почте -UINotification.label.Weekly=Еженедельно -UINotification.description.Weekly=Уведомление о еженедельном дайджете -UINotification.label.Monthly=Ежемесячно -UINotification.description.Monthly=Уведомление о ежемесячном дайджете - UINotification.title.Information=Информация UINotification.title.Confirmation=Подтверждение diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sk.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sk.properties index 7b6885d24c6..da99db02030 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sk.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sk.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Ako získať upozornenia UINotification.label.NoNotifications=Žiadne upozornenia UINotification.label.checkbox-mail=Okamžite mi pošlite e-mail -UINotification.label.selectBox-mail=Pošlite mi stručný e-mail UINotification.label.checkbox-web=Pozri na mieste UINotification.label.checkbox.default=Zobraziť na {0} -UINotification.label.Never=Nikdy -UINotification.label.Daily=Denný -UINotification.description.Daily=Denné súhrnné e-mailové upozornenie -UINotification.label.Weekly=Týždenný -UINotification.description.Weekly=E-mailové upozornenie na týždenný súhrn -UINotification.label.Monthly=Mesačný -UINotification.description.Monthly=Mesačné e-mailové upozornenie na súhrn - UINotification.title.Information=Informácie UINotification.title.Confirmation=Potvrdenie diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sl.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sl.properties index dc71648c599..ac078a187a5 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sl.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sl.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Način obveščanja UINotification.label.NoNotifications=Ni obvestil UINotification.label.checkbox-mail=Takoj mi pošlji e-pošto -UINotification.label.selectBox-mail=Pošlji mi e-pošto z izvlečkom dejavnosti UINotification.label.checkbox-web=Vidno na spletnem mestu UINotification.label.checkbox.default=Glej na {0} -UINotification.label.Never=Nikoli -UINotification.label.Daily=Dnevno -UINotification.description.Daily=Dnevno obvestilo po e-pošti -UINotification.label.Weekly=Tedensko -UINotification.description.Weekly=E-poštno obvestilo o tedenskem povzetku -UINotification.label.Monthly=Mesečno -UINotification.description.Monthly=E-poštno obvestilo o mesečnem povzetku - UINotification.title.Information=Informacije UINotification.title.Confirmation=Potrditev diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sq.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sq.properties index 44f726033e2..7721ae48168 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sq.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sq.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=crwdns40220:0crwdne40220:0 UINotification.label.NoNotifications=crwdns40222:0crwdne40222:0 UINotification.label.checkbox-mail=crwdns40224:0crwdne40224:0 -UINotification.label.selectBox-mail=crwdns40226:0crwdne40226:0 UINotification.label.checkbox-web=crwdns40228:0crwdne40228:0 UINotification.label.checkbox.default=crwdns40230:0{0}crwdne40230:0 -UINotification.label.Never=crwdns40232:0crwdne40232:0 -UINotification.label.Daily=crwdns40234:0crwdne40234:0 -UINotification.description.Daily=crwdns40236:0crwdne40236:0 -UINotification.label.Weekly=crwdns40238:0crwdne40238:0 -UINotification.description.Weekly=crwdns40240:0crwdne40240:0 -UINotification.label.Monthly=crwdns40242:0crwdne40242:0 -UINotification.description.Monthly=crwdns40244:0crwdne40244:0 - UINotification.title.Information=crwdns40246:0crwdne40246:0 UINotification.title.Confirmation=crwdns40248:0crwdne40248:0 diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sv_SE.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sv_SE.properties index 490acf8ba3a..5f878b6e0ce 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sv_SE.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sv_SE.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Hur man får aviseringar UINotification.label.NoNotifications=Inga aviseringar UINotification.label.checkbox-mail=Skicka mig ett mail direkt -UINotification.label.selectBox-mail=Skicka ett sammandragsmeddelande till mig UINotification.label.checkbox-web=Se på plats UINotification.label.checkbox.default=Se på {0} -UINotification.label.Never=Aldrig -UINotification.label.Daily=Dagligen -UINotification.description.Daily=Dagligen sammanställa e-postnotifiering -UINotification.label.Weekly=Veckovis -UINotification.description.Weekly=Sammanfatta e-postnotifiering varje vecka -UINotification.label.Monthly=Månadsvis -UINotification.description.Monthly=Sammanfatta e-postnotifiering per månad - UINotification.title.Information=Information UINotification.title.Confirmation=Bekräfta diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_th.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_th.properties index 0128b8b453b..605b01b557f 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_th.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_th.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=วิธีการรับกา UINotification.label.NoNotifications=ไม่มีการแจ้งเตือน UINotification.label.checkbox-mail=ส่งอีเมลถึงฉันทันที -UINotification.label.selectBox-mail=ส่งอีเมลสรุปให้ฉัน UINotification.label.checkbox-web=ดูบนเว็บไซต์ UINotification.label.checkbox.default=ดูบน {0} -UINotification.label.Never=ไม่เคย -UINotification.label.Daily=อันดับรายวัน -UINotification.description.Daily=การแจ้งเตือนทางอีเมลสรุปรายวัน -UINotification.label.Weekly=รายสัปดาห์ -UINotification.description.Weekly=การแจ้งเตือนทางอีเมลสรุปรายสัปดาห์ -UINotification.label.Monthly=รายเดือน -UINotification.description.Monthly=การแจ้งเตือนทางอีเมลสรุปรายเดือน - UINotification.title.Information=ข้อมูล UINotification.title.Confirmation=การยืนยัน diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_tr.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_tr.properties index 170230cdc98..7a8eda6fbfb 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_tr.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_tr.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Bildirimler nasıl alınır UINotification.label.NoNotifications=Bildirim yok UINotification.label.checkbox-mail=Şimdi bana e-posta gönder -UINotification.label.selectBox-mail=Bana bir digest e-posta gönder UINotification.label.checkbox-web=Sitede gör UINotification.label.checkbox.default=Burada gör {0} -UINotification.label.Never=Asla -UINotification.label.Daily=Günlük -UINotification.description.Daily=Günlük düzenlenmiş e-posta bildirimi -UINotification.label.Weekly=Haftalık -UINotification.description.Weekly=Haftalık düzenlenmiş e-posta bildirimi -UINotification.label.Monthly=Aylık -UINotification.description.Monthly=Aylık düzenlenmiş e-posta bildirimi - UINotification.title.Information=Bilgi UINotification.title.Confirmation=Onay diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_uk.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_uk.properties index 69ab6b78798..688a6a517f0 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_uk.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_uk.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Як отримати повідомл UINotification.label.NoNotifications=Немає повідомлень UINotification.label.checkbox-mail=Відправити мені по електронній пошті прямо зараз -UINotification.label.selectBox-mail=Надіслати мені підсумок електронною поштою UINotification.label.checkbox-web=Переглянути на сайті UINotification.label.checkbox.default=Побачити на {0} -UINotification.label.Never=Ніколи -UINotification.label.Daily=Щодня -UINotification.description.Daily=Щоденні повідомлення електронною поштою -UINotification.label.Weekly=Щотижня -UINotification.description.Weekly=Щотижневі повідомлення електронною поштою -UINotification.label.Monthly=Щомісяця -UINotification.description.Monthly=Щомісячні повідомлення електронною поштою - UINotification.title.Information=Інформація UINotification.title.Confirmation=Повторіть пароль diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_vi.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_vi.properties index 765859a44e5..904bf1a62dc 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_vi.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_vi.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=Cách nhận thông báo UINotification.label.NoNotifications=Không gửi thông báo UINotification.label.checkbox-mail=Gửi thư ngay lập tức -UINotification.label.selectBox-mail=Gửi thư tổng hợp UINotification.label.checkbox-web=Xem trực tuyến UINotification.label.checkbox.default=Xem qua kênh {0} -UINotification.label.Never=Không bao giờ -UINotification.label.Daily=Hàng ngày -UINotification.description.Daily=Thông báo email thông báo hàng ngày -UINotification.label.Weekly=Hàng tuần -UINotification.description.Weekly=Thông báo email tổng hợp hàng tuần -UINotification.label.Monthly=Hàng tháng -UINotification.description.Monthly=Thông báo qua email tổng hợp hàng tháng - UINotification.title.Information=Thông tin UINotification.title.Confirmation=Xác nhận diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_CN.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_CN.properties index f10460b0ef2..b08b705d790 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_CN.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_CN.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=如何得到通知 UINotification.label.NoNotifications=无通知 UINotification.label.checkbox-mail=给我发电子邮件的时候了 -UINotification.label.selectBox-mail=发给我摘要电子邮件 UINotification.label.checkbox-web=在网站上看到 UINotification.label.checkbox.default=在 {0} 上看到 -UINotification.label.Never=从不 -UINotification.label.Daily=每日 -UINotification.description.Daily=每日摘要电子邮件通知 -UINotification.label.Weekly=每周 -UINotification.description.Weekly=每周摘要电子邮件通知 -UINotification.label.Monthly=每月 -UINotification.description.Monthly=每月摘要电子邮件通知 - UINotification.title.Information=信息 UINotification.title.Confirmation=确认 diff --git a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_TW.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_TW.properties index 44ced63b0ed..5e45ed2f076 100644 --- a/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_TW.properties +++ b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_TW.properties @@ -19,18 +19,9 @@ UINotification.label.HowToGetNotification=如何获取通知 UINotification.label.NoNotifications=没有通知 UINotification.label.checkbox-mail=立即给我发送电子邮件 -UINotification.label.selectBox-mail=给我发送摘要电子邮件 UINotification.label.checkbox-web=现场查看 UINotification.label.checkbox.default=查看{0} -UINotification.label.Never=從不 -UINotification.label.Daily=每天 -UINotification.description.Daily=每日摘要电子邮件通知 -UINotification.label.Weekly=每週 -UINotification.description.Weekly=每周摘要电子邮件通知 -UINotification.label.Monthly=每月 -UINotification.description.Monthly=每月摘要电子邮件通知 - UINotification.title.Information=訊息 UINotification.title.Confirmation=確認 diff --git a/webapp/src/main/resources/locale/portlet/social/UserSettings_en.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_en.properties index 34dab1ddcc5..8db21551e36 100644 --- a/webapp/src/main/resources/locale/portlet/social/UserSettings_en.properties +++ b/webapp/src/main/resources/locale/portlet/social/UserSettings_en.properties @@ -64,12 +64,20 @@ UserSettings.button.tooltip.enabled=Edit password UserSettings.passwordChange.sso.enabled=Your authentication method doesn't allow to use a password UserSettings.title.muteSpacesNotifications=Muted spaces UserSettings.subtitle.muteSpacesNotifications=Muting a space stops notifications unless you are mentioned +UserSettings.title.digest=Send me a regular recap +UserSettings.subtitle.digest=You will be notified by an email on a daily or weekly basis UserSettings.drawer.title.muteSpacesNotifications=Muted spaces UserSettings.drawer.description.muteSpacesNotifications=Add a space for which no notifications will be sent unless you are mentioned UserSettings.drawer.label.mutedSpaces=Muted spaces UserSettings.drawer.spaceSuggesterPlaceholder=Choose a space UserSettings.drawer.spaceSuggesterNoData=No space found UserSettings.button.tooltip.unmute=Unmute space notifications +UserSettings.drawer.title.digest=Set Digest Mail Notifications +UserSettings.drawer.label.dailyDigest=Receive daily digest notification +UserSettings.drawer.label.weeklyDigest=Receive weekly digest notification +UserSettings.digest.success.fromNow=Any selected notification from now will be part of your digest +UserSettings.digest.error.save=Your digest mail notifications could not be saved +UserSettings.digest.error.load=Your digest mail notifications could not be loaded UserSettings.label.currentPassword=Current Password UserSettings.label.newPassword=New password diff --git a/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/notification-plugins-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/notification-plugins-configuration.xml index 057b7ff2439..2b12384aa57 100644 --- a/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/notification-plugins-configuration.xml +++ b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/notification-plugins-configuration.xml @@ -92,9 +92,6 @@ Instantly - - daily - @@ -132,9 +129,6 @@ Instantly - - daily - @@ -172,9 +166,6 @@ Instantly - - daily - @@ -219,9 +210,6 @@ Instantly - - daily - @@ -259,9 +247,6 @@ Instantly - - daily - @@ -302,9 +287,6 @@ Instantly - - daily - @@ -342,9 +324,6 @@ Instantly - - daily - @@ -584,13 +563,6 @@ 1 - - - - daily - - - general @@ -630,9 +602,6 @@ Instantly - - daily - @@ -674,9 +643,6 @@ Instantly - - weekly - @@ -713,9 +679,6 @@ Instantly - - weekly - @@ -757,9 +720,6 @@ Instantly - - weekly - @@ -924,4 +884,75 @@ Notifies platform administrators on account deactivation request     + + + + io.meeds.commons.digest.DigestCategoryRegistry + + spaces + addCategoryProvider + io.meeds.commons.digest.plugin.DigestCategoryPlugin + The space life notifications: invitations and join requests + + + id + spaces + + + labelKey + digest.category.spaces + + + order + 10 + + + pluginIds + SpaceInvitationPlugin + RequestJoinSpacePlugin + + + + + feed + addCategoryProvider + io.meeds.commons.digest.plugin.DigestCategoryPlugin + What happens on the activity streams the user follows + + + id + feed + + + labelKey + digest.category.feed + + + order + 20 + + + pluginIds + PostActivitySpaceStreamPlugin + ActivityCommentWatchPlugin + + + + + + social.digest.lines + addLineProvider + io.meeds.social.notification.digest.SocialDigestLinePlugin + Builds the digest email lines of the space and feed notifications + + + pluginIds + SpaceInvitationPlugin + RequestJoinSpacePlugin + PostActivitySpaceStreamPlugin + ActivityCommentWatchPlugin + + + + diff --git a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml index 387a922aacd..638c11aec49 100644 --- a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml +++ b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml @@ -3211,6 +3211,14 @@ + + userTimeZoneBaseExtension + baseGRP + + + bodyScrollListener baseGRP diff --git a/webapp/src/main/webapp/groovy/social/webui/UISocialPortalApplicationHead.gtmpl b/webapp/src/main/webapp/groovy/social/webui/UISocialPortalApplicationHead.gtmpl index b1cc1a3da68..bc57c8380ad 100644 --- a/webapp/src/main/webapp/groovy/social/webui/UISocialPortalApplicationHead.gtmpl +++ b/webapp/src/main/webapp/groovy/social/webui/UISocialPortalApplicationHead.gtmpl @@ -14,6 +14,10 @@ import org.exoplatform.social.core.search.SearchConnector; import org.exoplatform.commons.utils.PropertyManager; import org.exoplatform.portal.branding.BrandingService; + import org.exoplatform.services.organization.OrganizationService; + import org.exoplatform.services.organization.UserProfile; + import org.exoplatform.social.core.identity.model.Profile; + import java.time.ZoneId; import java.util.Set; def rcontext = _ctx.getRequestContext(); @@ -32,6 +36,22 @@ String ownerIdentityId = Utils.getOwnerIdentityId(); ProfilePropertyService profilePropertyService = uicomponent.getApplicationComponent(ProfilePropertyService.class); ProfilePropertySetting profilePropertySetting = profilePropertyService.getProfileSettingByName("manager"); + // The timezone the platform knows for the user: the userTimeZoneBaseExtension + // module compares it to the browser one and refreshes it when they differ. + // The module is loaded by the portal BaseExtension hook, which requires every + // defined module whose name carries that suffix: no page template requires it. + OrganizationService organizationService = uicomponent.getApplicationComponent(OrganizationService.class); + UserProfile organizationUserProfile = userName == null ? null : organizationService.getUserProfileHandler().findUserProfileByName(userName); + String userTimezone = organizationUserProfile == null ? null : organizationUserProfile.getAttribute(Profile.USER_TIME_ZONE); + try { + // Values saved before this synchronization existed were never validated: + // an unknown one must not end up in the script block below + if (userTimezone != null) { + ZoneId.of(userTimezone); + } + } catch (Exception e) { + userTimezone = null; + } %> diff --git a/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingDigestDrawer.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingDigestDrawer.vue new file mode 100644 index 00000000000..e6143a3ffe8 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingDigestDrawer.vue @@ -0,0 +1,219 @@ + + + + diff --git a/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingDigestEntry.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingDigestEntry.vue new file mode 100644 index 00000000000..382a73f9740 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingDigestEntry.vue @@ -0,0 +1,49 @@ + + diff --git a/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationDrawer.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationDrawer.vue index 8e9c89ef0e4..2540d6183bc 100644 --- a/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationDrawer.vue +++ b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationDrawer.vue @@ -27,27 +27,6 @@ class="mt-0" /> - @@ -29,10 +28,6 @@ export default { type: Object, default: null, }, - digestMailNotificationEnabled: { - type: Boolean, - default: false, - }, }, data: () => ({ isEnabledNotificationGroup: true, diff --git a/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationPlugin.vue index 41ababea83d..e3ef62feb76 100644 --- a/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationPlugin.vue +++ b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationPlugin.vue @@ -18,13 +18,6 @@ -