Merge lp:~libqtelegram-team/telegram-app/show-secret-chat-information-in-account-page into lp:telegram-app

[Jin]

[Roberto Mier Escandon (rmescandon)]

review: Approve

[Jin (jindallo)]

@Roberto,

Thanks for your approval!

=== modified file 'telegram/app/qml/AccountMessageAction.qml'
--- telegram/app/qml/AccountMessageAction.qml	2016-05-04 08:00:12 +0000
+++ telegram/app/qml/AccountMessageAction.qml	2016-05-16 06:53:35 +0000
@@ -52,15 +52,18 @@
             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
             text: {
                 var res = ""
-                var userName
+                var userName = user.firstName + " " + user.lastName
                 var fromUserName = fromUser.firstName + " " + fromUser.lastName
+                userName = userName.trim()
                 fromUserName = fromUserName.trim()
 
                 switch(action.classType) {
                 case typeMessageActionChatCreate:
                     if (action.title == "Secret Chat") {
-                        // TRANSLATORS: %1 indicates who created the secret chat.
-                        res = i18n.tr("%1 created a secret chat").arg(fromUserName);
+                        if (user.id == telegramObject.me)
+                            res = i18n.tr("You have invited %1 to join a secret chat.").arg(fromUserName)
+                        else
+                            res = i18n.tr("%1 invited you to join a secret chat.").arg(fromUserName)
                     } else {
                         if (fromUser.id == telegramObject.me)
                             res = i18n.tr("You created the group")
@@ -70,9 +73,6 @@
                     break
 
                 case typeMessageActionChatAddUser:
-                    userName = user.firstName + " " + user.lastName
-                    userName = userName.trim()
-
                     if (fromUser.id == telegramObject.me)
                         res = i18n.tr("You added <b>%1</b>").arg(userName)
                     else if (user.id == telegramObject.me)
@@ -82,9 +82,6 @@
                     break
 
                 case typeMessageActionChatDeleteUser:
-                    userName = user.firstName + " " + user.lastName
-                    userName = userName.trim()
-
                     if (user.id == fromUser.id) {
                         // TRANSLATORS: %1 is the person, who left the group chat.
                         res = i18n.tr("<b>%1</b> left the group").arg(userName)

=== modified file 'telegram/app/qml/components/DialogsListItem.qml'
--- telegram/app/qml/components/DialogsListItem.qml	2016-05-04 08:00:12 +0000
+++ telegram/app/qml/components/DialogsListItem.qml	2016-05-16 06:53:35 +0000
@@ -208,10 +208,17 @@
 
                     switch(message.action.classType) {
                         case typeMessageActionChatCreate:
-                            if (fromUser.id == telegramObject.me)
-                                res = i18n.tr("<font color=\"DarkBlue\">You created the group</font>")
-                            else
-                                res = i18n.tr("<font color=\"DarkBlue\">%1 created the group</font>").arg(fromUserName)
+                            if (message.action.title == "Secret Chat") {
+                                if (user.id == telegramObject.me)
+                                    res = i18n.tr("<font color=\"DarkBlue\">%1 joined your secret chat.</font>").arg(fromUserName)
+                                else
+                                    res = i18n.tr("<font color=\"DarkBlue\">You joined the secret chat.</font>")
+                            } else {
+                                if (fromUser.id == telegramObject.me)
+                                    res = i18n.tr("<font color=\"DarkBlue\">You created the group</font>")
+                                else
+                                    res = i18n.tr("<font color=\"DarkBlue\">%1 created the group</font>").arg(fromUserName)
+                            }
                             break
 
                         case typeMessageActionChatAddUser: