search

chenejac / VIVOTestMigrationJIRA

0 stars 0 forks source link

VIVO-1916: i18n: Hardcoded 'or' in some templates #1806

Closed chenejac closed 4 years ago

chenejac commented 4 years ago

Matthias Lühr (Migrated from VIVO-1916) said:

In some freemarker templates the word ' or ' between save and cancel link is hardcoded:

 

find . -name "*.ftl" |xargs grep "class=\"or\"" |grep -v i18n ./freemarker/edit/forms/defaultDataPropertyForm.ftl: or ./freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete_fr_CA.ftl: or ./freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl: or ./freemarker/edit/forms/defaultAddMissingIndividualForm.ftl: or ./freemarker/edit/forms/defaultDataPropertyForm_fr_CA.ftl: or ./freemarker/edit/forms/autoCompleteObjectPropForm.ftl: or ./freemarker/edit/forms/defaultAddMissingIndividualForm_fr_CA.ftl: or

 

Should be replaced by "${i18n().or)".

chenejac commented 4 years ago

Matthias Lühr said:

https://github.com/vivo-project/VIVO/pull/191

chenejac commented 4 years ago

Matthias Lühr said:

https://github.com/vivo-project/VIVO-languages/pull/71

chenejac commented 4 years ago

Andrew Woods said:

This looks good. Do you have two more pull-requests for:

./Vitro/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl:    <span class="or"> or </span>
./Vitro/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl:        <span class="or"> or </span>
./Vitro/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl:                <span class="or"> or </span>
./Vitro-languages/fr_CA/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm_fr_CA.ftl:    <span class="or"> or </span>^M

?

chenejac commented 4 years ago

Matthias Lühr said:

https://github.com/vivo-project/Vitro/pull/189

https://github.com/vivo-project/Vitro-languages/pull/32

chenejac commented 4 years ago

Andrew Woods said:

Resolved with: