Merge pull request #18 from gerhard-boden/prevent-double-encoding-sta…

…tic-text-master BUGFIX: Prevent double encoding in remaining form elements
neos · Aug 7, 2017 · 1303948 · 1303948
2 parents f31529f + 9334bc4
commit 1303948
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 14 deletions.
diff --git a/Resources/Private/Form/MultipleSelectCheckboxes.html b/Resources/Private/Form/MultipleSelectCheckboxes.html
@@ -5,7 +5,7 @@
 			<li>
 				<label>
 					<f:form.checkbox property="{element.identifier}" multiple="1" class="{element.properties.elementClassAttribute}" value="{value}" errorClass="{element.properties.elementErrorClassAttribute}" />
-					<span>{label -> f:translate(id: 'forms.elements.{element.identifier}.options.{value}', package: '{element.renderingOptions.translationPackage}')}</span>
+					<span>{f:translate(id: 'forms.elements.{element.identifier}.options.{value}', package: '{element.renderingOptions.translationPackage}', value: label)}</span>
 				</label>
 			</li>
 		</f:for>

diff --git a/Resources/Private/Form/Page.html b/Resources/Private/Form/Page.html
@@ -1,7 +1,7 @@
 {namespace form=Neos\Form\ViewHelpers}
 <fieldset>
 	<f:if condition="{page.label}">
-		<legend>{page.label -> f:translate(id: 'forms.pages.{page.identifier}.label', package: '{page.renderingOptions.translationPackage}')}</legend>
+		<legend>{f:translate(id: 'forms.pages.{page.identifier}.label', package: '{page.renderingOptions.translationPackage}', value: page.label)}</legend>
 	</f:if>
 	<f:for each="{page.elements}" as="element">
 		<form:renderRenderable renderable="{element}" />

diff --git a/Resources/Private/Form/Partials/Form/Navigation.html b/Resources/Private/Form/Partials/Form/Navigation.html
@@ -16,7 +16,7 @@
 					<f:form.button name="__currentPage" value="{form.pages -> f:count()}" class="btn btn-primary">
 						<f:if condition="{form.renderingOptions.submitButtonLabel}">
 							<f:then>
-								{form.renderingOptions.submitButtonLabel -> f:translate(package: '{form.renderingOptions.translationPackage}')}
+								{f:translate(id: 'forms.navigation.submit', package: '{form.renderingOptions.translationPackage}', value: form.renderingOptions.submitButtonLabel)}
 							</f:then>
 							<f:else>
 								{f:translate(id: 'forms.navigation.submit', package: '{form.renderingOptions.translationPackage}', value: 'Submit')}
@@ -27,4 +27,4 @@
 			</f:else>
 		</f:if>
 	</ul>
-</nav>
+</nav>
diff --git a/Resources/Private/Form/Password.html b/Resources/Private/Form/Password.html
@@ -1,7 +1,8 @@
+{namespace form=Neos\Form\ViewHelpers}
 <f:layout name="Neos.Form:Field" />
 <f:section name="field">
 	<f:form.password property="{element.identifier}" id="{element.uniqueIdentifier}" class="{element.properties.elementClassAttribute}" errorClass="{element.properties.elementErrorClassAttribute}" />
 	<f:if condition="{element.properties.passwordDescription}">
-		<span class="help-block">{element.properties.passwordDescription -> f:translate(id: 'forms.elements.{element.identifier}.passwordDescription', package: '{element.renderingOptions.translationPackage}')}</span>
+		<span class="help-block">{element -> form:translateElementProperty(property: 'passwordDescription')}</span>
 	</f:if>
 </f:section>
diff --git a/Resources/Private/Form/PasswordWithConfirmation.html b/Resources/Private/Form/PasswordWithConfirmation.html
@@ -1,9 +1,10 @@
+{namespace form=Neos\Form\ViewHelpers}
 <f:layout name="Neos.Form:Field" />
 <f:section name="field">
 	<f:form.password property="{element.identifier}.password" id="{element.uniqueIdentifier}" class="{element.properties.elementClassAttribute}" errorClass="{element.properties.elementErrorClassAttribute}" />
 	<f:if condition="{element.properties.passwordDescription}">
-		<span class="help-block">{element.properties.passwordDescription -> f:translate(id: 'forms.elements.{element.identifier}.passwordDescription', package: '{element.renderingOptions.translationPackage}')}</span>
+		<span class="help-block">{element -> form:translateElementProperty(property: 'passwordDescription')}</span>
 	</f:if>
-	<label for="{element.uniqueIdentifier}-confirmation">{element.properties.confirmationLabel -> f:translate(id: 'forms.elements.{element.identifier}.confirmationLabel', package: '{element.renderingOptions.translationPackage}') -> f:format.nl2br()}<f:if condition="{element.required}"><f:render partial="Neos.Form:Field/Required" /></f:if></label>
+	<label for="{element.uniqueIdentifier}-confirmation">{element -> form:translateElementProperty(property: 'confirmationLabel') -> f:format.nl2br()}<f:if condition="{element.required}"><f:render partial="Neos.Form:Field/Required" /></f:if></label>
 	<f:form.password property="{element.identifier}.confirmation" id="{element.uniqueIdentifier}-confirmation" class="{element.properties.confirmationClassAttribute}" errorClass="{element.properties.elementErrorClassAttribute}" />
 </f:section>
