[VIVO-1915] i18n - Adding a label with language tag through the "new" manageLabelsForindividualAddForm.ftl does not take the setting for language tag #184
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…individualAddForm, re ticket VIVO-1915
|
This is working well with adding new labels, but it is not honoring locales when editing labels through the same interface. It appears that clicking 'Edit' brings the user to a form that uses RDFSLabelGenerator which is not aware of the labels current locale, and instead creates a new label with the currently active locale. |
|
@gneissone : On today's sprint wrap-up call the team decided that the resolution to this ticket should be to remove the in-form language dropdown for the edit-label page... and as a result, rely on the language context set at the site-level to determine the langTag for added labels. |
…f the manageLabelsForIndividualftl, ticket vivo-1915
|
I removed the language select in both files but not removed the earlier fix with selected language. So i left the functionality (mainly java script) in since the fr-CA needs it and we had said that it should probably be reinstalled at a later time. The other thing with editing existing labels: If you edit an for example english label from the list and the language (global) is set to german and you save it, the original label is still there with english language tag and the new edited label gets the german language tag. Should we leave it like this? The second selection is removed via this PR Does anyone have an different opinion on that? |
|
I would suggest we remove: ..as it is functionally identical to the corresponding file in If the "fr_CA.ftl" file is removed, would that allow for removing the "earlier fix with selected language"? |
awoods
requested changes
Sep 23, 2020
webapp/src/main/webapp/js/individual/manageLabelsForIndividual.js
Outdated
Show resolved
Hide resolved
This seems like a usability issue... but one that we can address separately from the current issue. I have created a new ticket for this. @dofeldsc : if you are interested in working this new JIRA, that would be great. |
|
I found a functionality that prevented you from adding two labels in the same language (using the dropdown). I adjusted the functionality so that it still works without the dropdown. The Button "Add Label" is only visible if the selected langauge has no label. |
roflinn
added a commit
that referenced
this pull request
Feb 10, 2021
* Layer uqam updates onto master (minus trailing whitespace) * Update RDFServiceFactorySingle.java * Sprint i18n whitespace (#143) * Removed extraneous whitespace - modified: api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java * move RootUserPolicy.java from VIVO to Vitro repo. * Remove blank line * Fixed indentations * Update whitespace for: TemplateProcessingHelper.java * Update whitespace for: RDFServiceModel.java * Removed extraneous whitespaces. * Tagging UQAM Comments with following tags -Add-Feature -Optimization -Linguistic-Management -Bug-Correction * Resolve compilation failures in Vitro tests * Remove whitespace changes from SelectListGeneratorVTwo.java * Add null check on field values of RDF Form (#158) Resolves: https://jira.lyrasis.org/browse/VIVO-1800 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Fix incorrect tool-tip in language selection dropdown (#156) Resolves: https://jira.lyrasis.org/browse/VIVO-1783 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Sprint i18n/lang filtering model (#159) * Add language-aware graph filtering instead of layering on additional RDFService Resolves: https://jira.lyrasis.org/browse/VIVO-1771 * Remove hardcoded link label (#161) Resolves: https://jira.lyrasis.org/browse/VIVO-1779 * Enable filtering of non-enabled i18n language files from being loaded into triple store (#160) Define name of available language listing file (found in Vitro-languages) Update RDFFilesLoader method interfaces to include ServletContext Part of resolution to: https://jira.lyrasis.org/browse/VIVO-1836 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Add i18n version of Edit page title (#157) Related to: https://jira.lyrasis.org/browse/VIVO-1779 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Changing ontology extensions for n3 & assigning a base IRI to each (#163) ontology Co-authored-by: michelheon <heon@videotorn.ca> Co-authored-by: Andrew Woods <awoods@duraspace.org> https://jira.lyrasis.org/browse/VIVO-1862 * Update sprint-i18n with master branch (#166) * Make data property richtext editor option selectable from UI * [VIVO-1755] - Better error handling when reasoner disabled (#137) * Better error handling when reasoner disabled * Change reasoner error log message to debug * Extend reasoner status error handling * Improve reasoner error log message and extend to JenaAdminActions * Bump up log level for admin action to 'warn' and edit admin panel error message * Change Model writer lang from "N3-PP" to "N3" (#149) Resolves: https://jira.lyrasis.org/browse/VIVO-1761 Co-authored-by: Andrew Woods <awoods@duraspace.org> * [VIVO-1851] - Add 'remove' option to named graph management page (#162) * Add 'remove' option to named graph management page Resolves: https://jira.lyrasis.org/browse/VIVO-1851 * [VIVO-1872] - Add download option to SPARQL Query page (#164) * Add download option to SPARQL Query page * Set SPARQL query results content type even if downloading * Address pull request comments Co-authored-by: gneissone <mbgross@wustl.edu> Co-authored-by: Ralph O'Flinn <roflinn@users.noreply.github.com> Co-authored-by: Andrew Woods <awoods@duraspace.org> * [VIVO-1839] - Use language name for selector instead of flags (#165) * Use language name for selector instead of flags * Add country name to language selector * Increase min-width of language dropdown * Update data tree comment in languageSelector.ftl * Min-width for language dropdown * Language dropdown css adjustment * Capitalize locale label * Indent on languageSelector.ftl Resolves: https://jira.lyrasis.org/browse/VIVO-1839 * Adds internationalization to the admin/sparql-query page (#167) * Adds internationalization to the admin/sparql-query page Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1873 * Add i18n for 'save query result' Related to: https://jira.lyrasis.org/browse/VIVO-1873 * code review Co-authored-by: Andrew Woods <awoods@duraspace.org> * removed redundat files which are now available via Vitro- and VIVO-languages * Making UQAM-optimization aware of https:// * Add parent reference to installer/pom.xml (#174) Resolves: https://jira.lyrasis.org/browse/VIVO-1903 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Revert non-function RDF changes (#177) Related to: https://jira.lyrasis.org/browse/VIVO-1905 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Ensure 'other' in Individual->Teaching->advisees->type is translated Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1881 * Re-add logic from commit 7420957 * [VIVO-1812] use i18n translation for validation messages (#179) * replace constants with i18n text in BasicValidationVTwo * use constants for i18n template key Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1812 * added js_string at i18n strings to handle quotes properly, ticket vivo-1842 (#180) Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1842 * [VIVO-1870] simplify and concat translation for browse by vclass (#182) * simplify and concat translation for browse by vclass Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1870 * [VIVO-1900] i18n: added empty check for getCountry, fixing bug with spanish label (es) (#181) * added empty check for getCountry, fixing bug with spanish label (es), ticket vivo-1900 Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1900 * [VIVO 1870] update i18n key to JavaScript mapping (#183) * update menupage-script i18n key to JavaScript mapping Follow-on to resolution of: https://jira.lyrasis.org/browse/VIVO-1870 * [VIVO-1837] get i18n bundle from WebappDaoFactoryConfig preferred locales (#178) * apply i18n text to VClassDaoJena.getLabelForClass * expose i18n bundle through webapp dao factory interface * use whole messages for i18n * if request available use request bundle else use context bundle * clear cache when context theme directory changes * make getOverridingLocale from context private * select locale based on preferred locale from webapp dao factory * use first preferred local even when no selectable locales available on context * build default preferred locales from default preferred languages Resolves: https://jira.lyrasis.org/browse/VIVO-1837 * Ensure that "available langs" include base langs (#185) Resolves: https://jira.lyrasis.org/browse/VIVO-1922 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Ensure I18nStub is initialized before pertinent tests (#186) Resolves: https://jira.lyrasis.org/browse/VIVO-1923 Co-authored-by: Andrew Woods <awoods@duraspace.org> * add additional null checks to ensure context is ready for theme change (#187) * [VIVO-1915] i18n - Adding a label with language tag through the "new" manageLabelsForindividualAddForm.ftl does not take the setting for language tag (#184) * Fixed bug when addng a label with language tag through managLabelsForindividualAddForm, re ticket VIVO-1915 * removed the language select for managing multi language labels, ticket vivo-1915 * readded the fix for language selection because of the fr-CA version of the manageLabelsForIndividualftl, ticket vivo-1915 * removed earlier fix, removed comments, modified ManageLabelGenrator, ticket vivo-1915 Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1915 * - replaced hard coded "or"s with i18n().or * [VIVO-1925] i18n: Editing labels results in new label (#188) * fixed bug: Editing language labels results in new label, ticket vivo-1925 Resolves: https://jira.lyrasis.org/browse/VIVO-1925 * Enable lang selection without need for 'available-langs.properties' (#169) * Enable lang selection without need for 'available-langs.properties' Co-authored-by: Andrew Woods <awoods@duraspace.org> * Reduce number of times QuerySolutions are looped in LanguageFilteringRDFService (#194) - No functional change in this update Resolves: https://jira.lyrasis.org/browse/VIVO-1931 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Prevent 'ProcessRdfForm.parseN3ToRDF' from using null linguisticContext (#197) Resolves: https://jira.lyrasis.org/browse/VIVO-1944 Co-authored-by: Andrew Woods <awoods@duraspace.org> * [Vivo 1918] i18n: Reload firsttime files on start-up if changed (#195) Co-authored-by: Andrew Woods <awoods@lyrasis.org> * [VIVO-1936] i18n: updated the language comment in runtime.properties * ftl function to capitalize group name affording override * Further i18n for BasicValidationVTwo.java * Fixed DeletePropertyController.java - getting localname of property properly (#200) * Fixed DeletePropertyController.java - getting localname of property properly Resolves: https://jira.lyrasis.org/browse/VIVO-1816 * Removed hardcoded time units by properties calls in dateTimeWithPrecision.ftl * Use i18n values for date time form (#204) Resolves: https://jira.lyrasis.org/browse/VIVO-1953 * VIVO-1929: patch authorizing create individual form (#206) * patch authorizing create individual form Resolves: https://jira.lyrasis.org/browse/VIVO-1929 * Issue/vivo 1947 (#205) * Make data property richtext editor option selectable from UI * Better error handling when reasoner disabled * Change reasoner error log message to debug * Extend reasoner status error handling * Improve reasoner error log message and extend to JenaAdminActions * Bump up log level for admin action to 'warn' and edit admin panel error message * Change Model writer lang from "N3-PP" to "N3" (#149) * Prevent ontology editor and N3 editing from deleting property values in languages other than the one associated with the editing request. [https://jira.lyrasis.org/browse/VIVO-1947] Resolves: https://jira.lyrasis.org/browse/VIVO-1947 Co-authored-by: gneissone <mbgross@wustl.edu> Co-authored-by: Ralph O'Flinn <roflinn@users.noreply.github.com> Co-authored-by: Andrew Woods <awoods@lyrasis.org> Co-authored-by: Andrew Woods <awoods@duraspace.org> * Remove comments Co-authored-by: Andrew Woods <awoods@duraspace.org> Co-authored-by: Nicolas D <46490666+nicalico@users.noreply.github.com> Co-authored-by: VIVO UQAM <62542918+UQAM-VIVO@users.noreply.github.com> Co-authored-by: Matthias Luehr <luehr@hs-mittweida.de> Co-authored-by: michelheonuqam <heon.michel@uqam.ca> Co-authored-by: Brian Lowe <brianjlowe@gmail.com> Co-authored-by: j-dornbusch <joachim.dornbusch@ehess.fr> Co-authored-by: Michel Heon <heon@videotron.ca> Co-authored-by: gneissone <mbgross@wustl.edu> Co-authored-by: Ralph O'Flinn <roflinn@users.noreply.github.com> Co-authored-by: dofeldsc <dofeldsc@uos.de> Co-authored-by: root <root@vivo-development.hs-mittweida.de> Co-authored-by: gneissone <mbgross@unavco.org> Co-authored-by: William Welling <wwelling@library.tamu.edu> Co-authored-by: Kampe <Benjamin.Kampe@tib.eu> Co-authored-by: Gross, Benjamin <benjamin.gross@clarivate.com> Co-authored-by: matthiasluehr <60263380+matthiasluehr@users.noreply.github.com> Co-authored-by: nicolasdickner <dickner.nicolas@uqam.ca>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA Issue
related PRs:
1 PR
2 PR
What does this pull request do?
Fixes the bug when adding a label with language tag through manageLabelsForindivdualAddForm.
The selected language-tag was not used, in the end the parent language selection was used.
How should this be tested?
With a fresh VIVO instanz and the given sample data (https://wiki.lyrasis.org/display/VIVODOC19x/Sample+Data) you can added a label/title to an instanz in an different language (f.e. german). Now you can click the button right of the label to "manage labels". You see the first initial english label and a german label.
If you try to add another label (the "main" language selection is set to english, upper right corner) with the button "Add Label" and you choose for example "French (Canada)" and click "Save". The Label will be listed as english (see images). And now, with the fix, the new label should have the selected language.
Additional Notes:
I have also tested a few other places and found no problems but maybe someone with more experience in this area of the software should look at it and tell me if this is the right way to fix it.