Ubuntu Settings Components

Merge lp:~seb128/ubuntu-settings-components/workaround-unstranslated-string into lp:~registry/ubuntu-settings-components/trunk

  1. workaround-unstranslated-string
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Nick Dedekind
Approved revision: 80
Merged at revision: 82
Proposed branch: lp:~seb128/ubuntu-settings-components/workaround-unstranslated-string
Merge into: lp:~registry/ubuntu-settings-components/trunk
Diff against target: 15 lines (+4/-1)
1 file modified
Ubuntu/Settings/Components/ActionTextField.qml (+4/-1)
To merge this branch: bzr merge lp:~seb128/ubuntu-settings-components/workaround-unstranslated-string
Reviewer Review Type Date Requested Status
Nick Dedekind (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+240615@code.launchpad.net

Commit message

Get the string translation from telephony-service, that's a workaround but
ubuntu-settings-components is not currently setup for translations

Description of the change

Get the string translation from telephony-service, that's a workaround but
ubuntu-settings-components is not currently setup for translations

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/92/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/54/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/92/rebuild

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

Ok, fine by me; but this needs proper fixing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ubuntu/Settings/Components/ActionTextField.qml'
2--- Ubuntu/Settings/Components/ActionTextField.qml 2014-08-14 11:19:43 +0000
3+++ Ubuntu/Settings/Components/ActionTextField.qml 2014-11-04 17:12:55 +0000
4@@ -44,7 +44,10 @@
5 id: replyField
6 objectName: "replyText"
7
8- placeholderText: i18n.tr("Reply")
9+ /* Get the string translation from telephony-service, that's a
10+ workaround but ubuntu-settings-components is not currently
11+ setup for translations, see bug #1389234 */
12+ placeholderText: i18n.dtr("telephony-service", "Reply")
13 hasClearButton: false
14
15 Layout.fillWidth: true

Subscribers

People subscribed via source and target branches

to all changes: