From 5ef4ecd242bc369b16721a2b2818bf74b9cb012b Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Sun, 12 Apr 2015 11:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=97=A0?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/node_modules/note.js  | 2 +-
 src/public/js/app/note.js | 4 ++--
 src/public/langs/zh-cn.js | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/node_modules/note.js b/src/node_modules/note.js
index 75c1b4eb..21d97336 100644
--- a/src/node_modules/note.js
+++ b/src/node_modules/note.js
@@ -197,7 +197,7 @@ var Note = {
 			else {
 				var histories = [];
 				for(var i = doc.Histories.length - 1; i >= 0; --i) {
-					histories.push({Content: doc.Histories[i]});
+					histories.push({Content: doc.Histories[i], UpdatedTime: doc.UpdatedTime || new Date()});
 				}
 				callback(histories);
 			}
diff --git a/src/public/js/app/note.js b/src/public/js/app/note.js
index 34cf36a7..f11db01b 100644
--- a/src/public/js/app/note.js
+++ b/src/public/js/app/note.js
@@ -1442,7 +1442,7 @@ Note.listNoteContentHistories = function() {
 		for (i in re) {
 			var content = re[i]
 			content.Ab = Note.genAbstract(content.Content, 200);
-			str += tt('<tr><td seq="?">#?<? class="each-content">?</?> <div class="btns">' + getMsg("datetime") + ': <span class="label label-default">?</span> <button class="btn btn-default all">' + getMsg("unfold") + '</button> <button class="btn btn-primary back">' + getMsg('restoreFromThisVersion') + '</button></div></td></tr>', i, (+i+1), s, content.Ab, s, content.UpdatedTime)
+			str += tt('<tr><td seq="?">#?<? class="each-content">?</?> <div class="btns">' + getMsg("datetime") + ': <span class="label label-default">?</span> <button class="btn btn-default all">' + getMsg("unfold") + '</button> <button class="btn btn-primary back">' + getMsg('restoreFromThisVersion') + '</button></div></td></tr>', i, (+i+1), s, content.Ab, s, goNowToDatetime(content.UpdatedTime))
 		}
 		str += "</table></div>";
 		$content.html(str);
@@ -1546,7 +1546,7 @@ Note.searchNoteSys = function(val, noteId) {
 	NoteService.searchNote(val, function(notes) { 
 		if(notes) {
 			Note.searchKey = val;
-			Notebook.changeCurNotebookTitle('Search results', false, notes.length, false, true);
+			Notebook.changeCurNotebookTitle(getMsg('Search results'), false, notes.length, false, true);
 			Note.renderNotes(notes);
 			// markdown一旦setContent就focus, 导致搜索失去焦点
 			setTimeout(function() {
diff --git a/src/public/langs/zh-cn.js b/src/public/langs/zh-cn.js
index be52b838..457fd771 100644
--- a/src/public/langs/zh-cn.js
+++ b/src/public/langs/zh-cn.js
@@ -229,6 +229,8 @@
 	"Insert link into content": "插件附件链接到笔记中",
 	"Save as": "保存为",
 
+	"Search results": "搜索结果",
+
 	"Image saved successful!": "图片保存成功!",
 	"Image saved failure!": "图片保存失败!",
 	"File saved failure!": "文件保存失败!",