Merge pull request #4 from obisconcept/master

Additional translation features
obisconcept · Sep 29, 2016 · 9c20dff · 9c20dff
2 parents e70edb6 + 9a28695
commit 9c20dff
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 17 deletions.
diff --git a/Classes/ObisConcept/NeosBootstrapForm/FormElements/GoogleCaptcha.php b/Classes/ObisConcept/NeosBootstrapForm/FormElements/GoogleCaptcha.php
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -16,6 +16,7 @@ TYPO3:
               partialPathPattern: 'resource://ObisConcept.NeosBootstrapForm/Private/Templates/Form/Partials/{@type}.html'
               layoutPathPattern: 'resource://ObisConcept.NeosBootstrapForm/Private/Templates/Form/Layouts/{@type}.html'
               translationPackage: 'ObisConcept.NeosBootstrapForm'
+              translationSource: 'Form'
           'TYPO3.Form:Form':
             renderingOptions:
               formClassAttribute: 'form-horizontal'
@@ -24,19 +25,19 @@ TYPO3:
               formSubmitButtonClassAttribute: 'btn btn-primary'
               containerClassAttribute: 'pull-left'
               actionClassAttribute: 'col-sm-10 col-sm-offset-2'
-          'TYPO3.Form:Page':
-            renderingOptions:
-              pageClassAttribute: ''
-          'TYPO3.Form:Section':
-            properties:
-              sectionClassAttribute: 'col-xs-12'
           'TYPO3.Form:FormElement':
             properties:
               labelClassAttribute: 'col-sm-2 control-label'
               containerClassAttribute: 'form-group'
               containerInnerClassAttribute: 'col-sm-10'
               elementClassAttribute: 'form-control'
               elementErrorClassAttribute: 'has-error'
+          'TYPO3.Form:Page':
+            renderingOptions:
+              pageClassAttribute: 'col-xs-12'
+          'TYPO3.Form:Section':
+            properties:
+              sectionClassAttribute: 'col-xs-12'
           'TYPO3.Form:MultiLineText':
             properties:
               elementClassAttribute: 'form-control'

diff --git a/Resources/Private/Templates/Form/Layouts/Field.html b/Resources/Private/Templates/Form/Layouts/Field.html
@@ -2,7 +2,7 @@
 
 <f:form.validationResults for="{element.identifier}">
 	<div class="{element.properties.containerClassAttribute} {f:if(condition: validationResults.flattenedErrors, then: element.properties.elementErrorClassAttribute)}"<f:if condition="{element.rootForm.renderingOptions.previewMode}"> data-element="{form:form.formElementRootlinePath(renderable:element)}"</f:if>>
-		<label class="{element.properties.labelClassAttribute}" for="{element.uniqueIdentifier}"><f:translate id="form.label.{element.identifier}" source="Main" package="MuellerPlastik.MainWebsite" value="{element.label -> f:format.nl2br()}" /><f:if condition="{element.required}"><f:render partial="ObisConcept.BootstrapForm:Field/Required" /></f:if></label>
+		<label class="{element.properties.labelClassAttribute}" for="{element.uniqueIdentifier}"><f:translate id="form.label.{element.identifier}" source="{element.renderingOptions.translationSource}" package="{element.renderingOptions.translationPackage}" value="{element.label -> f:format.nl2br()}" /><f:if condition="{element.required}"><f:render partial="ObisConcept.BootstrapForm:Field/Required" /></f:if></label>
 		<div class="{element.properties.containerInnerClassAttribute}">
 			<f:render section="field" />
 			<f:if condition="{validationResults.flattenedErrors}">

diff --git a/Resources/Private/Templates/Form/MultiLineText.html b/Resources/Private/Templates/Form/MultiLineText.html
@@ -1,4 +1,4 @@
 <f:layout name="TYPO3.Form:Field" />
 <f:section name="field">
-	<f:form.textarea property="{element.identifier}" id="{element.uniqueIdentifier}" class="{element.properties.elementClassAttribute}" additionalAttributes="{placeholder: element.properties.placeholder, required: element.required}" rows="{element.properties.rows}" cols="{element.properties.cols}" errorClass="{element.properties.elementErrorClassAttribute}" />
+	<f:form.textarea property="{element.identifier}" id="{element.uniqueIdentifier}" class="{element.properties.elementClassAttribute}" additionalAttributes="{required: element.required}" rows="{element.properties.rows}" cols="{element.properties.cols}" errorClass="{element.properties.elementErrorClassAttribute}" placeholder="{f:translate(id: 'form.placeholder.{element.identifier}', source: '{element.renderingOptions.translationSource}', package: '{element.renderingOptions.translationPackage}', value: '{element.properties.placeholder}')}" />
 </f:section>
diff --git a/Resources/Private/Templates/Form/Page.html b/Resources/Private/Templates/Form/Page.html
@@ -2,9 +2,11 @@
 
 <fieldset {f:if(condition: page.renderingOptions.pageClassAttribute, then: ' class="{page.renderingOptions.pageClassAttribute}"')}>
 	<f:if condition="{page.label}">
-		<legend>{page.label}</legend>
+		<legend>{f:translate(id: 'form.page.{page.identifier}', source: '{page.renderingOptions.translationSource}', package: '{page.renderingOptions.translationPackage}', value: '{page.label}')}</legend>
 	</f:if>
-	<f:for each="{page.elements}" as="element">
-		<form:renderRenderable renderable="{element}" />
-	</f:for>
+	<div class="row">
+		<f:for each="{page.elements}" as="element">
+			<form:renderRenderable renderable="{element}" />
+		</f:for>
+	</div>
 </fieldset>
