Merge pull request #5 from obisconcept/master

Some labels formated wrong on Windows
obisconcept · Oct 5, 2016 · b159fbe · b159fbe
2 parents 9c20dff + 23a2693
commit b159fbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Resources/Private/Templates/Form/Partials/Form/Navigation.html b/Resources/Private/Templates/Form/Partials/Form/Navigation.html
@@ -6,7 +6,7 @@
 					<f:form.button name="__currentPage" value="{form.nextPage.index}" class="{form.renderingOptions.formNextButtonClassAttribute}">
 						<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:format.raw>{f:translate(id: 'form.nextButton', source: '{form.renderingOptions.translationSource}', package: '{form.renderingOptions.translationPackage}', value: '{form.renderingOptions.nextButtonLabel}')}</f:format.raw>
 							</f:then>
 							<f:else>
 								Next
@@ -20,7 +20,7 @@
 					<f:form.button name="__currentPage" value="{form.pages -> f:count()}" class="{form.renderingOptions.formSubmitButtonClassAttribute}">
 						<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:format.raw>{f:translate(id: 'form.submitButton', source: '{form.renderingOptions.translationSource}', package: '{form.renderingOptions.translationPackage}', value: '{form.renderingOptions.submitButtonLabel}')}</f:format.raw>
 							</f:then>
 							<f:else>
 								Submit
@@ -35,7 +35,7 @@
 				<f:form.button name="__currentPage" value="{form.previousPage.index}" formnovalidate="formnovalidate" class="{form.renderingOptions.formPrevButtonClassAttribute}">
 					<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:format.raw>{f:translate(id: 'form.prevButton', source: '{form.renderingOptions.translationSource}', package: '{form.renderingOptions.translationPackage}', value: '{form.renderingOptions.prevButtonLabel}')}</f:format.raw>
 						</f:then>
 						<f:else>
 							Previous

diff --git a/Resources/Private/Templates/Form/StaticText.html b/Resources/Private/Templates/Form/StaticText.html
@@ -1,4 +1,4 @@
 <f:if condition="{element.label}">
 	<h2>{element.label}</h2>
 </f:if>
-<p{f:if(condition: element.properties.elementClassAttribute, then: ' class="{element.properties.elementClassAttribute}"')}>{element.properties.text -> f:format.nl2br()}</p>
+<p{f:if(condition: element.properties.elementClassAttribute, then: ' class="{element.properties.elementClassAttribute}"')}><f:format.raw>{element.properties.text -> f:format.nl2br()}</f:format.raw></p>