[gnome-sound-recorder] Format date created strings.
- From: Meg Ford (Margaret) <megford src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sound-recorder] Format date created strings.
- Date: Sun, 28 Feb 2016 00:46:12 +0000 (UTC)
commit d67c189e2aa2a1e24c6082d1eacac361e4d711ea
Author: Meg Ford <megford gnome org>
Date: Sat Feb 27 16:49:57 2016 -0600
Format date created strings.
src/fileUtil.js | 15 +++++++--------
src/listview.js | 11 ++++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/fileUtil.js b/src/fileUtil.js
index 25d1b4a..f4364ef 100644
--- a/src/fileUtil.js
+++ b/src/fileUtil.js
@@ -48,7 +48,7 @@ const OffsetController = new Lang.Class({
getOffset: function() {
return this._offset;
},
-
+
getEndIdx: function() {
totItems = MainWindow.list.getItemCount();
if (CurrentEndIdx < totItems) {
@@ -56,14 +56,14 @@ const OffsetController = new Lang.Class({
} else {
this.endIdx = totItems - 1;
}
-
+
return this.endIdx;
},
-
+
increaseEndIdxStep: function() {
CurrentEndIdx += _OFFSET_STEP;
},
-
+
getcidx: function() {
return CurrentEndIdx;
}
@@ -71,12 +71,11 @@ const OffsetController = new Lang.Class({
const DisplayTime = new Lang.Class({
Name: 'DisplayTime',
-
- getDisplayTime: function(timeVal) {
+
+ getDisplayTime: function(mtime) {
let text = "";
let DAY = 86400000000;
let now = GLib.DateTime.new_now_local();
- let mtime = GLib.DateTime.new_from_timeval_local(timeVal);
let difference = now.difference(mtime);
let days = Math.floor(difference / DAY);
let weeks = Math.floor(difference / (7 * DAY));
@@ -112,6 +111,6 @@ const DisplayTime = new Lang.Class({
}
return text;
}
-});
+});
diff --git a/src/listview.js b/src/listview.js
index 42bc043..08d3c8f 100644
--- a/src/listview.js
+++ b/src/listview.js
@@ -121,17 +121,19 @@ const Listview = new Lang.Class({
let timeVal = file.get_modification_time();
let date = GLib.DateTime.new_from_timeval_local(timeVal);
let dateModifiedSortString = date.format("%Y%m%d%H%M%S");
- let dateModifiedDisplayString =
MainWindow.displayTime.getDisplayTime(timeVal);
+ let dateTime = GLib.DateTime.new_from_timeval_local(timeVal);
+ let dateModifiedDisplayString =
MainWindow.displayTime.getDisplayTime(dateTime);
let dateCreatedYes = file.has_attribute("time::created");
+ let dateCreatedString = null;
if (this.dateCreatedYes) {
let dateCreatedVal = file.get_attribute_uint64("time::created");
let dateCreated = GLib.DateTime.new_from_timeval_local(dateCreatedVal);
- this.dateCreatedString = dateCreated.format(_("%Y-%m-%d %H:%M:%S"));
+ dateCreatedString = MainWindow.displayTime.getDisplayTime(dateCreated);
}
fileInfo =
fileInfo.concat({ appName: null,
- dateCreated: null,
+ dateCreated: dateCreatedString,
dateForSort: dateModifiedSortString,
dateModified: dateModifiedDisplayString,
duration: null,
@@ -219,9 +221,8 @@ const Listview = new Lang.Class({
let dateTimeCreatedString = dateTimeTag.to_g_date_time();
if (dateTimeCreatedString) {
- this.dateCreatedString = dateTimeCreatedString.format(_("%Y-%m-%d %H:%M:%S"));
+ allFilesInfo[this.idx].dateCreated =
MainWindow.displayTime.getDisplayTime(dateTimeCreatedString);
}
- allFilesInfo[this.idx].dateCreated = this.dateCreatedString;
}
if (appString == GLib.get_application_name()) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]