Skip to content
This repository has been archived by the owner on Dec 6, 2022. It is now read-only.

Changed/inserted variables in .ftl files to fix French syntax problems #44

Merged
merged 1 commit into from
May 20, 2020
Merged

Conversation

nicalico
Copy link
Contributor

@nicalico nicalico commented Apr 30, 2020

Resolves :
https://jira.lyrasis.org/browse/VIVO-1773

Related PR : vivo-project/Vitro-languages#19

What does this pull request do?

How should this be tested?

  • All edit forms using addRoleToPersonTwoStage_fr_CA.ftl should be tested :

    • Direction de
    • Membre de
    • Activités cliniques
    • Événements
    • Responsable de collection
    • Autres activités de recherche
    • Activités d'enseignement
    • Évaluateur(-trice))
    • Organisateur d'événement
    • Activités professionnelles
    • Mobilisation des connaissances
    • Enseignement et formation
  • Related modifications in other .ftl files have to be tested in following edit forms:

    • Collaborateur(-trice)
    • Mentionné dans
    • Lieu

Interested parties

@MichelHeon

@nicalico nicalico changed the title Jira 1773 Changed/inserted variables in .ftl files to fix French syntax problems Apr 30, 2020
@awoods
Copy link
Member

awoods commented May 14, 2020

This pull-request is targeting master. Is that intentional? If not, I will retarget the pull-request to sprint-i18n.

@MichelHeon
Copy link

No, it's a mistake. I tried to change the target without success.

@awoods awoods changed the base branch from master to sprint-i18n May 14, 2020 14:22
@awoods
Copy link
Member

awoods commented May 14, 2020

Updated to target sprint-i18n.

@awoods
Copy link
Member

awoods commented May 14, 2020

The changes in this pull-request seem much more minimal than the description suggests. Is this pull-request complete?

@nicalico
Copy link
Contributor Author

Sorry for the wrong target.
The PR is complete. It is a very small change which impacts several pages, due to the reusing of addRoleToPersonTwoStage_fr_CA.ftl

@awoods awoods merged commit 6eeeb4d into vivo-project:sprint-i18n May 20, 2020
@nicalico nicalico deleted the jira-1773 branch July 6, 2020 17:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants