Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replacing singles quotes with double quotes in FreeMarker files #172

Closed
wants to merge 2 commits into from
Closed

Conversation

nicalico
Copy link
Contributor

@nicalico nicalico commented Jun 30, 2020

Related to :
vivo-project/VIVO#178
vivo-project/Vitro-languages#25
vivo-project/VIVO-languages#60

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

What is the bug?

  1. In the fr_CA properties files, some strings contain single quotes.
  2. When a FreeMarker file declares a variable with such a string, it cannot escape the single quotes.
  3. Hence, when JavaScript further declares such a variable by using singles quotes, this might cause an unbalanced quotation error.

What does this pull request do?

  1. Whenever a fr_CA custom FreeMarker file substituted single quotes to double quotes, that sustitution was reported in the equivalent core FreeMarker file (see also [DRAFT] Replacing singles quotes with double quotes in FreeMarker files VIVO#178)
  2. If there was no further customization in the fr_CA FreeMarker file, it was deleted (see [DRAFT] Removing custom fr_CA FreeMarkerfiles that have no diff with core files Vitro-languages#25 and [DRAFT] Removing custom fr_CA FreeMarkerfiles that have no diff with core files VIVO-languages#60 ).

Note: https://jira.lyrasis.org/browse/VIVO-1842 called for an exhaustive replacement of all the single quote to double quotes in the core FreeMarker files. This PR fixes only the one that would cause a bug.

How should this be tested?

Those modifications affect a great number of files, and a general checkup should be performed.

Interested parties

@MichelHeon

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant