Merge lp://qastaging/~dpm/ubuntu-calendar-app/i18n-improvements into lp://qastaging/ubuntu-calendar-app

FAILED: Continuous integration, rev:373
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/650/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1211
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1211/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/208

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

Ok, it seems that the translatable strings in Defines.js cannot be extracted as there are defined inside strings. Can things like this be defined in another way so that it's not inside a string?

function getReminderLabels() {
    var object = Qt.createQmlObject('\
        import QtQuick 2.0;\
        import Ubuntu.Components 0.1;\
        QtObject {\
            property var reminderLabel:[i18n.tr("No Reminder"),\
                i18n.tr("5 minutes"),\
                i18n.tr("15 minutes"),\
                i18n.tr("30 minutes"),\
                i18n.tr("1 hour"),\
                i18n.tr("2 hours"),\
                i18n.tr("1 day"),\
                i18n.tr("2 days"),\
                i18n.tr("1 week"),\
                i18n.tr("2 weeks")];}', Qt.application, 'ReminderLabelObj');
    return object.reminderLabel;
}

FAILED: Continuous integration, rev:374
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/651/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1212
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1212/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/209

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

FYI the test failures seen here seem to stem from an issue in trunk; we need to land https://code.launchpad.net/~gerlowskija/ubuntu-calendar-app/revised-fix-for-bug1334883/+merge/226049.

> Ok, it seems that the translatable strings in Defines.js cannot be extracted
> as there are defined inside strings. Can things like this be defined in
> another way so that it's not inside a string?
>
> function getReminderLabels() {
> var object = Qt.createQmlObject('\
> import QtQuick 2.0;\
> import Ubuntu.Components 0.1;\
> QtObject {\
> property var reminderLabel:[i18n.tr("No Reminder"),\
> i18n.tr("5 minutes"),\
> i18n.tr("15 minutes"),\
> i18n.tr("30 minutes"),\
> i18n.tr("1 hour"),\
> i18n.tr("2 hours"),\
> i18n.tr("1 day"),\
> i18n.tr("2 days"),\
> i18n.tr("1 week"),\
> i18n.tr("2 weeks")];}', Qt.application, 'ReminderLabelObj');
> return object.reminderLabel;
> }

if its necessary we may create separate QML file/Component and use it here and other place where required

On Thu, Jul 31, 2014 at 3:43 AM, Kunal Parmar <email address hidden>
wrote:

> > Ok, it seems that the translatable strings in Defines.js cannot be
> extracted
> > as there are defined inside strings. Can things like this be defined in
> > another way so that it's not inside a string?
> >
> > function getReminderLabels() {
> > var object = Qt.createQmlObject('\
> > import QtQuick 2.0;\
> > import Ubuntu.Components 0.1;\
> > QtObject {\
> > property var reminderLabel:[i18n.tr("No Reminder"),\
> > i18n.tr("5 minutes"),\
> > i18n.tr("15 minutes"),\
> > i18n.tr("30 minutes"),\
> > i18n.tr("1 hour"),\
> > i18n.tr("2 hours"),\
> > i18n.tr("1 day"),\
> > i18n.tr("2 days"),\
> > i18n.tr("1 week"),\
> > i18n.tr("2 weeks")];}', Qt.application,
> 'ReminderLabelObj');
> > return object.reminderLabel;
> > }
>
> if its necessary we may create separate QML file/Component and use it here
> and other place where required
>

I think that might be the best solution. Kunal, would you mind submitting
another branch with this change? Or perhaps explain how you'd do it and
another developer can pick it up?

Thanks!

> I think that might be the best solution. Kunal, would you mind submitting
> another branch with this change? Or perhaps explain how you'd do it and
> another developer can pick it up?

I will submit another branch, can you verify its working for you ?
Thanks,

On Thu, Jul 31, 2014 at 12:50 PM, Kunal Parmar <email address hidden>
wrote:

> > I think that might be the best solution. Kunal, would you mind submitting
> > another branch with this change? Or perhaps explain how you'd do it and
> > another developer can pick it up?
>
> I will submit another branch, can you verify its working for you ?
> Thanks,
>

Sure, I'll make sure to test it as soon as you tell me it's ready. Thanks!

In this case, this is now ready for review.

> Sure, I'll make sure to test it as soon as you tell me it's ready. Thanks!

Following is the MR, pls review and let me know if it works for you

https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/Translation/+merge/229049

Ok, I've merged your changes into this branch.

PASSED: Continuous integration, rev:376
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/664/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1234
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1234/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/222

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

Hm, I'm not sure it's related to changes in this branch, but running it on the device I cannot create any events.

The only relevant output that I see on the log is "Detectable autorepeat not supported."

PASSED: Continuous integration, rev:377
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/666/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1238
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/224

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

Looks good to me dpm.

Thank you for the MR

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/254/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1241/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/74

this branch needs to merged with trunk code, trunk code fixes autopilot test issue.

Merged with trunk and ready for a new review.

PASSED: Continuous integration, rev:378
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/670/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1253
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/228

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/257/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1256
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1256/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/77

FAILED: Continuous integration, rev:378
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/671/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1263
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/229

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

PASSED: Continuous integration, rev:378
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/672/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1264
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/230

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

Sometimes there's an error on the test that creates a new event, but it's not related to this branch. I'm investigating some related issues.
I'll reapprove this one to clean the queue.