dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change eq by RegEx (#1576)

Browse Source
This commit is contained in:
Christophe Maudoux 2018-12-10 21:14:30 +01:00
parent 3e6534a55a
commit b359476709
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lemonldap-ng-portal/site/coffee/portal.coffee
View File

@ -303,7 +303,11 @@ $(document).ready ->
for al in window.availableLanguages for al in window.availableLanguages
langdiv += "<img class=\"langicon\" src=\"#{window.staticPrefix}common/#{al}.png\" title=\"#{al}\" alt=\"[#{al}]\"> " langdiv += "<img class=\"langicon\" src=\"#{window.staticPrefix}common/#{al}.png\" title=\"#{al}\" alt=\"[#{al}]\"> "
for nl in nlangs for nl in nlangs
if al == nl console.log 'Navigator lang', nl
console.log 'Available lang', al
re = new RegExp('^'+al+'-?')
if nl.match re
console.log 'Matching lang', al
langs.push al langs.push al
else if al.substring(0, 1) == nl.substring(0, 1) else if al.substring(0, 1) == nl.substring(0, 1)
langs2.push al langs2.push al
@ -312,6 +316,7 @@ $(document).ready ->
lang = window.availableLanguages[0] lang = window.availableLanguages[0]
else if lang not in window.availableLanguages else if lang not in window.availableLanguages
lang = window.availableLanguages[0] lang = window.availableLanguages[0]
console.log 'Selected lang', lang
setCookie 'llnglanguage', lang setCookie 'llnglanguage', lang
translatePage(lang) translatePage(lang)

10
lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.8 // Generated by CoffeeScript 1.12.7
/* /*
LemonLDAP::NG Portal jQuery scripts LemonLDAP::NG Portal jQuery scripts
@ -217,7 +217,7 @@ LemonLDAP::NG Portal jQuery scripts
datas = {}; datas = {};
$(document).ready(function() { $(document).ready(function() {
var action, al, authMenuTabs, back_url, i, l, lang, langdiv, langs, langs2, len, len1, len2, link, m, menuIndex, menuTabs, method, nl, nlangs, ref, ref1; var action, al, authMenuTabs, back_url, i, l, lang, langdiv, langs, langs2, len, len1, len2, link, m, menuIndex, menuTabs, method, nl, nlangs, re, ref, ref1;
datas = getValues(); datas = getValues();
window.datas = datas; window.datas = datas;
if (datas['antiframe'] && top !== self) { if (datas['antiframe'] && top !== self) {
@ -288,7 +288,11 @@ LemonLDAP::NG Portal jQuery scripts
langdiv += "<img class=\"langicon\" src=\"" + window.staticPrefix + "common/" + al + ".png\" title=\"" + al + "\" alt=\"[" + al + "]\"> "; langdiv += "<img class=\"langicon\" src=\"" + window.staticPrefix + "common/" + al + ".png\" title=\"" + al + "\" alt=\"[" + al + "]\"> ";
for (l = 0, len1 = nlangs.length; l < len1; l++) { for (l = 0, len1 = nlangs.length; l < len1; l++) {
nl = nlangs[l]; nl = nlangs[l];
if (al === nl) { console.log('Navigator lang', nl);
console.log('Available lang', al);
re = new RegExp('^' + al + '-?');
if (nl.match(re)) {
console.log('Matching lang', al);
langs.push(al); langs.push(al);
} else if (al.substring(0, 1) === nl.substring(0, 1)) { } else if (al.substring(0, 1) === nl.substring(0, 1)) {
langs2.push(al); langs2.push(al);

2
lemonldap-ng-portal/site/htdocs/static/common/js/portal.min.js vendored
View File

File diff suppressed because one or more lines are too long