projects
/
euphorik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ab6de4c
)
MOD french -> english (6)
author
Greg Burri
<greg.burri@gmail.com>
Wed, 4 Mar 2009 15:15:55 +0000
(15:15 +0000)
committer
Greg Burri
<greg.burri@gmail.com>
Wed, 4 Mar 2009 15:15:55 +0000
(15:15 +0000)
js/chat/commandes.js
patch
|
blob
|
history
js/communication.js
patch
|
blob
|
history
js/formater.js
patch
|
blob
|
history
js/pageAbout.js
patch
|
blob
|
history
js/pageAdmin.js
patch
|
blob
|
history
js/pageMinichat.js
patch
|
blob
|
history
js/pageProfile.js
patch
|
blob
|
history
js/pageRegister.js
patch
|
blob
|
history
js/pageStatic.js
patch
|
blob
|
history
js/pages.js
patch
|
blob
|
history
js/util.js
patch
|
blob
|
history
diff --git
a/js/chat/commandes.js
b/js/chat/commandes.js
index
fb822aa
..
5aec5d5
100644
(file)
--- a/
js/chat/commandes.js
+++ b/
js/chat/commandes.js
@@
-39,7
+39,7
@@
euphorik.Commandes = function(client, pageMinichat, util, formater) {
this.texteAide = "<div id=\"aideCommandes\"><h1>Commandes</h1><ul>";
objectEach(
euphorik.Commandes.liste,
this.texteAide = "<div id=\"aideCommandes\"><h1>Commandes</h1><ul>";
objectEach(
euphorik.Commandes.liste,
- function(n
om
, commande) {
+ function(n
ame
, commande) {
thisCommandes.texteAide += "<li><span class=\"usage\">" + thisCommandes.formater.traitementComplet(commande.usage) + "</span> : " + thisCommandes.formater.traitementComplet(commande.description) + "</li>";
}
);
thisCommandes.texteAide += "<li><span class=\"usage\">" + thisCommandes.formater.traitementComplet(commande.usage) + "</span> : " + thisCommandes.formater.traitementComplet(commande.description) + "</li>";
}
);
@@
-94,14
+94,14
@@
euphorik.Commandes.prototype.exec = function(chaine) {
return [euphorik.Commandes.statut.pas_une_commande, ''];
}
return [euphorik.Commandes.statut.pas_une_commande, ''];
}
- var
nomCommand
e = fragments[0].slice(1);
+ var
commandNam
e = fragments[0].slice(1);
var args = fragments.slice(1);
var args = fragments.slice(1);
- if (
nomCommand
e === "") {
+ if (
commandNam
e === "") {
return [euphorik.Commandes.statut.erreur_commande, 'La commande est vide'];
}
// commandes spéciales pour afficher l'aide : "?", "h", "help", "aide"
return [euphorik.Commandes.statut.erreur_commande, 'La commande est vide'];
}
// commandes spéciales pour afficher l'aide : "?", "h", "help", "aide"
- if (
nomCommande === "?" || nomCommande === "h" || nomCommande === "help" || nomCommand
e === "aide") {
+ if (
commandName === "?" || commandName === "h" || commandName === "help" || commandNam
e === "aide") {
this.util.messageDialog(
this.texteAide,
euphorik.Util.messageType.informatif,
this.util.messageDialog(
this.texteAide,
euphorik.Util.messageType.informatif,
@@
-112,9
+112,9
@@
euphorik.Commandes.prototype.exec = function(chaine) {
return [euphorik.Commandes.statut.ok, ''];
}
return [euphorik.Commandes.statut.ok, ''];
}
- if (euphorik.Commandes.liste.hasOwnProperty(
nomCommand
e)) {
- return euphorik.Commandes.liste[
nomCommand
e].exec(args, this.client, this.pageMinichat);
+ if (euphorik.Commandes.liste.hasOwnProperty(
commandNam
e)) {
+ return euphorik.Commandes.liste[
commandNam
e].exec(args, this.client, this.pageMinichat);
}
}
- return [euphorik.Commandes.statut.erreur_commande, 'La commande /' +
nomCommand
e + ' est inconnue'];
+ return [euphorik.Commandes.statut.erreur_commande, 'La commande /' +
commandNam
e + ' est inconnue'];
};
};
diff --git
a/js/communication.js
b/js/communication.js
index
7288810
..
5ef2d88
100644
(file)
--- a/
js/communication.js
+++ b/
js/communication.js
@@
-63,8
+63,8
@@
euphorik.Communication.prototype.requete = function(action, json, funOk, funErro
}
\r
\r
var mess = this.getBase(action);
\r
}
\r
\r
var mess = this.getBase(action);
\r
- objectEach(json, function(n
om
, val) {
\r
- mess[n
om
] = val;
\r
+ objectEach(json, function(n
ame
, val) {
\r
+ mess[n
ame
] = val;
\r
});
if (this.funDebutReq) {
});
if (this.funDebutReq) {
@@
-101,8
+101,8
@@
euphorik.Communication.prototype.requete = function(action, json, funOk, funErro
};
\r
\r
if (paramsSupp) {
\r
};
\r
\r
if (paramsSupp) {
\r
- objectEach(paramsSupp, function(n
om
, val) {
\r
- paramsAjax[n
om
] = val;
\r
+ objectEach(paramsSupp, function(n
ame
, val) {
\r
+ paramsAjax[n
ame
] = val;
\r
});
\r
}
\r
\r
});
\r
}
\r
\r
diff --git
a/js/formater.js
b/js/formater.js
index
ba2cbc5
..
78e2407
100644
(file)
--- a/
js/formater.js
+++ b/
js/formater.js
@@
-30,7
+30,7
@@
euphorik.Formater = function() {
this.regexImg = new RegExp("^.*?\\.(gif|jpg|png|jpeg|bmp|tiff)$", "i");
\r
this.regexDomaine = new RegExp("^(?:(?:" + this.protocoles + ")://)(.*?)(?:$|/).*$", "i");
\r
this.regexTestProtocoleExiste = new RegExp("^(?:" + this.protocoles + ")://.*$", "i");
\r
this.regexImg = new RegExp("^.*?\\.(gif|jpg|png|jpeg|bmp|tiff)$", "i");
\r
this.regexDomaine = new RegExp("^(?:(?:" + this.protocoles + ")://)(.*?)(?:$|/).*$", "i");
\r
this.regexTestProtocoleExiste = new RegExp("^(?:" + this.protocoles + ")://.*$", "i");
\r
- this.regex
NomProtocol
e = new RegExp("^(.*?)://");
\r
+ this.regex
ProtocolNam
e = new RegExp("^(.*?)://");
\r
};
\r
\r
/**
\r
};
\r
\r
/**
\r
@@
-44,8
+44,8
@@
euphorik.Formater.prototype.filtrerInputPseudo = function(nick) {
\r
euphorik.Formater.prototype.getSmilesHTML = function() {
\r
var XHTML = "";
\r
\r
euphorik.Formater.prototype.getSmilesHTML = function() {
\r
var XHTML = "";
\r
- objectEach(this.smiles, function(n
om
) {
\r
- XHTML += "<img class=\"" + n
om + "\" src=\"img/smileys/" + nom + ".gif\" alt =\"" + nom
+ "\" />";
\r
+ objectEach(this.smiles, function(n
ame
) {
\r
+ XHTML += "<img class=\"" + n
ame + "\" src=\"img/smileys/" + name + ".gif\" alt =\"" + name
+ "\" />";
\r
});
\r
return XHTML;
\r
};
\r
});
\r
return XHTML;
\r
};
\r
@@
-79,9
+79,9
@@
euphorik.Formater.prototype.traiterLiensConv = function(m) {
* moyenne sur échantillon : 234ms
\r
*/
\r
euphorik.Formater.prototype.traiterSmiles = function(m) {
\r
* moyenne sur échantillon : 234ms
\r
*/
\r
euphorik.Formater.prototype.traiterSmiles = function(m) {
\r
- objectEach(this.smiles, function(n
om
, smiles) {
\r
+ objectEach(this.smiles, function(n
ame
, smiles) {
\r
for (var i = 0; i < smiles.length; i++) {
\r
for (var i = 0; i < smiles.length; i++) {
\r
- m = m.replace(smiles[i], "<img src=\"img/smileys/" + n
om + ".gif\" alt =\"" + nom
+ "\" />");
\r
+ m = m.replace(smiles[i], "<img src=\"img/smileys/" + n
ame + ".gif\" alt =\"" + name
+ "\" />");
\r
}
\r
});
\r
return m;
\r
}
\r
});
\r
return m;
\r
@@
-142,9
+142,9
@@
euphorik.Formater.prototype.getShort = function(url) {
if (rechercheDomaine && rechercheDomaine.length >= 2) {
\r
versionShort = rechercheDomaine[1];
\r
} else {
\r
if (rechercheDomaine && rechercheDomaine.length >= 2) {
\r
versionShort = rechercheDomaine[1];
\r
} else {
\r
- var
nomProtocole = this.regexNomProtocol
e.exec(url);
\r
- if (
nomProtocole && nomProtocol
e.length >= 2) {
\r
- versionShort =
nomProtocol
e[1];
\r
+ var
protocolName = this.regexProtocolNam
e.exec(url);
\r
+ if (
protocolName && protocolNam
e.length >= 2) {
\r
+ versionShort =
protocolNam
e[1];
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r
@@
-153,7
+153,7
@@
euphorik.Formater.prototype.getShort = function(url) {
};
\r
\r
euphorik.Formater.prototype.supprimerSmiles = function(m) {
\r
};
\r
\r
euphorik.Formater.prototype.supprimerSmiles = function(m) {
\r
- objectEach(this.smiles, function(n
om
, smiles) {
\r
+ objectEach(this.smiles, function(n
ame
, smiles) {
\r
for (var i = 0; i < smiles.length; i++) {
\r
m = m.replace(smiles[i], "");
\r
}
\r
for (var i = 0; i < smiles.length; i++) {
\r
m = m.replace(smiles[i], "");
\r
}
\r
diff --git
a/js/pageAbout.js
b/js/pageAbout.js
index
7da55a2
..
9a72139
100644
(file)
--- a/
js/pageAbout.js
+++ b/
js/pageAbout.js
@@
-17,7
+17,7
@@
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
\r
euphorik.PageAbout = function(client, formater, util, communication) {
\r
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
\r
euphorik.PageAbout = function(client, formater, util, communication) {
\r
- this.n
om
= "about";
\r
+ this.n
ame
= "about";
\r
\r
this.client = client;
\r
this.formater = formater;
\r
\r
this.client = client;
\r
this.formater = formater;
\r
diff --git
a/js/pageAdmin.js
b/js/pageAdmin.js
index
7a937d7
..
f94f9ab
100644
(file)
--- a/
js/pageAdmin.js
+++ b/
js/pageAdmin.js
@@
-22,7
+22,7
@@
euphorik.PageAdmin = function(client, formater, util, communication) {
euphorik.PageAdmin = function(client, formater, util, communication) {
- this.n
om
= "admin";
+ this.n
ame
= "admin";
this.client = client;
this.formater = formater;
this.client = client;
this.formater = formater;
diff --git
a/js/pageMinichat.js
b/js/pageMinichat.js
index
30ca5a3
..
0af78d0
100755
(executable)
--- a/
js/pageMinichat.js
+++ b/
js/pageMinichat.js
@@
-19,7
+19,7
@@
/*jslint laxbreak:true */
euphorik.PageMinichat = function(client, formater, util, communication) {
/*jslint laxbreak:true */
euphorik.PageMinichat = function(client, formater, util, communication) {
- this.n
om
= "minichat";
+ this.n
ame
= "minichat";
this.client = client;
this.formater = formater;
this.client = client;
this.formater = formater;
diff --git
a/js/pageProfile.js
b/js/pageProfile.js
index
2ae3fb3
..
99f2cfb
100755
(executable)
--- a/
js/pageProfile.js
+++ b/
js/pageProfile.js
@@
-17,7
+17,7
@@
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
\r
euphorik.PageProfile = function(client, formater, util) {
\r
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
\r
euphorik.PageProfile = function(client, formater, util) {
\r
- this.n
om
= "profile";
\r
+ this.n
ame
= "profile";
\r
\r
this.client = client;
\r
this.formater = formater;
\r
\r
this.client = client;
\r
this.formater = formater;
\r
diff --git
a/js/pageRegister.js
b/js/pageRegister.js
index
0d17f34
..
09d3631
100755
(executable)
--- a/
js/pageRegister.js
+++ b/
js/pageRegister.js
@@
-17,7
+17,7
@@
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
\r
euphorik.PageRegister = function(client, formater, util) {
\r
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
\r
euphorik.PageRegister = function(client, formater, util) {
\r
- this.n
om
= "register";
\r
+ this.n
ame
= "register";
\r
\r
this.client = client;
\r
this.formater = formater;
\r
\r
this.client = client;
\r
this.formater = formater;
\r
diff --git
a/js/pageStatic.js
b/js/pageStatic.js
index
4580bf3
..
df782f8
100644
(file)
--- a/
js/pageStatic.js
+++ b/
js/pageStatic.js
@@
-19,13
+19,13
@@
/**
* Correspond à une page html statique se nommant "<nom>.html" et se trouvant dans "/pages/".
*/
/**
* Correspond à une page html statique se nommant "<nom>.html" et se trouvant dans "/pages/".
*/
-euphorik.PageStatique = function(n
om
, communication) {
- this.n
om = nom
;
+euphorik.PageStatique = function(n
ame
, communication) {
+ this.n
ame = name
;
this.communication = communication;
};
euphorik.PageStatique.prototype.contenu = function() {
this.communication = communication;
};
euphorik.PageStatique.prototype.contenu = function() {
- return this.communication.load("pages/" + this.n
om
+ ".html");
+ return this.communication.load("pages/" + this.n
ame
+ ".html");
};
euphorik.PageStatique.prototype.charger = function() {
};
euphorik.PageStatique.prototype.charger = function() {
diff --git
a/js/pages.js
b/js/pages.js
index
ea13def
..
9cf7fbb
100644
(file)
--- a/
js/pages.js
+++ b/
js/pages.js
@@
-46,7
+46,7
@@
euphorik.Pages.prototype.addPage = function(page, defaultPage) {
page.pages = this; // la magie des langages dynamiques : le foutoire
\r
page.fragment = this.fragment;
\r
\r
page.pages = this; // la magie des langages dynamiques : le foutoire
\r
page.fragment = this.fragment;
\r
\r
- this.pages[page.n
om
] = page;
\r
+ this.pages[page.n
ame
] = page;
\r
\r
if (defaultPage) {
\r
this.pageDefaut = page;
\r
\r
if (defaultPage) {
\r
this.pageDefaut = page;
\r
@@
-81,13
+81,13
@@
euphorik.Pages.prototype.displayPage = function(pageName, forceToLoad) {
}
\r
\r
$("#menu li").removeClass("courante");
\r
}
\r
\r
$("#menu li").removeClass("courante");
\r
- $("#menu li." + page.n
om
).addClass("courante");
\r
+ $("#menu li." + page.n
ame
).addClass("courante");
\r
\r
this.pageCourante = page;
\r
var contenu = this.pageCourante.contenu();
\r
\r
$("#page").html(contenu).removeClass().addClass(
\r
\r
this.pageCourante = page;
\r
var contenu = this.pageCourante.contenu();
\r
\r
$("#page").html(contenu).removeClass().addClass(
\r
- this.pageCourante.n
om
+
\r
+ this.pageCourante.n
ame
+
\r
// A page can bring some additionnals CSS classes
\r
(this.pageCourante.classes ? " " + this.pageCourante.classes() : "")
\r
);
\r
// A page can bring some additionnals CSS classes
\r
(this.pageCourante.classes ? " " + this.pageCourante.classes() : "")
\r
);
\r
@@
-96,6
+96,6
@@
euphorik.Pages.prototype.displayPage = function(pageName, forceToLoad) {
this.pageCourante.charger();
\r
}
\r
\r
this.pageCourante.charger();
\r
}
\r
\r
- this.fragment.setVal("page", this.pageCourante.n
om
);
\r
+ this.fragment.setVal("page", this.pageCourante.n
ame
);
\r
this.fragment.write();
\r
};
\r
this.fragment.write();
\r
};
\r
diff --git
a/js/util.js
b/js/util.js
index
5554c51
..
27fab59
100644
(file)
--- a/
js/util.js
+++ b/
js/util.js
@@
-68,8
+68,8
@@
euphorik.Util.prototype.messageDialog = function(message, type, buttons, format,
}
\r
\r
$("#info .buttons").html("");
\r
}
\r
\r
$("#info .buttons").html("");
\r
- objectEach(buttons, function(n
om
, bouton) {
\r
- $("#info .buttons").append("<div>" + n
om
+ "</div>").find("div:last").click(bouton).click(close);
\r
+ objectEach(buttons, function(n
ame
, bouton) {
\r
+ $("#info .buttons").append("<div>" + n
ame
+ "</div>").find("div:last").click(bouton).click(close);
\r
});
\r
\r
$("#info").slideDown(200);
});
\r
\r
$("#info").slideDown(200);