i18n

LICENSE

@@ -1,4 +1,4 @@
-Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -178,7 +178,7 @@ Apache License
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

i18n/en_US.json

@@ -0,0 +1,105 @@
+{
+    "wide": "Wide",
+    "isDelete": "Delete",
+    "cancel": "Cancel",
+    "file": "File",
+    "login": "Login",
+    "username": "Username",
+    "current_user": "Current User",
+    "password": "Password",
+    "login_failed": "Login Failed",
+    "run": "Run",
+    "debug": "Debug",
+    "help": "Help",
+    "check_update": "Check Update",
+    "report_issues": "Report Issues",
+    "wide_doc": "Wide Document",
+    "about": "About",
+    "start_page": "Start Page",
+    "create_file": "Create File",
+    "create": "Create",
+    "create_dir": "Create Dir",
+    "delete": "Delete",
+    "save": "Save",
+    "exit": "Exit",
+    "close_all_files": "Close All",
+    "save_all_files": "Save All",
+    "format": "Format",
+    "goget": "go get",
+    "goinstall": "go install",
+    "build": "Build",
+    "build_n_run": "Build&Run",
+    "editor": "Editor",
+    "max_editor": "Maximize",
+    "restore_editor": "Restore Editor",
+    "unread_notification": "Unread",
+    "notification_2": "Not found [gocode], thereby [Autocomplete] will not work",
+    "notification_3": "Not found [ide_stub], thereby [Jump to Decl], [Find Usages] will not work",
+    "goto_line": "Goto Line",
+    "go": "Go",
+    "tip": "Tip",
+    "confirm": "Confirm",
+    "stop": "Stop",
+    "output": "Output",
+    "search": "Search",
+    "notification": "Notification",
+    "min": "Minimize",
+    "restore_side": "Restore File Tree",
+    "search_text": "Search Text",
+    "find": "Find",
+    "find_next": "Find Next",
+    "find_previous": "Find Previous",
+    "replace": "Replace",
+    "replace_all": "Replace All",
+    "restore_bottom": "Bottom Windows Restore",
+    "file_format": "File Extension",
+    "keyword": "Keyword",
+    "user_guide": "User Guide",
+    "dev_guide": "Dev Guide",
+    "keyboard_shortcuts": "Keyboard Shortcuts",
+    "ver": "Version",
+    "current_ver": "Current Version",
+    "dev_team": "Dev Team",
+    "donate": "Donate",
+    "donate_us": "Donate Us",
+    "confirm_save": "Confirm Save",
+    "workspace": "Workspace",
+    "project_address": "Project",
+    "community": "Community",
+    "autocomplete": "Autocomplete",
+    "jump_to_decl": "Jump To Decl",
+    "show_expr_info": "Show Expression Info",
+    "find_usages": "Find Usages",
+    "delete_line": "Delete Line",
+    "save_editor_file": "Save File",
+    "save_all_editors_files": "Save All",
+    "close_editor": "Close File",
+    "full_screen": "Full Screen",
+    "auto_indent": "Auto indent",
+    "indent": "Indent",
+    "unindent": "Un-indent",
+    "focus": "Focus",
+    "switch_tab": "Switch Tab",
+    "focus_editor": "Focus to Editor",
+    "focus_file_tree": "Focus to File Tree",
+    "focus_output": "Focus to Output",
+    "focus_search": "Focus to Search",
+    "focus_notification": "Focus to Notification",
+    "start-build": "Start [go build]",
+    "build-succ": "[go build] Successful",
+    "build-failed": "[go build] Failed",
+    "start-install": "Start [go install]",
+    "install-succ": "[go install] Successful",
+    "install-failed": "[go install] Fialed",
+    "start-get": "Start [go get]",
+    "get-succ": "[go get] Successful",
+    "get-failed": "[go get] Failed",
+    "check_version": "Checking update",
+    "new_version_available": "new version available",
+    "go_env": "Go",
+    "os": "OS",
+    "project": "Project",
+    "license": "License",
+    "credits": "Credits",
+    "colon": ": "
+}

i18n/locales.go

