Remove files replicated in i18n #186
Conversation
awoods
changed the title
There was a problem hiding this comment.
Confirmed about page and menu still worked after building with these changes. I had to do a couple things in order to build successfully, however.
- Add the changes in vivo-project/Vitro@80140a8#diff-064ab49fc0040c4f39a58244e845ad1fR32-R36 to JenaBaseDaoTest
- mvn install VIVO with the -o flag
The first item doesn't have anything to do this with this PR, so I'm approving, but the test may need to be updated so new users don't run into build failures. The second item forces maven to use a local repository for the language files instead of a remote. I updated the documentation for VIVO 1.12 to include this information for developers.
|
Perhaps I spoke too soon. I'm running into an issue with a completely fresh install now... the menu only shows 'Home' and the english i18n labels are missing upon initial startup... but if I restart the application they appear. Initial state After restart |
There was a problem hiding this comment.
The menu.n3 file being deleted here includes functional triples that don't appear to be included anywhere in VIVO-languages, e.g.
display:DefaultMenu display:hasElement display:EventsMenuItem .
menu.n3 should be re-added with the labels removed (since they are included in VIVO-language PR).
|
Thanks for the review and catch, @gneissone . I have re-added |
|
@awoods should the label and linkText literals be removed from menu.n3 since they are replicated in VIVO-languages? |
@gneissone : I was wondering about that as well. Since they do not have any |
|
If they are always superseded by the strings in VIVO-languages, and VIVO-languages is always required, I would argue for them to be removed. Why keep them if they're never used? |
I was thinking that having the triples all in that file added clarity, and potentially a clue as to which triples to look for in other files. But their presence may also be a point of confusion. |
|
I was thinking it would be a point of confusion if they are never used. Could potentially leave them in, but commented out, with a note that they are superseded by labels in the VIVO-language repo? I agree that splitting families of triples across multiple files, and even repositories is potentially confusing. We could always add comments that point people to specifically where to look in other files, but that presents its own problem when files get moved without updating the comments. |
|
PR updated based on code review comments. |
* Layer uqam updates onto master (minus trailing whitespace) * Update AddOrganizerRoleToPersonGenerator.java Removed extraneous whitespace * My whitespace (#153) * Update AddPublicationToPersonGenerator.java * Removed extraneous whitespace AND move RootUserPolicy.java from VIVO to Vitro * Fixed whitespace in: AddAttendeeRoleToPersonGenerator.java * Fixed indentations for AddOutreachProviderRoleToPersonGenerator.java * Fixed indentations * Removed extraneous whitespace (#158) * Removed extraneous whitespace * Fix bug introduced in cleaning up whitespace * Tagging UQAM comments with the following tags -Add-Feature -Optimization -Linguistic-Management -Bug-Correction * Update AddReviewerRoleToPersonGenerator.java * Added an internationalization correction to be considered in the vivo-i18n-core that was forgotten when sprint-i18n was created. * Fix typo in AddReviewerRoleToPersonGenerator Resolves: https://jira.lyrasis.org/browse/VIVO-1774 * Fix typo in AddOutreachProviderRoleToPersonGenerator Resolves: https://jira.lyrasis.org/browse/VIVO-1775 * Include language dependencies in build all of the time (#168) Move "LocaleSelectionSetup" higher in the startup list so that the Vitro:RDFFilesLoader has the locale info available on its startup Part of resolution to: https://jira.lyrasis.org/browse/VIVO-1836 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Made modifications to publicationToPersonUtils.js so that multilangua… (#170) * Made modifications to publicationToPersonUtils.js so that multilanguage support will not break the javascript functionalty. Co-authored-by: root <root@vivo-development.hs-mittweida.de> Resolves: https://jira.lyrasis.org/browse/VIVO-1739 * Feature language en_CA (#169) * Changing ontology extensions for n3 & assigning a base IRI to each ontology Co-authored-by: michelheonuqam <heon.michel@uqam.ca> Co-authored-by: michelheon <heon@videotorn.ca> Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1862 * i18n: title tag and headings in capability map are in english in french version (#173) * added multi-language support for ticket VIVO-1846 * fixed swapped properties, added Capability map title to i18n Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1847 * Added i18n support for Capability Map control buttons, JIRA ticket VIVO-1846 * removed redundat files which are now available via Vitro- and VIVO-languages * added i18n support for the capability map, ticket vivo-1892 * Revert non-function RDF changes (#180) 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 * [VIVO-1842] i18n: Added function js_string at i18n variables to handle quotes properly (#181) * added js_string at i18n strings to handle quotes properly, ticket vivo-1842 Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1842 * replace static headings with i18n values (#183) Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1844 * added empty check for getCountry, fixing bug with spanish label (es), ticket vivo-1900 (#182) Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1900 * Issue/vivo 1908 (#185) * Provide fallback language in language-filtered webpage SPARQL query and use existing RDFService-based filtering for ConstantFieldOptions Resolves: https://jira.lyrasis.org/browse/VIVO-1906 * Fix bug of missing toString() (#187) Related to: https://jira.lyrasis.org/browse/VIVO-1906 Co-authored-by: Andrew Woods <awoods@duraspace.org> * Remove files replicated in i18n (#186) Related to: https://jira.lyrasis.org/browse/VIVO-1917 * removed redundant vitroAnnotations, now in VIVO-languages, ticket vivo-1821 * Removed key.png from the template and replaced it with css sprite and… (#184) * Removed key.png from the template and replaced it with css sprite and descriptions in plain text. * * adding height to background images, hopefully fixing issues Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1902 * [VIVO-1915] i18n - removing language select for label management for individuals (#190) * removed the language select for managing multi language labels fpr individuals, ticket vivo-1915 * modified ManageLabelsForPersonGenerator so that you can only add an langauge label if it is not already set, ticket vivo-1915 Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1915 * - added i18n() to hardcoded values * added i18n support to person's domain in capability map, ticket 1867 * [VIVO-1946] - Update ResearcherID description in vivo.owl (#188) * Update ResearcherID description in vivo.owl Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1946 * [VIVO-1936] i18n: updated the language comment in runtime.properties (#203) Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1936 Co-authored-by: Kampe <Benjamin.Kampe@tib.eu> * [VIVO-1924] i18n: @en i18n properties are not loaded during first site startup. (#204) * rearranged startup-listeners fixing bug with language files, ticket VIVO-1924 * Added a comment to prevent future bugs like this, ticket VIVO-1924 * fixed previous comment, ticket VIVO-1924 * Remove duplicate text from dropdown menus * Minor checkstyle correction following: VIVO-1936 (#206) Follow-on to: https://jira.lyrasis.org/browse/VIVO-1936 Co-authored-by: Andrew Woods <awoods@duraspace.org> * follow-up on vivo-1936 - restore default values in example-settings.xml (#210) Co-authored-by: gneissone <mbgross@wustl.edu> * [VIVO-1798] - Internationalize first and last name validation (#207) * Internationalize first and last name validation Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1798 * adding collections process terms (#165) * adding collections process terms No JIRA :( * Non-functional change to comment in example.applicationSetup.n3 Related to: https://jira.lyrasis.org/browse/VIVO-1741 * Update orcidConfirm.ftl (#199) Fix i18n property used on ORCID confirmation step 2 button. Related to https://jira.lyrasis.org/browse/VIVO-1945 * Fix external AGROVOC service URL * URL fix for LCSH service * Remove unnecessary pom.xml 'profile' - Also, uncomment language overlays - Noting that this is not actually necessary, as any 'war' Maven dependencies are automatically overlayed: - https://maven.apache.org/plugins/maven-war-plugin/overlays.html Co-authored-by: Andrew Woods <awoods@duraspace.org> Co-authored-by: Nicolas D <46490666+nicalico@users.noreply.github.com> Co-authored-by: UQAM-VIVO <heon.michel@uqam.ca> Co-authored-by: matthiasluehr <60263380+matthiasluehr@users.noreply.github.com> Co-authored-by: Michel Heon <heon@videotron.ca> Co-authored-by: dofeldsc <dofeldsc@uos.de> Co-authored-by: William Welling <wwelling@library.tamu.edu> Co-authored-by: Brian Lowe <brianjlowe@gmail.com> Co-authored-by: Matthias Lühr <luehr@hs-mittweida.de> Co-authored-by: Ben <mbgross@wustl.edu> Co-authored-by: Benjamin Kampe <benjamin@fehrmanns.net> Co-authored-by: Kampe <Benjamin.Kampe@tib.eu> Co-authored-by: Gross, Benjamin <benjamin.gross@clarivate.com> Co-authored-by: diatomsRcool <annethessen@gmail.com> Co-authored-by: L.O <53535673+lb-ov@users.noreply.github.com>
Related to: https://jira.lyrasis.org/browse/VIVO-1917
See: vivo-project/VIVO-languages#67
No functional changes in the update... just reorganizing files.
Will be necessary to completely remove your triplestore and home/rdf files to test this update.