Ubuntu Weather App

Merge lp:~anthonywong/ubuntu-weather-app/fix-date-str-i18n into lp:ubuntu-weather-app/obsolete.trunk

  1. fix-date-str-i18n
  2. Merge into trunk
Proposed by Anthony Wong
Status: Merged
Approved by: David Planella
Approved revision: 272
Merged at revision: 276
Proposed branch: lp:~anthonywong/ubuntu-weather-app/fix-date-str-i18n
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 48 lines (+11/-2)
2 files modified
components/ScrollingArea.qml (+1/-1)
po/com.ubuntu.weather.pot (+10/-1)
To merge this branch: bzr merge lp:~anthonywong/ubuntu-weather-app/fix-date-str-i18n
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Review via email: mp+222940@code.launchpad.net

Commit message

Date string is now translatable.

To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, thanks!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/ScrollingArea.qml'
2--- components/ScrollingArea.qml 2014-04-16 13:56:28 +0000
3+++ components/ScrollingArea.qml 2014-06-12 12:40:28 +0000
4@@ -89,7 +89,7 @@
5 var dateData = currentHour.date;
6 var dateTime = new Date(dateData.year, dateData.month, dateData.date, dateData.hours, dateData.minutes)
7 // TRANSLATORS: this is a date to which a time of the day will be appended
8- var dateTimeString = Qt.formatDateTime(dateTime, i18n.tr('dddd, dd MMMM')) + ' - ' + Qt.formatTime(dateTime);
9+ var dateTimeString = Qt.formatDateTime(dateTime, i18n.tr("dddd, dd MMMM")) + ' - ' + Qt.formatTime(dateTime);
10 dateComponent.dateString = dateTimeString;
11 dateComponent.renderText();
12 //
13
14=== modified file 'po/com.ubuntu.weather.pot'
15--- po/com.ubuntu.weather.pot 2014-06-05 10:37:14 +0000
16+++ po/com.ubuntu.weather.pot 2014-06-12 12:40:28 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: ubuntu-weather-app\n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2014-06-05 12:34+0200\n"
22+"POT-Creation-Date: 2014-06-12 20:37+0800\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@@ -157,6 +157,11 @@
27 msgid "Settings"
28 msgstr ""
29
30+#. TRANSLATORS: this is a date to which a time of the day will be appended
31+#: components/ScrollingArea.qml:92
32+msgid "dddd, dd MMMM"
33+msgstr ""
34+
35 #: components/SettingsSheet.qml:33
36 msgid "Celsius"
37 msgstr ""
38@@ -181,6 +186,10 @@
39 msgid "Inches"
40 msgstr ""
41
42+#: components/SettingsSheet.qml:82
43+msgid "Temperature units"
44+msgstr ""
45+
46 #: components/SettingsSheet.qml:94
47 msgid "Wind speed units"
48 msgstr ""

Subscribers

People subscribed via source and target branches