From e3f4b50c5301095a0c6ea240f9c656bb153034db Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Tue, 13 May 2014 15:12:38 +0800
Subject: [PATCH] writing mode v1.0

---
 app/i18n/i18n.go             | 4 ++--
 app/views/Note/note-dev.html | 2 +-
 messages/msg.en              | 2 ++
 messages/msg.zh              | 2 ++
 public/js/app/page.js        | 4 ++--
 public/js/i18n/msg.en.js     | 2 +-
 public/js/i18n/msg.zh.js     | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/i18n/i18n.go b/app/i18n/i18n.go
index bf1713e..02d8b56 100644
--- a/app/i18n/i18n.go
+++ b/app/i18n/i18n.go
@@ -10,8 +10,8 @@ import (
 
 // convert revel msg to js msg
 
-var msgBasePath = "/Users/life/Documents/Go/package/src/leanote/messages/"
-var targetBasePath = "/Users/life/Documents/Go/package/src/leanote/public/js/i18n/"
+var msgBasePath = "/Users/life/Documents/Go/package/src/github.com/leanote/leanote/messages/"
+var targetBasePath = "/Users/life/Documents/Go/package/src/github.com/leanote/leanote/public/js/i18n/"
 func parse(filename string) {
 	file, err := os.Open(msgBasePath + filename)
 	reader := bufio.NewReader(file)
diff --git a/app/views/Note/note-dev.html b/app/views/Note/note-dev.html
index 04282db..821230c 100644
--- a/app/views/Note/note-dev.html
+++ b/app/views/Note/note-dev.html
@@ -177,7 +177,7 @@ function log(o) {
 				{{end}}
 				
 				<div class="pull-right" style="line-height: 60px; margin-right:10px" id="toggleEditorMode">
-					<a href="#writing">写作模式</a>
+					<a href="#writing">{{msg . "writingMode"}}</a>
 				</div>
 				
 				<!--
diff --git a/messages/msg.en b/messages/msg.en
index 1d9d526..41283ef 100644
--- a/messages/msg.en
+++ b/messages/msg.en
@@ -81,6 +81,8 @@ defaultShare=Default sharing
 leftHidden=Hidden slide bar
 leftShow=Show slide bar
 nav=Note nav
+writingMode=Writing Mode
+normalMode=Normal Mode
 
 update=Update
 create=Create
diff --git a/messages/msg.zh b/messages/msg.zh
index a790022..accb37b 100644
--- a/messages/msg.zh
+++ b/messages/msg.zh
@@ -82,6 +82,8 @@ defaultShare=默认共享
 leftHidden=隐藏左侧
 leftShow=展开左侧
 nav=文档导航
+writingMode=写作模式
+normalMode=普通模式
 
 update=更新
 create=创建
diff --git a/public/js/app/page.js b/public/js/app/page.js
index 883609c..cbba30c 100644
--- a/public/js/app/page.js
+++ b/public/js/app/page.js
@@ -703,9 +703,9 @@ editorMode.prototype.toggleAText = function(isWriting) {
 	setTimeout(function() {
 		toggleA = $("#toggleEditorMode a");
 		if(isWriting) {
-			toggleA.attr("href", self.normalHash).text("普通模式");
+			toggleA.attr("href", self.normalHash).text(getMsg("normalMode"));
 		} else {
-			toggleA.attr("href", self.writingHash).text("写作模式");
+			toggleA.attr("href", self.writingHash).text(getMsg("writingMode"));
 		}	
 	}, 0);
 }
diff --git a/public/js/i18n/msg.en.js b/public/js/i18n/msg.en.js
index 977fe3e..8ce2dbd 100644
--- a/public/js/i18n/msg.en.js
+++ b/public/js/i18n/msg.en.js
@@ -1 +1 @@
-var MSG = {"3th":"Third-party accounts","a":"a","aboutLeanote":"About Leanote","accountSetting":"Account","addNotebook":"Add Notebook","all":"Newest","basicInfo":"Basic","blog":"Blog","blogInfo":"You can public your knowledge and Leanote is your blog!","blue":"blue","cancel":"Cancel","checkEmai":"Check email","clickAddTag":"Click to add Tag","close":"Close","confirmPassword":"Please confirm your password","cooperation":"Cooperation","cooperationInfo":"Collaborate with friends to improve your knowledge.","create":"Create","curUser":"Email","default":"Default","defaultShare":"Default sharing","demoRegister":"您现在使用的是体验帐号, \u003ca href=\"/register\"\u003e立即注册?\u003c/a\u003e","editorTips":"Editor Tips","editorTipsInfo":"\u003ch4\u003e1. Short Cuts\u003c/h4\u003ectrl+shift+c Toggle code \u003cbr /\u003e ctrl+shift+i Insert/edit image \u003ch4\u003e2. shift+enter Get out of current block\u003c/h4\u003e eg. \u003cimg src=\"/images/outofcode.png\" style=\"width: 90px\"/\u003e in this situation you can use shift+enter to get out of current code block.","email":"Email","emailOrOthers":"Email or other contact way","findPassword":"Find password","findPasswordSendEmailOver":"We have already send the find password link to your email, please check out your email","findPasswordTimeout":"time out","forgetPassword ":" Forget password?","green":"green","hi":"Hi","history":"Histories","home":"Home","ing":"processing","inputEmail":"Email is required","inputPassword":"Password is required","inputPassword2":"Please input your password again","inputUsername":"Username(email) is required","knowledge":"Knowledge","knowledgeInfo":"Use leanote as a note, manage your knowledge in Leanote.","leanoteBlog":"Blog","leftHidden":"Hidden slide bar","leftShow":"Show slide bar","login":"Login","loginSuccess":"login success","logining":"login","logout":"Logout","moto":"Not just a note!","myBlog":"Blog","myNote":"Enter to my note","myNotebook":"My Notebook","myTag":"My Tag","nav":"Note Nav","newMarkdown":"New Markdown Note","newNote":"New Note","newPassword":"New Password","notGoodPassword":"Tt's not a good password, the length is at least 6","notebook":"Notebook","oldPassword":"Old Password","or":"or","password":"Password","password2":"Confirm your password","passwordTips":"The length is at least 6","reFindPassword":"find password again","red":"red","register":"Register","registerSuccessAndRdirectToNote":"register success, now redirect to my note...","save":"Save","send":"Send","share":"Share","shareInfo":"Share your knowledge to your friends in Leanote.","simple":"Simple","submit":"submit","suggestions":"Suggestions","suggestionsInfo":"help us to improve our service.","tag":"Tag","themeSetting":"Theme","trash":"Trash","try":"Try it","unTitled":"UnTitled","update":"Update","updateEmail":"Update Email","updatePassword":"Update password","updatePasswordSuccessRedirectToLogin":"update password success and redirect to login page...","uploadImage":"Upload Image","usernameOrEmail":"Username or email","usernameSetting":"Update Username","welcomeUseLeanote":"Welcome!","wrongEmail":"Wrong email","wrongPassword":"Wrong password","wrongUsernameOrPassword":"Wrong username or password","yellow":"yellow","yourContact":"Your contact"};
\ No newline at end of file
+var MSG = {"3th":"Third-party accounts","aboutLeanote":"About leanote","aboutMe":"About me","accountSetting":"Account","addNotebook":"Add notebook","all":"Newest","basicInfo":"Basic","blog":"Blog","blogInfo":"You can public your knowledge and leanote is your blog!","blogSet":"Set blog","blue":"blue","cancel":"Cancel","checkEmai":"Check email","clickAddTag":"Click to add Tag","close":"Close","confirmPassword":"Please confirm your password","cooperation":"Cooperation","cooperationInfo":"Collaborate with friends to improve your knowledge.","create":"Create","curUser":"Email","default":"Default","defaultShare":"Default sharing","demoRegister":"\u003ca href=\"/register\"\u003eSign up\u003c/a\u003e","editorTips":"Tips","editorTipsInfo":"\u003ch4\u003e1. Short cuts\u003c/h4\u003ectrl+shift+c Toggle code \u003cbr /\u003e ctrl+shift+i Insert/edit image \u003ch4\u003e2. shift+enter Get out of current block\u003c/h4\u003e eg. \u003cimg src=\"/images/outofcode.png\" style=\"width: 90px\"/\u003e in this situation you can use shift+enter to get out of current code block.","email":"Email","emailOrOthers":"Email or other contact way","findPassword":"Find password","findPasswordSendEmailOver":"We have already send the find password link to your email, please check out your email","findPasswordTimeout":"time out","forgetPassword ":" Forget password?","green":"green","hi":"Hi","history":"Histories","home":"Home","ing":"processing","inputEmail":"Email is required","inputPassword":"Password is required","inputPassword2":"Please input your password again","inputUsername":"Username(email) is required","knowledge":"Knowledge","knowledgeInfo":"Use leanote as a note, manage your knowledge in leanote.","leanoteBlog":"Blog","leftHidden":"Hidden slide bar","leftShow":"Show slide bar","login":"Sign in","loginSuccess":"login success","logining":"Sign in","logout":"Logout","moto":"your own cloud note!","myBlog":"Blog","myNote":"My note","myNotebook":"My notebook","myTag":"My tag","nav":"Note nav","newMarkdown":"New markdown note","newNote":"New note","newPassword":"New password","normalMode":"Normal Mode","notFound":"This page cann't found.","notGoodPassword":"Tt's not a good password, the length is at least 6","notebook":"Notebook","oldPassword":"Old password","or":"or","password":"Password","password2":"Confirm your password","passwordTips":"The length is at least 6","reFindPassword":"find password again","red":"red","register":"Sign up","registerSuccessAndRdirectToNote":"register success, now redirect to my note...","save":"Save","send":"Send","share":"Share","shareInfo":"Share your knowledge to your friends in leanote.","simple":"Simple","submit":"submit","suggestions":"Suggestions","suggestionsInfo":"help us to improve our service.","tag":"Tag","themeSetting":"Theme","trash":"Trash","try":"Try it","unTitled":"UnTitled","update":"Update","updateEmail":"Update email","updatePassword":"Update password","updatePasswordSuccessRedirectToLogin":"update password success and redirect to login page...","uploadImage":"Upload image","usernameOrEmail":"Username or email","usernameSetting":"Update username","welcomeUseLeanote":"Welcome!","writingMode":"Writing Mode","wrongEmail":"Wrong email","wrongPassword":"Wrong password","wrongUsernameOrPassword":"Wrong username or password","yellow":"yellow","yourContact":"Your contact","yourSuggestions":"Suggestions"};
\ No newline at end of file
diff --git a/public/js/i18n/msg.zh.js b/public/js/i18n/msg.zh.js
index 5a4ca70..347c4e7 100644
--- a/public/js/i18n/msg.zh.js
+++ b/public/js/i18n/msg.zh.js
@@ -1 +1 @@
-var MSG = {"3th":"第三方登录","aboutLeanote":"关于Leanote","accountSetting":"帐户设置","addNotebook":"添加笔记本","all":"最新","basicInfo":"基本信息","blog":"博客","blogInfo":"将笔记公开, 让知识传播的更远!","blue":"蓝色","cancel":"取消","checkEmai":"查收邮箱","clickAddTag":"点击添加标签","close":"关闭","confirmPassword":"两次密码输入不一致","cooperation":"协作","cooperationInfo":"分享给好友的同时也可以让你的好友和你一起来完善它.","create":"创建","curUser":"当前登录帐户","default":"默认","defaultShare":"默认共享","demoRegister":"您现在使用的是体验帐号, \u003ca href=\"/register\"\u003e立即注册?\u003c/a\u003e","editorTips":"帮助","editorTipsInfo":"\u003ch4\u003e1. 快捷键\u003c/h4\u003ectrl+shift+c 代码块切换 \u003cbr /\u003e ctrl+shift+i 插入/修改图片\u003ch4\u003e2. shift+enter 跳出当前区域\u003c/h4\u003e比如在代码块中\u003cimg src=\"/images/outofcode.png\" style=\"width: 90px\"/\u003e按shift+enter可跳出当前代码块.","email":"Email","emailOrOthers":"Email或其它联系方式","findPassword":"找回密码","findPasswordSendEmailOver":"已经将修改密码的链接发送到您的邮箱, 请查收邮件.","findPasswordTimeout":"链接已过期","forgetPassword ":" 忘记密码?","green":"绿色","hi":"Hi","history":"历史记录","home":"主页","ing":"正在处理","inputEmail":"请输入Email","inputPassword":"请输入密码","inputPassword2":"请再次输入密码","inputUsername":"请输入用户名或Email","knowledge":"知识","knowledgeInfo":"leanote是一个笔记, 你可以用它来管理自己的知识.","leanoteBlog":"官方博客","leftHidden":"隐藏左侧","leftShow":"展开左侧","login":"登录","loginSuccess":"登录成功, 正在跳转","logining":"正在登录","logout":"退出","moto":"不一样的笔记!","myBlog":"我的博客","myNote":"进入我的笔记","myNotebook":"我的笔记本","myTag":"我的标签","nav":"文档导航","newMarkdown":"新建Markdown笔记","newNote":"新建笔记","newPassword":"新密码","notGoodPassword":"密码至少6位","notebook":"笔记本","oldPassword":"旧密码","or":"或","password":"密码","password2":"确认密码","passwordTips":"密码至少6位","reFindPassword":"重新找回密码","red":"红色","register":"注册","registerSuccessAndRdirectToNote":"注册成功, 正在转至我的笔记...","save":"保存","send":"发送","share":"分享","shareInfo":"你也可以将知识分享给你的好友.","simple":"简约","submit":"提交","suggestions":"您的建议","suggestionsInfo":"帮助我们完善leanote","tag":"标签","themeSetting":"主题设置","trash":"废纸篓","try":"体验一下","unTitled":"无标题","update":"更新","updateEmail":"修改Email","updatePassword":"修改密码","updatePasswordSuccessRedirectToLogin":"修改成功, 正在跳转到登录页","uploadImage":"上传图片","usernameOrEmail":"用户名或Email","usernameSetting":"用户名设置","welcomeUseLeanote":"欢迎使用Leanote","wrongEmail":"Email格式有误","wrongPassword":"密码有误","wrongUsernameOrPassword":"用户名或密码有误","yellow":"黄色","yourContact":"您的联系方式"};
\ No newline at end of file
+var MSG = {"3th":"第三方登录","aboutLeanote":"关于leanote","aboutMe":"关于我","accountSetting":"帐户设置","addNotebook":"添加笔记本","all":"最新","basicInfo":"基本信息","blog":"博客","blogInfo":"将笔记公开, 让知识传播的更远!","blogSet":"博客设置","blue":"蓝色","cancel":"取消","checkEmai":"查收邮箱","clickAddTag":"点击添加标签","close":"关闭","confirmPassword":"两次密码输入不一致","cooperation":"协作","cooperationInfo":"分享给好友的同时也可以让你的好友和你一起来完善它.","create":"创建","curUser":"当前登录帐户","default":"默认","defaultShare":"默认共享","demoRegister":"\u003ca href=\"/register\"\u003e立即注册\u003c/a\u003e","editorTips":"帮助","editorTipsInfo":"\u003ch4\u003e1. 快捷键\u003c/h4\u003ectrl+shift+c 代码块切换 \u003cbr /\u003e ctrl+shift+i 插入/修改图片\u003ch4\u003e2. shift+enter 跳出当前区域\u003c/h4\u003e比如在代码块中\u003cimg src=\"/images/outofcode.png\" style=\"width: 90px\"/\u003e按shift+enter可跳出当前代码块.","email":"Email","emailOrOthers":"Email或其它联系方式","findPassword":"找回密码","findPasswordSendEmailOver":"已经将修改密码的链接发送到您的邮箱, 请查收邮件.","findPasswordTimeout":"链接已过期","forgetPassword ":" 忘记密码?","green":"绿色","hi":"Hi","history":"历史记录","home":"主页","ing":"正在处理","inputEmail":"请输入Email","inputPassword":"请输入密码","inputPassword2":"请再次输入密码","inputUsername":"请输入用户名或Email","knowledge":"知识","knowledgeInfo":"leanote是一个笔记, 你可以用它来管理自己的知识.","leanoteBlog":"官方博客","leftHidden":"隐藏左侧","leftShow":"展开左侧","login":"登录","loginSuccess":"登录成功, 正在跳转","logining":"正在登录","logout":"退出","moto":"不一样的笔记!","myBlog":"我的博客","myNote":"我的笔记","myNotebook":"我的笔记本","myTag":"我的标签","nav":"文档导航","newMarkdown":"新建Markdown笔记","newNote":"新建笔记","newPassword":"新密码","normalMode":"普通模式","notFound":"该页面不存在","notGoodPassword":"密码至少6位","notebook":"笔记本","oldPassword":"旧密码","or":"或","password":"密码","password2":"确认密码","passwordTips":"密码至少6位","reFindPassword":"重新找回密码","red":"红色","register":"注册","registerSuccessAndRdirectToNote":"注册成功, 正在转至我的笔记...","save":"保存","send":"发送","share":"分享","shareInfo":"你也可以将知识分享给你的好友.","simple":"简约","submit":"提交","suggestions":"建议","suggestionsInfo":"帮助我们完善leanote","tag":"标签","themeSetting":"主题设置","trash":"废纸篓","try":"体验一下","unTitled":"无标题","update":"更新","updateEmail":"修改Email","updatePassword":"修改密码","updatePasswordSuccessRedirectToLogin":"修改成功, 正在跳转到登录页","uploadImage":"上传图片","usernameOrEmail":"用户名或Email","usernameSetting":"用户名设置","welcomeUseLeanote":"欢迎使用leanote","writingMode":"写作模式","wrongEmail":"Email格式有误","wrongPassword":"密码有误","wrongUsernameOrPassword":"用户名或密码有误","yellow":"黄色","yourContact":"您的联系方式","yourSuggestions":"帮助完善leanote"};
\ No newline at end of file