Unico Hommes pushed to branch feature/translations-psp1 at cms-community / hippo-plugin-selections
Commits: 6c3e4071 by Unico Hommes at 2016-03-09T13:01:55+01:00 HIPPLUG-1274 convert bootstrap content for translations psp1 - - - - - 6 changed files: - demo/content/src/main/resources/configuration/modules/autoexport-module.xml - demo/content/src/main/resources/content/documents/valuelists/chained.xml - demo/content/src/main/resources/hippoecm-extension.xml - demo/content/src/main/resources/selection-demo-namespace.xml - + demo/content/src/main/resources/translations.json - demo/pom.xml Changes: ===================================== demo/content/src/main/resources/configuration/modules/autoexport-module.xml ===================================== --- a/demo/content/src/main/resources/configuration/modules/autoexport-module.xml +++ b/demo/content/src/main/resources/configuration/modules/autoexport-module.xml @@ -6,8 +6,7 @@ <sv:value>false</sv:value> </sv:property> <sv:property sv:name="autoexport:modules" sv:type="String" h:merge="override"> - <sv:value>bootstrap/content:/content</sv:value> - <sv:value>bootstrap/configuration:/</sv:value> + <sv:value>content:/</sv:value> </sv:property> </sv:node> </sv:node> ===================================== demo/content/src/main/resources/content/documents/valuelists/chained.xml ===================================== --- a/demo/content/src/main/resources/content/documents/valuelists/chained.xml +++ b/demo/content/src/main/resources/content/documents/valuelists/chained.xml @@ -1,15 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" sv:name="chained"> +<?xml version="1.0" encoding="UTF-8"?><sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" sv:name="chained"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>hippostd:folder</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> + <sv:value>hippo:named</sv:value> <sv:value>mix:referenceable</sv:value> - <sv:value>hippo:translated</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>461acf46-1c10-4aa6-ab7d-a393d2647a9d</sv:value> </sv:property> + <sv:property sv:name="hippo:name" sv:type="String"> + <sv:value>Interdependent / Chained</sv:value> + </sv:property> <sv:property sv:name="hippostd:foldertype" sv:type="String" sv:multiple="true"> <sv:value>new-document</sv:value> <sv:value>new-folder</sv:value> @@ -19,19 +21,22 @@ <sv:value>hippo:handle</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> + <sv:value>hippo:named</sv:value> <sv:value>mix:referenceable</sv:value> - <sv:value>hippo:translated</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>59ae78cc-192b-4764-8224-6e73133efb26</sv:value> </sv:property> + <sv:property sv:name="hippo:name" sv:type="String"> + <sv:value>1 - Continents</sv:value> + </sv:property> <sv:node sv:name="continents"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>selection:valuelist</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>mix:referenceable</sv:value> <sv:value>hippotranslation:translated</sv:value> + <sv:value>mix:referenceable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>57164487-d849-4f54-bf17-16b0e5025a4c</sv:value> @@ -69,36 +74,28 @@ </sv:property> </sv:node> </sv:node> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value/> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>1 - Continents</sv:value> - </sv:property> - </sv:node> </sv:node> <sv:node sv:name="africa"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>hippo:handle</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> + <sv:value>hippo:named</sv:value> <sv:value>mix:referenceable</sv:value> - <sv:value>hippo:translated</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>a941736b-4d51-4038-8ffa-4c5fa5bfdc9e</sv:value> </sv:property> + <sv:property sv:name="hippo:name" sv:type="String"> + <sv:value>1.1 - Africa</sv:value> + </sv:property> <sv:node sv:name="africa"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>selection:valuelist</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>mix:referenceable</sv:value> <sv:value>hippotranslation:translated</sv:value> + <sv:value>mix:referenceable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>835e7193-5266-4deb-b880-fdc7df331388</sv:value> @@ -158,36 +155,28 @@ </sv:property> </sv:node> </sv:node> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value/> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>1.1 - Africa</sv:value> - </sv:property> - </sv:node> </sv:node> <sv:node sv:name="europe"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>hippo:handle</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> + <sv:value>hippo:named</sv:value> <sv:value>mix:referenceable</sv:value> - <sv:value>hippo:translated</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>5966ae23-3395-473a-9ced-0a5f7db48903</sv:value> </sv:property> + <sv:property sv:name="hippo:name" sv:type="String"> + <sv:value>1.2 - Europe</sv:value> + </sv:property> <sv:node sv:name="europe"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>selection:valuelist</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>mix:referenceable</sv:value> <sv:value>hippotranslation:translated</sv:value> + <sv:value>mix:referenceable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>419201e3-d746-479e-98ad-18377d01fa7f</sv:value> @@ -196,7 +185,6 @@ <sv:value>live</sv:value> <sv:value>preview</sv:value> </sv:property> - <sv:property sv:name="hippotranslation:id" sv:type="String"> <sv:value>fe560ef3-3fc5-40d8-b1c4-34f21d88474c</sv:value> </sv:property> @@ -281,27 +269,5 @@ </sv:property> </sv:node> </sv:node> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value/> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>1.2 - Europe</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value/> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>Interdependent / Chained</sv:value> - </sv:property> </sv:node> </sv:node> ===================================== demo/content/src/main/resources/hippoecm-extension.xml ===================================== --- a/demo/content/src/main/resources/hippoecm-extension.xml +++ b/demo/content/src/main/resources/hippoecm-extension.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Copyright 2009-2013 Hippo @@ -13,8 +13,7 @@ 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. ---> -<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" sv:name="hippo:initialize"> +--><sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" sv:name="hippo:initialize"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>hippo:initializefolder</sv:value> </sv:property> @@ -449,7 +448,7 @@ <sv:property sv:name="hippo:sequence" sv:type="Double"> <sv:value>33100.5</sv:value> </sv:property> - <sv:property sv:name="hippo:contentpropadd" sv:multiple="true" sv:type="String"> + <sv:property sv:multiple="true" sv:name="hippo:contentpropadd" sv:type="String"> <sv:value>editor</sv:value> </sv:property> </sv:node> @@ -552,7 +551,7 @@ </sv:property> </sv:node> <!-- Autoexport module configuration --> - <sv:node sv:name="taxonomydemo-autoexport-module"> + <sv:node sv:name="selectionsdemo-autoexport-module"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>hippo:initializeitem</sv:value> </sv:property> @@ -566,4 +565,15 @@ <sv:value>30010</sv:value> </sv:property> </sv:node> + <sv:node sv:name="selections-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>32051</sv:value> + </sv:property> + <sv:property sv:name="hippo:resourcebundles" sv:type="String"> + <sv:value>translations.json</sv:value> + </sv:property> + </sv:node> </sv:node> ===================================== demo/content/src/main/resources/selection-demo-namespace.xml ===================================== --- a/demo/content/src/main/resources/selection-demo-namespace.xml +++ b/demo/content/src/main/resources/selection-demo-namespace.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" sv:name="selectiondemo"> +<?xml version="1.0" encoding="UTF-8"?><sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0" sv:name="selectiondemo"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>hipposysedit:namespace</sv:value> </sv:property> @@ -52,8 +51,8 @@ <sv:value>hipposysedit:templatetype</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>mix:referenceable</sv:value> <sv:value>editor:editable</sv:value> + <sv:value>mix:referenceable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>90cd0dbf-27ad-4423-b85a-66b8424521cf</sv:value> @@ -73,8 +72,8 @@ <sv:value>hipposysedit:nodetype</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>hipposysedit:remodel</sv:value> <sv:value>mix:referenceable</sv:value> + <sv:value>hipposysedit:remodel</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>3a316b5f-5f3b-46e1-9156-9702649f352d</sv:value> @@ -489,85 +488,6 @@ <sv:value>${wicket.id}</sv:value> </sv:property> </sv:node> - <sv:node sv:name="translator"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>frontend:plugin</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>hippostd:translated</sv:value> - </sv:property> - <sv:property sv:name="plugin.class" sv:type="String"> - <sv:value>org.hippoecm.frontend.i18n.ConfigTraversingPlugin</sv:value> - </sv:property> - <sv:property sv:name="translator.id" sv:type="String"> - <sv:value>${cluster.id}.translator</sv:value> - </sv:property> - <sv:node sv:name="hippostd:translations"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippostd:translations</sv:value> - </sv:property> - <sv:node sv:name="choice.true"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>frontend:pluginconfig</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>hippo:translated</sv:value> - </sv:property> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value>nl</sv:value> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>Ja</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value>en</sv:value> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>Yes</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="choice.false"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>frontend:pluginconfig</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>hippo:translated</sv:value> - </sv:property> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value>nl</sv:value> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>Nee</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value>en</sv:value> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>No</sv:value> - </sv:property> - </sv:node> - </sv:node> - </sv:node> - </sv:node> <sv:node sv:name="title"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>frontend:plugin</sv:value> @@ -1089,8 +1009,8 @@ <sv:value>hipposysedit:templatetype</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>mix:referenceable</sv:value> <sv:value>editor:editable</sv:value> + <sv:value>mix:referenceable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>0c427538-f035-4c26-904f-d31acbab3aa6</sv:value> @@ -1110,8 +1030,8 @@ <sv:value>hipposysedit:nodetype</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>hipposysedit:remodel</sv:value> <sv:value>mix:referenceable</sv:value> + <sv:value>hipposysedit:remodel</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>4e024aa5-efb2-42ac-9c0e-d2a47c0e73ca</sv:value> @@ -1183,8 +1103,8 @@ <sv:value>selectiondemo:multilingualdocument</sv:value> </sv:property> <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>mix:referenceable</sv:value> <sv:value>hippotranslation:translated</sv:value> + <sv:value>mix:referenceable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>33cf1ad1-9457-496b-a155-22d74d2bc890</sv:value> @@ -1260,85 +1180,6 @@ <sv:value>${wicket.id}</sv:value> </sv:property> </sv:node> - <sv:node sv:name="translator"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>frontend:plugin</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>hippostd:translated</sv:value> - </sv:property> - <sv:property sv:name="plugin.class" sv:type="String"> - <sv:value>org.hippoecm.frontend.i18n.ConfigTraversingPlugin</sv:value> - </sv:property> - <sv:property sv:name="translator.id" sv:type="String"> - <sv:value>${cluster.id}.translator</sv:value> - </sv:property> - <sv:node sv:name="hippostd:translations"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippostd:translations</sv:value> - </sv:property> - <sv:node sv:name="choice.true"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>frontend:pluginconfig</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>hippo:translated</sv:value> - </sv:property> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value>nl</sv:value> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>Ja</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value>en</sv:value> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>Yes</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="choice.false"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>frontend:pluginconfig</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>hippo:translated</sv:value> - </sv:property> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value>nl</sv:value> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>Nee</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="hippo:translation"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>hippo:translation</sv:value> - </sv:property> - <sv:property sv:name="hippo:language" sv:type="String"> - <sv:value>en</sv:value> - </sv:property> - <sv:property sv:name="hippo:message" sv:type="String"> - <sv:value>No</sv:value> - </sv:property> - </sv:node> - </sv:node> - </sv:node> - </sv:node> <sv:node sv:name="title"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>frontend:plugin</sv:value> ===================================== demo/content/src/main/resources/translations.json ===================================== --- /dev/null +++ b/demo/content/src/main/resources/translations.json @@ -0,0 +1,22 @@ +{"hippo:types": { + "selectiondemo:textdocument": { + "nl": { + "selectiondemo:choice.true": "Ja", + "selectiondemo:choice.false": "Nee" + }, + "en": { + "selectiondemo:choice.true": "Yes", + "selectiondemo:choice.false": "No" + } + }, + "selectiondemo:multilingualdocument": { + "nl": { + "selectiondemo:choice.true": "Ja", + "selectiondemo:choice.false": "Nee" + }, + "en": { + "selectiondemo:choice.true": "Yes", + "selectiondemo:choice.false": "No" + } + } +}} \ No newline at end of file ===================================== demo/pom.xml ===================================== --- a/demo/pom.xml +++ b/demo/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-cms7-release</artifactId> - <version>11.0.0-SNAPSHOT</version> + <version>11.0.0-translations-psp1-SNAPSHOT</version> </parent> <name>Hippo Plugin Selections Demo Project</name> @@ -28,15 +28,8 @@ <artifactId>hippo-plugin-selections-demo</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> - - <scm> - <connection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/selections/demo/trunk/</connection> - <developerConnection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/selections/demo/trunk/</developerConnection> - <url>https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/selections/demo/trunk/</url> - </scm> - + <properties> - <hippo.plugin.selections.version>4.0.0-SNAPSHOT</hippo.plugin.selections.version> <taglibs.version>1.2.1</taglibs.version> <commons.lang.version>2.6</commons.lang.version> <lib.spring-js.version>2.0.5.RELEASE</lib.spring-js.version> View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-selections/commit/6c3e40712eb3fdeb75e2aaf0b55cd3654cf4f82a
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn