Merge pull request #118 from b3log/1.1.0

1.1.0

conf/wide.go

@@ -80,7 +80,6 @@ func FixedTimeCheckEnv() {
 
 			if "" == os.Getenv("GOROOT") {
 				glog.Fatal("Not found $GOROOT")
-
 				os.Exit(-1)
 			}
 

i18n/en_US.json

@@ -60,7 +60,7 @@
     "ver": "Version",
     "current_ver": "Current Version",
     "dev_team": "Dev Team",
-    "donate_us": "Donate Us",
+    "donate": "Donate",
     "confirm_save": "Confirm Save",
     "workspace": "Workspace",
     "project_address": "Project",

i18n/ja_JP.json

@@ -60,7 +60,7 @@
     "ver": "バージョン",
     "current_ver": "現在のバージョン",
     "dev_team": "開発チーム",
-    "donate_us": "寄付",
+    "donate": "寄付",
     "confirm_save": "保存の確認",
     "workspace": "ワークスペース",
     "project_address": "プロジェクト",

i18n/zh_CN.json

@@ -60,7 +60,7 @@
     "ver": "版本",
     "current_ver": "当前版本",
     "dev_team": "开发团队",
-    "donate_us": "捐赠我们",
+    "donate": "捐赠我们",
     "confirm_save": "请确认所有文件已保存",
     "workspace": "工作空间",
     "project_address": "项目地址",

views/about.html

@@ -21,7 +21,7 @@
             <label>{{.i18n.dev_team}}{{.i18n.colon}}</label>
             <a href="https://github.com/b3log/b3log-solo/wiki/About_us" target="_blank">B3log</a><br/> 
 
-            <label>{{.i18n.donate_us}}{{.i18n.colon}}</label>
+            <label>{{.i18n.donate}}{{.i18n.colon}}</label>
             <a href="http://b3log.org/donate.html" target="_blank">b3log.org/donate.html</a>
         </div>
         <div class="fn-left thx">

views/start.html

@@ -22,7 +22,7 @@
             <a href="https://github.com/b3log/b3log-solo/wiki/About_us" target="_blank">B3log</a>
         </li>
         <li>
-            <label>{{.i18n.donate_us}}{{.i18n.colon}}</label>
+            <label>{{.i18n.donate}}{{.i18n.colon}}</label>
             <a href="http://b3log.org/donate.html" target="_blank">b3log.org/donate.html</a>
         </li>
     </ul>