correct translation placeholders

Resources/translations/messages.en.yaml

@@ -15,30 +15,30 @@ Compliance: null
 '(POLICY NOT FOUND!)': null
 'Legal notice': null
 Close: null
-'Enter your text by overriding the <em>%s</em> template file.': null
+'Enter your text by overriding the <em>%s%</em> template file.': null
 'Site policies': null
-'%s accepted': null
-'%s not accepted.': null
-'''%s accepted.': null
+'%s% accepted': null
+'%s% not accepted.': null
+'''%s% accepted.': null
 'Minimum age': null
-'Confirmed minimum age requirement (%s years of age) met.': null
+'Confirmed minimum age requirement (%s% years of age) met.': null
 'Minimum age requirement not confirmed.': null
-'%s accepted.': null
+'%s% accepted.': null
 'Policy not accepted.': null
 Accepted.: null
 'Not accepted.': null
-'Trade conditions for %s': null
-'Cancellation right policy for %s': null
+'Trade conditions for %s%': null
+'Cancellation right policy for %s%': null
 'Policy not available': null
 'The selected policy is not available.': null
-'Privacy policy for %s': null
-'Terms of use for %s': null
+'Privacy policy for %s%': null
+'Terms of use for %s%': null
 'In order to log in you must accept this site\''s policies. If you have accepted the site\''s policies in the past, then they have been updated and we ask that you review the changes.': null
 'If you leave this page without successfully accepting the policies, then you will not be logged in.': null
 Cancel: null
 'Cancel and logout': null
-'Accessibility statement for %s': null
-'Legal notice for %s': null
+'Accessibility statement for %s%': null
+'Legal notice for %s%': null
 'Check this box to indicate your acceptance of this site''s policies.': null
 Policies: null
 'Notice: This setting resets the acceptance of the site policies for all users in this group. Next time they want to log-in, they will have to acknowledge their acceptance of them again, and will not be able to log-in if they do not. This action does not affect the main administrator account. You can perform the same operation for individual users by visiting the Users manager in the site admin panel.': null

Resources/translations/zikulalegalmodule.en.yaml

@@ -1,7 +1,7 @@
 'Please click on the following links to read the corresponding documents.': null
 'Terms of use': null
 'Privacy policy': null
-'You need to be %s years of age or older, in accordance with our minimum age requirement.': null
+'You need to be %s% years of age or older, in accordance with our minimum age requirement.': null
 'General terms and conditions of trade': null
 'Cancellation right policy': null
 'Site policies': null

Resources/views/Include/acceptPolicies.html.twig

@@ -19,7 +19,7 @@
             <li><a class="policy-link" data-toggle="modal" data-target="#modal-privacy-policy" href="{{ policyUrl }}">{{ policyName }}</a></li>
         {% endif %}
         {% if activePolicies.agePolicy|default and not acceptedPolicies.agePolicy|default %}
-            <li>{% trans with { '%s': getModVar(constant('Zikula\\LegalModule\\Constant::MODNAME'), constant('Zikula\\LegalModule\\Constant::MODVAR_MINIMUM_AGE'), 13) } from 'zikulalegalmodule' %}You need to be %s years of age or older, in accordance with our minimum age requirement.{% endtrans %}</li>
+            <li>{% trans with { '%s%': getModVar(constant('Zikula\\LegalModule\\Constant::MODNAME'), constant('Zikula\\LegalModule\\Constant::MODVAR_MINIMUM_AGE'), 13) } from 'zikulalegalmodule' %}You need to be %s% years of age or older, in accordance with our minimum age requirement.{% endtrans %}</li>
         {% endif %}
         {% if activePolicies.tradeConditions|default and not acceptedPolicies.tradeConditions|default %}
             {% set policyUrl = getModVar(constant('Zikula\\LegalModule\\Constant::MODNAME'), constant('Zikula\\LegalModule\\Constant::MODVAR_TRADECONDITIONS_URL')) %}

Resources/views/User/accessibilityStatement.html.twig

@@ -1,2 +1,2 @@
-{{ moduleHeader('user', 'Accessibility statement for %s'|trans({ '%s': pagevars.title }), '', true, true) }}
+{{ moduleHeader('user', 'Accessibility statement for %s%'|trans({ '%s%': pagevars.title }), '', true, true) }}
 {{ include('@ZikulaLegalModule/' ~ app.request.locale ~ '/accessibilityStatement.html.twig') }}

Resources/views/User/cancellationRightPolicy.html.twig

@@ -1,2 +1,2 @@
-{{ moduleHeader('user', 'Cancellation right policy for %s'|trans({ '%s': pagevars.title }), '', true, true) }}
+{{ moduleHeader('user', 'Cancellation right policy for %s%'|trans({ '%s%': pagevars.title }), '', true, true) }}
 {{ include('@ZikulaLegalModule/' ~ app.request.locale ~ '/cancellationRightPolicy.html.twig') }}

