projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MOD french -> english (3)
[euphorik.git]
/
js
/
chat
/
message.js
diff --git
a/js/chat/message.js
b/js/chat/message.js
index
c24be1d
..
2586dbb
100644
(file)
--- a/
js/chat/message.js
+++ b/
js/chat/message.js
@@
-16,11
+16,9
@@
// You should have received a copy of the GNU General Public License
\r
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
\r
// You should have received a copy of the GNU General Public License
\r
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
\r
-euphorik.Reponse = function(id,
pseudo
, login) {
\r
+euphorik.Reponse = function(id,
nick
, login) {
\r
this.id = id;
\r
this.id = id;
\r
- this.pseudo = pseudo;
\r
- this.login = login;
\r
- this.pseudo = pseudo || "";
\r
+ this.nick = nick || "";
\r
this.login = login || "";
\r
};
\r
\r
this.login = login || "";
\r
};
\r
\r
@@
-35,7
+33,7
@@
euphorik.Message = function(client, formater, element) {
this.auteurId = element.user_id;
\r
this.racineId = element.root;
\r
this.date = element.date;
\r
this.auteurId = element.user_id;
\r
this.racineId = element.root;
\r
this.date = element.date;
\r
- this.
pseudo
= element.nick;
\r
+ this.
nick
= element.nick;
\r
this.login = element.login;
\r
this.contenu = element.content;
\r
\r
this.login = element.login;
\r
this.contenu = element.content;
\r
\r
@@
-120,9
+118,9
@@
euphorik.Message.prototype.XHTML = function(messagePair, pre) {
\r
// construit l'identifiant de la personne
\r
var identifiant =
\r
\r
// construit l'identifiant de la personne
\r
var identifiant =
\r
- this.client.nickFormat === "nick" || this.login === "" ? this.formater.traitementComplet(this.
pseudo
) :
\r
+ this.client.nickFormat === "nick" || this.login === "" ? this.formater.traitementComplet(this.
nick
) :
\r
(this.client.nickFormat === "login" ? this.formater.traitementComplet(this.login) :
\r
(this.client.nickFormat === "login" ? this.formater.traitementComplet(this.login) :
\r
- this.formater.traitementComplet(this.
pseudo
) + "<span class=\"login\">(" + this.formater.traitementComplet(this.login) +")</span>" );
\r
+ this.formater.traitementComplet(this.
nick
) + "<span class=\"login\">(" + this.formater.traitementComplet(this.login) +")</span>" );
\r
\r
var XHTMLrepondA = "";
\r
var debut = true;
\r
\r
var XHTMLrepondA = "";
\r
var debut = true;
\r
@@
-130,7
+128,7
@@
euphorik.Message.prototype.XHTML = function(messagePair, pre) {
if (!debut) {
\r
XHTMLrepondA += ", ";
\r
}
\r
if (!debut) {
\r
XHTMLrepondA += ", ";
\r
}
\r
- XHTMLrepondA += thisMessage.formater.traitementComplet(rep.
pseudo
);
\r
+ XHTMLrepondA += thisMessage.formater.traitementComplet(rep.
nick
);
\r
debut = false;
\r
});
\r
if (XHTMLrepondA) {
\r
debut = false;
\r
});
\r
if (XHTMLrepondA) {
\r
@@
-146,10
+144,10
@@
euphorik.Message.prototype.XHTML = function(messagePair, pre) {
"\">" +
\r
"<span class=\"entete\">" +
\r
"<span class=\"dateComplete\">[<span class=\"date\">" + this.date + "</span>]</span>" +
\r
"\">" +
\r
"<span class=\"entete\">" +
\r
"<span class=\"dateComplete\">[<span class=\"date\">" + this.date + "</span>]</span>" +
\r
- "<span class=\"
pseudo
\"><span class=\"id\" style=\"display: none\">" + this.auteurId + "</span><span class=\"ident\">" + identifiant + "</span></span>" +
\r
+ "<span class=\"
nick
\"><span class=\"id\" style=\"display: none\">" + this.auteurId + "</span><span class=\"ident\">" + identifiant + "</span></span>" +
\r
"</span>" +
\r
"<span class=\"delimitationEntete\"></span>" +
\r
XHTMLrepondA +
\r
"</span>" +
\r
"<span class=\"delimitationEntete\"></span>" +
\r
XHTMLrepondA +
\r
- "<span class=\"contenu\">" + this.formater.traitementComplet(this.contenu, this.
pseudo
) + "</span>" +
\r
+ "<span class=\"contenu\">" + this.formater.traitementComplet(this.contenu, this.
nick
) + "</span>" +
\r
"</div>";
\r
};
\r
"</div>";
\r
};
\r