translations-psp1] HIPPLUG-1274 convert bootstrap content for translations psp1

Unico Hommes Wed, 09 Mar 2016 03:20:28 -0800

Unico Hommes pushed to branch feature/translations-psp1 at cms-community / 
hippo-plugin-poll



Commits:
a89876be by Unico Hommes at 2016-03-09T12:20:03+01:00
HIPPLUG-1274 convert bootstrap content for translations psp1

- - - - -


5 changed files:

- demo/content/src/main/resources/configuration/modules/autoexport-module.xml
- demo/content/src/main/resources/content/documents/poll-demo/common.xml
- 
demo/content/src/main/resources/content/documents/poll-demo/custom-poll-documents.xml
- demo/content/src/main/resources/content/documents/poll-demo/poll-documents.xml
- 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/poll-demo/common.xml
=====================================
--- a/demo/content/src/main/resources/content/documents/poll-demo/common.xml
+++ b/demo/content/src/main/resources/content/documents/poll-demo/common.xml
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0"; sv:name="common">
+<?xml version="1.0" encoding="UTF-8"?><sv:node 
xmlns:sv="http://www.jcp.org/jcr/sv/1.0"; sv:name="common">
   <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>mix:referenceable</sv:value>
     <sv:value>hippotranslation:translated</sv:value>
-    <sv:value>hippo:translated</sv:value>
+    <sv:value>hippo:named</sv:value>
+    <sv:value>mix:referenceable</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:uuid" sv:type="String">
     <sv:value>4925daf0-1eb7-47eb-a4c2-602b74ff19e5</sv:value>
   </sv:property>
+  <sv:property sv:name="hippo:name" sv:type="String">
+    <sv:value>Common</sv:value>
+  </sv:property>
   <sv:property sv:name="hippostd:foldertype" sv:type="String" 
sv:multiple="true">
     <sv:value>new-translated-folder</sv:value>
     <sv:value>new-document</sv:value>
@@ -21,47 +23,27 @@
   <sv:property sv:name="hippotranslation:locale" sv:type="String">
     <sv:value>en</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/>
-    </sv:property>
-    <sv:property sv:name="hippo:message" sv:type="String">
-      <sv:value>Common</sv:value>
-    </sv:property>
-  </sv:node>
   <sv:node sv:name="homepage">
     <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>810949d9-dc3c-4bb8-89b9-261580f68518</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/>
-      </sv:property>
-      <sv:property sv:name="hippo:message" sv:type="String">
-        <sv:value>Home Page</sv:value>
-      </sv:property>
-    </sv:node>
+    <sv:property sv:name="hippo:name" sv:type="String">
+      <sv:value>Home Page</sv:value>
+    </sv:property>
     <sv:node sv:name="homepage">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>polldemo:textdocument</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>b846d112-f7c5-4d5d-ac02-dfc52b7f6ee6</sv:value>
@@ -70,6 +52,9 @@
         <sv:value>live</sv:value>
         <sv:value>preview</sv:value>
       </sv:property>
+      <sv:property sv:name="hippo:related___pathreference" sv:type="String">
+        <sv:value>common/homepage</sv:value>
+      </sv:property>
       <sv:property sv:name="hippostd:holder" sv:type="String">
         <sv:value>admin</sv:value>
       </sv:property>
@@ -106,7 +91,6 @@
       <sv:property sv:name="polldemo:title" sv:type="String">
         <sv:value>polldemo Home Page</sv:value>
       </sv:property>
-      
       <sv:node sv:name="polldemo:body">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
           <sv:value>hippostd:html</sv:value>
@@ -137,30 +121,22 @@ vote again.&lt;/p&gt;
       <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>523d103a-d878-465a-b4fe-095f874d7a7a</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/>
-      </sv:property>
-      <sv:property sv:name="hippo:message" sv:type="String">
-        <sv:value>About Us</sv:value>
-      </sv:property>
-    </sv:node>
+    <sv:property sv:name="hippo:name" sv:type="String">
+      <sv:value>About Us</sv:value>
+    </sv:property>
     <sv:node sv:name="about-us">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>polldemo:textdocument</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>1801751e-77b2-4dfb-8420-9d8168df2668</sv:value>
@@ -169,6 +145,9 @@ vote again.&lt;/p&gt;
         <sv:value>live</sv:value>
         <sv:value>preview</sv:value>
       </sv:property>
