Bug 1293370 - Fix double equal sign (==) in definition of entity conversation.muc.invitationWithReason.password. r=aleth a=jorgk
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 09 Aug 2016 14:24:16 +0200
changeset 27432 0b543813d4abd9ed9faafb47db48381800a18165
parent 27431 4aa478f373837917eaf7b1e1e4894ab2e50e4fbc
child 27433 1b5ca34bd56e48f811c5b1bb341862f1041db587
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth, jorgk
bugs1293370
Bug 1293370 - Fix double equal sign (==) in definition of entity conversation.muc.invitationWithReason.password. r=aleth a=jorgk
chat/locales/en-US/xmpp.properties
chat/protocols/xmpp/xmpp.jsm
--- a/chat/locales/en-US/xmpp.properties
+++ b/chat/locales/en-US/xmpp.properties
@@ -124,21 +124,21 @@ chatRoomField.password=_Password
 
 # LOCALIZATION NOTE (conversation.muc.*):
 #   These are displayed as a system message when a chatroom invitation is
 #   received.
 #   %1$S is the inviter.
 #   %2$S is the room.
 #   %3$S is the reason which is a message provided by the person sending the
 #   invitation.
-conversation.muc.invitationWithReason=%1$S has invited you to join %2$S: %3$S
+conversation.muc.invitationWithReason2=%1$S has invited you to join %2$S: %3$S
 #   %3$S is the password of the room.
 #   %4$S is the reason which is a message provided by the person sending the
 #   invitation.
-conversation.muc.invitationWithReason.password==%1$S has invited you to join %2$S with password %3$S: %4$S
+conversation.muc.invitationWithReason2.password=%1$S has invited you to join %2$S with password %3$S: %4$S
 conversation.muc.invitationWithoutReason=%1$S has invited you to join %2$S
 #   %3$S is the password of the room.
 conversation.muc.invitationWithoutReason.password=%1$S has invited you to join %2$S with password %3$S
 
 # LOCALIZATION NOTE (conversation.muc.join):
 #   This is displayed as a system message when a participant joins room.
 #   %S is the nick of the participant.
 conversation.message.join=%S entered the room.
--- a/chat/protocols/xmpp/xmpp.jsm
+++ b/chat/protocols/xmpp/xmpp.jsm
@@ -1976,17 +1976,17 @@ var XMPPAccountPrototype = {
       muc.setTopic(subject.innerText, nick);
       return;
     }
 
     let invitation = this.parseInvitation(aStanza);
     if (invitation) {
       let messageID;
       if (invitation.reason)
-        messageID = "conversation.muc.invitationWithReason";
+        messageID = "conversation.muc.invitationWithReason2";
       else
         messageID = "conversation.muc.invitationWithoutReason";
       if (invitation.password)
         messageID += ".password";
       let params =
         [invitation.from, invitation.mucJid, invitation.password,
          invitation.reason].filter(s => s);
       let message = _(messageID, ...params);