Ubuntu Calculator App

Merge lp:~dalius-sandbox/ubuntu-calculator-app/timezone-issue into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

  1. timezone-issue
  2. Merge into old_trunk
Proposed by Dalius
Status: Merged
Approved by: Riccardo Ferrazzo
Approved revision: 30
Merged at revision: 30
Proposed branch: lp:~dalius-sandbox/ubuntu-calculator-app/timezone-issue
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 12 lines (+1/-1)
1 file modified
Simple/SimplePage.qml (+1/-1)
To merge this branch: bzr merge lp:~dalius-sandbox/ubuntu-calculator-app/timezone-issue
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Riccardo Ferrazzo (community) Approve
Review via email: mp+153654@code.launchpad.net

Commit message

Timezone issue fixed

Description of the change

Timezone issue fixed

To post a comment you must log in.
Revision history for this message
Riccardo Ferrazzo (f-riccardo87) :
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 'Simple/SimplePage.qml'
2--- Simple/SimplePage.qml 2013-03-14 15:44:07 +0000
3+++ Simple/SimplePage.qml 2013-03-16 09:34:21 +0000
4@@ -121,7 +121,7 @@
5 if (answer !== '') {
6 var currentDate = new Date();
7 if (memory.get(0).mainLabel.length == 0)
8- memory.get(0).mainLabel = currentDate.toLocaleString();
9+ memory.get(0).mainLabel = currentDate.toString();
10 memory.get(0).isLastItem = false
11 memory.setProperty(0, "timeStamp", currentDate.getTime());
12 memory.insert(0,{'dbId': -1, 'answer': '', 'operators': [{_text:'', _operation:'', _number:''}], 'isLastItem': true, 'mainLabel': ''});

Subscribers

People subscribed via source and target branches