Resources/views/User/legalNotice.html.twig

@@ -1,2 +1,2 @@
-{{ moduleHeader('user', 'Legal notice for %s'|trans({ '%s': pagevars.title }), '', true, true) }}
+{{ moduleHeader('user', 'Legal notice for %s%'|trans({ '%s%': pagevars.title }), '', true, true) }}
 {{ include('@ZikulaLegalModule/' ~ app.request.locale ~ '/legalNotice.html.twig') }}

Resources/views/User/privacyPolicy.html.twig

@@ -1,2 +1,2 @@
-{{ moduleHeader('user', 'Privacy policy for %s'|trans({ '%s': pagevars.title }), '', true, true) }}
+{{ moduleHeader('user', 'Privacy policy for %s%'|trans({ '%s%': pagevars.title }), '', true, true) }}
 {{ include('@ZikulaLegalModule/' ~ app.request.locale ~ '/privacyPolicy.html.twig') }}

Resources/views/User/termsOfUse.html.twig

@@ -1,2 +1,2 @@
-{{ moduleHeader('user', 'Terms of use for %s'|trans({ '%s': pagevars.title }), '', true, true) }}
+{{ moduleHeader('user', 'Terms of use for %s%'|trans({ '%s%': pagevars.title }), '', true, true) }}
 {{ include('@ZikulaLegalModule/' ~ app.request.locale ~ '/termsOfUse.html.twig') }}

Resources/views/User/tradeConditions.html.twig

@@ -1,2 +1,2 @@
-{{ moduleHeader('user', 'Trade conditions for %s'|trans({ '%s': pagevars.title }), '', true, true) }}
+{{ moduleHeader('user', 'Trade conditions for %s%'|trans({ '%s%': pagevars.title }), '', true, true) }}
 {{ include('@ZikulaLegalModule/' ~ app.request.locale ~ '/tradeConditions.html.twig') }}

Resources/views/UsersUI/edit.html.twig

@@ -16,7 +16,7 @@
             {% if editablePolicies.termsOfUse %}
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_termsofuse_yes" name="acceptedpolicies_termsofuse" required="required"{% if acceptedPolicies.termsOfUse %} checked="checked"{% endif %} value="1" class="custom-control-input" />
-                    <label for="acceptpolicies_termsofuse_yes">{{ '%s accepted.'|trans({ '%s': policyLink })|safeHtml }}</label>
+                    <label for="acceptpolicies_termsofuse_yes">{{ '%s% accepted.'|trans({ '%s%': policyLink })|safeHtml }}</label>
                 </div>
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_termsofuse_no" name="acceptedpolicies_termsofuse" required="required"{% if not acceptedPolicies.termsOfUse %} checked="checked"{% endif %} value="0" class="custom-control-input" />
@@ -44,7 +44,7 @@
             {% if editablePolicies.privacyPolicy %}
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_privacypolicy_yes" name="acceptedpolicies_privacypolicy" required="required"{% if acceptedPolicies.privacyPolicy %} checked="checked"{% endif %} value="1" class="custom-control-input" />
-                    <label class="custom-control-label" for="acceptpolicies_privacypolicy_yes">{{ '%s accepted.'|trans({ '%s': policyLink })|safeHtml }}</label>
+                    <label class="custom-control-label" for="acceptpolicies_privacypolicy_yes">{{ '%s% accepted.'|trans({ '%s%': policyLink })|safeHtml }}</label>
                 </div>
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_privacypolicy_no" name="acceptedpolicies_privacypolicy" required="required"{% if not acceptedPolicies.privacyPolicy %} checked="checked"{% endif %} value="0" class="custom-control-input" />
@@ -66,7 +66,7 @@
             {% if editablePolicies.agePolicy %}
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_agepolicy_yes" name="acceptedpolicies_agepolicy" required="required"{% if acceptedPolicies.agePolicy %} checked="checked"{% endif %} value="1" class="custom-control-input" />
-                    <label class="custom-control-label" for="acceptpolicies_agepolicy_yes">{% trans with { '%s': getModVar(constant('Zikula\\LegalModule\\Constant::MODNAME'), constant('Zikula\\LegalModule\\Constant::MODVAR_MINIMUM_AGE'), 13) } %}Confirmed minimum age requirement (%s years of age) met.{% endtrans %}</label>
+                    <label class="custom-control-label" for="acceptpolicies_agepolicy_yes">{% trans with { '%s%': getModVar(constant('Zikula\\LegalModule\\Constant::MODNAME'), constant('Zikula\\LegalModule\\Constant::MODVAR_MINIMUM_AGE'), 13) } %}Confirmed minimum age requirement (%s% years of age) met.{% endtrans %}</label>
                 </div>
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_agepolicy_no" name="acceptedpolicies_agepolicy" required="required"{% if not acceptedPolicies.agePolicy %} checked="checked"{% endif %} value="0" class="custom-control-input" />
@@ -76,7 +76,7 @@
                     {{ fieldErrors.agepolicy|default }}
                 </p>
             {% else %}