+      <sv:property sv:name="hippo:related___pathreference" sv:type="String">
+        <sv:value>common/about-us</sv:value>
+      </sv:property>
       <sv:property sv:name="hippostd:holder" sv:type="String">
         <sv:value>admin</sv:value>
       </sv:property>
@@ -202,7 +181,6 @@ vote again.&lt;/p&gt;
       <sv:property sv:name="polldemo:title" sv:type="String">
         <sv:value>About us</sv:value>
       </sv:property>
-      
       <sv:node sv:name="polldemo:body">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
           <sv:value>hippostd:html</sv:value>
@@ -218,30 +196,22 @@ vote again.&lt;/p&gt;
       <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>1a72e601-14ed-42f7-96af-4753dde2eb70</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/>
-      </sv:property>
-      <sv:property sv:name="hippo:message" sv:type="String">
-        <sv:value>myPollComponentDocument</sv:value>
-      </sv:property>
-    </sv:node>
+    <sv:property sv:name="hippo:name" sv:type="String">
+      <sv:value>myPollComponentDocument</sv:value>
+    </sv:property>
     <sv:node sv:name="mypollcomponentdocument">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>polldemo:textdocument</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>3f4c0138-9f0d-468d-8b57-9d22bac34b21</sv:value>
@@ -250,6 +220,9 @@ vote again.&lt;/p&gt;
         <sv:value>live</sv:value>
         <sv:value>preview</sv:value>
       </sv:property>
+      <sv:property sv:name="hippo:related___pathreference" sv:type="String">
+        <sv:value>common/mypollcomponentdocument</sv:value>
+      </sv:property>
       <sv:property sv:name="hippostd:holder" sv:type="String">
         <sv:value>admin</sv:value>
       </sv:property>
@@ -286,7 +259,6 @@ vote again.&lt;/p&gt;
       <sv:property sv:name="polldemo:title" sv:type="String">
         <sv:value>Poll Component Demo</sv:value>
       </sv:property>
-      
       <sv:node sv:name="polldemo:body">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
           <sv:value>hippostd:html</sv:value>


=====================================
demo/content/src/main/resources/content/documents/poll-demo/custom-poll-documents.xml
=====================================
--- 
a/demo/content/src/main/resources/content/documents/poll-demo/custom-poll-documents.xml
+++ 
b/demo/content/src/main/resources/content/documents/poll-demo/custom-poll-documents.xml
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0"; 
sv:name="custom-poll-documents">
+<?xml version="1.0" encoding="UTF-8"?><sv:node 
xmlns:sv="http://www.jcp.org/jcr/sv/1.0"; sv:name="custom-poll-documents">
   <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>mix:referenceable</sv:value>
     <sv:value>hippotranslation:translated</sv:value>
-    <sv:value>hippo:translated</sv:value>
+    <sv:value>hippo:named</sv:value>
+    <sv:value>mix:referenceable</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:uuid" sv:type="String">
     <sv:value>be709e8a-de01-4e97-b7ff-e4d2a30110f5</sv:value>
   </sv:property>
+  <sv:property sv:name="hippo:name" sv:type="String">
+    <sv:value>Custom Poll Documents</sv:value>
+  </sv:property>
   <sv:property sv:name="hippostd:foldertype" sv:type="String" 
sv:multiple="true">
     <sv:value>new-translated-folder</sv:value>
     <sv:value>new-document</sv:value>
@@ -21,47 +23,27 @@
   <sv:property sv:name="hippotranslation:locale" sv:type="String">
     <sv:value>en</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/>
-    </sv:property>
-    <sv:property sv:name="hippo:message" sv:type="String">
-      <sv:value>Custom Poll Documents</sv:value>
-    </sv:property>
-  </sv:node>
   <sv:node sv:name="mycustompolldocument">
     <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>a43de528-8656-471f-9683-f8e6b6cd3171</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/>
-      </sv:property>
-      <sv:property sv:name="hippo:message" sv:type="String">
-        <sv:value>myCustomPollDocument</sv:value>
-      </sv:property>
-    </sv:node>
+    <sv:property sv:name="hippo:name" sv:type="String">
+      <sv:value>myCustomPollDocument</sv:value>
+    </sv:property>
     <sv:node sv:name="mycustompolldocument">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>polldemo:custompolldocument</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>a7b5cbdd-28a3-4827-bc02-8257f8e8c3ec</sv:value>
