Merge lp:~vthompson/ubuntu-calculator-app/update-translations into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Victor Thompson]

Update translations and default date formatting string for en_US

Update translations and default date formatting string for en_US. Other English locales have translations, whereas US English does not. Therefore, the formatting string has been defaulted to en_US and other locales can add translations of this formatting string.

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

PASSED: Continuous integration, rev:201
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/141/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/557
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/140
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/140
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/12

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good! Thanks for the fix!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calculator-app-autolanding/55/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/565
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-autolanding/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-autolanding/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-autolanding/11

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

I think the AP test failures were fluke failures. They pass on the desktop and nothing was modified that would affect calculations.

[David Planella (dpm)]

Looks good to me too, not sure why this went unnoticed and hadn't landed yet.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calculator-app-autolanding/87/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2291/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-autolanding/87/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-autolanding/87/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-autolanding/43/console

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Victor, could you merge trunk into this one and re-push? Thanks!

review: Needs Fixing

[Victor Thompson (vthompson)]

Will do tonight.
On Apr 29, 2014 8:58 AM, "David Planella" <email address hidden> wrote:

> Review: Needs Fixing
>
> Victor, could you merge trunk into this one and re-push? Thanks!
> --
>
> https://code.launchpad.net/~vthompson/ubuntu-calculator-app/update-translations/+merge/200166
> You are the owner of
> lp:~vthompson/ubuntu-calculator-app/update-translations.
>

[lp:~vthompson/ubuntu-calculator-app/update-translations]

202. By Victor Thompson on 2014-04-29

Merge of trunk and regenerate .pot file

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

PASSED: Continuous integration, rev:202
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/195/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2307
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/194
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/194
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/66

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me.
Thank you Victor

review: Approve

[David Planella (dpm)]

Perfect, glad we got this merged, thanks Victor!

Just a question:

56 +msgid "dd MMM yy, hh:mm"

Is this string correctly formatted for en_US?

[Victor Thompson (vthompson)]

It is not. Looks like I caught one of the date strings and not the other. I
think the translators commentary splits up strings that would have
otherwise been lumped together causing me not to notice the second instance.
On Apr 30, 2014 1:26 AM, "David Planella" <email address hidden> wrote:

> Perfect, glad we got this merged, thanks Victor!
>
> Just a question:
>
> 56 +msgid "dd MMM yy, hh:mm"
>
> Is this string correctly formatted for en_US?
> --
>
> https://code.launchpad.net/~vthompson/ubuntu-calculator-app/update-translations/+merge/200166
> You are the owner of
> lp:~vthompson/ubuntu-calculator-app/update-translations.
>

[David Planella (dpm)]

Ah, ok. The translators comments shouldn't split the strings if they're identical, not sure what's going on here. If they do split the strings, then I'll have learnt a new quirk about xgettext :)

=== modified file 'Storage.qml'
--- Storage.qml	2014-02-09 11:26:16 +0000
+++ Storage.qml	2014-04-29 23:45:08 +0000
@@ -96,7 +96,7 @@
                             obj.dbId = res.rows.item(i).id;
                             // TRANSLATORS: this is a time formatting string,
                             // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
-                            obj.dateText = Qt.formatDateTime(parseDate(res.rows.item(i).insertDate), i18n.tr("dd MMM yy, hh:mm"))
+                            obj.dateText = Qt.formatDateTime(parseDate(res.rows.item(i).insertDate), i18n.tr("MMM dd yyyy, hh:mm"))
 
                             if (!('mainLabel' in obj))
                                 obj.mainLabel = ''

=== modified file 'po/ubuntu-calculator-app.pot'
--- po/ubuntu-calculator-app.pot	2014-03-11 00:22:17 +0000
+++ po/ubuntu-calculator-app.pot	2014-04-29 23:45:08 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-calculator-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-10 19:22-0500\n"
+"POT-Creation-Date: 2014-04-29 18:43-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -19,8 +19,13 @@
 
 #. TRANSLATORS: this is a time formatting string,
 #. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
-#: ../Storage.qml:99 ../Simple/SimplePage.qml:303
-msgid "dd MMM yy, hh:mm"
+#: ../Storage.qml:99
+msgid "MMM dd yyyy, hh:mm"
+msgstr ""
+
+#: ../ubuntu-calculator-app.qml:42
+#: ../.build/com.ubuntu.calculator_calculator.desktop.in:1
+msgid "Calculator"
 msgstr ""
 
 #: ../Simple/CalcKeyboard.qml:48
@@ -53,6 +58,13 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../.build/com.ubuntu.calculator_calculator.desktop.in:1
-msgid "Calculator"
+#. TRANSLATORS: Not a Number. For example, 0/0 is undefined as a real number, and so is represented by NaN
+#: ../Simple/SimplePage.qml:110
+msgid "NaN"
+msgstr ""
+
+#. TRANSLATORS: this is a time formatting string,
+#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
+#: ../Simple/SimplePage.qml:321
+msgid "dd MMM yy, hh:mm"
 msgstr ""