From ec87f52a2887aacf7caceb2559fd41caa442513c Mon Sep 17 00:00:00 2001 From: Wang Shidong Date: Sat, 29 Sep 2018 23:16:47 +0800 Subject: [PATCH] Do not load language layer automatically (#2220) --- autoload/SpaceVim.vim | 4 +-- autoload/SpaceVim/layers/chinese.vim | 2 ++ autoload/SpaceVim/layers/japanese.vim | 2 +- docs/cn/layers.md | 1 + docs/cn/layers/japanese.md | 39 +++++++++++++++++++++++++++ docs/layers.md | 1 + docs/layers/japanese.md | 36 +++++++++++++++++++++++++ wiki/en/Following-HEAD.md | 2 ++ 8 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 docs/cn/layers/japanese.md create mode 100644 docs/layers/japanese.md diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 103b5214e..90de46b89 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -801,9 +801,9 @@ function! SpaceVim#end() abort call SpaceVim#mapping#guide#register_prefix_descriptions('', 'g:leaderGuide_map') endif if g:spacevim_vim_help_language ==# 'cn' - call SpaceVim#layers#load('chinese') + let &helplang = 'cn' elseif g:spacevim_vim_help_language ==# 'ja' - call SpaceVim#layers#load('japanese') + let &helplang = 'jp' endif "" " generate tags for SpaceVim diff --git a/autoload/SpaceVim/layers/chinese.vim b/autoload/SpaceVim/layers/chinese.vim index 3915b7790..bafff50cf 100644 --- a/autoload/SpaceVim/layers/chinese.vim +++ b/autoload/SpaceVim/layers/chinese.vim @@ -21,4 +21,6 @@ endfunction function! SpaceVim#layers#chinese#config() abort let g:_spacevim_mappings_space.x.g = {'name' : '+translate'} call SpaceVim#mapping#space#def('nnoremap', ['x', 'g', 't'], 'Ydc', 'translate current word', 1) + " do not load vimcdoc plugin + let g:loaded_vimcdoc = 1 endfunction diff --git a/autoload/SpaceVim/layers/japanese.vim b/autoload/SpaceVim/layers/japanese.vim index ee55db917..d5a09e547 100644 --- a/autoload/SpaceVim/layers/japanese.vim +++ b/autoload/SpaceVim/layers/japanese.vim @@ -8,7 +8,7 @@ function! SpaceVim#layers#japanese#plugins() abort return [ - \ ['vim-jp/vimdoc-ja'], + \ ['vim-jp/vimdoc-ja', {'merged' : 0}], \ ] endfunction diff --git a/docs/cn/layers.md b/docs/cn/layers.md index 5f2ac8d36..b070249c5 100644 --- a/docs/cn/layers.md +++ b/docs/cn/layers.md @@ -80,6 +80,7 @@ Vim 插件以及相关配置。而 SpaceVim 是以模块的方式来组织和管 | [fzf](fzf/) | 提供以 fzf 为核心的异步模糊查找机制，支持模糊搜索文件、历史纪录、函数列表等。 | | [git](git/) | 这一模块为 SpaceVim 提供了 git 支持，根据当前 Vim 版本特性，选择 gina 或者 gita 作为默认的后台 git 插件。 | | [github](github/) | 该模块主要提供了 Github 数据管理功能，包括问题列表、动态等管理。 | +| [japanese](japanese/) | 该模块为日文用户提供了日文的 Vim 帮助文档，同时提供部分插件的日文帮助文档。 | | [lang#WebAssembly](lang/WebAssembly/) | 这一模块为 WebAssembly 开发提供支持。 | | [lang#agda](lang/agda/) | 这一模块为 SpaceVim 提供了 agda 语言开发的支持，主要包括语法高亮及一键运行。 | | [lang#asciidoc](lang/asciidoc/) | 这一模块为 asciidoc 编辑提供支持，包括格式化、自动生成文章目录、代码块等特性。 | diff --git a/docs/cn/layers/japanese.md b/docs/cn/layers/japanese.md new file mode 100644 index 000000000..a77cae47d --- /dev/null +++ b/docs/cn/layers/japanese.md @@ -0,0 +1,39 @@ +--- +title: "SpaceVim japanese 模块" +description: "该模块为日文用户提供了日文的 Vim 帮助文档，同时提供部分插件的日文帮助文档。" +lang: cn +--- + +# [可用模块](../) >> japanese + + + +- [模块描述](#模块描述) +- [启用模块](#启用模块) +- [模块配置](#模块配置) + + + +## 模块描述 + +该模块为日文用户提供了日文的 Vim 帮助文档，同时提供部分插件的日文帮助文档。 + +## 启用模块 + +日文用户，可以在配置文件里面启用该模块，以获取日文帮助文档： + +```toml +[[layers]] + name = "japanese" +``` + +## 模块配置 + +加在该模块后，默认的帮助文件语言并为设置为日文，可以通过 SpaceVim 选项 +`vim_help_language` 来设置，可将其值设为 `"jp"`。 + +```toml +[options] + vim_help_language = "jp" +``` + diff --git a/docs/layers.md b/docs/layers.md index 04280810e..b8372af4a 100644 --- a/docs/layers.md +++ b/docs/layers.md @@ -84,6 +84,7 @@ enable = false | [fzf](fzf/) | This layers provide a heavily customized fzf centric work-flow | | [git](git/) | This layers adds extensive support for git | | [github](github/) | This layer provides GitHub integration for SpaceVim | +| [japanese](japanese/) | Layer for japanese users, include japanese docs and runtime messages | | [lang#WebAssembly](lang/WebAssembly/) | This layer adds WebAssembly support to SpaceVim | | [lang#agda](lang/agda/) | This layer adds agda language support to SpaceVim | | [lang#asciidoc](lang/asciidoc/) | Edit asciidoc within vim, autopreview asciidoc in the default browser, with this layer you can also format asciidoc file. | diff --git a/docs/layers/japanese.md b/docs/layers/japanese.md new file mode 100644 index 000000000..c434cadad --- /dev/null +++ b/docs/layers/japanese.md @@ -0,0 +1,36 @@ +--- +title: "SpaceVim japanese layer" +description: "Layer for japanese users, include japanese docs and runtime messages" +--- + +# [Available Layers](../) >> japanese + + + +- [Description](#description) +- [Install](#install) +- [Configuration](#configuration) + + + +## Description + +This layer is for japanese users, and provide japanese docs and runtime messages. + +## Install + +To use this configuration layer, add following snippet to your custom configuration file. + +```toml +[[layers]] + name = "japanese" +``` + +## Configuration + +if you want to enable this feature, add following snippet to your custom config file. + +```toml +[options] + vim_help_language = "jp" +``` diff --git a/wiki/en/Following-HEAD.md b/wiki/en/Following-HEAD.md index 1e03565f0..09b1a9dda 100644 --- a/wiki/en/Following-HEAD.md +++ b/wiki/en/Following-HEAD.md @@ -10,6 +10,8 @@ The next release is v1.0.0. ### Changed +- Do not load language layer ([#2220](https://github.com/SpaceVim/SpaceVim/pull/2220)) + ### Fixed ### Removed