From: Greg Burri <greg.burri@gmail.com>
Date: Wed, 4 Mar 2009 15:15:55 +0000 (+0000)
Subject: MOD french -> english (6)
X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=commitdiff_plain;h=24ed7a141aa345454300dd260bbabae3a9f92408

MOD french -> english (6)
---

diff --git a/js/chat/commandes.js b/js/chat/commandes.js
index fb822aa..5aec5d5 100644
--- 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,
-      function(nom, commande) {
+      function(name, commande) {
          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, ''];
    }
    
-   var nomCommande = fragments[0].slice(1);
+   var commandName = fragments[0].slice(1);
    var args = fragments.slice(1);
    
-   if (nomCommande === "") {
+   if (commandName === "") {
       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" || nomCommande === "aide") {
+   if (commandName === "?" || commandName === "h" || commandName === "help" || commandName === "aide") {
       this.util.messageDialog(
          this.texteAide,
          euphorik.Util.messageType.informatif,
@@ -112,9 +112,9 @@ euphorik.Commandes.prototype.exec = function(chaine) {
       return [euphorik.Commandes.statut.ok, ''];
    }
    
-   if (euphorik.Commandes.liste.hasOwnProperty(nomCommande)) {
-      return euphorik.Commandes.liste[nomCommande].exec(args, this.client, this.pageMinichat);
+   if (euphorik.Commandes.liste.hasOwnProperty(commandName)) {
+      return euphorik.Commandes.liste[commandName].exec(args, this.client, this.pageMinichat);
    }
    
-   return [euphorik.Commandes.statut.erreur_commande, 'La commande /' + nomCommande + ' est inconnue'];
+   return [euphorik.Commandes.statut.erreur_commande, 'La commande /' + commandName + ' est inconnue'];
 };
diff --git a/js/communication.js b/js/communication.js
index 7288810..5ef2d88 100644
--- a/js/communication.js
+++ b/js/communication.js
@@ -63,8 +63,8 @@ euphorik.Communication.prototype.requete = function(action, json, funOk, funErro
    }
 
    var mess = this.getBase(action);
-   objectEach(json, function(nom, val) {
-      mess[nom] = val;
+   objectEach(json, function(name, val) {
+      mess[name] = val;
    });
    
    if (this.funDebutReq) {
@@ -101,8 +101,8 @@ euphorik.Communication.prototype.requete = function(action, json, funOk, funErro
    };
    
    if (paramsSupp) {
-      objectEach(paramsSupp, function(nom, val) {
-         paramsAjax[nom] = val;
+      objectEach(paramsSupp, function(name, val) {
+         paramsAjax[name] = val;
       });
    }
    
diff --git a/js/formater.js b/js/formater.js
index ba2cbc5..78e2407 100644
--- 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");
    this.regexDomaine = new RegExp("^(?:(?:" + this.protocoles + ")://)(.*?)(?:$|/).*$", "i");
    this.regexTestProtocoleExiste = new RegExp("^(?:" + this.protocoles + ")://.*$", "i");
-   this.regexNomProtocole = new RegExp("^(.*?)://");
+   this.regexProtocolName = new RegExp("^(.*?)://");
 };
 
 /**
@@ -44,8 +44,8 @@ euphorik.Formater.prototype.filtrerInputPseudo = function(nick) {
 
 euphorik.Formater.prototype.getSmilesHTML = function() {
    var XHTML = "";
-   objectEach(this.smiles, function(nom) {
-      XHTML += "<img class=\"" + nom + "\" src=\"img/smileys/" + nom + ".gif\" alt =\"" + nom + "\" />";
+   objectEach(this.smiles, function(name) {
+      XHTML += "<img class=\"" + name + "\" src=\"img/smileys/" + name + ".gif\" alt =\"" + name + "\" />";
    });
    return XHTML;
 };
@@ -79,9 +79,9 @@ euphorik.Formater.prototype.traiterLiensConv = function(m) {
   * moyenne sur échantillon : 234ms
   */
 euphorik.Formater.prototype.traiterSmiles = function(m) {  
-   objectEach(this.smiles, function(nom, smiles) {
+   objectEach(this.smiles, function(name, smiles) {
       for (var i = 0; i < smiles.length; i++) {
-         m = m.replace(smiles[i], "<img src=\"img/smileys/" + nom + ".gif\" alt =\"" + nom + "\"  />");
+         m = m.replace(smiles[i], "<img src=\"img/smileys/" + name + ".gif\" alt =\"" + name + "\"  />");
       }
    });
    return m;
@@ -142,9 +142,9 @@ euphorik.Formater.prototype.getShort = function(url) {
       if (rechercheDomaine && rechercheDomaine.length >= 2) {
          versionShort = rechercheDomaine[1];
       } else {
-         var nomProtocole = this.regexNomProtocole.exec(url);
-         if (nomProtocole && nomProtocole.length >= 2) {
-            versionShort = nomProtocole[1];
+         var protocolName = this.regexProtocolName.exec(url);
+         if (protocolName && protocolName.length >= 2) {
+            versionShort = protocolName[1];
          }
       }
    }
@@ -153,7 +153,7 @@ euphorik.Formater.prototype.getShort = function(url) {
  };
  
 euphorik.Formater.prototype.supprimerSmiles = function(m) {
-   objectEach(this.smiles, function(nom, smiles) {
+   objectEach(this.smiles, function(name, smiles) {
       for (var i = 0; i < smiles.length; i++) {
          m = m.replace(smiles[i], "");
       }
diff --git a/js/pageAbout.js b/js/pageAbout.js
index 7da55a2..9a72139 100644
--- a/js/pageAbout.js
+++ b/js/pageAbout.js
@@ -17,7 +17,7 @@
 // along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.
 
 euphorik.PageAbout = function(client, formater, util, communication) {
-   this.nom = "about";
+   this.name = "about";
    
    this.client = client;
    this.formater = formater;
diff --git a/js/pageAdmin.js b/js/pageAdmin.js
index 7a937d7..f94f9ab 100644
--- a/js/pageAdmin.js
+++ b/js/pageAdmin.js
@@ -22,7 +22,7 @@
 
 
 euphorik.PageAdmin = function(client, formater, util, communication) {
-   this.nom = "admin";
+   this.name = "admin";
    
    this.client = client;
    this.formater = formater;
diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index 30ca5a3..0af78d0 100755
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -19,7 +19,7 @@
 /*jslint laxbreak:true */
 
 euphorik.PageMinichat = function(client, formater, util, communication) {
-   this.nom = "minichat";
+   this.name = "minichat";
    
    this.client = client;
    this.formater = formater;
diff --git a/js/pageProfile.js b/js/pageProfile.js
index 2ae3fb3..99f2cfb 100755
--- a/js/pageProfile.js
+++ b/js/pageProfile.js
@@ -17,7 +17,7 @@
 // along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.
 
 euphorik.PageProfile = function(client, formater, util) {
-   this.nom = "profile";
+   this.name = "profile";
    
    this.client = client;
    this.formater = formater;
diff --git a/js/pageRegister.js b/js/pageRegister.js
index 0d17f34..09d3631 100755
--- a/js/pageRegister.js
+++ b/js/pageRegister.js
@@ -17,7 +17,7 @@
 // along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.
 
 euphorik.PageRegister = function(client, formater, util) {
-   this.nom = "register";
+   this.name = "register";
    
    this.client = client;
    this.formater = formater;
diff --git a/js/pageStatic.js b/js/pageStatic.js
index 4580bf3..df782f8 100644
--- 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/".
   */
-euphorik.PageStatique = function(nom, communication) {
-   this.nom = nom;
+euphorik.PageStatique = function(name, communication) {
+   this.name = name;
    this.communication = communication;
 };
 
 euphorik.PageStatique.prototype.contenu = function() {
-   return this.communication.load("pages/" + this.nom + ".html");
+   return this.communication.load("pages/" + this.name + ".html");
 };
 
 euphorik.PageStatique.prototype.charger = function() {
diff --git a/js/pages.js b/js/pages.js
index ea13def..9cf7fbb 100644
--- 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
    page.fragment = this.fragment;
    
-   this.pages[page.nom] = page;   
+   this.pages[page.name] = page;   
        
    if (defaultPage) {
       this.pageDefaut = page;
@@ -81,13 +81,13 @@ euphorik.Pages.prototype.displayPage = function(pageName, forceToLoad) {
    }
   
    $("#menu li").removeClass("courante");
-   $("#menu li." + page.nom).addClass("courante");
+   $("#menu li." + page.name).addClass("courante");
       
    this.pageCourante = page;
    var contenu = this.pageCourante.contenu();
   
    $("#page").html(contenu).removeClass().addClass(
-      this.pageCourante.nom +
+      this.pageCourante.name +
       // A page can bring some additionnals CSS classes
       (this.pageCourante.classes ? " " + this.pageCourante.classes() : "")
    );
@@ -96,6 +96,6 @@ euphorik.Pages.prototype.displayPage = function(pageName, forceToLoad) {
       this.pageCourante.charger();
    }
    
-   this.fragment.setVal("page", this.pageCourante.nom);
+   this.fragment.setVal("page", this.pageCourante.name);
    this.fragment.write();
 };
diff --git a/js/util.js b/js/util.js
index 5554c51..27fab59 100644
--- a/js/util.js
+++ b/js/util.js
@@ -68,8 +68,8 @@ euphorik.Util.prototype.messageDialog = function(message, type, buttons, format,
    }
    
    $("#info .buttons").html("");
-   objectEach(buttons, function(nom, bouton) {
-      $("#info .buttons").append("<div>" + nom + "</div>").find("div:last").click(bouton).click(close);
+   objectEach(buttons, function(name, bouton) {
+      $("#info .buttons").append("<div>" + name + "</div>").find("div:last").click(bouton).click(close);
    });
    
    $("#info").slideDown(200);