-                <span class="form-control-static">{{ acceptedPolicies.agePolicy ? 'Confirmed minimum age requirement (%s years of age) met.'|trans({ '%s': getModVar(constant('Zikula\\LegalModule\\Constant::MODNAME'), constant('Zikula\\LegalModule\\Constant::MODVAR_MINIMUM_AGE'), 13) }) : 'Minimum age requirement not confirmed.'|trans }}</span>
+                <span class="form-control-static">{{ acceptedPolicies.agePolicy ? 'Confirmed minimum age requirement (%s% years of age) met.'|trans({ '%s%': getModVar(constant('Zikula\\LegalModule\\Constant::MODNAME'), constant('Zikula\\LegalModule\\Constant::MODVAR_MINIMUM_AGE'), 13) }) : 'Minimum age requirement not confirmed.'|trans }}</span>
             {% endif %}
             </div>
         </div>
@@ -94,7 +94,7 @@
             {% if editablePolicies.tradeConditions %}
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_tradeconditions_yes" name="acceptedpolicies_tradeconditions" required="required"{% if acceptedPolicies.tradeConditions %} checked="checked"{% endif %} value="1" class="custom-control-input" />
-                    <label class="custom-control-label" for="acceptpolicies_tradeconditions_yes">{{ '%s accepted.'|trans({ '%s': policyLink })|safeHtml }}</label>
+                    <label class="custom-control-label" for="acceptpolicies_tradeconditions_yes">{{ '%s% accepted.'|trans({ '%s%': policyLink })|safeHtml }}</label>
                 </div>
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_tradeconditions_no" name="acceptedpolicies_tradeconditions" required="required"{% if not acceptedPolicies.tradeConditions %} checked="checked"{% endif %} value="0" class="custom-control-input" />
@@ -122,7 +122,7 @@
             {% if editablePolicies.cancellationRightPolicy %}
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_cancellationrightpolicy_yes" name="acceptedpolicies_cancellationrightpolicy" required="required"{% if acceptedPolicies.cancellationRightPolicy %} checked="checked"{% endif %} value="1" class="custom-control-input" />
-                    <label class="custom-control-label" for="acceptpolicies_cancellationrightpolicy_yes">{{ '%s accepted.'|trans({ '%s': policyLink })|safeHtml }}</label>
+                    <label class="custom-control-label" for="acceptpolicies_cancellationrightpolicy_yes">{{ '%s% accepted.'|trans({ '%s%': policyLink })|safeHtml }}</label>
                 </div>
                 <div class="custom-control custom-radio">
                     <input type="radio" id="acceptpolicies_cancellationrightpolicy_no" name="acceptedpolicies_cancellationrightpolicy" required="required"{% if not acceptedPolicies.cancellationRightPolicy %} checked="checked"{% endif %} value="0" class="custom-control-input" />

Resources/views/UsersUI/view.html.twig

@@ -10,7 +10,7 @@
         <div class="form-group row">
             <label class="col-md-3 col-form-label">{{ policyName ~ ':' }}</label>
             <div class="col-md-9">
-                <span class="form-control-plaintext">{% if acceptedPolicies.termsOfUse %}{% trans with { '%s': policyLink|raw } %}%s accepted{% endtrans %}{% else %}{% trans with { '%s': policyLink|raw } %}%s not accepted.{% endtrans %}{% endif %}</span>
+                <span class="form-control-plaintext">{% if acceptedPolicies.termsOfUse %}{% trans with { '%s%': policyLink|raw } %}%s% accepted{% endtrans %}{% else %}{% trans with { '%s%': policyLink|raw } %}%s% not accepted.{% endtrans %}{% endif %}</span>
             </div>
         </div>
     {% endif %}
@@ -24,15 +24,15 @@
         <div class="form-group">
             <label class="col-md-3 col-form-label">{{ policyName ~ ':' }}</label>
             <div class="col-md-9">
