Ard Schrijvers pushed to branch master at cms-community /
hippo-plugin-seo-support
Commits:
92ea306a by Unico Hommes at 2015-10-07T09:08:03+00:00
HIPPLUG-1200 copy for branch seo-support-2.1.0-translations-1
- - - - -
683ac7c0 by Unico Hommes at 2015-10-07T12:06:22+00:00
HIPPLUG-1199 move type field translations to repository-based resource bundle
- - - - -
000b3561 by Unico Hommes at 2015-10-26T13:51:06+00:00
HIPPLUG-1200 better branch name
- - - - -
87653215 by Unico Hommes at 2015-10-26T13:52:24+00:00
HIPPLUG-1200 better version
- - - - -
e7075598 by Unico Hommes at 2015-11-23T16:13:21+00:00
HIPPLUG-1200 merge changes from trunk
- - - - -
b9f34294 by Unico Hommes at 2015-11-25T13:02:59+00:00
HIPPLUG-1228 Rewrite resource bundle bootstrap configuration to use new
resourcebundles initialize item instruction
- - - - -
f061d0d2 by Ate Douma at 2016-02-16T02:46:23+01:00
HIPPLUG-1200 merge changes from master
- - - - -
514d7121 by Ard Schrijvers at 2016-03-16T17:20:48+01:00
HIPPLUG-1200 Merge changes in feature/translations-psp1
- - - - -
1a667c88 by Ard Schrijvers at 2016-03-17T14:50:41+01:00
HIPPLUG-1200 Reintegrate feature/translations-psp1
- - - - -
5 changed files:
- .gitattributes
- pom.xml
- repository/src/main/resources/hippoecm-extension.xml
- repository/src/main/resources/seosupport-namespace.xml
- + repository/src/main/resources/type-translations.json
Changes:
=====================================
.gitattributes
=====================================
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,6 +7,7 @@ repository/src/main/resources/hide-seosupport.xml -text
repository/src/main/resources/hippoecm-extension.xml -text
svneol=unset#application/xml
repository/src/main/resources/seosupport-namespace.xml -text
svneol=unset#application/xml
repository/src/main/resources/seosupport.cnd -text
+repository/src/main/resources/type-translations.json -text
site/pom.xml svneol=native#text/plain
site/src/main/resources/org/onehippo/forge/seo/support/SEOHelperComponentParamsInfo.properties
-text
site/src/main/resources/org/onehippo/forge/seo/support/SEOHelperComponentParamsInfo_de.properties
-text
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,9 @@
</scm>
<properties>
- <hippo.hst.version>4.0.0-SNAPSHOT</hippo.hst.version>
+ <hippo.hst.version>4.0.0-translations-psp1-SNAPSHOT</hippo.hst.version>
<hippo.commons.version>3.0.0-SNAPSHOT</hippo.commons.version>
- <hippo.repository.version>4.0.0-SNAPSHOT</hippo.repository.version>
+
<hippo.repository.version>4.0.0-translations-psp1-SNAPSHOT</hippo.repository.version>
<lib.junit.version>4.8.2</lib.junit.version>
<lib.easymock.version>3.0</lib.easymock.version>
</properties>
=====================================
repository/src/main/resources/hippoecm-extension.xml
=====================================
--- a/repository/src/main/resources/hippoecm-extension.xml
+++ b/repository/src/main/resources/hippoecm-extension.xml
@@ -48,4 +48,17 @@
<sv:value>/hippo:configuration/hippo:frontend/cms/cms-tree-views/configuration/configurationBrowser/filters</sv:value>
</sv:property>
</sv:node>
+
+ <sv:node sv:name="seosupport-type-translations">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>hippo:initializeitem</sv:value>
+ </sv:property>
+ <sv:property sv:name="hippo:resourcebundles" sv:type="String">
+ <sv:value>type-translations.json</sv:value>
+ </sv:property>
+ <sv:property sv:name="hippo:sequence" sv:type="Double">
+ <sv:value>20001</sv:value>
+ </sv:property>
+ </sv:node>
+
</sv:node>
=====================================
repository/src/main/resources/seosupport-namespace.xml
=====================================
--- a/repository/src/main/resources/seosupport-namespace.xml
+++ b/repository/src/main/resources/seosupport-namespace.xml
@@ -13,52 +13,7 @@
<sv:property sv:multiple="true" sv:name="jcr:mixinTypes" sv:type="Name">
<sv:value>mix:referenceable</sv:value>
<sv:value>editor:editable</sv:value>
- <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>SEO</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>SEO</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>de</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>SEO</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>fr</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>SEO</sv:value>
- </sv:property>
- </sv:node>
<sv:node sv:name="hipposysedit:nodetype">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>hippo:handle</sv:value>
@@ -167,233 +122,6 @@
<sv:property sv:multiple="true" sv:name="frontend:services"
sv:type="String">
<sv:value>wicket.id</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="translator">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>frontend:plugin</sv:value>
- </sv:property>
- <sv:property sv:multiple="true" sv:name="jcr:mixinTypes"
sv:type="Name">
- <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: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="seotitle">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>frontend:pluginconfig</sv:value>
- </sv:property>
- <sv:property sv:multiple="true" sv:name="jcr:mixinTypes"
sv:type="Name">
- <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>en</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>SEO Title</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>nl</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>SEO titel</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>de</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>SEO-Titel</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>fr</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Titre SEO</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="seodescription">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>frontend:pluginconfig</sv:value>
- </sv:property>
- <sv:property sv:multiple="true" sv:name="jcr:mixinTypes"
sv:type="Name">
- <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>en</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>SEO Description</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>nl</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>SEO beschrijving</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>de</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>SEO-Beschreibung</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>fr</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Description SEO</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="seodescription.hint">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>frontend:pluginconfig</sv:value>
- </sv:property>
- <sv:property sv:multiple="true" sv:name="jcr:mixinTypes"
sv:type="Name">
- <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>en</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Text to be used in the meta description
tag</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>nl</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Tekst die in de meta-description tag gebruikt
dient te worden</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>de</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Text für Tag 'meta-description'</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>fr</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Texte à utiliser dans la balise
"meta-description"</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="seotitle.hint">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>frontend:pluginconfig</sv:value>
- </sv:property>
- <sv:property sv:multiple="true" sv:name="jcr:mixinTypes"
sv:type="Name">
- <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>en</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Text to be used in the title tag</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>nl</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Tekst die in de title tag gebruikt dient te
worden</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>de</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Text für Tag 'title'</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>fr</sv:value>
- </sv:property>
- <sv:property sv:name="hippo:message" sv:type="String">
- <sv:value>Texte à utiliser dans la balise "title"</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
- </sv:node>
<sv:node sv:name="root">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>frontend:plugin</sv:value>
@@ -415,9 +143,6 @@
<sv:property sv:name="field" sv:type="String">
<sv:value>seotitle</sv:value>
</sv:property>
- <sv:property sv:name="hint" sv:type="String">
- <sv:value>seotitle.hint</sv:value>
- </sv:property>
<sv:property sv:name="plugin.class" sv:type="String">
<sv:value>org.hippoecm.frontend.editor.plugins.field.PropertyFieldPlugin</sv:value>
</sv:property>
@@ -440,9 +165,6 @@
<sv:property sv:name="field" sv:type="String">
<sv:value>seodescription</sv:value>
</sv:property>
- <sv:property sv:name="hint" sv:type="String">
- <sv:value>seodescription.hint</sv:value>
- </sv:property>
<sv:property sv:name="plugin.class" sv:type="String">
<sv:value>org.hippoecm.frontend.editor.plugins.field.PropertyFieldPlugin</sv:value>
</sv:property>
=====================================
repository/src/main/resources/type-translations.json
=====================================
--- /dev/null
+++ b/repository/src/main/resources/type-translations.json
@@ -0,0 +1,20 @@
+{
+ "hippo:types" : {
+ "seosupport:seo" : {
+ "en" : {
+ "jcr:name" : "SEO",
+ "seosupport:seotitle" : "SEO Title",
+ "seosupport:seodescription" : "SEO Description",
+ "seosupport:seotitle#hint" : "Text to be used in the title tag",
+ "seosupport:seodescription#hint" : "Text to be used in the meta
description tag"
+ },
+ "nl" : {
+ "jcr:name" : "SEO",
+ "seosupport:seotitle" : "SEO Titel",
+ "seosupport:seodescription" : "SEO beschrijving",
+ "seosupport:seotitle#hint" : "Tekst die in de title tag gebruikt dient
te worden",
+ "seosupport:seodescription#hint" : "Tekst die in de meta description
tag gebruikt dient te worden"
+ }
+ }
+ }
+}
\ No newline at end of file
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-seo-support/compare/de1bbea39ab452531aa418995a61c5d001697fcf...1a667c880531c019017167b6566a4302cf8a608d
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
