Jeroen Hoffman pushed to branch bugfix/HIPPLUG-1334 at cms-community /
hippo-plugin-poll
Commits:
4228767a by Oscar Scholten at 2016-09-05T15:33:48+02:00
HIPPLUG-1381 moving component parameter translations to repository resource
bundle
- - - - -
7b60047a by Jeroen Hoffman at 2016-09-16T11:29:51+02:00
HIPPLUG-1334 Merge branch 'master' into bugfix/HIPPLUG-1334
- - - - -
4 changed files:
- + addon-repository/src/main/resources/component-param-translations.json
- addon-repository/src/main/resources/hippoecm-extension.xml
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
-
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
Changes:
=====================================
addon-repository/src/main/resources/component-param-translations.json
=====================================
--- /dev/null
+++ b/addon-repository/src/main/resources/component-param-translations.json
@@ -0,0 +1,29 @@
+{
+ "hippo:hst": {
+ "componentparameters": {
+ "org": {
+ "onehippo": {
+ "forge": {
+ "poll": {
+ "component": {
+ "PollComponentInfo": {
+ "en": {
+ "poll-dataPath": "Path to store poll data",
+ "poll-docsClass": "Poll documents class",
+ "poll-pollCompoundName": "Name of poll compound",
+ "poll-docsPath": "Path to poll documents relative to site
content root"
+ }
+ },
+ "PollDocumentComponentInfo": {
+ "en": {
+ "poll-docsPath": "Poll document"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
=====================================
addon-repository/src/main/resources/hippoecm-extension.xml
=====================================
--- a/addon-repository/src/main/resources/hippoecm-extension.xml
+++ b/addon-repository/src/main/resources/hippoecm-extension.xml
@@ -213,6 +213,18 @@
</sv:property>
</sv:node>
+ <sv:node sv:name="hippopoll-component-param-translations">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>hippo:initializeitem</sv:value>
+ </sv:property>
+ <sv:property sv:name="hippo:sequence" sv:type="Double">
+ <sv:value>20402</sv:value>
+ </sv:property>
+ <sv:property sv:name="hippo:resourcebundles" sv:type="String">
+ <sv:value>component-param-translations.json</sv:value>
+ </sv:property>
+ </sv:node>
+
<!-- added in 11, obsolete in 12 -->
<sv:node sv:name="hippopoll-delete-translator">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
=====================================
hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
=====================================
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollComponentInfo.java
@@ -20,16 +20,16 @@ import org.hippoecm.hst.core.parameters.Parameter;
public interface PollComponentInfo {
- @Parameter(name = "poll-dataPath", displayName = "Path to store poll data")
+ @Parameter(name = "poll-dataPath")
String getPollDataPath();
- @Parameter(name = "poll-docsClass", displayName = "Poll documents class")
+ @Parameter(name = "poll-docsClass")
String getPollDocsClass();
- @Parameter(name = "poll-pollCompoundName", displayName = "Name of poll
compound")
+ @Parameter(name = "poll-pollCompoundName")
String getPollCompoundName();
- @Parameter(name = "poll-docsPath", required = true, displayName = "Path to
poll documents relative to site content root")
+ @Parameter(name = "poll-docsPath", required = true)
@JcrPath(pickerSelectableNodeTypes = "hippostd:folder")
String getPollDocsPath();
}
=====================================
hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
=====================================
---
a/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
+++
b/hst-client/src/main/java/org/onehippo/forge/poll/component/PollDocumentComponentInfo.java
@@ -21,19 +21,19 @@ import org.hippoecm.hst.core.parameters.Parameter;
public interface PollDocumentComponentInfo extends PollComponentInfo {
@Override
- @Parameter(name = "poll-dataPath", displayName = "Path to store poll
data", hideInChannelManager = true)
+ @Parameter(name = "poll-dataPath", hideInChannelManager = true)
String getPollDataPath();
@Override
- @Parameter(name = "poll-docsClass", displayName = "Poll documents class",
hideInChannelManager = true)
+ @Parameter(name = "poll-docsClass", hideInChannelManager = true)
String getPollDocsClass();
@Override
- @Parameter(name = "poll-pollCompoundName", displayName = "Name of poll
compound", hideInChannelManager = true)
+ @Parameter(name = "poll-pollCompoundName", hideInChannelManager = true)
String getPollCompoundName();
@Override
- @Parameter(name = "poll-docsPath", required = true, displayName = "Poll
document")
+ @Parameter(name = "poll-docsPath", required = true)
@JcrPath(pickerSelectableNodeTypes = "poll:polldocument")
String getPollDocsPath();
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-poll/compare/33f07b827d7157b6ed5c7dedb8b956a8f13ddf33...7b60047ae981a45eb0730448daa98af4169dc08b
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