diff --git a/Resources/Private/Form/PreviewPage.html b/Resources/Private/Form/PreviewPage.html
@@ -2,13 +2,13 @@
 {namespace media=Neos\Media\ViewHelpers}
 <fieldset>
 	<f:if condition="{page.label}">
-		<legend>{page.label -> f:translate(id: 'forms.pages.{page.identifier}.label', package: '{page.renderingOptions.translationPackage}')}</legend>
+		<legend>{f:translate(id: 'forms.pages.{page.identifier}.label', package: '{page.renderingOptions.translationPackage}', value: page.label)}</legend>
 	</f:if>
 	<output>
 		<table>
 			<tr>
-				<th style="width: 170px">Label</th>
-				<th>Value</th>
+				<th style="width: 170px">{f:translate(id: 'forms.pages.labelTitle', package: '{page.renderingOptions.translationPackage}', value: 'Label')}</th>
+				<th>{f:translate(id: 'forms.pages.valueTitle', package: '{page.renderingOptions.translationPackage}', value: 'Value')}</th>
 			</tr>
 			<form:renderValues renderable="{page.rootForm}">
 				<tr>

diff --git a/Resources/Private/Form/Section.html b/Resources/Private/Form/Section.html
@@ -1,7 +1,7 @@
 {namespace form=Neos\Form\ViewHelpers}
 <fieldset id="{section.uniqueIdentifier}"{f:if(condition: section.properties.elementClassAttribute, then: ' class="{section.properties.elementClassAttribute}"')}>
 	<f:if condition="{section.label}">
-		<legend>{section.label -> f:translate(id: 'forms.sections.{section.identifier}.label', package: '{section.renderingOptions.translationPackage}')}</legend>
+		<legend>{f:translate(id: 'forms.sections.{section.identifier}.label', 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/Form/SingleSelectRadiobuttons.html b/Resources/Private/Form/SingleSelectRadiobuttons.html
@@ -5,7 +5,7 @@
 			<li>
 				<label>
 					<f:form.radio property="{element.identifier}" class="{element.properties.elementClassAttribute}" value="{value}" errorClass="{element.properties.elementErrorClassAttribute}" />
-					<span>{label -> f:translate(id: 'forms.elements.{element.identifier}.options.{value}', package: '{element.renderingOptions.translationPackage}')}</span>
+					<span>{f:translate(id: 'forms.elements.{element.identifier}.options.{value}', package: '{element.renderingOptions.translationPackage}', value: label)}</span>
 				</label>
 			</li>
 		</f:for>

diff --git a/Resources/Private/Form/StaticText.html b/Resources/Private/Form/StaticText.html
@@ -1,6 +1,7 @@
+{namespace form=Neos\Form\ViewHelpers}
 <f:if condition="{element.label}">
-	<h2>{element.label -> f:translate(id: 'forms.elements.{element.identifier}.label', package: element.renderingOptions.translationPackage)}</h2>
+	<h2>{element -> form:translateElementProperty(property: 'label')}</h2>
 </f:if>
 <f:if condition="{element.properties.text}">
-	<p{f:if(condition: element.properties.elementClassAttribute, then: ' class="{element.properties.elementClassAttribute}"')}>{element.properties.text -> f:translate(id: 'forms.elements.{element.identifier}.text', package: '{element.renderingOptions.translationPackage}') -> f:format.nl2br()}</p>
+	<p{f:if(condition: element.properties.elementClassAttribute, then: ' class="{element.properties.elementClassAttribute}"')}>{element -> form:translateElementProperty(property: 'text') -> f:format.nl2br()}</p>
 </f:if>
diff --git a/Resources/Private/Translations/de/Main.xlf b/Resources/Private/Translations/de/Main.xlf
@@ -14,6 +14,14 @@
                 <source>Submit</source>
                 <target>Abschicken</target>
             </trans-unit>
+            <trans-unit id="forms.pages.labelTitle" xml:space="preserve">
+                <source>Label</source>
+                <target>Bezeichnung</target>
+            </trans-unit>
+            <trans-unit id="forms.pages.valueTitle" xml:space="preserve">
+                <source>Value</source>
+                <target>Wert</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/Private/Translations/en/Main.xlf b/Resources/Private/Translations/en/Main.xlf
@@ -11,6 +11,12 @@
             <trans-unit id="forms.navigation.submit" xml:space="preserve">
                 <source>Submit</source>
             </trans-unit>
+            <trans-unit id="forms.pages.labelTitle" xml:space="preserve">
+                <source>Label</source>
+            </trans-unit>
+            <trans-unit id="forms.pages.valueTitle" xml:space="preserve">
+                <source>Value</source>
+            </trans-unit>
         </body>
     </file>
 </xliff>