address-book-app

Merge lp:~bfiller/address-book-app/disable-predictive-text into lp:address-book-app

disable-predictive-text
Merge into trunk

Proposed by Bill Filler on 2014-01-23

Status:	Merged
Approved by:	Bill Filler on 2014-01-26
Approved revision:	122
Merged at revision:	121
Proposed branch:	lp:~bfiller/address-book-app/disable-predictive-text
Merge into:	lp:address-book-app
Diff against target:	242 lines (+41/-36) 4 files modified po/address-book-app.pot (+38/-36) src/imports/ContactEdit/ContactDetailAddressesEditor.qml (+1/-0) src/imports/ContactEdit/ContactDetailNameEditor.qml (+1/-0) src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml (+1/-0)
To merge this branch:	bzr merge lp:~bfiller/address-book-app/disable-predictive-text
Related bugs:	Link a bug report

Reviewer	Review Type	Status
Bill Filler (community)		Approve on 2014-01-26
PS Jenkins bot	continuous-integration	Approve on 2014-01-26
Review via email: mp+202776@code.launchpad.net

Commit message

disable predictive text for some fields where it doesn't make sense

Description of the change

disable predictive text for some fields where it doesn't make sense

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/357/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-24:

FAILED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/358/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2382/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2593/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2383/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/358/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-24:

FAILED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/359/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2599/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2390/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2601/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2391/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/359/rebuild

review: Needs Fixing (continuous-integration)

lp:~bfiller/address-book-app/disable-predictive-text updated on 2014-01-24

120. By Bill Filler on 2014-01-24: merge from trunk
121. By Bill Filler on 2014-01-24: merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/361/rebuild

review: Needs Fixing (continuous-integration)

lp:~bfiller/address-book-app/disable-predictive-text updated on 2014-01-24

122. By Bill Filler on 2014-01-24: merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/362/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/363/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-26:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/364/rebuild

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-01-26:

jenkins finally passed, renato tested so approving

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Bill Filler

Rufus

Ubuntu Phablet Team

1	=== modified file 'po/address-book-app.pot'
2	--- po/address-book-app.pot 2013-10-11 19:18:14 +0000
3	+++ po/address-book-app.pot 2014-01-24 19:42:47 +0000
4	@@ -1,5 +1,5 @@
5	# SOME DESCRIPTIVE TITLE.
6	-# Copyright (C) 2013 Canonical Ltd.
7	+# Copyright (C) YEAR Canonical Ltd.
8	# This file is distributed under the same license as the PACKAGE package.
9	# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
10	#
11	@@ -8,7 +8,7 @@
12	msgstr ""
13	"Project-Id-Version: address-book-app\n"
14	"Report-Msgid-Bugs-To: \n"
15	-"POT-Creation-Date: 2013-10-11 16:16-0300\n"
16	+"POT-Creation-Date: 2014-01-24 11:48-0500\n"
17	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
18	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
19	"Language-Team: LANGUAGE <LL@li.org>\n"
20	@@ -17,7 +17,7 @@
21	"Content-Type: text/plain; charset=CHARSET\n"
22	"Content-Transfer-Encoding: 8bit\n"
23
24	-#: src/imports/ContactList/ContactListPage.qml:122
25	+#: src/imports/ContactList/ContactListPage.qml:153
26	msgid "Add"
27	msgstr ""
28
29	@@ -26,17 +26,17 @@
30	msgid "Address"
31	msgstr ""
32
33	-#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:61
34	+#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:63
35	msgid "Aim"
36	msgstr ""
37
38	-#: src/imports/Ubuntu/Contacts/ContactListView.qml:111
39	+#: src/imports/Ubuntu/Contacts/ContactListView.qml:115
40	msgid "All contacts"
41	msgstr ""
42
43	-#: src/imports/ContactEdit/ContactEditor.qml:320
44	-#: src/imports/ContactEdit/EditToolbar.qml:36
45	-#: src/imports/Ubuntu/Contacts/DialogButtons.qml:36
46	+#: src/imports/ContactEdit/ContactEditor.qml:347
47	+#: src/imports/ContactEdit/EditToolbar.qml:37
48	+#: src/imports/Ubuntu/Contacts/DialogButtons.qml:37
49	msgid "Cancel"
50	msgstr ""
51
52	@@ -45,7 +45,7 @@
53	msgstr ""
54
55	#: data/address-book-app.desktop.in:6 data/address-book-app.desktop.in:7
56	-#: src/imports/ContactList/ContactListPage.qml:47
57	+#: src/imports/ContactList/ContactListPage.qml:53
58	msgid "Contacts"
59	msgstr ""
60
61	@@ -57,17 +57,18 @@
62	msgid "Country"
63	msgstr ""
64
65	-#: src/imports/ContactView/ContactView.qml:149
66	-#: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:239
67	+#: src/imports/ContactList/ContactListPage.qml:78
68	+#: src/imports/ContactView/ContactView.qml:157
69	+#: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:245
70	msgid "Delete"
71	msgstr ""
72
73	-#: src/imports/ContactEdit/EditToolbar.qml:50
74	-#: src/imports/Ubuntu/Contacts/DialogButtons.qml:51
75	+#: src/imports/ContactEdit/EditToolbar.qml:52
76	+#: src/imports/Ubuntu/Contacts/DialogButtons.qml:53
77	msgid "Done"
78	msgstr ""
79
80	-#: src/imports/ContactView/ContactView.qml:159
81	+#: src/imports/ContactView/ContactView.qml:169
82	msgid "Edit"
83	msgstr ""
84
85	@@ -90,33 +91,33 @@
86	msgstr ""
87
88	#: src/imports/ContactEdit/ContactFetchError.qml:25
89	-#: src/imports/ContactList/ContactListPage.qml:54
90	+#: src/imports/ContactList/ContactListPage.qml:60
91	msgid "Error"
92	msgstr ""
93
94	-#: src/imports/ContactList/ContactListPage.qml:55
95	+#: src/imports/ContactList/ContactListPage.qml:61
96	msgid "Fail to Load contacts"
97	msgstr ""
98
99	#: src/imports/ContactView/ContactDetailPhoneNumbersView.qml:33
100	-#: src/imports/ContactView/ContactDetailPhoneNumbersView.qml:42
101	+#: src/imports/ContactView/ContactDetailPhoneNumbersView.qml:44
102	msgid "Favorite"
103	msgstr ""
104
105	-#: src/imports/Ubuntu/Contacts/ContactListView.qml:61
106	+#: src/imports/Ubuntu/Contacts/ContactListView.qml:65
107	msgid "Favourites"
108	msgstr ""
109
110	-#: src/imports/ContactEdit/ContactDetailNameEditor.qml:77
111	+#: src/imports/ContactEdit/ContactDetailNameEditor.qml:78
112	msgid "First name"
113	msgstr ""
114
115	-#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:122
116	-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:102
117	+#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:116
118	+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:95
119	msgid "Home"
120	msgstr ""
121
122	-#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:62
123	+#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:64
124	msgid "ICQ"
125	msgstr ""
126
127	@@ -124,15 +125,15 @@
128	msgid "IM"
129	msgstr ""
130
131	-#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:64
132	+#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:66
133	msgid "Jabber"
134	msgstr ""
135
136	-#: src/imports/ContactEdit/ContactDetailNameEditor.qml:77
137	+#: src/imports/ContactEdit/ContactDetailNameEditor.qml:78
138	msgid "Last name"
139	msgstr ""
140
141	-#: src/imports/ContactEdit/ContactDetailAvatarEditor.qml:77
142	+#: src/imports/ContactEdit/ContactDetailAvatarEditor.qml:81
143	msgid "Loading"
144	msgstr ""
145
146	@@ -140,11 +141,11 @@
147	msgid "Locality"
148	msgstr ""
149
150	-#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:65
151	+#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:67
152	msgid "MSN"
153	msgstr ""
154
155	-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:106
156	+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:99
157	msgid "Mobile"
158	msgstr ""
159
160	@@ -152,8 +153,8 @@
161	msgid "Organization"
162	msgstr ""
163
164	-#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:124
165	-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:110
166	+#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:118
167	+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:103
168	msgid "Other"
169	msgstr ""
170
171	@@ -179,15 +180,16 @@
172	msgid "Role"
173	msgstr ""
174
175	-#: src/imports/ContactEdit/ContactEditor.qml:311
176	+#: src/imports/ContactEdit/ContactEditor.qml:338
177	msgid "Save"
178	msgstr ""
179
180	-#: src/imports/ContactList/ContactListPage.qml:115
181	+#: src/imports/ContactList/ContactListPage.qml:78
182	+#: src/imports/ContactList/ContactListPage.qml:145
183	msgid "Select"
184	msgstr ""
185
186	-#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:67
187	+#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:69
188	msgid "Skype"
189	msgstr ""
190
191	@@ -211,15 +213,15 @@
192	msgid "View contact's profile"
193	msgstr ""
194
195	-#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:123
196	-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:104
197	+#: src/imports/Common/ContactDetailGroupWithTypeBase.qml:117
198	+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:97
199	msgid "Work"
200	msgstr ""
201
202	-#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:108
203	+#: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:101
204	msgid "Work Mobile"
205	msgstr ""
206
207	-#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:68
208	+#: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:70
209	msgid "Yahoo"
210	msgstr ""
211
212	=== modified file 'src/imports/ContactEdit/ContactDetailAddressesEditor.qml'
213	--- src/imports/ContactEdit/ContactDetailAddressesEditor.qml 2013-08-28 17:06:38 +0000
214	+++ src/imports/ContactEdit/ContactDetailAddressesEditor.qml 2014-01-24 19:42:47 +0000
215	@@ -33,4 +33,5 @@
216	i18n.tr("Region"),
217	i18n.tr("Post code"),
218	i18n.tr("Country") ]
219	+ inputMethodHints: Qt.ImhNoPredictiveText
220	}
221
222	=== modified file 'src/imports/ContactEdit/ContactDetailNameEditor.qml'
223	--- src/imports/ContactEdit/ContactDetailNameEditor.qml 2013-11-13 00:17:22 +0000
224	+++ src/imports/ContactEdit/ContactDetailNameEditor.qml 2014-01-24 19:42:47 +0000
225	@@ -76,6 +76,7 @@
226	detail: root.detail
227	height: units.gu(4)
228	placeholderText: field == QtContacts.Name.FirstName ? i18n.tr("First name") : i18n.tr("Last name")
229	+ inputMethodHints: Qt.ImhNoPredictiveText
230	onTextChanged: checkIsEmpty()
231	onFieldChanged: checkIsEmpty()
232
233
234	=== modified file 'src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml'
235	--- src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml 2013-09-18 14:10:33 +0000
236	+++ src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml 2014-01-24 19:42:47 +0000
237	@@ -31,4 +31,5 @@
238	i18n.tr("Role"),
239	i18n.tr("Title")
240	]
241	+ inputMethodHints: Qt.ImhNoPredictiveText
242	}