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
=== modified file 'po/com.ubuntu.telegram.pot'
--- po/com.ubuntu.telegram.pot 2014-12-09 09:28:03 +0000
+++ po/com.ubuntu.telegram.pot 2015-01-12 16:48:36 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-12-09 10:24+0100\n"11"POT-Creation-Date: 2015-01-12 17:42+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@
22msgid "You"22msgid "You"
23msgstr ""23msgstr ""
2424
25#: ../components/DelegateUtils.qml:37 ../ui/DialogPage.qml:25125#: ../components/DelegateUtils.qml:37 ../ui/DialogPage.qml:260
26#: ../ui/ProfilePage.qml:3226#: ../ui/ProfilePage.qml:32
27msgid "DELETED"27msgid "DELETED"
28msgstr ""28msgstr ""
@@ -67,28 +67,28 @@
67msgid "%1 removed the group photo"67msgid "%1 removed the group photo"
68msgstr ""68msgstr ""
6969
70#: ../components/TelegramContactsListItem.qml:6170#: ../components/TelegramContactsListItem.qml:59
71msgid "Contact"71msgid "Contact"
72msgstr ""72msgstr ""
7373
74#: ../components/TelegramContactsListItem.qml:7774#: ../components/TelegramContactsListItem.qml:75
75msgid "Last seen"75msgid "Last seen"
76msgstr ""76msgstr ""
7777
78#: ../components/TelegramContactsListItem.qml:97 ../ui/AddContactPage.qml:33278#: ../components/TelegramContactsListItem.qml:95 ../ui/AddContactPage.qml:336
79#: ../ui/ProfilePage.qml:4179#: ../ui/ProfilePage.qml:41
80msgid "online"80msgid "online"
81msgstr ""81msgstr ""
8282
83#. TRANSLATORS: the argument refers to a time83#. TRANSLATORS: the argument refers to a time
84#: ../components/TelegramContactsListItem.qml:100 ../ui/AddContactPage.qml:33584#: ../components/TelegramContactsListItem.qml:98 ../ui/AddContactPage.qml:339
85#: ../ui/ProfilePage.qml:4485#: ../ui/ProfilePage.qml:44
86#, qt-format86#, qt-format
87msgid "last seen %1"87msgid "last seen %1"
88msgstr ""88msgstr ""
8989
90#: ../components/TelegramDialogsListItem.qml:4390#: ../components/TelegramDialogsListItem.qml:43
91#: ../library/uitest/ui/DialogsPage.qml:11691#: ../library/uitest/ui/DialogsPage.qml:117
92msgid "typing..."92msgid "typing..."
93msgstr ""93msgstr ""
9494
@@ -106,11 +106,11 @@
106msgid "Next"106msgid "Next"
107msgstr ""107msgstr ""
108108
109#: ../library/uitest/ui/DialogDesignPage.qml:245109#: ../library/uitest/ui/DialogDesignPage.qml:256
110msgid "Enter local path to send"110msgid "Enter local path to send"
111msgstr ""111msgstr ""
112112
113#: ../library/uitest/ui/DialogDesignPage.qml:252113#: ../library/uitest/ui/DialogDesignPage.qml:263
114msgid "Enter msg to send"114msgid "Enter msg to send"
115msgstr ""115msgstr ""
116116
@@ -156,35 +156,35 @@
156msgid "calling user's mobile"156msgid "calling user's mobile"
157msgstr ""157msgstr ""
158158
159#: ../telegram.qml:636159#: ../telegram.qml:638
160msgid "Push notifications"160msgid "Push notifications"
161msgstr ""161msgstr ""
162162
163#: ../telegram.qml:637163#: ../telegram.qml:639
164msgid "To enable push, sign in to your Ubuntu One account."164msgid "To enable push, sign in to your Ubuntu One account."
165msgstr ""165msgstr ""
166166
167#: ../telegram.qml:639167#: ../telegram.qml:641
168msgid "Sign in to Ubuntu One"168msgid "Sign in to Ubuntu One"
169msgstr ""169msgstr ""
170170
171#: ../telegram.qml:647171#: ../telegram.qml:649
172msgid "Remind me later"172msgid "Remind me later"
173msgstr ""173msgstr ""
174174
175#: ../telegram.qml:651175#: ../telegram.qml:653
176msgid "Don't use push"176msgid "Don't use push"
177msgstr ""177msgstr ""
178178
179#: ../telegram.qml:686179#: ../telegram.qml:688
180msgid "Unauthorized"180msgid "Unauthorized"
181msgstr ""181msgstr ""
182182
183#: ../telegram.qml:687183#: ../telegram.qml:689
184msgid "You have been logged out. Please log in."184msgid "You have been logged out. Please log in."
185msgstr ""185msgstr ""
186186
187#: ../telegram.qml:689 ../ui/ContactsPage.qml:229 ../ui/ContactsPage.qml:375187#: ../telegram.qml:691 ../ui/ContactsPage.qml:229 ../ui/ContactsPage.qml:375
188#: ../ui/SettingsPage.qml:57 ../ui/SettingsPage.qml:165188#: ../ui/SettingsPage.qml:57 ../ui/SettingsPage.qml:165
189msgid "OK"189msgid "OK"
190msgstr ""190msgstr ""
@@ -245,11 +245,15 @@
245msgid "Could not add contact"245msgid "Could not add contact"
246msgstr ""246msgstr ""
247247
248#: ../ui/AddContactPage.qml:308248#: ../ui/AddContactPage.qml:309
249msgid "Please include the country code."
250msgstr ""
251
252#: ../ui/AddContactPage.qml:312
249msgid "Number is not a valid phone number"253msgid "Number is not a valid phone number"
250msgstr ""254msgstr ""
251255
252#: ../ui/AddContactPage.qml:346256#: ../ui/AddContactPage.qml:350
253msgid "Not connected, try again later"257msgid "Not connected, try again later"
254msgstr ""258msgstr ""
255259
@@ -337,23 +341,27 @@
337msgid "Send video"341msgid "Send video"
338msgstr ""342msgstr ""
339343
340#: ../ui/DialogPage.qml:35 ../ui/GroupProfilePage.qml:46344#: ../ui/DialogPage.qml:35 ../ui/DialogsPage.qml:106
345msgid "Clear history"
346msgstr ""
347
348#: ../ui/DialogPage.qml:41 ../ui/GroupProfilePage.qml:40
341msgid "Group Info"349msgid "Group Info"
342msgstr ""350msgstr ""
343351
344#: ../ui/DialogPage.qml:35352#: ../ui/DialogPage.qml:41
345msgid "Profile Info"353msgid "Profile Info"
346msgstr ""354msgstr ""
347355
348#: ../ui/DialogPage.qml:79356#: ../ui/DialogPage.qml:85
349msgid "Add to contacts"357msgid "Add to contacts"
350msgstr ""358msgstr ""
351359
352#: ../ui/DialogPage.qml:112360#: ../ui/DialogPage.qml:118
353msgid "Type message"361msgid "Type message"
354msgstr ""362msgstr ""
355363
356#: ../ui/DialogPage.qml:243364#: ../ui/DialogPage.qml:250
357msgid "Delete"365msgid "Delete"
358msgstr ""366msgstr ""
359367
@@ -382,26 +390,34 @@
382msgid "Waiting for connection..."390msgid "Waiting for connection..."
383msgstr ""391msgstr ""
384392
385#: ../ui/GroupProfilePage.qml:51393#: ../ui/DialogsPage.qml:118 ../ui/GroupProfilePage.qml:195
394msgid "Info"
395msgstr ""
396
397#: ../ui/GroupProfilePage.qml:45
386msgid "Add member"398msgid "Add member"
387msgstr ""399msgstr ""
388400
389#: ../ui/GroupProfilePage.qml:98401#: ../ui/GroupProfilePage.qml:94
390msgid "members"402msgid "members"
391msgstr ""403msgstr ""
392404
393#: ../ui/GroupProfilePage.qml:114405#: ../ui/GroupProfilePage.qml:110
394msgid "Notifications"406msgid "Notifications"
395msgstr ""407msgstr ""
396408
397#: ../ui/GroupProfilePage.qml:116409#: ../ui/GroupProfilePage.qml:112
398msgid "Disabled"410msgid "Disabled"
399msgstr ""411msgstr ""
400412
401#: ../ui/GroupProfilePage.qml:116413#: ../ui/GroupProfilePage.qml:112
402msgid "Enabled"414msgid "Enabled"
403msgstr ""415msgstr ""
404416
417#: ../ui/GroupProfilePage.qml:180
418msgid "Remove from group"
419msgstr ""
420
405#: ../ui/IntroPage.qml:103421#: ../ui/IntroPage.qml:103
406msgid "Start Messaging"422msgid "Start Messaging"
407msgstr ""423msgstr ""
408424
=== modified file 'tests/autopilot/sctelegram/test_generic.py'
--- tests/autopilot/sctelegram/test_generic.py 2014-12-15 16:14:39 +0000
+++ tests/autopilot/sctelegram/test_generic.py 2015-01-12 16:48:36 +0000
@@ -8,12 +8,12 @@
8dir_base = os.path.expanduser("~/.local/share/unity-scopes")8dir_base = os.path.expanduser("~/.local/share/unity-scopes")
9scope_id = "com.ubuntu.telegram_sctelegram"9scope_id = "com.ubuntu.telegram_sctelegram"
10click_id = "com.ubuntu.telegram"10click_id = "com.ubuntu.telegram"
11scope_path = os.path.join(dir_base, scope_id + "_0.9.29.205")11scope_path = os.path.join(dir_base, scope_id + "_0.9.31.206")
12cache_path = os.path.join(dir_base, 'leaf-net/' + click_id)12cache_path = os.path.join(dir_base, 'leaf-net/' + click_id)
13ini_path = os.path.join(scope_path, scope_id + ".ini")13ini_path = os.path.join(scope_path, scope_id + ".ini")
1414
15#POFILES arrives from cmake as a semicolon delimited string of paths to all po files15#POFILES arrives from cmake as a semicolon delimited string of paths to all po files
16langs = 'po/es.po;po/ca.po'.replace('.po', '')16langs = 'po/ca.po;po/es.po'.replace('.po', '')
17langs = langs.replace('po/', '')17langs = langs.replace('po/', '')
18langs = langs.split(';')18langs = langs.split(';')
1919
2020
=== modified file 'tests/autopilot/sctelegram/test_scope.py'
--- tests/autopilot/sctelegram/test_scope.py 2014-12-15 16:14:39 +0000
+++ tests/autopilot/sctelegram/test_scope.py 2015-01-12 16:48:36 +0000
@@ -6,7 +6,7 @@
6import configparser6import configparser
77
8dir_base = os.path.expanduser("~/.local/share/unity-scopes")8dir_base = os.path.expanduser("~/.local/share/unity-scopes")
9scope_path = os.path.join(dir_base, "com.ubuntu.telegram_sctelegram_0.9.29.205")9scope_path = os.path.join(dir_base, "com.ubuntu.telegram_sctelegram_0.9.31.206")
10ini_path = os.path.join(scope_path, "com.ubuntu.telegram_sctelegram.ini")10ini_path = os.path.join(scope_path, "com.ubuntu.telegram_sctelegram.ini")
11langs_ =""11langs_ =""
12SCOPEDATA = "/home/phablet/autopilot/scope-data"12SCOPEDATA = "/home/phablet/autopilot/scope-data"
1313
=== modified file 'ui/AddContactPage.qml'
--- ui/AddContactPage.qml 2014-10-21 14:03:09 +0000
+++ ui/AddContactPage.qml 2015-01-12 16:48:36 +0000
@@ -302,8 +302,12 @@
302 invite.visible = true;302 invite.visible = true;
303 }303 }
304 }304 }
305
305 onErrorPhone: {306 onErrorPhone: {
306 if (errorText == "PHONE_NUMBER_INVALID") {307 if (errorText == "PHONE_NUMBER_INVALID" && phone.indexOf('+') === -1) {
308 busy = false;
309 error = i18n.tr("Please include the country code.");
310 } else if (errorText == "PHONE_NUMBER_INVALID") {
307 busy = false;311 busy = false;
308 error = i18n.tr("Number is not a valid phone number");312 error = i18n.tr("Number is not a valid phone number");
309 }313 }

Subscribers

People subscribed via source and target branches

to all changes: