Merge lp:~rpadovani/ubuntu-calculator-app/fromDateToString into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Modified function fromDateToString using Qt.formatDateTime for internationalization

Modified function fromDateToString using Qt.formatDateTime for internationalization.
TODO: when there will system settings understand when use AM/PM and when use 24hours format

[Dalius (dalius-sandbox)]

review: Approve

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~rpadovani/ubuntu-calculator-app/fromDateToString/+merge/157222/+edit-commit-message

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'Storage.qml'
--- Storage.qml	2013-03-20 16:28:57 +0000
+++ Storage.qml	2013-04-04 20:26:20 +0000
@@ -77,24 +77,18 @@
      * returns a string based on how much time has passed
      */
     function fromDateToString(time) {
+        // TODO: see in settings if user wants AM/PM or 24h
+        // Now all strings are in AM/PM
+        // Below every string there is a comment with string in 24h
         time = new Date(time);
         var now = new Date();
         var string;
 
-        // Create a string with minutes :MM AM/PM
-        var minutes = ":";
-        minutes += time.getMinutes() < 10 ? "0" : "";
-        minutes += time.getMinutes() + " "
-        minutes += time.getHours() > 12 ? "PM" : "AM";
-
-        var weekdays = ["Sun","Mon","Tue", "Wed", "Thu", "Fry", "Sat"];
-        var months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-
         // Today
         if (now.getDate() - time.getDate() === 0 && now.getMonth() === time.getMonth()) {
             // Between 0 & 59 minutes
             if (now.getHours() - time.getHours() < 1 || (now.getHours() - time.getHours() === 1 && time.getMinutes() > now.getMinutes())) {
-                // This is for different hours ex datestamp 11:58 now 12:02
+                // This is for different hours e.g. datestamp 11:58 now 12:02 prints "4 minutes ago"
                 string = now.getMinutes() - time.getMinutes() > 0 ? now.getMinutes() - time.getMinutes() : now.getMinutes() - time.getMinutes() + 60;
                 string += " minutes ago";
 
@@ -106,27 +100,24 @@
             }
 
             // > 1 hour ago
-            string = now.getHours() - time.getHours() + " hour";
-            string += now.getHours() - time.getHours() > 1 ? "s" : "";
+            string = now.getHours() - time.getHours();
+            string += now.getHours() - time.getHours() > 1 ? "hours" : "hour";
             return string + "  ago";
         } // End today
 
-        // Between yesterday and one week ago
-        if (now.getDate() - time.getDate() > 0 && now.getDate() - time.getDate() < 7 && now.getMonth() === time.getMonth()) {
-            string = now.getDate() - time.getDate() === 1 ? "Yesterday" : weekdays[time.getDay()];
-            string += ", ";
-            string += time.getHours() > 12 ? time.getHours() - 12 : time.getHours();
-            string += minutes;
+        // Between two days and one week ago
+        if (now.getDate() - time.getDate() > 1 && now.getDate() - time.getDate() < 7 && now.getMonth() === time.getMonth())
+            return Qt.formatDateTime(time, "ddd, hh:mm AP"); // E.g. Mon, 05:55 PM
+            // return Qt.formatDateTime(time, "ddd, hh:mm"); // E.g. Mon, 17:55
 
-            return string;
-        }
+        // Yesterday
+        if (now.getDate() - time.getDate() === 1 && now.getMonth() === time.getMonth())
+            return "Yesterday, " + Qt.formatDateTime(time, "hh:mm AP") // E.g. Yesterday, 05:55 PM
+            // return "Yesterday, " + Qt.formatDateTime(time, "hh:mm") // E.g. Yesterday, 17:55
 
         // More than one week ago
-        string = months[time.getMonth()];
-        string += " " + weekdays[time.getDay()] + ", ";
-        string += time.getHours() > 12 ? time.getHours() - 12 : time.getHours();
-        string += minutes;
-        return string;
+        return Qt.formatDateTime(time, "MMM dd, hh:mm AP"); // E.g. Jan 03, 05:55 PM
+        // return Qt.formatDateTime(time, "MMM dd, hh:mm"); // E.g. Jan 03, 17:55
     }
 
     // Function to have time from an ID