[VIVO-1839] - Use language name for selector instead of flags

[gneissone]

JIRA Issue: https://jira.lyrasis.org/browse/VIVO-1839

• Other Relevant Links (Mailing list discussion, related pull requests, etc.)
  From Slack

What does this pull request do?

Changes the language selector dropdown from displaying flag images to displaying the locale name.

What's new?

Displays the locale name in the language selector (in that locale's language, e.g. the text for German will always say Deutsch regardless of which language is currently selected.

How should this be tested?

Build with changes. Confirm language selector still works as intended and languages are display as text, not images.

Additional Notes:

The label is generated from Java's Locale library, so the language must use a recognized locale code to work correctly. This matches the current behavior, which only made an exception for a special 'es-GO' translation that used to be included with VIVO (see

Vitro/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java

Line 143 in 6d64d27

if (!"es_GO".equals(localeString) && // No complaint about bogus locale

).

Interested parties

@awoods

[gneissone]

If this is merged, a handful of flag images can be deleted from VIVO, VIVO language and Vitro language repos.

[awoods]

Actually, with the fix of a trivial merge conflict in the file:
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java
.. I was able target this pull-request at the sprint-i18n branch.
Now that the sprint-i18n branch has two different English language locales (en_US and en_CA), it surfaces the fact that they both show up as "English" in the dropdown.

Given this, if you don't mind, I would like:

1. to have this PR targeted at the sprint-i18n branch, and
2. to update the PR to include both the language and locale.

Thoughts?

[gneissone]

What do you suggest is the default behavior? Always show place name?

'English (United States)'
'English (Canada)'
'Français (Canada)' ?

Or do we want the place only if there are multiple of the same? Will sites want to show multiple versions of the same language?

[gneissone]

Based on comment on Slack, updated to include country name.

[awoods]

I was unable to see the changes introduced here because this PR branch is not current with the sprint-i18n branch. Specifically, the versions in the pom.xml files all indicate "1.11.1-SNAPSHOT" instead of "1.11.2-SNAPSHOT"... which is not picked up by VIVO during build.

[gneissone]

I was unable to see the changes introduced here because this PR branch is not current with the sprint-i18n branch. Specifically, the versions in the pom.xml files all indicate "1.11.1-SNAPSHOT" instead of "1.11.2-SNAPSHOT"... which is not picked up by VIVO during build.

An unfortunate side-effect of jumping between pointing the pull request at master and i18n-sprint. It will be nice to get master merged into the sprint branch. Out of curiosity, @awoods did you check out my branch or are you checking out the pull request via git fetch origin pull/ID/head:BRANCHNAME? I wonder if the latter method avoids this issue.

[awoods]

I checked out the pull/ID

Also noting the the version number in the master branch is also "1.11.2-SNAPSHOT".

[gneissone]

Right, I just rebased my branch back in time to a point before there were merge conflicts between master and sprint-i18n, saw there were only relevant files in my diff on the pull request and called it a day. I should have merged the current sprint-i18n branch back in, which I have now done.

[awoods]

This looks good... and we can move forward as it stands. I will note, however, that the dropdown items would render better if the width were expanded.
See:

@gneissone , thoughts?

[gneissone]

I already pushed out the min-width by 40 pixels so it looked good on my screen, didn't try other resolutions. I wonder if it's necessary to set the width at all, or if it can be as wide as the longest list item.

[awoods]

I already pushed out the min-width by 40 pixels so it looked good on my screen, didn't try other resolutions. I wonder if it's necessary to set the width at all, or if it can be as wide as the longest list item.

If removing the width allows for dynamically appropriate sizing... that would be great.

[gneissone]

@awoods Changed the min-width to be an em value, see if that works for you. If not, please suggest a width that looks okay.

[nicalico]

Great improvement! However, capitalizing is not consistent. I suggest to change

<a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale} -- ${locale.label}">${locale.label}<#if locale.country?has_content> (${locale.country})</#if></a>

to

<a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale} -- ${locale.label}">${locale.label?capitalize}<#if locale.country?has_content> (${locale.country})</#if></a>

[gneissone]

@nicalico I incorporated your capitalization suggestion, thanks. I don't have a nice cross-browser solution for the dropdown width, but I'm open to suggestions or they could be submitted as part of a different pull request.

[nicalico]

Thanks for the capitalizing. As for the Firefox fix, I have little time to work on it at the moment -- not to mention my css-fu isn't outstanding -- so maybe we should just move the PR forward as suggested by @awoods, and reopen the ticket when a fix occur to us.

[nicalico]

@gneissone I have a hard time untangling the commits, here. Did you change something to the css? It doesn't look so, and yet the menu now displays correctly in FF.

[gneissone]

@nicalico Perhaps its easier to just look at the file diff instead of the commit chain, since adjustments were made to the css multiple times based on feedback.

I didn't change anything in the css in the last commit. I changed the dropdown to be slightly wider on May 29, though.

[nicalico]

@gneissone Yes, I saw that -- but I reported the FF bug on June 6th. Beats me. At any rate, I pulled / recompiled 30 minutes ago, and it looks perfect. Good to merge, in my opinion.