Merge pull request #26 from gerhard-boden/retrieve-language-dimension…

…-from-settings FEATURE: Retrieve active language dimension from TYPO3CR settings
neos · Jan 26, 2018 · d9e665c · d9e665c
2 parents 331fadb + b151d24
commit d9e665c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/Documentation/index.rst b/Documentation/index.rst
@@ -88,9 +88,12 @@ example the rendered tags for the homepage would be.
 According to the following dimension settings, there would be a lot more tags expected. However only two variants of the
 homepage exists, thus only `en_US` and its fallback `en_UK` are rendered.
 
+In case the dimension that contains the language is not named `language` you have to set the alternative name with the
+property `ContentRepository.dimensionTypes.language`.
+
 ::
 
-  TYPO3CR:
+  ContentRepository:
     contentDimensions:
       'language':
         label: 'Language'
@@ -127,3 +130,5 @@ homepage exists, thus only `en_US` and its fallback `en_UK` are rendered.
             label: 'Latvian'
             values: ['lv']
             uriSegment: 'lv'
+    dimensionTypes:
+      language: 'language'
diff --git a/Resources/Private/Fusion/Root.fusion b/Resources/Private/Fusion/Root.fusion
@@ -3,10 +3,12 @@
 # so Neos.Seo extends this default object
 #
 prototype(Neos.Neos:Page) {
+	@context.languageDimension = ${Configuration.setting('Neos.ContentRepository.dimensionTypes.language') != null ? Configuration.setting('Neos.ContentRepository.dimensionTypes.language') : 'language'}
+
 	htmlTag {
 		attributes {
-			lang = ${String.replace(documentNode.context.dimensions.language[0], '_', '-')}
-			[email protected] = ${Configuration.setting('Neos.ContentRepository.contentDimensions.language') != null}
+			lang = ${String.replace(documentNode.context.dimensions[languageDimension][0], '_', '-')}
+			[email protected] = ${Configuration.setting('Neos.ContentRepository.contentDimensions.' + languageDimension) != null}
 			[email protected] = ${node.context.workspace.name == 'live'}
 		}
 	}
@@ -65,12 +67,12 @@ prototype(Neos.Neos:Page) {
 		}
 
 		alternateLanguageLinks = Neos.Neos:DimensionMenu {
-			@if.languageDimensionExists = ${Configuration.setting('Neos.ContentRepository.contentDimensions.language') != null}
+			@if.languageDimensionExists = ${Configuration.setting('Neos.ContentRepository.contentDimensions.' + languageDimension) != null}
 			@if.onlyRenderWhenInLiveWorkspace = ${node.context.workspace.name == 'live'}
 
-			localeToLanguage = ${String.replace((item.preset ? item.preset.values[0] : item.dimensions[dimension][0]), '_', '-')}
+			localeToLanguage = ${String.replace((item.preset ? item.preset.values[0] : item.dimensions[languageDimension][0]), '_', '-')}
 
-			dimension = 'language'
+			dimension = ${languageDimension}
 			templatePath = 'resource://Neos.Seo/Private/Templates/FusionObjects/AlternateLanguageLinks.html'
 		}
 

diff --git a/Resources/Private/Templates/FusionObjects/AlternateLanguageLinks.html b/Resources/Private/Templates/FusionObjects/AlternateLanguageLinks.html
@@ -1,4 +1,4 @@
 {namespace neos=Neos\Neos\ViewHelpers}
 {namespace ts=Neos\Fusion\ViewHelpers}
 <f:for each="{items}" as="item"><f:if condition="{item.node}">
-<link rel="alternate" hreflang="{ts:render(path: 'localeToLanguage', context: {item: item, dimension: dimension})}" href="{neos:uri.node(node : item.node, absolute: true)}"/></f:if></f:for>
+<link rel="alternate" hreflang="{ts:render(path: 'localeToLanguage', context: {item: item})}" href="{neos:uri.node(node : item.node, absolute: true)}"/></f:if></f:for>