From 43460916e0df03e99cb273b3987d0d5d354e8abe Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebastian.castro@protonmail.com>
Date: Tue, 4 May 2021 17:59:28 +0200
Subject: [PATCH] i18n: some fixs
---
assets/js/element-form/geocode-address.js | 2 +-
.../custom-fields/form-builder.html.twig | 72 +++++++++----------
.../custom-fields/mapping-ontology.html.twig | 2 +-
translations/admin+intl-icu.fr.yaml | 2 +-
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/assets/js/element-form/geocode-address.js b/assets/js/element-form/geocode-address.js
index ee7f9b10e..2c3d5acae 100755
--- a/assets/js/element-form/geocode-address.js
+++ b/assets/js/element-form/geocode-address.js
@@ -104,7 +104,7 @@ function geocodeAddress(address) {
console.log("geocoding error", status);
} else {
- $('#geocode-error').textt('js.element_form.geocode_error', {address: address})).show()
+ $('#geocode-error').text(t('js.element_form.geocode_error', {address: address})).show()
}
$('#geocode-spinner-loader').hide();
diff --git a/templates/admin/core_custom/custom-fields/form-builder.html.twig b/templates/admin/core_custom/custom-fields/form-builder.html.twig
index 8d8d19db5..35bc5f2e9 100755
--- a/templates/admin/core_custom/custom-fields/form-builder.html.twig
+++ b/templates/admin/core_custom/custom-fields/form-builder.html.twig
@@ -15,22 +15,22 @@
var fbEditor = document.getElementById('form-builder-container');
var fields = [
- { label:t('js.form_builder.fields.title'), name: "title", attrs: { type: 'title' }, icon: '*' },
- { label:t('js.form_builder.fields.taxonomy'), name: "taxonomy", attrs: { type: 'taxonomy' }, icon: '*' },
- { label:t('js.form_builder.fields.address'), name: "address", attrs: { type: 'address' }, icon: '*' },
- { label:t('js.form_builder.fields.openhours'), name: "openhours", attrs: { type: 'openhours' }, icon: '⌚' },
- { label:t('js.form_builder.fields.separator'), name: "separator", attrs: { type: 'separator' }, icon: '⚊' },
- { label:t('js.form_builder.fields.checkbox'), name: "checkbox", attrs: { type: 'checkbox' }, icon: '☑' },
- { label:t('js.form_builder.fields.email'), name: "email", attrs: { type: 'email' }, icon: '@' },
- { label:t('js.form_builder.fields.images'), name: "images", attrs: { type: 'images' }, icon: '⇫' },
- { label:t('js.form_builder.fields.files'), name: "files", attrs: { type: 'files' }, icon: '⇫' },
- { label:t('js.form_builder.fields.elements'), name: "elements", attrs: { type: 'elements' }, icon: '*' }
+ { label: t('js.form_builder.fields.title'), name: "title", attrs: { type: 'title' }, icon: '*' },
+ { label: t('js.form_builder.fields.taxonomy'), name: "taxonomy", attrs: { type: 'taxonomy' }, icon: '*' },
+ { label: t('js.form_builder.fields.address'), name: "address", attrs: { type: 'address' }, icon: '*' },
+ { label: t('js.form_builder.fields.openhours'), name: "openhours", attrs: { type: 'openhours' }, icon: '⌚' },
+ { label: t('js.form_builder.fields.separator'), name: "separator", attrs: { type: 'separator' }, icon: '⚊' },
+ { label: t('js.form_builder.fields.checkbox'), name: "checkbox", attrs: { type: 'checkbox' }, icon: '☑' },
+ { label: t('js.form_builder.fields.email'), name: "email", attrs: { type: 'email' }, icon: '@' },
+ { label: t('js.form_builder.fields.images'), name: "images", attrs: { type: 'images' }, icon: '⇫' },
+ { label: t('js.form_builder.fields.files'), name: "files", attrs: { type: 'files' }, icon: '⇫' },
+ { label: t('js.form_builder.fields.elements'), name: "elements", attrs: { type: 'elements' }, icon: '*' }
];
var templates = {
title: function(fieldData) { return { field: '<input id="' + fieldData.name + '"><span class="mandatory">' +t('js.form_builder.fields.title_help') + '</span>' }; },
address: function(fieldData) { return { field: '<input id="' + fieldData.name + '"><span class="mandatory">' +t('js.form_builder.fields.address_help') + '</span>' }; },
taxonomy: function(fieldData) { return { field: '<select id="' + fieldData.name + '"><option>Choisissez une catégorie principale</option></select><span class="mandatory">' +t('js.form_builder.fields.taxonomy_help') + '</span>' }; },
- openhours: function(fieldData) { return { field:t('js.form_builder.fields.openhours_help') }; },
+ openhours: function(fieldData) { return { field: t('js.form_builder.fields.openhours_help') }; },
separator: function(fieldData) { return { field: '<hr>' }; },
checkbox: function(fieldData) { return { field: '<input id="' + fieldData.name + '"' + (fieldData.defaultvalue == "yes" ? 'checked="checked"' : '') + ' type="checkbox"/>' }; },
email: function(fieldData) { return { field: '<input id="' + fieldData.name + '"' + ' type="email"/><span class="mandatory">' +t('js.form_builder.fields.email_help') + '</span>' }; },
@@ -40,22 +40,22 @@
elements: function(fieldData) { return { field: '<select id="' + fieldData.name + '"><option>'+ fieldData.label+'</option></select>' }; },
};
- var iconAttr = { label:t('js.form_builder.icon'), placeholder:t('js.form_builder.icon_placeholder') }
- var labelAttr = { label:t('js.form_builder.label') }
- var errorMsgAttrs = { label:t('js.form_builder.errorMsg'), placeholder:t('js.form_builder.errorMsg_placeholder') }
- var searchAttrs = { label:t('js.form_builder.search'), type: 'checkbox' };
- var searchWeightAttrs = { label:t('js.form_builder.searchWeigh'), type: 'number', value: "1" };
- var patternAttrs = { label:t('js.form_builder.pattern'), placeholder:t('js.form_builder.pattern_placeholder') };
+ var iconAttr = { label: t('js.form_builder.icon'), placeholder: t('js.form_builder.icon_placeholder') }
+ var labelAttr = { label: t('js.form_builder.label') }
+ var errorMsgAttrs = { label: t('js.form_builder.errorMsg'), placeholder: t('js.form_builder.errorMsg_placeholder') }
+ var searchAttrs = { label: t('js.form_builder.search'), type: 'checkbox' };
+ var searchWeightAttrs = { label: t('js.form_builder.searchWeigh'), type: 'number', value: "1" };
+ var patternAttrs = { label: t('js.form_builder.pattern'), placeholder: t('js.form_builder.pattern_placeholder') };
var typeUserAttrs = {
text: {
icon: iconAttr,
label: labelAttr,
separator: { label: '' }, // separate important attrs from others
subtype: { label: 'Type', options: {
- 'text':t('js.form_builder.subtype.text'),
- 'tel':t('js.form_builder.subtype.tel'),
- 'email':t('js.form_builder.subtype.email'),
- 'url':t('js.form_builder.subtype.url')
+ 'text': t('js.form_builder.subtype.text'),
+ 'tel': t('js.form_builder.subtype.tel'),
+ 'email': t('js.form_builder.subtype.email'),
+ 'url': t('js.form_builder.subtype.url')
},
},
search: searchAttrs,
@@ -67,8 +67,8 @@
icon: iconAttr,
label: labelAttr,
subtype: { label: 'Type', options: {
- 'textarea':t('js.form_builder.subtype.textarea'),
- 'wysiwyg':t('js.form_builder.subtype.wysiwyg')
+ 'textarea': t('js.form_builder.subtype.textarea'),
+ 'wysiwyg': t('js.form_builder.subtype.wysiwyg')
},
},
search: searchAttrs,
@@ -78,7 +78,7 @@
},
paragraph: {
label: {
- label:t('js.form_builder.content'),
+ label: t('js.form_builder.content'),
type: "textarea"
}
},
@@ -87,7 +87,7 @@
number: { icon: iconAttr, label: labelAttr, errorMsg: errorMsgAttrs },
title: {
label: labelAttr,
- maxlength: { label:t('js.form_builder.maxlength')},
+ maxlength: { label: t('js.form_builder.maxlength')},
icon: iconAttr,
search: searchAttrs,
searchWeight: searchWeightAttrs,
@@ -97,8 +97,8 @@
address: { icon: iconAttr, label: labelAttr },
'checkbox-group': {
style: {
- label:t('js.form_builder.style'),
- options: { 'normal':t('js.form_builder.options.normal'), 'filled':t('js.form_builder.options.filled') }
+ label: t('js.form_builder.style'),
+ options: { 'normal': t('js.form_builder.options.normal'), 'filled': t('js.form_builder.options.filled') }
},
errorMsg: errorMsgAttrs,
label: labelAttr
@@ -106,8 +106,8 @@
checkbox: {
label: labelAttr,
defaultvalue: {
- label:t('js.form_builder.defaultvalue'),
- options: { 'no':t('js.form_builder.options.no'), 'yes':t('js.form_builder.options.yes') }
+ label: t('js.form_builder.defaultvalue'),
+ options: { 'no': t('js.form_builder.options.no'), 'yes': t('js.form_builder.options.yes') }
},
errorMsg: errorMsgAttrs
},
@@ -131,20 +131,20 @@
files: {
icon: iconAttr,
label: labelAttr,
- accept: { label:t('js.form_builder.accept'), placeholder:t('js.form_builder.accept_placeholder')},
+ accept: { label: t('js.form_builder.accept'), placeholder: t('js.form_builder.accept_placeholder')},
separator: { label: '' }, // separate important attrs from others
},
date: {
icon: iconAttr,
label: labelAttr,
- timepicker: { label:t('js.form_builder.timepicker'), type: 'checkbox'},
- range: { label:t('js.form_builder.range'), type: 'checkbox' },
+ timepicker: { label: t('js.form_builder.timepicker'), type: 'checkbox'},
+ range: { label: t('js.form_builder.range'), type: 'checkbox' },
},
elements: {
label: labelAttr,
icon: iconAttr,
- reversedBy: { label:t('js.form_builder.reversedBy'), placeholder:t('js.form_builder.reversedBy_placeholder') },
- multiple: { label:t('js.form_builder.multiple'), type: 'checkbox' },
+ reversedBy: { label: t('js.form_builder.reversedBy'), placeholder: t('js.form_builder.reversedBy_placeholder') },
+ multiple: { label: t('js.form_builder.multiple'), type: 'checkbox' },
separator: { label: '' }, // separate important attrs from others
}
};
@@ -162,7 +162,7 @@
controlOrder: ['text', 'email', 'images', 'textarea', 'checkbox', 'checkbox-group', 'radio-group', 'select', 'date', 'number', 'files', 'elements'],
disabledAttrs: ['className', 'inline', 'toggle', 'description', 'other', 'multiple'],
formData: {{ formData|json_encode|raw }},
- roles: { 1:t('js.form_builder.roles.1') },
+ roles: { 1: t('js.form_builder.roles.1') },
typeUserAttrs: typeUserAttrs
});
@@ -213,7 +213,7 @@
})
}
propNameOptions = propNameOptions.sort((a,b) => a.disabled ? 1 : -1)
- propNameOptions.unshift({id: '', text:t('js.form_builder.propNameOptions'), disabled: true})
+ propNameOptions.unshift({id: '', text: t('js.form_builder.propNameOptions'), disabled: true})
$(".fld-name:visible:not(.initialized)").select2({
createSearchChoice:function(term, data) {
if ($(data).filter(function() {
diff --git a/templates/admin/core_custom/custom-fields/mapping-ontology.html.twig b/templates/admin/core_custom/custom-fields/mapping-ontology.html.twig
index 2afca7209..e587121f6 100755
--- a/templates/admin/core_custom/custom-fields/mapping-ontology.html.twig
+++ b/templates/admin/core_custom/custom-fields/mapping-ontology.html.twig
@@ -57,7 +57,7 @@
<center>
<button type="button" class="btn btn-default display-all-props"
onclick="$('.low-used').removeClass('low-used'); $(this).remove()">
- {{ 'mapping-taxonomy.displayMore'|trans({'%percent%': percentThreshold}) }}
+ {{ 'mapping-ontology.displayMore'|trans({'%percent%': percentThreshold}) }}
</button>
</center>
{% endif %}
diff --git a/translations/admin+intl-icu.fr.yaml b/translations/admin+intl-icu.fr.yaml
index 4063059d7..d826dc801 100755
--- a/translations/admin+intl-icu.fr.yaml
+++ b/translations/admin+intl-icu.fr.yaml
@@ -815,7 +815,7 @@ config_form:
config_description: >-
<div class='text-and-iframe-container'><div class='iframe-container-aside'><iframe height='200' sandbox='allow-same-origin allow-scripts' src='https://video.colibris-outilslibres.org/videos/embed/2dd4dad3-63fa-4bb4-b48c-e518f8e56d36' frameborder='0' allowfullscreen></iframe></div>
<b>Le formulaire permet d'ajouter/éditer des données depuis l'interface publique</b></br>
- Si vous avez importé des données, vous pouvez ajouter un champ au formulaire et le lier au champ importé grâce à l'attribut \"Nom du champ\"</div>"
+ Si vous avez importé des données, vous pouvez ajouter un champ au formulaire et le lier au champ importé grâce à l'attribut \"Nom du champ\"</div>
fields:
elementFormIntroText: "Texte d'introduction qui apparait en haut du formulaire"
elementFormIntroText_placeholder: "Exemple: Attention nous ne référençons pas tel et tel type d'élements"
--
GitLab