-                <span class="form-control-plaintext">{% if acceptedPolicies.privacyPolicy %}{% trans with { '%s': policyLink|raw } %}'%s accepted.{% endtrans %}{% else %}{% trans with { '%s': policyLink|raw } %}%s not accepted.{% endtrans %}{% endif %}</span>
+                <span class="form-control-plaintext">{% if acceptedPolicies.privacyPolicy %}{% trans with { '%s%': policyLink|raw } %}'%s% accepted.{% endtrans %}{% else %}{% trans with { '%s%': policyLink|raw } %}%s% not accepted.{% endtrans %}{% endif %}</span>
             </div>
         </div>
     {% endif %}
     {% if activePolicies.agePolicy and viewablePolicies.agePolicy %}
         <div class="form-group">
             <label class="col-md-3 col-form-label">{% trans %}Minimum age{% endtrans %}</label>
             <div class="col-md-9">
-                <span class="form-control-plaintext">{% if acceptedPolicies.agePolicy %}{% trans with { '%s': getModVar(constant('Zikula\\LegalModule\\Constant::MODNAME'), constant('Zikula\\LegalModule\\Constant::MODVAR_MINIMUM_AGE'), 13) } %}Confirmed minimum age requirement (%s years of age) met.{% endtrans %}{% else %}{% trans %}Minimum age requirement not confirmed.{% endtrans %}{% endif %}</span>
+                <span class="form-control-plaintext">{% if acceptedPolicies.agePolicy %}{% trans with { '%s%': getModVar(constant('Zikula\\LegalModule\\Constant::MODNAME'), constant('Zikula\\LegalModule\\Constant::MODVAR_MINIMUM_AGE'), 13) } %}Confirmed minimum age requirement (%s% years of age) met.{% endtrans %}{% else %}{% trans %}Minimum age requirement not confirmed.{% endtrans %}{% endif %}</span>
             </div>
         </div>
     {% endif %}
@@ -46,7 +46,7 @@
         <div class="form-group">
             <label class="col-md-3 col-form-label">{{ policyName ~ ':' }}</label>
             <div class="col-md-9">
-                <span class="form-control-plaintext">{% if acceptedPolicies.tradeConditions %}{% trans with { '%s': policyLink|raw } %}%s accepted.{% endtrans %}{% else %}{% trans with { '%s': policyLink|raw } %}%s not accepted.{% endtrans %}{% endif %}</span>
+                <span class="form-control-plaintext">{% if acceptedPolicies.tradeConditions %}{% trans with { '%s%': policyLink|raw } %}%s% accepted.{% endtrans %}{% else %}{% trans with { '%s%': policyLink|raw } %}%s% not accepted.{% endtrans %}{% endif %}</span>
             </div>
         </div>
     {% endif %}
@@ -60,7 +60,7 @@
         <div class="form-group">
             <label class="col-md-3 col-form-label">{{ policyName ~ ':' }}</label>
             <div class="col-md-9">
-                <span class="form-control-plaintext">{% if acceptedPolicies.cancellationRightPolicy %}{% trans with { '%s': policyLink|raw } %}%s accepted.{% endtrans %}{% else %}{% trans with { '%s': policyLink|raw } %}%s not accepted.{% endtrans %}{% endif %}</span>
+                <span class="form-control-plaintext">{% if acceptedPolicies.cancellationRightPolicy %}{% trans with { '%s%': policyLink|raw } %}%s% accepted.{% endtrans %}{% else %}{% trans with { '%s%': policyLink|raw } %}%s% not accepted.{% endtrans %}{% endif %}</span>
             </div>
         </div>
     {% endif %}

Resources/views/en/cancellationRightPolicy.html.twig

@@ -1 +1 @@
-<p>{{ 'Enter your text by overriding the <em>%s</em> template file.'|trans({ '%s': 'modules/zikula/legal-module/Resources/views/en/cancellationRightPolicy.html.twig' })|raw }}</p>
+<p>{{ 'Enter your text by overriding the <em>%s%</em> template file.'|trans({ '%s%': 'modules/zikula/legal-module/Resources/views/en/cancellationRightPolicy.html.twig' })|raw }}</p>

Resources/views/en/legalNotice.html.twig

@@ -1 +1 @@
-<p>{{ 'Enter your text by overriding the <em>%s</em> template file.'|trans({ '%s': 'modules/zikula/legal-module/Resources/views/en/legalNotice.html.twig' })|raw }}</p>
+<p>{{ 'Enter your text by overriding the <em>%s%</em> template file.'|trans({ '%s%': 'modules/zikula/legal-module/Resources/views/en/legalNotice.html.twig' })|raw }}</p>

Resources/views/en/tradeConditions.html.twig

@@ -1 +1 @@
-<p>{{ 'Enter your text by overriding the <em>%s</em> template file.'|trans({ '%s': 'modules/zikula/legal-module/Resources/views/en/tradeConditions.html.twig' })|raw }}</p>
+<p>{{ 'Enter your text by overriding the <em>%s%</em> template file.'|trans({ '%s%': 'modules/zikula/legal-module/Resources/views/en/tradeConditions.html.twig' })|raw }}</p>