[SYNCOPE-1063] provides parametric properties
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5221e60e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5221e60e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5221e60e Branch: refs/heads/SYNCOPE-808 Commit: 5221e60efa43da9e1d65c1f64dfd2b1bf20ecbd3 Parents: 8be5d4d Author: fmartelli <fabio.marte...@gmail.com> Authored: Wed Apr 12 17:22:44 2017 +0200 Committer: fmartelli <fabio.marte...@gmail.com> Committed: Wed Apr 12 17:22:44 2017 +0200 ---------------------------------------------------------------------- .../client/console/topology/TopologyTogglePanel.java | 10 ++++++---- .../client/console/topology/TopologyTogglePanel.html | 6 +++--- .../console/topology/TopologyTogglePanel.properties | 11 +++++++---- .../console/topology/TopologyTogglePanel_it.properties | 11 +++++++---- .../topology/TopologyTogglePanel_pt_BR.properties | 11 +++++++---- .../console/topology/TopologyTogglePanel_ru.properties | 11 +++++++---- 6 files changed, 37 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/5221e60e/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java index 74b570b..4bb1aa2 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java @@ -364,7 +364,8 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> { ResourceTO modelObject = resourceRestClient.read(node.getKey()); target.add(propTaskModal.setContent( new ResourceStatusModal(propTaskModal, pageRef, modelObject))); - propTaskModal.header(new ResourceModel("resource.provisioning.status", "Provisioning Status")); + propTaskModal.header(new Model<>(MessageFormat.format(getString("resource.provisioning.status"), + node.getKey()))); propTaskModal.show(true); } }; @@ -418,7 +419,8 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> { public void onClick(final AjaxRequestTarget target) { target.add(propTaskModal.setContent( new PropagationTasks(propTaskModal, node.getKey(), pageRef))); - propTaskModal.header(new ResourceModel("task.propagation.list")); + propTaskModal.header( + new Model<>(MessageFormat.format(getString("task.propagation.list"), node.getKey()))); propTaskModal.show(true); } }; @@ -432,7 +434,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> { @Override public void onClick(final AjaxRequestTarget target) { target.add(schedTaskModal.setContent(new PullTasks(schedTaskModal, pageRef, node.getKey()))); - schedTaskModal.header(new ResourceModel("task.pull.list")); + schedTaskModal.header(new Model<>(MessageFormat.format(getString("task.pull.list"), node.getKey()))); schedTaskModal.show(true); } }; @@ -446,7 +448,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> { @Override public void onClick(final AjaxRequestTarget target) { target.add(schedTaskModal.setContent(new PushTasks(schedTaskModal, pageRef, node.getKey()))); - schedTaskModal.header(new ResourceModel("task.push.list")); + schedTaskModal.header(new Model<>(MessageFormat.format(getString("task.push.list"), node.getKey()))); schedTaskModal.show(true); } }; http://git-wip-us.apache.org/repos/asf/syncope/blob/5221e60e/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html index 28ef607..051df49 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.html @@ -48,13 +48,13 @@ under the License. <li><a href="#" wicket:id="explore"><i class="fa fa-eye"></i><wicket:message key="resource.menu.explore"/></a></li> </wicket:enclosure> <wicket:enclosure child="propagation"> - <li><a href="#" wicket:id="propagation"><i class="fa fa-arrow-right"></i><wicket:message key="task.propagation.list"/></a></li> + <li><a href="#" wicket:id="propagation"><i class="fa fa-arrow-right"></i><wicket:message key="resource.menu.propagation.list"/></a></li> </wicket:enclosure> <wicket:enclosure child="pull"> - <li><a href="#" wicket:id="pull"><i class="fa fa-chevron-circle-left"></i><wicket:message key="task.pull.list"/></a></li> + <li><a href="#" wicket:id="pull"><i class="fa fa-chevron-circle-left"></i><wicket:message key="resource.menu.pull.list"/></a></li> </wicket:enclosure> <wicket:enclosure child="push"> - <li><a href="#" wicket:id="push"><i class="fa fa-chevron-circle-right"></i><wicket:message key="task.push.list"/></a></li> + <li><a href="#" wicket:id="push"><i class="fa fa-chevron-circle-right"></i><wicket:message key="resource.menu.push.list"/></a></li> </wicket:enclosure> <wicket:enclosure child="status"> <li><a href="#" wicket:id="status"><i class="fa fa-list-ul"></i><wicket:message key="resource.menu.provisioning.status"/></a></li> http://git-wip-us.apache.org/repos/asf/syncope/blob/5221e60e/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties index c82fc37..43df570 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties @@ -29,10 +29,13 @@ resource.menu.provision=Edit provision rules resource.menu.explore=Explore resource task.custom.list=Custom tasks -task.propagation.list=Propagation tasks -task.pull.list=Pull tasks -task.push.list=Push tasks +task.propagation.list=Propagation tasks {0} +task.pull.list=Pull tasks {0} +task.push.list=Push tasks {0} resource.explore.list=Explore ${key} connectors.reload=Reload all connectors -resource.provisioning.status=Provisioning Status +resource.provisioning.status=Provisioning Status {0} resource.menu.provisioning.status=Provisioning status +resource.menu.push.list=Push tasks +resource.menu.pull.list=Pull tasks +resource.menu.propagation.list=Propagation tasks http://git-wip-us.apache.org/repos/asf/syncope/blob/5221e60e/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties index 4156f8b..90ed5ec 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties @@ -29,10 +29,13 @@ resource.menu.provision=Modifica regole di provisioning resource.menu.explore=Esplora risorsa task.custom.list=Task personalizzati -task.propagation.list=Task di propagazione -task.pull.list=Pull task -task.push.list=Push task +task.propagation.list=Task di propagazione {0} +task.pull.list=Pull task {0} +task.push.list=Push task {0} resource.explore.list=Esplora ${key} connectors.reload=Ricarica tutti i connettori -resource.provisioning.status=Stato provisioning +resource.provisioning.status=Stato provisioning {0} resource.menu.provisioning.status=Stato provisioning +resource.menu.push.list=Push tasks +resource.menu.pull.list=Pull tasks +resource.menu.propagation.list=Task di propagazione http://git-wip-us.apache.org/repos/asf/syncope/blob/5221e60e/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties index b2748c6..6f2520e 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties @@ -29,10 +29,13 @@ resource.menu.provision=Alterar regras de provision resource.menu.explore=Explorar recurso task.custom.list=Custom tasks -task.propagation.list=Propagation tasks -task.pull.list=Pull tasks -task.push.list=Push tasks +task.propagation.list=Propagation tasks {0} +task.pull.list=Pull tasks {0} +task.push.list=Push tasks {0} resource.explore.list=Explorar ${key} connectors.reload=Reload all connectors -resource.provisioning.status=Provisioning status +resource.provisioning.status=Provisioning status {0} resource.menu.provisioning.status=Provisioning status +resource.menu.push.list=Push tasks +resource.menu.pull.list=Pull tasks +resource.menu.propagation.list=Propagation tasks http://git-wip-us.apache.org/repos/asf/syncope/blob/5221e60e/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties index 3097e5d..997f304 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties @@ -30,10 +30,13 @@ resource.menu.provision=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\ resource.menu.explore=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0440\u0435\u0441\u0443\u0440\u0441\u0430 task.custom.list=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0437\u0430\u0434\u0430\u0447\u0438 -task.propagation.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439 -task.pull.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445 -task.push.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0434\u0430\u043d\u043d\u044b\u0445 +task.propagation.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439 {0} +task.pull.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445 {0} +task.push.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0434\u0430\u043d\u043d\u044b\u0445 {0} resource.explore.list=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 ${key} connectors.reload=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0432\u0441\u0435 \u043a\u043e\u043d\u043d\u0435\u043a\u0442\u043e\u0440\u044b -resource.provisioning.status=\u0421\u0442\u0430\u0442\u0443\u0441 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f +resource.provisioning.status=\u0421\u0442\u0430\u0442\u0443\u0441 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f {0} resource.menu.provisioning.status=\u0421\u0442\u0430\u0442\u0443\u0441 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f +resource.menu.push.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0434\u0430\u043d\u043d\u044b\u0445 +resource.menu.pull.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445 +resource.menu.propagation.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439