Merge lp:~smartboyhw/ubuntu-rssreader-app/fix-lp-1215542 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Howard Chan]

Fixed Bug (LP: #1215542)

It fixes Bug 1215542.

[David Planella (dpm)]

Looks good to me, thanks a lot!

However, I've got a question on this change:

31 + text: i18n.tr("Add feeds")

Is the change here needed? It seems to affect a button, not the page. Have you tested where this text is shown?

review: Needs Information

[Howard Chan (smartboyhw)]

> Looks good to me, thanks a lot!
>
> However, I've got a question on this change:
>
> 31 + text: i18n.tr("Add feeds")
>
> Is the change here needed? It seems to affect a button, not the page. Have you
> tested where this text is shown?

Hmm, can't seem to find where is the button, maybe dead code, as David suggested?

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:47
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~smartboyhw/ubuntu-rssreader-app/fix-lp-1215542/+merge/182875/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/7/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/96
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/7
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/7
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/7
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/7

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:47
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/8/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/8
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/8
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/8
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/8

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This should pass now, archive issues this morning prevented it from passing.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:47
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/12/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/113
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/12/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:50
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/13/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/114
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/13

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Looks like you need to rebase perhaps?

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:48
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~smartboyhw/ubuntu-rssreader-app/fix-lp-1215542/+merge/183314/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/14/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/121
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/14
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/14
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/14
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/14

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'feeds/AppendFeedPage.qml'
--- feeds/AppendFeedPage.qml	2013-08-17 10:42:20 +0000
+++ feeds/AppendFeedPage.qml	2013-08-31 08:06:25 +0000
@@ -11,7 +11,7 @@
     id: appendFeedPage
 
     objectName: "appendfeedpage"
-    title: "Append feed"
+    title: "Add feeds"
     flickable: null
     visible: false
 
@@ -170,7 +170,7 @@
             objectName: "tfFeedUrl"
             id: tfFeedUrl
 
-            placeholderText: i18n.tr("Enter keywords or direct url")
+            placeholderText: i18n.tr("Type a keyword or URL")
 
             width: parent.width - units.gu(4) * 2
             anchors {

=== modified file 'feeds/ManageFeedsPage.qml'
--- feeds/ManageFeedsPage.qml	2013-08-06 20:45:50 +0000
+++ feeds/ManageFeedsPage.qml	2013-08-31 08:06:25 +0000
@@ -332,7 +332,7 @@
 
             contentsWidth: sheetContentColumn.width
             contentsHeight: units.gu(11) // TODO BUG - doesn't works
-            title: isForEdit? i18n.tr("Edit feed") : i18n.tr("Append feed")
+            title: isForEdit? i18n.tr("Edit feed") : i18n.tr("Add feeds")
 
             Column {
                 id: sheetContentColumn

=== modified file 'ubuntu-rssreader-app.qml'
--- ubuntu-rssreader-app.qml	2013-08-29 11:25:22 +0000
+++ ubuntu-rssreader-app.qml	2013-08-31 08:06:25 +0000
@@ -201,7 +201,7 @@
         AppendFeedPage {
             id: appendFeedPage
 
-            title: i18n.tr("Append feed")
+            title: i18n.tr("Add feeds")
             flickable: null
             visible: false
         }