Telegram app

Merge lp:~libqtelegram-team/telegram-app/app-dev-contactphone into lp:telegram-app/app-dev

  1. app-dev-contactphone
  2. Merge into telegram-app-dev
Proposed by Michał Karnicki
Status: Merged
Approved by: Roberto Mier Escandon
Approved revision: 212
Merged at revision: 212
Proposed branch: lp:~libqtelegram-team/telegram-app/app-dev-contactphone
Merge into: lp:telegram-app/app-dev
Diff against target: 254 lines (+53/-33)
4 files modified
po/com.ubuntu.telegram.pot (+45/-29)
tests/autopilot/sctelegram/test_generic.py (+2/-2)
tests/autopilot/sctelegram/test_scope.py (+1/-1)
ui/AddContactPage.qml (+5/-1)
To merge this branch: bzr merge lp:~libqtelegram-team/telegram-app/app-dev-contactphone
Reviewer Review Type Date Requested Status
Roberto Mier Escandon Pending
Review via email: mp+246186@code.launchpad.net

Description of the change

More informative error message when country code may be missing.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.telegram.pot'
2--- po/com.ubuntu.telegram.pot 2014-12-09 09:28:03 +0000
3+++ po/com.ubuntu.telegram.pot 2015-01-12 16:48:36 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-12-09 10:24+0100\n"
9+"POT-Creation-Date: 2015-01-12 17:42+0100\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -22,7 +22,7 @@
14 msgid "You"
15 msgstr ""
16
17-#: ../components/DelegateUtils.qml:37 ../ui/DialogPage.qml:251
18+#: ../components/DelegateUtils.qml:37 ../ui/DialogPage.qml:260
19 #: ../ui/ProfilePage.qml:32
20 msgid "DELETED"
21 msgstr ""
22@@ -67,28 +67,28 @@
23 msgid "%1 removed the group photo"
24 msgstr ""
25
26-#: ../components/TelegramContactsListItem.qml:61
27+#: ../components/TelegramContactsListItem.qml:59
28 msgid "Contact"
29 msgstr ""
30
31-#: ../components/TelegramContactsListItem.qml:77
32+#: ../components/TelegramContactsListItem.qml:75
33 msgid "Last seen"
34 msgstr ""
35
36-#: ../components/TelegramContactsListItem.qml:97 ../ui/AddContactPage.qml:332
37+#: ../components/TelegramContactsListItem.qml:95 ../ui/AddContactPage.qml:336
38 #: ../ui/ProfilePage.qml:41
39 msgid "online"
40 msgstr ""
41
42 #. TRANSLATORS: the argument refers to a time
43-#: ../components/TelegramContactsListItem.qml:100 ../ui/AddContactPage.qml:335
44+#: ../components/TelegramContactsListItem.qml:98 ../ui/AddContactPage.qml:339
45 #: ../ui/ProfilePage.qml:44
46 #, qt-format
47 msgid "last seen %1"
48 msgstr ""
49
50 #: ../components/TelegramDialogsListItem.qml:43
51-#: ../library/uitest/ui/DialogsPage.qml:116
52+#: ../library/uitest/ui/DialogsPage.qml:117
53 msgid "typing..."
54 msgstr ""
55
56@@ -106,11 +106,11 @@
57 msgid "Next"
58 msgstr ""
59
60-#: ../library/uitest/ui/DialogDesignPage.qml:245
61+#: ../library/uitest/ui/DialogDesignPage.qml:256
62 msgid "Enter local path to send"
63 msgstr ""
64
65-#: ../library/uitest/ui/DialogDesignPage.qml:252
66+#: ../library/uitest/ui/DialogDesignPage.qml:263
67 msgid "Enter msg to send"
68 msgstr ""
69
70@@ -156,35 +156,35 @@
71 msgid "calling user's mobile"
72 msgstr ""
73
74-#: ../telegram.qml:636
75+#: ../telegram.qml:638
76 msgid "Push notifications"
77 msgstr ""
78
79-#: ../telegram.qml:637
80+#: ../telegram.qml:639
81 msgid "To enable push, sign in to your Ubuntu One account."
82 msgstr ""
83
84-#: ../telegram.qml:639
85+#: ../telegram.qml:641
86 msgid "Sign in to Ubuntu One"
87 msgstr ""
88
89-#: ../telegram.qml:647
90+#: ../telegram.qml:649
91 msgid "Remind me later"
92 msgstr ""
93
94-#: ../telegram.qml:651
95+#: ../telegram.qml:653
96 msgid "Don't use push"
97 msgstr ""
98
99-#: ../telegram.qml:686
100+#: ../telegram.qml:688
101 msgid "Unauthorized"
102 msgstr ""
103
104-#: ../telegram.qml:687
105+#: ../telegram.qml:689
106 msgid "You have been logged out. Please log in."
107 msgstr ""
108
109-#: ../telegram.qml:689 ../ui/ContactsPage.qml:229 ../ui/ContactsPage.qml:375
110+#: ../telegram.qml:691 ../ui/ContactsPage.qml:229 ../ui/ContactsPage.qml:375
111 #: ../ui/SettingsPage.qml:57 ../ui/SettingsPage.qml:165
112 msgid "OK"
113 msgstr ""
114@@ -245,11 +245,15 @@
115 msgid "Could not add contact"
116 msgstr ""
117
118-#: ../ui/AddContactPage.qml:308
119+#: ../ui/AddContactPage.qml:309
120+msgid "Please include the country code."
121+msgstr ""
122+
123+#: ../ui/AddContactPage.qml:312
124 msgid "Number is not a valid phone number"
125 msgstr ""
126
127-#: ../ui/AddContactPage.qml:346
128+#: ../ui/AddContactPage.qml:350
129 msgid "Not connected, try again later"
130 msgstr ""
131
132@@ -337,23 +341,27 @@
133 msgid "Send video"
134 msgstr ""
135
136-#: ../ui/DialogPage.qml:35 ../ui/GroupProfilePage.qml:46
137+#: ../ui/DialogPage.qml:35 ../ui/DialogsPage.qml:106
138+msgid "Clear history"
139+msgstr ""
140+
141+#: ../ui/DialogPage.qml:41 ../ui/GroupProfilePage.qml:40
142 msgid "Group Info"
143 msgstr ""
144
145-#: ../ui/DialogPage.qml:35
146+#: ../ui/DialogPage.qml:41
147 msgid "Profile Info"
148 msgstr ""
149
150-#: ../ui/DialogPage.qml:79
151+#: ../ui/DialogPage.qml:85
152 msgid "Add to contacts"
153 msgstr ""
154
155-#: ../ui/DialogPage.qml:112
156+#: ../ui/DialogPage.qml:118
157 msgid "Type message"
158 msgstr ""
159
160-#: ../ui/DialogPage.qml:243
161+#: ../ui/DialogPage.qml:250
162 msgid "Delete"
163 msgstr ""
164
165@@ -382,26 +390,34 @@
166 msgid "Waiting for connection..."
167 msgstr ""
168
169-#: ../ui/GroupProfilePage.qml:51
170+#: ../ui/DialogsPage.qml:118 ../ui/GroupProfilePage.qml:195
171+msgid "Info"
172+msgstr ""
173+
174+#: ../ui/GroupProfilePage.qml:45
175 msgid "Add member"
176 msgstr ""
177
178-#: ../ui/GroupProfilePage.qml:98
179+#: ../ui/GroupProfilePage.qml:94
180 msgid "members"
181 msgstr ""
182
183-#: ../ui/GroupProfilePage.qml:114
184+#: ../ui/GroupProfilePage.qml:110
185 msgid "Notifications"
186 msgstr ""
187
188-#: ../ui/GroupProfilePage.qml:116
189+#: ../ui/GroupProfilePage.qml:112
190 msgid "Disabled"
191 msgstr ""
192
193-#: ../ui/GroupProfilePage.qml:116
194+#: ../ui/GroupProfilePage.qml:112
195 msgid "Enabled"
196 msgstr ""
197
198+#: ../ui/GroupProfilePage.qml:180
199+msgid "Remove from group"
200+msgstr ""
201+
202 #: ../ui/IntroPage.qml:103
203 msgid "Start Messaging"
204 msgstr ""
205
206=== modified file 'tests/autopilot/sctelegram/test_generic.py'
207--- tests/autopilot/sctelegram/test_generic.py 2014-12-15 16:14:39 +0000
208+++ tests/autopilot/sctelegram/test_generic.py 2015-01-12 16:48:36 +0000
209@@ -8,12 +8,12 @@
210 dir_base = os.path.expanduser("~/.local/share/unity-scopes")
211 scope_id = "com.ubuntu.telegram_sctelegram"
212 click_id = "com.ubuntu.telegram"
213-scope_path = os.path.join(dir_base, scope_id + "_0.9.29.205")
214+scope_path = os.path.join(dir_base, scope_id + "_0.9.31.206")
215 cache_path = os.path.join(dir_base, 'leaf-net/' + click_id)
216 ini_path = os.path.join(scope_path, scope_id + ".ini")
217
218 #POFILES arrives from cmake as a semicolon delimited string of paths to all po files
219-langs = 'po/es.po;po/ca.po'.replace('.po', '')
220+langs = 'po/ca.po;po/es.po'.replace('.po', '')
221 langs = langs.replace('po/', '')
222 langs = langs.split(';')
223
224
225=== modified file 'tests/autopilot/sctelegram/test_scope.py'
226--- tests/autopilot/sctelegram/test_scope.py 2014-12-15 16:14:39 +0000
227+++ tests/autopilot/sctelegram/test_scope.py 2015-01-12 16:48:36 +0000
228@@ -6,7 +6,7 @@
229 import configparser
230
231 dir_base = os.path.expanduser("~/.local/share/unity-scopes")
232-scope_path = os.path.join(dir_base, "com.ubuntu.telegram_sctelegram_0.9.29.205")
233+scope_path = os.path.join(dir_base, "com.ubuntu.telegram_sctelegram_0.9.31.206")
234 ini_path = os.path.join(scope_path, "com.ubuntu.telegram_sctelegram.ini")
235 langs_ =""
236 SCOPEDATA = "/home/phablet/autopilot/scope-data"
237
238=== modified file 'ui/AddContactPage.qml'
239--- ui/AddContactPage.qml 2014-10-21 14:03:09 +0000
240+++ ui/AddContactPage.qml 2015-01-12 16:48:36 +0000
241@@ -302,8 +302,12 @@
242 invite.visible = true;
243 }
244 }
245+
246 onErrorPhone: {
247- if (errorText == "PHONE_NUMBER_INVALID") {
248+ if (errorText == "PHONE_NUMBER_INVALID" && phone.indexOf('+') === -1) {
249+ busy = false;
250+ error = i18n.tr("Please include the country code.");
251+ } else if (errorText == "PHONE_NUMBER_INVALID") {
252 busy = false;
253 error = i18n.tr("Number is not a valid phone number");
254 }

Subscribers

People subscribed via source and target branches

to all changes: