Unity 8

Merge lp:~seb128/unity8/set-inline-reply-hint into lp:unity8

  1. set-inline-reply-hint
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: kevin gunn
Approved revision: 1436
Merged at revision: 1570
Proposed branch: lp:~seb128/unity8/set-inline-reply-hint
Merge into: lp:unity8
Diff against target: 255 lines (+45/-40)
3 files modified
debian/control (+1/-1)
po/unity8.pot (+43/-39)
qml/Panel/Indicators/MessageMenuItemFactory.qml (+1/-0)
To merge this branch: bzr merge lp:~seb128/unity8/set-inline-reply-hint
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Nick Dedekind (community) Approve
Michał Sawicz Needs Fixing
Review via email: mp+240766@code.launchpad.net

Commit message

Set text hint property for the messaging menus inline reply widget

Description of the change

Set text hint property for the messaging menus inline reply widget

NOTE: needs to go lockstep with lp:~seb128/ubuntu-settings-components/define-text-hint-property

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Requires https://code.launchpad.net/~seb128/ubuntu-settings-components/define-text-hint-property/+merge/240706

Doing it this way should avoid having to do translations from the components

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1420
http://jenkins.qa.ubuntu.com/job/unity8-ci/4832/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6493/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1818/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1928/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1926/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7745/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4832/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

Done (rebased on the current vcs version as well)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1421
http://jenkins.qa.ubuntu.com/job/unity8-ci/4880/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/144/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4880/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1433
http://jenkins.qa.ubuntu.com/job/unity8-ci/4882/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/59/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/147/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4882/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
1 conflicts encountered.

Revision history for this message
Sebastien Bacher (seb128) wrote :

would the change be ok otherwise? I can rebase if that's to get the change in, no point if that's to have it sitting there again unreviewed until it conflicts because some other changes landed while it was waiting

Revision history for this message
Sebastien Bacher (seb128) wrote :

ok, rebased on trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1434
http://jenkins.qa.ubuntu.com/job/unity8-ci/4978/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/369/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/155/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/369/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4978/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

Fix is good, but..

./po/update-unity-pot please.

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

Rebased on trunk and updated the translation template

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

Thanks. Looks good now.

review: Approve
Revision history for this message
kevin gunn (kgunn72) wrote :

NOTE: needs to go lockstep with lp:~seb128/ubuntu-settings-components/define-text-hint-property

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1436
http://jenkins.qa.ubuntu.com/job/unity8-ci/5182/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/951/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/346/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/347/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/347/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/949/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5182/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-01-09 10:41:11 +0000
3+++ debian/control 2015-01-22 10:10:33 +0000
4@@ -48,7 +48,7 @@
5 qtdeclarative5-dev-tools,
6 qtdeclarative5-private-dev (>= 5.2.1),
7 qtdeclarative5-qtmultimedia-plugin,
8- qtdeclarative5-ubuntu-settings-components (>= 0.4),
9+ qtdeclarative5-ubuntu-settings-components (>= 0.5),
10 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
11 qtdeclarative5-ubuntu-web-plugin,
12 ttf-ubuntu-font-family,
13
14=== modified file 'po/unity8.pot'
15--- po/unity8.pot 2014-12-10 09:55:58 +0000
16+++ po/unity8.pot 2015-01-22 10:10:33 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: unity8\n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2014-12-10 10:55+0100\n"
22+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26@@ -50,59 +50,59 @@
27 msgstr[0] ""
28 msgstr[1] ""
29
30-#: qml/Components/Dialogs.qml:70
31+#: qml/Components/Dialogs.qml:86
32 msgid "Log out"
33 msgstr ""
34
35-#: qml/Components/Dialogs.qml:71
36+#: qml/Components/Dialogs.qml:87
37 msgid "Are you sure you want to log out?"
38 msgstr ""
39
40-#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
41-#: qml/Components/Dialogs.qml:122
42+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
43+#: qml/Components/Dialogs.qml:134
44 msgid "No"
45 msgstr ""
46
47-#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
48-#: qml/Components/Dialogs.qml:129
49+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
50+#: qml/Components/Dialogs.qml:140
51 msgid "Yes"
52 msgstr ""
53
54-#: qml/Components/Dialogs.qml:94
55+#: qml/Components/Dialogs.qml:108
56 msgid "Shut down"
57 msgstr ""
58
59-#: qml/Components/Dialogs.qml:95
60+#: qml/Components/Dialogs.qml:109
61 msgid "Are you sure you want to shut down?"
62 msgstr ""
63
64-#: qml/Components/Dialogs.qml:119
65+#: qml/Components/Dialogs.qml:131
66 msgid "Reboot"
67 msgstr ""
68
69-#: qml/Components/Dialogs.qml:120
70+#: qml/Components/Dialogs.qml:132
71 msgid "Are you sure you want to reboot?"
72 msgstr ""
73
74-#: qml/Components/Dialogs.qml:144
75+#: qml/Components/Dialogs.qml:154
76 msgid "Power"
77 msgstr ""
78
79-#: qml/Components/Dialogs.qml:145
80+#: qml/Components/Dialogs.qml:155
81 msgid ""
82 "Are you sure you would like\n"
83 "to power off?"
84 msgstr ""
85
86-#: qml/Components/Dialogs.qml:147
87+#: qml/Components/Dialogs.qml:157
88 msgid "Power off"
89 msgstr ""
90
91-#: qml/Components/Dialogs.qml:157
92+#: qml/Components/Dialogs.qml:166
93 msgid "Restart"
94 msgstr ""
95
96-#: qml/Components/Dialogs.qml:167
97+#: qml/Components/Dialogs.qml:175
98 msgid "Cancel"
99 msgstr ""
100
101@@ -164,32 +164,32 @@
102 msgid "OK"
103 msgstr ""
104
105-#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
106+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
107 msgid "See less"
108 msgstr ""
109
110-#: qml/Dash/GenericScopeView.qml:431
111+#: qml/Dash/GenericScopeView.qml:485
112 msgid "See all"
113 msgstr ""
114
115-#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
116+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
117 #: qml/Panel/SearchIndicator.qml:27
118 msgid "Search"
119 msgstr ""
120
121-#: qml/Dash/PageHeader.qml:260
122+#: qml/Dash/PageHeader.qml:267
123 msgid "Store"
124 msgstr ""
125
126-#: qml/Dash/PageHeader.qml:277
127+#: qml/Dash/PageHeader.qml:284
128 msgid "Settings"
129 msgstr ""
130
131-#: qml/Dash/PageHeader.qml:284
132+#: qml/Dash/PageHeader.qml:291
133 msgid "Remove from Favorites"
134 msgstr ""
135
136-#: qml/Dash/PageHeader.qml:284
137+#: qml/Dash/PageHeader.qml:291
138 msgid "Add to Favorites"
139 msgstr ""
140
141@@ -221,19 +221,19 @@
142 msgid "Release to refresh…"
143 msgstr ""
144
145-#: qml/Dash/ScopesList.qml:63
146+#: qml/Dash/ScopesList.qml:66
147 msgid "Manage"
148 msgstr ""
149
150-#: qml/Dash/ScopesList.qml:107
151+#: qml/Dash/ScopesList.qml:112
152 msgid "Home"
153 msgstr ""
154
155-#: qml/Dash/ScopesList.qml:108
156+#: qml/Dash/ScopesList.qml:113
157 msgid "Also installed"
158 msgstr ""
159
160-#: qml/Greeter/Greeter.qml:174
161+#: qml/Greeter/Greeter.qml:133
162 msgid "Unlock"
163 msgstr ""
164
165@@ -277,6 +277,10 @@
166 msgid "Failed, tap to retry"
167 msgstr ""
168
169+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
170+msgid "Reply"
171+msgstr ""
172+
173 #: qml/Panel/Indicators/ModemInfoItem.qml:105
174 msgid "Unlock SIM"
175 msgstr ""
176@@ -285,55 +289,55 @@
177 msgid "Roaming"
178 msgstr ""
179
180-#: qml/Shell.qml:367
181+#: qml/Shell.qml:390
182 #, qt-format
183 msgid "Enter %1"
184 msgstr ""
185
186-#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
187+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
188 msgid "Enter passphrase"
189 msgstr ""
190
191-#: qml/Shell.qml:369
192+#: qml/Shell.qml:392
193 msgid "Enter passcode"
194 msgstr ""
195
196-#: qml/Shell.qml:370
197+#: qml/Shell.qml:393
198 #, qt-format
199 msgid "Sorry, incorrect %1"
200 msgstr ""
201
202-#: qml/Shell.qml:371
203+#: qml/Shell.qml:394
204 msgid "Sorry, incorrect passphrase"
205 msgstr ""
206
207-#: qml/Shell.qml:372
208+#: qml/Shell.qml:395
209 msgid "Please re-enter"
210 msgstr ""
211
212-#: qml/Shell.qml:373
213+#: qml/Shell.qml:396
214 msgid "Sorry, incorrect passcode"
215 msgstr ""
216
217-#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
218+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
219 msgid "Sorry, incorrect passphrase."
220 msgstr ""
221
222-#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
223+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
224 msgid "Sorry, incorrect passcode."
225 msgstr ""
226
227-#: qml/Shell.qml:469
228+#: qml/Shell.qml:492
229 msgid "This will be your last attempt."
230 msgstr ""
231
232-#: qml/Shell.qml:471
233+#: qml/Shell.qml:494
234 msgid ""
235 "If passphrase is entered incorrectly, your phone will conduct a factory "
236 "reset and all personal data will be deleted."
237 msgstr ""
238
239-#: qml/Shell.qml:472
240+#: qml/Shell.qml:495
241 msgid ""
242 "If passcode is entered incorrectly, your phone will conduct a factory reset "
243 "and all personal data will be deleted."
244
245=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
246--- qml/Panel/Indicators/MessageMenuItemFactory.qml 2014-09-09 16:01:25 +0000
247+++ qml/Panel/Indicators/MessageMenuItemFactory.qml 2015-01-22 10:10:33 +0000
248@@ -146,6 +146,7 @@
249 time: timeFormatter.timeString
250 body: getExtendedProperty(extendedData, "xCanonicalText", "")
251 replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
252+ replyHintText: i18n.tr("Reply")
253 // icons
254 avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
255 icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/message")

Subscribers

People subscribed via source and target branches