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

Fix language switching and login/logout in SALSAH #331

Merged
merged 5 commits into from
Nov 28, 2016

Conversation

benjamingeer
Copy link

@benjamingeer benjamingeer commented Nov 23, 2016

This fixes language switching in SALSAH. You can click on the language links at the top right corner of the GUI, and the language of GUI prompts changes. This doesn't affect the language of data (such as property labels), which still depend on the user's preferred language (stored in the user's knora-base:User in the triplestore).

Closes #316.

SALSAH.userdata = {lang: 'en'};
}
$.get('lang/' + SALSAH.userdata.lang + '.json', function(data) {
console.log("Getting language strings: " + SALSAH.userdata.lang)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment out the console output :-)

@tobiasschweizer
Copy link
Contributor

When asking the user if he really wants to change the language of the GUI he should be warned that the page is going to be reloaded (open windows and unsaved changes will be lost).

@tobiasschweizer
Copy link
Contributor

tobiasschweizer commented Nov 28, 2016

Have you run the browser tests?

Please add a browser test for changing the language.

@benjamingeer
Copy link
Author

I added a browser test for changing the language, and the other tests pass, too.

@benjamingeer benjamingeer merged commit 4c61185 into develop Nov 28, 2016
@benjamingeer benjamingeer deleted the wip/salsah-language branch November 28, 2016 15:18
SepidehAlassi added a commit that referenced this pull request Dec 13, 2016
* develop:
  Improve configuration for more concurrent requests (#338)
  Upgrade to Scala 2.12 (#343)
  Fix various inconsistencies in knora-base.ttl and docs. (#330)
  Fix language switching and login/logout in SALSAH (#331)
  Graph data API operation (#267)
  Allow connections over HTTPS (#332)
  Update README.md
  Add link to GraphDB.
  fix (salsah): Add missing JavaScript “var”.
  fix (webapi): Fix RouteUtilV1 so it returns HTML instead of JSON when requested (#326)
  Ontology and documentation fixes. (#325)
  fix (salsah): Create multiple links in a resource, and other bug fixes (#315)
  feature (webapi): Make TransformData fix “test” labels on regions. (#311)
  Fixes for subclasses and subproperties (#303)
  Add script to update docs on knora.org (#300)
  docs: Make trivial change for testing purposes.
  fix (webapi): CORS problems (#307)
  Use inference to optimise searches on GraphDB (#301)
@benjamingeer benjamingeer mentioned this pull request Jul 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch language
3 participants