@@ -70,6 +52,9 @@
         <sv:value>live</sv:value>
         <sv:value>preview</sv:value>
       </sv:property>
+      <sv:property sv:name="hippo:related___pathreference" sv:type="String">
+        <sv:value>custom-poll-documents/mycustompolldocument</sv:value>
+      </sv:property>
       <sv:property sv:name="hippostd:holder" sv:type="String">
         <sv:value>admin</sv:value>
       </sv:property>
@@ -106,7 +91,6 @@
       <sv:property sv:name="polldemo:title" sv:type="String">
         <sv:value>Title of Custom Poll Document</sv:value>
       </sv:property>
-      
       <sv:node sv:name="polldemo:poll">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
           <sv:value>poll:poll</sv:value>


=====================================
demo/content/src/main/resources/content/documents/poll-demo/poll-documents.xml
=====================================
--- 
a/demo/content/src/main/resources/content/documents/poll-demo/poll-documents.xml
+++ 
b/demo/content/src/main/resources/content/documents/poll-demo/poll-documents.xml
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node xmlns:sv="http://www.jcp.org/jcr/sv/1.0"; sv:name="poll-documents">
+<?xml version="1.0" encoding="UTF-8"?><sv:node 
xmlns:sv="http://www.jcp.org/jcr/sv/1.0"; sv:name="poll-documents">
   <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>mix:referenceable</sv:value>
     <sv:value>hippotranslation:translated</sv:value>
-    <sv:value>hippo:translated</sv:value>
+    <sv:value>hippo:named</sv:value>
+    <sv:value>mix:referenceable</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:uuid" sv:type="String">
     <sv:value>7420f2a1-774f-49fe-9dff-f3179890a306</sv:value>
   </sv:property>
+  <sv:property sv:name="hippo:name" sv:type="String">
+    <sv:value>Poll Documents</sv:value>
+  </sv:property>
   <sv:property sv:name="hippostd:foldertype" sv:type="String" 
sv:multiple="true">
     <sv:value>new-translated-folder</sv:value>
     <sv:value>new-document</sv:value>
@@ -21,29 +23,20 @@
   <sv:property sv:name="hippotranslation:locale" sv:type="String">
     <sv:value>en</sv:value>
   </sv:property>
-  
   <sv:node sv:name="mypolldocument">
     <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>c1cb4f9d-d6e0-4062-a715-9890e2e56230</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/>
-      </sv:property>
-      <sv:property sv:name="hippo:message" sv:type="String">
-        <sv:value>myPollDocument</sv:value>
-      </sv:property>
-    </sv:node>
+    <sv:property sv:name="hippo:name" sv:type="String">
+      <sv:value>myPollDocument</sv:value>
+    </sv:property>
     <sv:node sv:name="mypolldocument">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
         <sv:value>poll:polldocument</sv:value>
@@ -58,6 +51,9 @@
         <sv:value>live</sv:value>
         <sv:value>preview</sv:value>
       </sv:property>
+      <sv:property sv:name="hippo:related___pathreference" sv:type="String">
+        <sv:value>poll-documents/mypolldocument</sv:value>
+      </sv:property>
       <sv:property sv:name="hippostd:holder" sv:type="String">
         <sv:value>admin</sv:value>
       </sv:property>
@@ -143,15 +139,4 @@ Pick your color please!</sv:value>
       </sv:node>
     </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>Poll Documents</sv:value>
-    </sv:property>
-  </sv:node>
 </sv:node>


=====================================
demo/pom.xml
=====================================
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -19,7 +19,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 Poll Demo</name>
@@ -27,13 +27,7 @@
   <artifactId>hippo-plugin-poll-demo</artifactId>
   <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-
-  <scm>
-    
<connection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/poll/demo/trunk/</connection>
-    
<developerConnection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/poll/demo/trunk/</developerConnection>
-    
<url>https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/poll/demo/trunk/</url>
-  </scm>
-
+  
   <properties>
     <taglibs.version>1.2.1</taglibs.version>
     <commons.lang.version>2.6</commons.lang.version>



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/a89876bef81a892c01bd869a9a48b5944ecd838b

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][feature/translations-psp1] HIPPLUG-1274 convert bootstrap content for translations psp1

Reply via email to