Merge lp:~cellsoftware/telegram-app/1530698 into lp:telegram-app

[Paz Chauhan]

[Ash (ashley-richards)]

I have overviewed Paz's QML code and, to me, it all looks fine.

[Ash (ashley-richards)]

review: Approve

[lp:~cellsoftware/telegram-app/1530698]

178. By Paz Chauhan on 2016-04-26

.po and .pot files reverted

[Jin (jindallo)]

The code looks good to me,
and verified pass locally.

Thanks for this patch,
I will top-approve.

review: Approve

=== modified file 'telegram/app/qml/AccountMessageAction.qml'
--- telegram/app/qml/AccountMessageAction.qml	2016-04-17 01:29:55 +0000
+++ telegram/app/qml/AccountMessageAction.qml	2016-04-26 11:27:11 +0000
@@ -2,6 +2,7 @@
 import Ubuntu.Components 1.3
 import AsemanTools 1.0
 import TelegramQML 1.0
+import QtQuick.Window 2.0
 
 Item {
     id: message_action
@@ -41,9 +42,13 @@
         visible: hasAction
 
         Label {
+            id: actionText
             anchors.horizontalCenter: parent.horizontalCenter
+            width: Screen.width * 0.85
+            horizontalAlignment: Text.AlignHCenter
             fontSize: "small"
             color: "#333333"
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
             text: {
                 var res = ""
                 var userName
 
=== modified file 'telegram/app/qml/components/MessagesListItem.qml'
--- telegram/app/qml/components/MessagesListItem.qml	2016-04-06 08:01:54 +0000
+++ telegram/app/qml/components/MessagesListItem.qml	2016-04-26 11:27:11 +0000
@@ -230,7 +230,6 @@
 
                     Label {
                         id: message_text
-
                         // Taken from messaging-app
                         function parseText(text) {
                             var phoneExp = /(\+?([0-9]+[ ]?)?\(?([0-9]+)\)?[-. ]?([0-9]+)[-. ]?([0-9]+)[-. ]?([0-9]+))/img;