Repository: syncope Updated Branches: refs/heads/master 18ed21e7a -> f9fe0d3b3
Reworking Notification modal window Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f9fe0d3b Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f9fe0d3b Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f9fe0d3b Branch: refs/heads/master Commit: f9fe0d3b32329d1553cc43aa8d157e670f926332 Parents: 18ed21e Author: Francesco Chicchiriccò <[email protected]> Authored: Tue Aug 16 11:19:09 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue Aug 16 11:19:09 2016 +0200 ---------------------------------------------------------------------- .../NotificationDirectoryPanel.java | 8 +- .../NotificationWizardBuilder.java | 97 ++++++++++---------- .../markup/html/form/MultiFieldPanel.java | 2 +- .../NotificationWizardBuilder$Abouts.properties | 9 +- ...tificationWizardBuilder$Abouts_it.properties | 9 +- ...icationWizardBuilder$Abouts_pt_BR.properties | 9 +- ...tificationWizardBuilder$Abouts_ru.properties | 18 +--- .../NotificationWizardBuilder$Details.html | 9 +- ...NotificationWizardBuilder$Details.properties | 3 +- ...ificationWizardBuilder$Details_it.properties | 3 +- ...cationWizardBuilder$Details_pt_BR.properties | 3 +- ...ificationWizardBuilder$Details_ru.properties | 1 - .../NotificationWizardBuilder$Events.properties | 40 -------- ...tificationWizardBuilder$Events_it.properties | 40 -------- ...icationWizardBuilder$Events_pt_BR.properties | 40 -------- ...tificationWizardBuilder$Events_ru.properties | 41 --------- .../NotificationWizardBuilder$Recipients.html | 3 + ...ificationWizardBuilder$Recipients.properties | 3 +- ...cationWizardBuilder$Recipients_it.properties | 1 + ...ionWizardBuilder$Recipients_pt_BR.properties | 1 + ...cationWizardBuilder$Recipients_ru.properties | 1 + .../console/pages/Notifications.properties | 12 +-- .../console/pages/Notifications_it.properties | 14 +-- .../pages/Notifications_pt_BR.properties | 12 +-- .../console/pages/Notifications_ru.properties | 12 +-- 25 files changed, 76 insertions(+), 315 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java index 1c481d4..51f2616 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java @@ -89,14 +89,14 @@ public class NotificationDirectoryPanel List<IColumn<NotificationTO, String>> columns = new ArrayList<>(); columns.add(new KeyPropertyColumn<NotificationTO>( new StringResourceModel("key", this, null), "key", "key")); - columns.add(new CollectionPropertyColumn<NotificationTO>( - new StringResourceModel("events", this, null), "events", "events")); + columns.add(new PropertyColumn<NotificationTO, String>( + new StringResourceModel("sender", this, null), "sender", "sender")); columns.add(new PropertyColumn<NotificationTO, String>( new StringResourceModel("subject", this, null), "subject", "subject")); columns.add(new PropertyColumn<NotificationTO, String>( new StringResourceModel("template", this, null), "template", "template")); - columns.add(new PropertyColumn<NotificationTO, String>( - new StringResourceModel("traceLevel", this, null), "traceLevel", "traceLevel")); + columns.add(new CollectionPropertyColumn<NotificationTO>( + new StringResourceModel("events", this, null), "events", "events")); columns.add(new BooleanPropertyColumn<NotificationTO>( new StringResourceModel("active", this, null), "active", "active")); http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java index ac69b7c..5d5dd3d 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWizardBuilder.java @@ -108,9 +108,9 @@ public class NotificationWizardBuilder extends AjaxWizardBuilder<NotificationWra @Override protected WizardModel buildModelSteps(final NotificationWrapper modelObject, final WizardModel wizardModel) { wizardModel.add(new NotificationWizardBuilder.Details(modelObject)); + wizardModel.add(new NotificationWizardBuilder.Recipients(modelObject)); wizardModel.add(new NotificationWizardBuilder.Events(modelObject)); wizardModel.add(new NotificationWizardBuilder.Abouts(modelObject)); - wizardModel.add(new NotificationWizardBuilder.Recipients(modelObject)); return wizardModel; } @@ -133,19 +133,6 @@ public class NotificationWizardBuilder extends AjaxWizardBuilder<NotificationWra subject.addRequiredLabel(); add(subject); - AjaxTextFieldPanel recipientAttrName = new AjaxTextFieldPanel( - "recipientAttrName", new ResourceModel("recipientAttrName", "recipientAttrName").getObject(), - new PropertyModel<String>(notificationTO, "recipientAttrName")); - recipientAttrName.setChoices(getSchemaNames()); - recipientAttrName.addRequiredLabel(); - recipientAttrName.setTitle(getString("intAttrNameInfo.help") - + "<div style=\"font-size: 10px;\">" - + "<code>groups[groupName].attribute</code>\n" - + "<code>anyObjects[anyObjectName].attribute</code>\n" - + "<code>memberships[groupName].attribute</code>\n" - + "</div>", true); - add(recipientAttrName); - AjaxDropDownChoicePanel<String> template = new AjaxDropDownChoicePanel<>( "template", getString("template"), new PropertyModel<String>(notificationTO, "template")); @@ -183,6 +170,8 @@ public class NotificationWizardBuilder extends AjaxWizardBuilder<NotificationWra private static final long serialVersionUID = -7709805590497687958L; public Events(final NotificationWrapper modelObject) { + setTitleModel(new ResourceModel("events")); + add(new EventCategoryPanel( "eventSelection", loggerRestClient.listEvents(), @@ -212,27 +201,25 @@ public class NotificationWizardBuilder extends AjaxWizardBuilder<NotificationWra super(id, model); setOutputMarkupId(true); - List<String> anyTypeTOs = CollectionUtils.collect( - new AnyTypeRestClient().list(), - EntityTOUtils.<AnyTypeTO>keyTransformer(), new ArrayList<String>()); + final AjaxDropDownChoicePanel<String> type = + new AjaxDropDownChoicePanel<>("about", "anyType", new Model<String>() { - final AjaxDropDownChoicePanel<String> type = new AjaxDropDownChoicePanel<>("about", "about", - new Model<String>() { + private static final long serialVersionUID = -2350296434572623272L; - private static final long serialVersionUID = -2350296434572623272L; - - @Override - public String getObject() { - return model.getObject().getLeft(); - } + @Override + public String getObject() { + return model.getObject().getLeft(); + } - @Override - public void setObject(final String object) { - model.setObject(Pair.of(object, model.getObject().getRight())); - } + @Override + public void setObject(final String object) { + model.setObject(Pair.of(object, model.getObject().getRight())); + } - }); - type.setChoices(anyTypeTOs); + }); + type.setChoices(CollectionUtils.collect( + new AnyTypeRestClient().list(), + EntityTOUtils.<AnyTypeTO>keyTransformer(), new ArrayList<String>())); type.addRequiredLabel(); add(type); @@ -298,12 +285,14 @@ public class NotificationWizardBuilder extends AjaxWizardBuilder<NotificationWra private static final long serialVersionUID = -7709805590497687958L; public Abouts(final NotificationWrapper modelObject) { + setTitleModel(new ResourceModel("about")); + final WebMarkupContainer aboutContainer = new WebMarkupContainer("about"); aboutContainer.setOutputMarkupId(true); add(aboutContainer); - final IModel<List<Pair<String, List<SearchClause>>>> model - = new PropertyModel<>(modelObject, "aboutClauses"); + final IModel<List<Pair<String, List<SearchClause>>>> model = + new PropertyModel<>(modelObject, "aboutClauses"); aboutContainer.add(new MultiPanel<Pair<String, List<SearchClause>>>("abouts", "abouts", model, false) { @@ -357,23 +346,33 @@ public class NotificationWizardBuilder extends AjaxWizardBuilder<NotificationWra }; public Recipients(final NotificationWrapper modelObject) { - final NotificationTO notificationTO = modelObject.getInnerObject(); - final boolean createFlag = notificationTO.getKey() == null; + setTitleModel(new ResourceModel("recipients")); - final AjaxTextFieldPanel staticRecipientsFieldPanel = new AjaxTextFieldPanel("panel", "staticRecipients", - new Model<String>()); - staticRecipientsFieldPanel.addValidator(EmailAddressValidator.getInstance()); + NotificationTO notificationTO = modelObject.getInnerObject(); - final MultiFieldPanel<String> staticRecipients = new MultiFieldPanel.Builder<>( - new PropertyModel<List<String>>(notificationTO, "staticRecipients")). - build("staticRecipients", "staticRecipients", staticRecipientsFieldPanel); + AjaxTextFieldPanel recipientAttrName = new AjaxTextFieldPanel( + "recipientAttrName", new ResourceModel("recipientAttrName", "recipientAttrName").getObject(), + new PropertyModel<String>(notificationTO, "recipientAttrName")); + recipientAttrName.setChoices(getSchemaNames()); + recipientAttrName.addRequiredLabel(); + recipientAttrName.setTitle(getString("intAttrNameInfo.help") + + "<div style=\"font-size: 10px;\">" + + "<code>groups[groupName].attribute</code>\n" + + "<code>anyObjects[anyObjectName].attribute</code>\n" + + "<code>memberships[groupName].attribute</code>\n" + + "</div>", true); + add(recipientAttrName); - add(staticRecipients.hideLabel()); + AjaxTextFieldPanel staticRecipientsFieldPanel = + new AjaxTextFieldPanel("panel", "staticRecipients", new Model<String>()); + staticRecipientsFieldPanel.addValidator(EmailAddressValidator.getInstance()); + add(new MultiFieldPanel.Builder<>( + new PropertyModel<List<String>>(notificationTO, "staticRecipients")). + build("staticRecipients", "staticRecipients", staticRecipientsFieldPanel).hideLabel()); - final AnyObjectSearchPanel recipients = new UserSearchPanel.Builder( + add(new UserSearchPanel.Builder( new PropertyModel<List<SearchClause>>(modelObject, "recipientClauses")). - required(false).build("recipients"); - add(recipients); + required(false).build("recipients")); AjaxDropDownChoicePanel<String> recipientsProviderClassName = new AjaxDropDownChoicePanel<>( "recipientsProviderClassName", "recipientsProviderClassName", @@ -381,15 +380,13 @@ public class NotificationWizardBuilder extends AjaxWizardBuilder<NotificationWra recipientsProviderClassName.setChoices(recipientProviders.getObject()); add(recipientsProviderClassName); - final AjaxCheckBoxPanel selfAsRecipient = new AjaxCheckBoxPanel("selfAsRecipient", + AjaxCheckBoxPanel selfAsRecipient = new AjaxCheckBoxPanel("selfAsRecipient", getString("selfAsRecipient"), new PropertyModel<Boolean>(notificationTO, "selfAsRecipient")); - add(selfAsRecipient); - - if (createFlag) { + if (notificationTO.getKey() == null) { selfAsRecipient.getField().setDefaultModelObject(Boolean.FALSE); } + add(selfAsRecipient); } - } private List<String> getSchemaNames() { http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java index 16df1e7..bcd5c17 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java @@ -81,7 +81,7 @@ public abstract class MultiFieldPanel<E extends Serializable> extends AbstractMu public MultiFieldPanel<E> build(final String id, final String name, final FieldPanel<E> panelTemplate) { return new MultiFieldPanel<E>(id, name, model, panelTemplate, eventTemplate) { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 6600411297376841521L; @Override protected E newModelObject() { http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts.properties index 8a8946a..af4dbdd 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts.properties @@ -14,11 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -checkAbout=All -userFilter=User filter -userFilterWarning=Do not use this filter unless events are not targeted at users -roleFilter=Role filter -roleFilterWarning=Do not use this filter unless events are not targeted at roles -checkUserAbout=Users -checkRoleAbout=Roles -abouts=What is the notification referring to? +search=About matching condition http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_it.properties index 43c055b..8de183f 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_it.properties @@ -14,11 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -checkAbout=Tutto -userFilter=Filtro utenti -userFilterWarning=Non usare questo filtro se gli eventi catturati non riguardano espressamente utenti -roleFilter=Filtro ruoli -roleFilterWarning=Non usare questo filtro se gli eventi catturati non riguardano espressamente ruoli -checkUserAbout=Utenti -checkRoleAbout=Ruoli -abouts=A cosa si riferisce la notifica? +search=Condizione per la selezione dell'About http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_pt_BR.properties index f31449f..af4dbdd 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_pt_BR.properties @@ -14,11 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -checkAbout=Todos -userFilter=Filtro usu\u00e1rio -userFilterWarning=N\u00e3o use este filtro n\u00e3o ser que os eventos n\u00e3o s\u00e3o direcionados a usu\u00e1rios -roleFilter=Filtro fun\u00e7\u00e3o -roleFilterWarning=N\u00e3o use este filtro n\u00e3o ser que os eventos n\u00e3o s\u00e3o direcionados a fun\u00e7\u00f5es -checkUserAbout=Usu\u00e1rio -checkRoleAbout=Fun\u00e7\u00e3o -abouts=O que diz respeito \u00e0 notifica\u00e7\u00e3o? +search=About matching condition http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_ru.properties index a3751e9..ffe4e90 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Abouts_ru.properties @@ -15,19 +15,5 @@ # specific language governing permissions and limitations # under the License. # -# checkAbout=Ðбо вÑÑм -checkAbout=\u041e\u0431\u043e \u0432\u0441\u0451\u043c -# userFilter=ФилÑÑÑ Ð¿Ð¾Ð»ÑзоваÑелей -userFilter=\u0424\u0438\u043b\u044c\u0442\u0440 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 -# userFilterWarning=Ðе иÑполÑзÑйÑе ÑÑÐ¾Ñ ÑилÑÑÑ, еÑли ÑобÑÑие не пÑедназнаÑено Ð´Ð»Ñ Ð¿Ð¾Ð»ÑзоваÑелей -userFilterWarning=\u041d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u0438\u043b\u044c\u0442\u0440, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439# roleFilter=Role filter -# roleFilter=ФилÑÑÑ Ñолей -roleFilter=\u0424\u0438\u043b\u044c\u0442\u0440 \u0440\u043e\u043b\u0435\u0439 -# roleFilterWarning=Ðе иÑполÑзÑйÑе ÑÑÐ¾Ñ ÑилÑÑÑ, еÑли ÑобÑÑие не пÑедназнаÑено Ð´Ð»Ñ Ñолей -roleFilterWarning=\u041d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u0438\u043b\u044c\u0442\u0440, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u0440\u043e\u043b\u0435\u0439 -# checkUserAbout=ÐолÑзоваÑели -checkUserAbout=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 -# checkRoleAbout=Роли -checkRoleAbout=\u0420\u043e\u043b\u0438 -# abouts=Рком или о Ñем ÑаÑÑÑлаеÑÑÑ ÑÑо Ñведомление? -abouts=\u041e \u043a\u043e\u043c \u0438\u043b\u0438 \u043e \u0447\u0435\u043c \u0440\u0430\u0441\u0441\u044b\u043b\u0430\u0435\u0442\u0441\u044f \u044d\u0442\u043e \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435? +# checkAbout=\u00d0\u009e\u00d0\u00b1\u00d0\u00be \u00d0\u00b2\u00d1\u0081\u00d1\u0091\u00d0\u00bc +search=About matching condition http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.html b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.html index 05ce8cf..d9844ab 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.html @@ -21,13 +21,13 @@ under the License. <body> <wicket:panel> <div class="form-group"> - <span wicket:id="sender">[sender]</span> + <span wicket:id="isActive">[isActive]</span> </div> <div class="form-group"> - <span wicket:id="subject">[subject]</span> + <span wicket:id="sender">[sender]</span> </div> <div class="form-group"> - <span wicket:id="recipientAttrName">[recipientAttrName]</span> + <span wicket:id="subject">[subject]</span> </div> <div class="form-group"> <span wicket:id="template">[template]</span> @@ -35,9 +35,6 @@ under the License. <div class="form-group"> <span wicket:id="traceLevel">[traceLevel]</span> </div> - <div class="form-group"> - <span wicket:id="isActive">[isActive]</span> - </div> </wicket:panel> </body> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.properties index 72f0e85..f62baec 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details.properties @@ -18,5 +18,4 @@ subject=Subject sender=Sender template=Template traceLevel=Trace level -recipientAttrName=Recipients e-mail attribute -isActive=Enabled +isActive=Active http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_it.properties index 85ee48f..9cb2433 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_it.properties @@ -18,5 +18,4 @@ subject=Oggetto sender=Mittente template=Modello traceLevel=Livello di tracciamento -recipientAttrName=Attributo e-mail destinatari -isActive=Abilitata +isActive=Attiva http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_pt_BR.properties index 7838db0..8e10219 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_pt_BR.properties @@ -18,5 +18,4 @@ subject=Assunto sender=Remetente template=Template traceLevel=N\u00edvel de Trace -recipientAttrName=Destinat\u00e1rios de e-mail para atributos -isActive=Ativada +isActive=Ativa http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_ru.properties index dcaf0f9..d54d4f2 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Details_ru.properties @@ -19,5 +19,4 @@ subject=\u0422\u0435\u043c\u0430 sender=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u0435\u043b\u044c template=\u0428\u0430\u0431\u043b\u043e\u043d traceLevel=\u0423\u0440\u043e\u0432\u0435\u043d\u044c \u043b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f -recipientAttrName=\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0430 \u0441 \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0435\u0439 isActive=\u0410\u043a\u0442\u0438\u0432\u043d\u043e http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events.properties deleted file mode 100644 index 879b380..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events.properties +++ /dev/null @@ -1,40 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -title=Edit notification -submit=Save -subject=Subject -sender=Sender -template=Template -traceLevel=Trace level -notification=Notification -about=About -events=Events -recipients=Recipients -selfAsRecipient=Include users matching About -checkRecipients=Search recipients -checkAbout=All -userFilter=User filter -userFilterWarning=Do not use this filter unless events are not targeted at users -userNotifications=User notifications -userNotificationsWarning=Do not select this checkbox unless events are not targeted at users -roleFilter=Role filter -roleFilterWarning=Do not use this filter unless events are not targeted at roles -roleNotifications=Role notifications -roleNotificationsWarning=Do not select this checkbox unless events are not targeted at roles -isActive=Enabled -checkUserAbout=Users -checkRoleAbout=Roles http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_it.properties deleted file mode 100644 index ae80bb2..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_it.properties +++ /dev/null @@ -1,40 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -title=Gestisci notifiche -submit=Salva -subject=Oggetto -sender=Mittente -template=Modello -traceLevel=Livello di tracciamento -notification=Notifica -about=Soggetti -events=Eventi -recipients=Destinatari -selfAsRecipient=Includi i soggetti -checkRecipients=Cerca i destinatari -checkAbout=Tutto -userFilter=Filtro utenti -userFilterWarning=Non usare questo filtro se gli eventi catturati non riguardano espressamente utenti -userNotifications=Notifiche utente -userNotificationsWarning=Non selezionare questa checkbox se gli eventi catturati non riguardano espressamente utenti -roleFilter=Filtro ruoli -roleFilterWarning=Non usare questo filtro se gli eventi catturati non riguardano espressamente ruoli -roleNotifications=Notifiche ruoli -roleNotificationsWarning=Non selezionare questa checkbox se gli eventi catturati non riguardano espressamente ruoli -isActive=Abilitata -checkUserAbout=Utenti -checkRoleAbout=Ruoli http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_pt_BR.properties deleted file mode 100644 index 5c70e66..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_pt_BR.properties +++ /dev/null @@ -1,40 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -title=Alterar Notifica\u00e7\u00e3o -submit=Salvar -subject=Assunto -sender=Remetente -template=Template -traceLevel=N\u00edvel de Trace -notification=Notifica\u00e7\u00e3o -about=Sobre -events=Eventos -recipients=Destinat\u00e1rios -selfAsRecipient=Incluir usu\u00e1rios relacionados Sobre -checkRecipients=Buscar Destinat\u00e1rios -checkAbout=Todos -userFilter=Filtro usu\u00e1rio -userFilterWarning=N\u00e3o use este filtro n\u00e3o ser que os eventos n\u00e3o s\u00e3o direcionados a usu\u00e1rios -roleFilter=Filtro fun\u00e7\u00e3o -roleFilterWarning=N\u00e3o use este filtro n\u00e3o ser que os eventos n\u00e3o s\u00e3o direcionados a fun\u00e7\u00f5es -userNotifications=Notifica\u00e7\u00f5es do usu\u00e1rio -userNotificationsWarning=N\u00e3o selecione esta op\u00e7\u00e3o a menos que os eventos n\u00e3o s\u00e3o direcionados a usu\u00e1rios -roleNotifications=Notifica\u00e7\u00f5es do fun\u00e7\u00f5es -roleNotificationsWarning=N\u00e3o selecione esta op\u00e7\u00e3o a menos que os eventos n\u00e3o s\u00e3o direcionados a fun\u00e7\u00f5es -isActive=Ativada -checkUserAbout=Usu\u00e1rio -checkRoleAbout=Fun\u00e7\u00e3o http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_ru.properties deleted file mode 100644 index 3930063..0000000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Events_ru.properties +++ /dev/null @@ -1,41 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -title=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 -submit=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c -subject=\u0422\u0435\u043c\u0430 -sender=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u0435\u043b\u044c -template=\u0428\u0430\u0431\u043b\u043e\u043d -traceLevel=\u0423\u0440\u043e\u0432\u0435\u043d\u044c \u043b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f -notification=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 -about=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u043e -events=\u0421\u043e\u0431\u044b\u0442\u0438\u044f -recipients=\u041f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0438 -selfAsRecipient=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0432 \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439, \u043e \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0440\u0430\u0441\u0441\u044b\u043b\u0430\u0435\u0442\u0441\u044f \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 -checkRecipients=\u041f\u043e\u0438\u0441\u043a \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0435\u0439 -checkAbout=\u041e\u0431\u043e \u0432\u0441\u0451\u043c -userFilter=\u0424\u0438\u043b\u044c\u0442\u0440 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 -userFilterWarning=\u041d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u0438\u043b\u044c\u0442\u0440, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 -userNotifications=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 -userNotificationsWarning=\u041d\u0435 \u0443\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u043b\u0430\u0433, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 -roleFilter=\u0424\u0438\u043b\u044c\u0442\u0440 \u0440\u043e\u043b\u0435\u0439 -roleFilterWarning=\u041d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u0438\u043b\u044c\u0442\u0440, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u0440\u043e\u043b\u0435\u0439 -roleNotifications=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u0440\u043e\u043b\u0435\u0439 -roleNotificationsWarning=\u041d\u0435 \u0443\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u043b\u0430\u0433, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u0440\u043e\u043b\u0435\u0439 -isActive=\u0410\u043a\u0442\u0438\u0432\u043d\u043e -checkUserAbout=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 -checkRoleAbout=\u0420\u043e\u043b\u0438 http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.html b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.html index 1910ce6..cb8bc9d 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.html @@ -27,6 +27,9 @@ under the License. <span wicket:id="recipients">[recipients]</span> </div> <div class="form-group"> + <span wicket:id="recipientAttrName">[recipientAttrName]</span> + </div> + <div class="form-group"> <span wicket:id="recipientsProviderClassName">[recipientsProviderClassName]</span> </div> <div id="userFilter" class="form-group box"> http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.properties index b94947e..958509b 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients.properties @@ -19,5 +19,6 @@ recipientsProviderClassName=Notification recipient provider staticRecipients=Static recipients selfAsRecipient=Include users matching About userNotifications=User notifications -userNotificationsWarning=Do not select this checkbox unless events are not targeted at users +userNotificationsWarning=Do not select this checkbox unless events are targeted at users search=Search for recipients +recipientAttrName=Recipients e-mail attribute http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_it.properties index bc98ce5..6f39ad7 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_it.properties @@ -21,3 +21,4 @@ userNotifications=Notifiche utente userNotificationsWarning=Non selezionare questa checkbox se gli eventi catturati non riguardano espressamente utenti search=Cerca destinatari recipientsProviderClassName=Provider destinatari notifica +recipientAttrName=Attributo e-mail destinatari http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_pt_BR.properties index 43f0cfc..f26e5ed 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_pt_BR.properties @@ -21,3 +21,4 @@ userNotifications=Notifica\u00e7\u00f5es do usu\u00e1rio userNotificationsWarning=N\u00e3o selecione esta op\u00e7\u00e3o a menos que os eventos n\u00e3o s\u00e3o direcionados a usu\u00e1rios search=Pesquisa para os destinat\u00e1rios recipientsProviderClassName=Notification recipient provider +recipientAttrName=Destinat\u00e1rios de e-mail para atributos http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_ru.properties index bf94d76..8c90a30 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationWizardBuilder$Recipients_ru.properties @@ -22,3 +22,4 @@ userNotifications=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u userNotificationsWarning=\u041d\u0435 \u0443\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u043b\u0430\u0433, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 search=\u041f\u043e\u0438\u0441\u043a \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0435\u0439 recipientsProviderClassName=Notification recipient provider +recipientAttrName=\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435 \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u0430 \u0441 \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0435\u0439 http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.properties index c8b5711..bd1dbaf 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.properties @@ -25,17 +25,7 @@ about=About events=Events selfAsRecipient=Include users matching About checkRecipients=Search recipients -checkAbout=All -userFilter=User filter -userFilterWarning=Do not use this filter unless events are not targeted at users -userNotifications=User notifications -userNotificationsWarning=Do not select this checkbox unless events are not targeted at users -roleFilter=Role filter -roleFilterWarning=Do not use this filter unless events are not targeted at roles -roleNotifications=Role notifications -roleNotificationsWarning=Do not select this checkbox unless events are not targeted at roles isActive=Enabled -checkUserAbout=Users -checkRoleAbout=Roles active=Active +anyType=Object Type http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_it.properties index 94113c6..cd053b4 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_it.properties @@ -25,17 +25,7 @@ about=Soggetti events=Eventi selfAsRecipient=Includi i soggetti checkRecipients=Cerca i destinatari -checkAbout=Tutto -userFilter=Filtro utenti -userFilterWarning=Non usare questo filtro se gli eventi catturati non riguardano espressamente utenti -userNotifications=Notifiche utente -userNotificationsWarning=Non selezionare questa checkbox se gli eventi catturati non riguardano espressamente utenti -roleFilter=Filtro ruoli -roleFilterWarning=Non usare questo filtro se gli eventi catturati non riguardano espressamente i ruoli -roleNotifications=Notifiche ruoli -roleNotificationsWarning=Non selezionare questa checkbox se gli eventi catturati non riguardano espressamente ruoli isActive=Abilitata -checkUserAbout=Utenti -checkRoleAbout=Ruoli -active=Attivo +active=Attiva +anyType=Tipo oggetto http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_pt_BR.properties index 8ac31ef..f6754f6 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_pt_BR.properties @@ -25,17 +25,7 @@ about=Sobre events=Eventos selfAsRecipient=Incluir usu\u00e1rios relacionados Sobre checkRecipients=Buscar Destinat\u00e1rios -checkAbout=Todos -userFilter=Filtro usu\u00e1rio -userFilterWarning=N\u00e3o use este filtro n\u00e3o ser que os eventos n\u00e3o s\u00e3o direcionados a usu\u00e1rios -roleFilter=Filtro fun\u00e7\u00e3o -roleFilterWarning=N\u00e3o use este filtro n\u00e3o ser que os eventos n\u00e3o s\u00e3o direcionados a fun\u00e7\u00f5es -userNotifications=Notifica\u00e7\u00f5es do usu\u00e1rio -userNotificationsWarning=N\u00e3o selecione esta op\u00e7\u00e3o a menos que os eventos n\u00e3o s\u00e3o direcionados a usu\u00e1rios -roleNotifications=Notifica\u00e7\u00f5es do fun\u00e7\u00f5es -roleNotificationsWarning=N\u00e3o selecione esta op\u00e7\u00e3o a menos que os eventos n\u00e3o s\u00e3o direcionados a fun\u00e7\u00f5es isActive=Ativada -checkUserAbout=Usu\u00e1rio -checkRoleAbout=Fun\u00e7\u00e3o active=Ativo +anyType=Object Type http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fe0d3b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_ru.properties index dd811d5..2144fa5 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_ru.properties @@ -26,17 +26,7 @@ about=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u043e events=\u0421\u043e\u0431\u044b\u0442\u0438\u044f selfAsRecipient=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0432 \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439, \u043e \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0440\u0430\u0441\u0441\u044b\u043b\u0430\u0435\u0442\u0441\u044f \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 checkRecipients=\u041f\u043e\u0438\u0441\u043a \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0435\u0439 -checkAbout=\u041e\u0431\u043e \u0432\u0441\u0451\u043c -userFilter=\u0424\u0438\u043b\u044c\u0442\u0440 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 -userFilterWarning=\u041d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u0438\u043b\u044c\u0442\u0440, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 -userNotifications=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 -userNotificationsWarning=\u041d\u0435 \u0443\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u043b\u0430\u0433, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 -roleFilter=\u0424\u0438\u043b\u044c\u0442\u0440 \u0440\u043e\u043b\u0435\u0439 -roleFilterWarning=\u041d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u0438\u043b\u044c\u0442\u0440, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u0440\u043e\u043b\u0435\u0439 -roleNotifications=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u0440\u043e\u043b\u0435\u0439 -roleNotificationsWarning=\u041d\u0435 \u0443\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u0444\u043b\u0430\u0433, \u0435\u0441\u043b\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u0440\u043e\u043b\u0435\u0439 isActive=\u0410\u043a\u0442\u0438\u0432\u043d\u043e -checkUserAbout=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 -checkRoleAbout=\u0420\u043e\u043b\u0438 active=\u0410\u043a\u0442\u0438\u0432\u043d\u043e +anyType=\u0422\u0438\u043f \u043e\u0431\u044a\u0435\u043a\u0442\u0430
