litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #338 from litvinovg/autocomplete_form

Browse source 
[i18n sprint] Language-neutral help text in autocomplete forms
This commit is contained in:
Dragan Ivanovic 2022-10-27 15:08:05 +02:00 • committed by GitHub
commit 1511e00c61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
View file

@ -125,7 +125,7 @@ Also multiple types parameter set to true only if more than one type returned-->
}; };
var i18nStrings = { var i18nStrings = {
selectAnExisting: '${i18n().select_an_existing?js_string}', selectAnExisting: '${i18n().select_an_existing?js_string}',
orCreateNewOne: '${i18n().or_create_new_one?js_string}', selectAnExistingOrCreateNewOne: '${i18n().select_an_existing_or_create_a_new_one?js_string}',
selectedString: '${i18n().selected?js_string}' selectedString: '${i18n().selected?js_string}'
}; };
</script> </script>

4
webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
View file

@ -695,10 +695,10 @@ var customForm = {
// ac fields there are cases where we also have to check if the help text is already there // ac fields there are cases where we also have to check if the help text is already there
if (!$(selectedObj).val() || $(selectedObj).hasClass(this.acHelpTextClass) || $(selectedObj).val().substring(0, 18) == customForm.selectAnExisting ) { if (!$(selectedObj).val() || $(selectedObj).hasClass(this.acHelpTextClass) || $(selectedObj).val().substring(0, 18) == customForm.selectAnExisting ) {
typeText = this.getTypeNameForLabels($(selectedObj)); typeText = this.getTypeNameForLabels($(selectedObj));
var helpText = customForm.selectAnExisting + " " + typeText + " " + customForm.orCreateNewOne ; var helpText = customForm.selectAnExistingOrCreateNewOne ;
//Different for object property autocomplete //Different for object property autocomplete
if ( this.acSelectOnly ) { if ( this.acSelectOnly ) {
helpText = customForm.selectAnExisting + " " + typeText; helpText = customForm.selectAnExisting;
} }
$(selectedObj).val(helpText) $(selectedObj).val(helpText)
.addClass(this.acHelpTextClass); .addClass(this.acHelpTextClass);