diff --git a/Resources/Private/Templates/Form/Partials/Form/Navigation.html b/Resources/Private/Templates/Form/Partials/Form/Navigation.html
@@ -4,22 +4,43 @@
 			<f:then>
 				<li class="next" style="float: right;">
 					<f:form.button name="__currentPage" value="{form.nextPage.index}" class="{form.renderingOptions.formNextButtonClassAttribute}">
-						{f:if(condition:form.renderingOptions.nextButtonLabel, then:form.renderingOptions.nextButtonLabel, else: 'Next')}
+						<f:if condition="{form.renderingOptions.nextButtonLabel}">
+							<f:then>
+								{f:translate(id: 'form.nextButton', source: '{form.renderingOptions.translationSource}', package: '{form.renderingOptions.translationPackage}', value: '{form.renderingOptions.nextButtonLabel}')}
+							</f:then>
+							<f:else>
+								Next
+							</f:else>
+						</f:if>
 					</f:form.button>
 				</li>
 			</f:then>
 			<f:else>
 				<li class="next submit" style="float: right;">
 					<f:form.button name="__currentPage" value="{form.pages -> f:count()}" class="{form.renderingOptions.formSubmitButtonClassAttribute}">
-						{f:if(condition:form.renderingOptions.submitButtonLabel, then:form.renderingOptions.submitButtonLabel, else: 'Submit')}
+						<f:if condition="{form.renderingOptions.submitButtonLabel}">
+							<f:then>
+								{f:translate(id: 'form.submitButton', source: '{form.renderingOptions.translationSource}', package: '{form.renderingOptions.translationPackage}', value: '{form.renderingOptions.submitButtonLabel}')}
+							</f:then>
+							<f:else>
+								Submit
+							</f:else>
+						</f:if>
 					</f:form.button>
 				</li>
 			</f:else>
 		</f:if>
 		<f:if condition="{form.previousPage}">
 			<li class="previous">
 				<f:form.button name="__currentPage" value="{form.previousPage.index}" formnovalidate="formnovalidate" class="{form.renderingOptions.formPrevButtonClassAttribute}">
-					{f:if(condition:form.renderingOptions.prevButtonLabel, then:form.renderingOptions.prevButtonLabel, else: 'Previous')}
+					<f:if condition="{form.renderingOptions.prevButtonLabel}">
+						<f:then>
+							{f:translate(id: 'form.prevButton', source: '{form.renderingOptions.translationSource}', package: '{form.renderingOptions.translationPackage}', value: '{form.renderingOptions.prevButtonLabel}')}
+						</f:then>
+						<f:else>
+							Previous
+						</f:else>
+					</f:if>
 				</f:form.button>
 			</li>
 		</f:if>

diff --git a/Resources/Private/Templates/Form/Section.html b/Resources/Private/Templates/Form/Section.html
@@ -2,7 +2,7 @@
 
 <fieldset id="{section.uniqueIdentifier}"{f:if(condition: section.properties.sectionClassAttribute, then: ' class="{section.properties.sectionClassAttribute}"')}>
 	<f:if condition="{section.label}">
-		<legend>{section.label}</legend>
+		<legend>{f:translate(id: 'form.section.{section.identifier}', source: '{section.renderingOptions.translationSource}', package: '{section.renderingOptions.translationPackage}', value: '{section.label}')}</legend>
 	</f:if>
 	<f:for each="{section.elements}" as="element">
 		<form:renderRenderable renderable="{element}" />

diff --git a/Resources/Private/Templates/Form/SingleLineText.html b/Resources/Private/Templates/Form/SingleLineText.html
@@ -1,4 +1,4 @@
 <f:layout name="TYPO3.Form:Field" />
 <f:section name="field">
-	<f:form.textfield property="{element.identifier}" id="{element.uniqueIdentifier}" class="{element.properties.elementClassAttribute}" placeholder="{element.properties.placeholder}" required="{element.required}" />
+	<f:form.textfield property="{element.identifier}" id="{element.uniqueIdentifier}" class="{element.properties.elementClassAttribute}" placeholder="{f:translate(id: 'form.placeholder.{element.identifier}', source: '{element.renderingOptions.translationSource}', package: '{element.renderingOptions.translationPackage}', value: '{element.properties.placeholder}')}" required="{element.required}" />
 </f:section>
diff --git a/Resources/Private/Translations/de/Form.xlf b/Resources/Private/Translations/de/Form.xlf
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file original="" product-name="ObisConcept.BootstrapForm" source-language="en" datatype="plaintext" target-language="de">
+		<body></body>
+    </file>
+</xliff>
diff --git a/Resources/Private/Translations/en/Form.xlf b/Resources/Private/Translations/en/Form.xlf
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file original="" product-name="ObisConcept.BootstrapForm" source-language="en" datatype="plaintext">
+		<body></body>
+    </file>
+</xliff>
diff --git a/Resources/Private/TypoScript/ProtoTypes/Form.ts2 b/Resources/Private/TypoScript/ProtoTypes/Form.ts2
diff --git a/Resources/Private/TypoScript/ProtoTypes/Page.ts2 b/Resources/Private/TypoScript/ProtoTypes/Page.ts2
@@ -6,6 +6,10 @@ prototype(TYPO3.Neos:Page) {
             tagName = 'script'
             attributes {
                 src = 'https://www.google.com/recaptcha/api.js'
+                src.@process.setLang {
+                    expression = ${value + '?hl=' + documentNode.context.dimensions.language[0]}
+                    @if.languageDimensionExists = ${Configuration.setting('TYPO3.TYPO3CR.contentDimensions.language')
+                }
             }
         }
 

diff --git a/Resources/Private/TypoScript/Root.ts2 b/Resources/Private/TypoScript/Root.ts2