Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'trial/notifications' into develop

Browse Source 
Conflicts:
	WebContent/main.html
This commit is contained in:
DennisSchiefer
2012-07-05 14:02:37 +01:00
parent 8b17e4864e 5e24749826
commit 517f321ccc
13 changed files with 226 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/localization/OSRM.Localization.js
+7 -3
View File
@@ -42,12 +42,16 @@ init: function() {
}
// generate selectors
OSRM.GUI.selectorInit("gui-language-toggle", options, selected, OSRM.Localization.setLanguage);
OSRM.GUI.selectorInit("gui-language-2-toggle", options_2, selected, OSRM.Localization.setLanguage);
OSRM.GUI.selectorInit("gui-language-toggle", options, selected, OSRM.Localization.setLanguageWrapper);
OSRM.GUI.selectorInit("gui-language-2-toggle", options_2, selected, OSRM.Localization.setLanguageWrapper);
// set default language
OSRM.Localization.setLanguage( OSRM.DEFAULTS.LANGUAGE );
},
setLanguageWrapper: function(language) { // wrapping required to correctly prevent localization tooltip from showing
OSRM.GUI.deactivateTooltip( "localization" );
OSRM.Localization.setLanguage(language);
},
setLanguage: function(language) {
// change value of both language selectors
OSRM.GUI.selectorChange( document.getElementById('gui-language-toggle'), language );
@@ -100,4 +104,4 @@ translate: function(text) {
};
// shorter call to translate function
OSRM.loc = OSRM.Localization.translate;
OSRM.loc = OSRM.Localization.translate;