search

vivo-project / VIVO

VIVO is an extensible semantic web application for research discovery and showcasing scholarly work
http://vivoweb.org
BSD 3-Clause "New" or "Revised" License
207 stars 130 forks source link

VIVO-1863: Menus are presented in French Canadian in the en_CA context. #3451

Closed chenejac closed 3 years ago

chenejac commented 4 years ago

Michel Héon (Migrated from VIVO-1863) said:

This bug is associated to this feature

https://jira.lyrasis.org/browse/VIVO-1862

 

chenejac commented 4 years ago

Michel Héon said:

[~accountid:60785ded115da6006f540529]

Associated PR [https://github.com/vivo-project/VIVO-languages/pull/48]

The problem is that some language files (including the files associated with 'propertygroups.n3' ) were in the 'everytime' directory instead of 'firstime'. To fix this and other possible problems, all label files for all languages have been moved to 'firstime'. h2. For testing

!image-2020-05-20-11-03-50-611.png|width=644,height=623!

!image-2020-05-20-11-05-24-264.png|width=629,height=621!

 

chenejac commented 4 years ago

Michel Héon said:

See comment in the ticket

chenejac commented 4 years ago

Michel Héon said:

[~accountid:60785ded115da6006f540529]

I'm not sure what to do with a ticket... It's been fixed since a long time

 

 

chenejac commented 4 years ago

Andrew Woods said:

The pull-request appears to have merge conflicts. Please resolve.

chenejac commented 4 years ago

Michel Héon said:

[~accountid:60785ded115da6006f540529]---

i hope is done

 


heon@linuxwork:~/GIT/VIVO-languages$ git push MicheHeon
fatal: 'MicheHeon' does not appear to be a git repository
fatal: Could not read from remote repository.Please make sure you have the correct access rights
and the repository exists.
heon@linuxwork:~/GIT/VIVO-languages$ git branch -D sprint-i18n
Deleted branch sprint-i18n (was 301aaa6).
heon@linuxwork:~/GIT/VIVO-languages$ git checkout --track upstream/sprint-i18n
fatal: 'upstream/sprint-i18n' is not a commit and a branch 'sprint-i18n' cannot be created from it
heon@linuxwork:~/GIT/VIVO-languages$ git log
commit f20569aeea35fb219700f9211423caa9ca95ec3d (HEAD -> Bug-1863)
Author: michelheon <heon@videotorn.ca>
Date:   Wed May 20 09:07:45 2020 -0400    moving labels ontologies from everytime directory to firstime. We
    anticipate that it will be necessary to deposit label ontologies in the
    same repository as the core ontology.commit d2e0616a2f2891998fb19b4620c33e76b97576c8
Author: michelheon <heon@videotorn.ca>
Date:   Tue May 12 09:53:47 2020 -0400    Adding en_CAcommit 54d3784872cc2a225645c84b4b416d4082c7a3d6
Author: michelheon <heon@videotorn.ca>
Date:   Mon May 11 16:48:09 2020 -0400    Adding en_CAcommit 301aaa643db03d77e276bae1d0a6f5c6676c715e (origin/sprint-i18n)
Author: dofeldsc <dofeldsc@uos.de>
Date:   Fri Jun 26 17:42:37 2020 +0200    [VIVO-1846] i18n: Added i18n support for Capability Map control buttons (#58)

    * Added i18n support for Capability Map control buttons, JIRA ticket VIVO-1846

    * fixed wrong translation for resume

    Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1846commit 08e6a327bd917174c160502b0727cc2b7c7ccfaa
Author: dofeldsc <dofeldsc@uos.de>
Date:   Thu Jun 25 16:36:30 2020 +0200    i18n: title tag and headings in capability map are in english in french version (#56)

    * Added multi-language terms for VIVO-1846

    * fixed swapped properties, added Capability map title to i18n

    * changed Capabilty Map in german to Forschungsnetz

    Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1847commit 5fb35d55257b752fdef74f4b874736724e4038ac

 

 

chenejac commented 4 years ago

Andrew Woods said:

Still seeing a merge conflict.

chenejac commented 4 years ago

Andrew Woods said:

Pull-request: https://github.com/vivo-project/VIVO-languages/pull/62

supersedes: https://github.com/vivo-project/VIVO-languages/pull/48

chenejac commented 4 years ago

Andrew Woods said:

The capability map has been refactored to use property templates in: https://github.com/vivo-project/VIVO-languages/commit/2c47b73688f6ceacdf8f7bda055ee2c2147cf5fd

PR-62 again has merge conflicts and should be resolved with 'sprint-i18n'. The resolution will include:

..it is unfortunate that en_CA/webapp/src/main/webapp/i18n/vivo_all_en_CA.properties has been reformatted in the current PR.

chenejac commented 4 years ago

Michel Héon said:

Sorry i can't do more... Requires too advanced git skills for my level

chenejac commented 4 years ago

Nicolas B Dickn said:

Michel gave me the keys to his account, and I tried to fix it.

So

https://github.com/vivo-project/VIVO-languages/pull/63

now supersedes

[https://github.com/vivo-project/VIVO-languages/pull/62]

chenejac commented 4 years ago

Andrew Woods said:

The rebase of the origin pull-request appears to be successful.

For testing, I completely moved my TDB stores, then started VIVO with the code from this ticket. However, I am still seeing French when selecting en_CA. See screenshot. !Screenshot from 2020-07-14 17-23-25.png|thumbnail!

chenejac commented 4 years ago

Nicolas B Dickn said:

[~accountid:60785ded115da6006f540529] I discussed it with Michel, and he gave me a couple of hints at what could be done. I'll push some changes and let you know.

 

chenejac commented 4 years ago

Michel Héon said:

Hi [~accountid:60785ded115da6006f540529]

Can you tell me which branch you extracted for VIVO, Vitro and Vitro-Languages

chenejac commented 4 years ago

Andrew Woods said:

chenejac commented 4 years ago

Michel Héon said:

I'm assuming the links you transmitted are from the branch origin/sprint-i18n

On my side, everything's working fine...

Can you do the following procedure to verify that we have a similar starting situation:

1- stop tomcat and revome all log files in the $TOMCAT/log directory

2- stop solr

3- delete directories :  ${YOUR_INSTALL_DIR}/vivo/home/{bin/, rdf/ tdbContentModels/ tdbModels/ upgrade/ uploads/}

4- Make sure you have this configuration in applicationSetup.n3

:application
    a   vitroWebapp:application.ApplicationImpl ,
        vitroWebapp:modules.Application ;
    :hasSearchEngine              :instrumentedSearchEngineWrapper ;
    :hasSearchIndexer             :basicSearchIndexer ;
    :hasImageProcessor            :iioImageProcessor ;
    :hasFileStorage               :ptiFileStorage ;
    :hasContentTripleSource       :tdbContentTripleSource ;
    :hasConfigurationTripleSource :tdbConfigurationTripleSource ;
    :hasTBoxReasonerModule        :jfactTBoxReasonerModule .
#:sdbContentTripleSource
*    a   vitroWebapp:triplesource.impl.sdb.ContentTripleSourceSDB ,
*        vitroWebapp:modules.tripleSource.ContentTripleSource .
:tdbContentTripleSource
    a   vitroWebapp:triplesource.impl.tdb.ContentTripleSourceTDB ,
        vitroWebapp:modules.tripleSource.ContentTripleSource ;
    * May be an absolute path, or relative to the Vitro home directory.

:hasTdbDirectory "tdbContentModels" .:sparqlContentTripleSource
    a   vitroWebapp:triplesource.impl.sparql.ContentTripleSourceSPARQL ,
        vitroWebapp:modules.tripleSource.ContentTripleSource ;
    * The URI of the SPARQL endpoint for your triple-store.
    :hasEndpointURI "http://localhost:3030/vivo/query" ;
    * The URI to use for SPARQL UPDATE calls against your triple-store. 
    :hasUpdateEndpointURI "http://localhost:3030/vivo/update" .

5 - re-install VIVO Projet

6- After the installation, make sure that the menu. files are only in the directory ${YOUR_INSTALL_DIR}/vivo/home/rdf/display/firsttime. Make sure they're not in any other place!

7- Start sorl

8- Start tomcat

if it not work, send me the file vivo.all.log which is in the tomcat's log directory.

 

 

chenejac commented 4 years ago

Michel Héon said:

As a complement:

The contents of the rdf/display directory should look like this

!image-2020-07-16-09-57-48-097.png!

chenejac commented 4 years ago

Andrew Woods said:

Very helpful. I will look as soon as possible... likely not today :(

chenejac commented 4 years ago

Andrew Woods said:

Pending response to code review:

chenejac commented 3 years ago

Michel Héon said:

[~accountid:60785ded115da6006f540529], [~accountid:6113d5f84e8d8d0069f2e68b] , The problem is solved. The regression tests are also completed. I'm waiting for the resolution of [https://github.com/vivo-community/vivo-regression-tests/pull/11]  to push the new code.

chenejac commented 3 years ago

Michel Héon said:

There are no changes to be made. Previous fixes that have been committed in the i18n branch including the handling of the firstime directory reading process have been fixed.

On the other hand, a regression test to test this case is currently in my local repository. I'm waiting for PR-11 resolution to push the new test code.

chenejac commented 3 years ago

Michel Héon said:

see [https://github.com/vivo-community/vivo-regression-tests/pull/13]

It is possible to use this regression test to validate the resolution of this ticket

 

mvn -s settings.xml clean test -Dxml.file=UserMenu-testSuite.xml -DskipTests.value=false

chenejac commented 3 years ago

Andrew Woods said:

Resolved with: https://github.com/vivo-community/vivo-regression-tests/commit/e368abe270064d9d1dc627a00050e3bc2e531437