Skip to content

Modified .ftl files to minimize usage of concatenated labels

backups requested to merge github/fork/nicalico/jira-1796-1797-1818 into sprint-i18n

Created by: nicalico

Better alternative to : https://github.com/vivo-project/VIVO-languages/pull/42

Resolves : https://jira.lyrasis.org/browse/VIVO-1796 https://jira.lyrasis.org/browse/VIVO-1797 https://jira.lyrasis.org/browse/VIVO-1818

What does this pull request do?

The systematic concatenation of variables in the .ftl files creates several grammar and syntax problems across different languages.

This pull request aims at minimizing the use of concatenated labels in order to fix those problems in the French version, using an approach that could possibily be generalized in the core .ftl files to improve their reusability as-is across languages.

In order to achieve this goal, related fields have been grouped and headed (h3) by redundant/common strings removed from the labels. This approach allows for maximal reuse of variables and strings already present in the .ftl and .properties files, with two exceptions:

  • The string dept_or_school_name had to be added to vivo_all_fr_CA.properties.
  • The string collection_or_series had to be modified in various .properties files.

Some formal changes were made to improve organization and readability :

  • Some field have been relocated to allow regrouping
  • In somes cases, <h4> headers have been converted to <h3> header to improve readability.
  • Several labels were aligned with the input fields for a more compact layout. Whenever the class="inline" was placed within a <p> tag, it was relocated in the daughter <label> tag, as the basic edit.css stylesheets specify a layout for label.inline, but not for p.inline. There is a p.inline statement in customForm.css, but it was not having the desired effect.

Unrelated but minor changes:

  • In a few cases, <p></p> have been replaced by <br/>

Note: this pull request only fixes the most problematic cases. Another pull request should aim at fine tuning the normalization of forms across the whole site, making sure the layout is always consistant (e.g. should the input field be always inline with the label, etc)

How should this be tested?

  • Add and Edit forms should be tested for the following sections:
    • Direction de
    • Membre de
    • Activités cliniques
    • Événements
    • Publications choisies
    • Responsable de collection
    • Éditeur
    • Autres activités de recherche
    • Activités d'enseignement
    • Évaluateur(-trice))
    • Organisateur d'événement
    • Activités professionnelles
    • Mobilisation des connaissances
    • Enseignement et formation
    • Lieu

Interested parties

@MichelHeon

Merge request reports