@@ -20,9 +20,10 @@ var Locales = map[string]locale{}
 
 // 加载国际化配置.
 func Load() {
-	// TODO: 加载所有语言配置
+	// TODO: 自动加载所有语言配置
-	load("zh_CN")
 
+	load("zh_CN")
+	load("en_US")
 }
 
 func load(localeStr string) {

i18n/zh_CN.json

@@ -36,7 +36,7 @@
     "notification_2": "没有检查到 gocode，这将会导致 [自动完成] 失效",
     "notification_3": "没有检查到 ide_stub，这将会导致 [跳转到声明]、[查找使用] 失效",
     "goto_line": "跳转到行",
-    "goto": "跳转",
+    "go": "跳转",
     "tip": "提示",
     "confirm": "确定",
     "stop": "停止",
@@ -94,5 +94,13 @@
     "start-get": "开始 [go get]",
     "get-succ": "[go get] 成功",
     "get-failed": "[go get] 失败",
+    "check_version": "正在检查更新",
+    "new_version_available": "新版本可用",
+    "go_env": "Go 环境",
+    "os": "操作系统",
+    "project": "项目",
+    "license": "许可协议",
+    "credits": "致谢",
+    "uptodate": "当前已是最新版本",
     "colon": "："
 }

main.go

@@ -256,7 +256,8 @@ func aboutHandler(w http.ResponseWriter, r *http.Request) {
 	username := httpSession.Values["username"].(string)
 	locale := conf.Wide.GetUser(username).Locale
 
-	model := map[string]interface{}{"conf": conf.Wide, "i18n": i18n.GetAll(locale), "locale": locale, "ver": Ver}
+	model := map[string]interface{}{"conf": conf.Wide, "i18n": i18n.GetAll(locale), "locale": locale, "ver": Ver,
+		"goos": runtime.GOOS, "goarch": runtime.GOARCH, "gover": runtime.Version()}
 
 	t, err := template.ParseFiles("view/about.html")
 

static/css/about.css

@@ -1,3 +1,7 @@
+#dialogAboutDialog .dialog-main {
+    background-color: #FFF;
+}
+
 #dialogAbout {
     margin: 35px 100px 0 100px;
     line-height: 20px;
@@ -12,7 +16,7 @@
     text-decoration: underline;
 }
 
-#startPage label {
+#dialogAbout label {
     color: #666;
 }
 
@@ -23,7 +27,16 @@
 }
 
 #dialogAbout .space {
-    margin-bottom: 10px;
+    margin-bottom: 6px;
+    border-bottom: 1px solid #f1f1f1;
+    padding-bottom: 6px;
+
+}
+
+#dialogAbout .thx {
+    border-left: 1px solid #f1f1f1;
+    padding-left: 24px;
+    margin-top: 16px;
 }
 
 #dialogAbout .thx,
@@ -40,4 +53,6 @@
     color: #999;
     font-size: 12px;
     line-height: normal;
+    height: 85px;
+    overflow: auto;
 }

static/js/wide.js

@@ -199,7 +199,7 @@ var wide = {
             "height": 52,
             "width": 260,
             "title": config.label.goto_line,
-            "okText": config.label.goto,
+            "okText": config.label.go,
             "cancelText": config.label.cancel,
             "afterOpen": function () {
                 $("#dialogGoLinePrompt > input").val('').focus();
@@ -283,17 +283,16 @@ var wide = {
                         jsonp: "callback",
                         success: function (data, textStatus) {
                            if ($("#dialogAbout .version").text() === data.wideVersion) {
-                               $(".upgrade").text('当前已是最新版本');
+                               $(".upgrade").text(config.label.uptodate);
                            } else {
-                                $(".upgrade").html("请下载最新版本<a href='' target='_blank'>" + data.wideVersion + "</a>");
+                                $(".upgrade").html(config.label.new_version_available + config.label.colon 
+                                        + "<a href='" + data.wideDownload 
+                                        + "' target='_blank'>" + data.wideVersion + "</a>");
                            }
                         }
                     });
                 }
             });
-
-            // TODO: remove
-            $("#dialogAbout").dialog("open");
         });
     },
     _initLayout: function () {

view/about.html

@@ -2,35 +2,31 @@
     <img class="logo" src="{{.conf.StaticServer}}/static/images/wide-logo.png" alt="wide logi"/>
     <div class="fn-left">
         <h2>Hello, 世界</h2>
-        <h3>Coding with Go on the Wide way. </h3>
+        <h3>Coding with Go on the Wide way.</h3>
     </div>
 </div>
-<div class="space"></div>
+<br/>
 <div>
     <label>{{.i18n.current_ver}}{{.i18n.colon}}</label> 
-    <span class="version">{{.ver}}</span> <br/>
+    <span class="version">{{.ver}}</span>,
-    <span class="upgrade">正在检查更新...</span>
+    <span class="upgrade">{{.i18n.check_version}}....</span>
     <div class="space"></div>
 
     <div class="fn-clear">
         <div class="fn-left">
-            <label>go环境{{.i18n.colon}}</label>
+            <label>{{.i18n.go_env}}{{.i18n.colon}}</label>
-            $G #20 (comment), $GOOS, $GOARCH <br/> 
+            {{.gover}}, {{.goos}}_{{.goarch}}<br/> 
-            <label>操作系统{{.i18n.colon}}</label>
-            Windows
-            <div class="space"></div>
-
             <label>{{.i18n.project_address}}{{.i18n.colon}}</label>
             <a href="https://github.com/b3log/wide" target="_blank">github.com/b3log/wide</a><br/>
 
             <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.dev_team}}{{.i18n.colon}}</label>
+            <label>{{.i18n.donate}}{{.i18n.colon}}</label>
-            <a href="https://github.com/b3log/b3log-solo/wiki/About_us" target="_blank">B3log</a>
+            <a href="http://b3log.org/donate.html" target="_blank">b3log.org/donate.html</a>
         </div>
         <div class="fn-left thx">
-            致谢{{.i18n.colon}}
+            <label>{{.i18n.credits}}{{.i18n.colon}}</label>
             <ul>
                 <li>
                     <a href="http://golang.org">golang</a>
@@ -49,23 +45,209 @@
     </div>
     <div class="space"></div>
     <div>
-        许可协议 
+        <label>{{.i18n.license}}{{.i18n.colon}}</label>
-        <div class="license">
+        <pre class="license">
-            /*
+                                 Apache License
-            * Copyright (C) 2011, Liyuan Li
+                           Version 2.0, January 2004
-            *
+                        http://www.apache.org/licenses/
-            * Licensed under the Apache License, Version 2.0 (the "License");
+
-            * you may not use this file except in compliance with the License.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-            * You may obtain a copy of the License at
+
-            *
+   1. Definitions.
-            *     http://www.apache.org/licenses/LICENSE-2.0
+
-            *
+      "License" shall mean the terms and conditions for use, reproduction,
-            * Unless required by applicable law or agreed to in writing, software
+      and distribution as defined by Sections 1 through 9 of this document.
-            * distributed under the License is distributed on an "AS IS" BASIS,
+
-            * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      "Licensor" shall mean the copyright owner or entity authorized by
-            * See the License for the specific language governing permissions and
+      the copyright owner that is granting the License.
-            * limitations under the License.
+
-            */
+      "Legal Entity" shall mean the union of the acting entity and all
-        </div>
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+        </pre>
     </div>
 </div>

view/index.html

@@ -181,7 +181,7 @@
         <div class="footer fn-clear">
             <div class="fn-left">
                 <span title="{{.i18n.restore_side}}" class="font-ico ico-restore fn-none"></span>
-                <span title="{{.i18n.resotre_bottom}}" class="font-ico ico-restore fn-none"></span>
+                <span title="{{.i18n.restore_bottom}}" class="font-ico ico-restore fn-none"></span>
             </div>
             <div class="fn-right">
                 <span class="cursor"></span>
@@ -217,7 +217,7 @@
                                     "delete": "{{.i18n.delete}}",
                                     "cancel": "{{.i18n.cancel}}",
                                     "goto_line": "{{.i18n.goto_line}}",
-                                    "goto": "{{.i18n.goto}}",
+                                    "go": "{{.i18n.go}}",
                                     "create": "{{.i18n.create}}",
                                     "create_file": "{{.i18n.create_file}}",
                                     "create_dir": "{{.i18n.create_dir}}",
@@ -231,7 +231,10 @@
                                     "start_page": "{{.i18n.start_page}}",
                                     "confirm_save": "{{.i18n.confirm_save}}",
                                     "community": "{{.i18n.community}}",
-                                    "about": "{{.i18n.about}}"
+                                    "about": "{{.i18n.about}}",
+                                    "new_version_available": "{{.i18n.new_version_available}}",
+                                    "colon": "{{.i18n.colon}}",
+                                    "uptodate": "{{.i18n.uptodate}}"
                             },
                             "channel": {
                             "editor": '{{.conf.EditorChannel}}',