diff --git a/LICENSE b/LICENSE deleted file mode 100644 index ae2cf74..0000000 --- a/LICENSE +++ /dev/null @@ -1,37 +0,0 @@ -The Star And Thank Author License (SATA) - -Copyright © 2019 Shen-Yu(shenyu@hotmail.com) - -Project Url: https://github.com/Shen-Yu/hexo-theme-ayer - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -And wait, the most important, you shall star/+1/like the project(s) in project url -section above first, and then thank the author(s) in Copyright section. - -Here are some suggested ways: - - - Email the authors a thank-you letter, and make friends with him/her/them. - - Report bugs or issues. - - Tell friends what a wonderful project this is. - - And, sure, you can just express thanks in your mind without telling the world. - -Contributors of this project by forking have the option to add his/her name and -forked project url at copyright and project url sections, but shall not delete -or modify anything else in these two sections. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/scripts/events/lib/hello.js b/scripts/events/lib/hello.js index dba62e5..9d9177f 100644 --- a/scripts/events/lib/hello.js +++ b/scripts/events/lib/hello.js @@ -1,25 +1,7 @@ "use strict"; module.exports = (hexo) => { - const isZh = hexo.theme.i18n.languages[0].search(/zh-CN/i) !== -1; - if (isZh) { - hexo.log.info(` ------------------------------------------------- -| | -| __ ________ _____ | -| /\\\\ \\ / / ____| __ \\ | -| / \\\\ \\_/ /| |__ | |__) | | -| / /\\ \\\\ / | __| | _ / | -| / ____ \\| | | |____| | \\ \\ | -| /_/ \\_\\_| |______|_| \\_\\ | -| | -| 感谢使用 Ayer 主题 ! | -| 文档: https://shen-yu.gitee.io/2019/ayer/ | -| | ------------------------------------------------- -`); - } else { - hexo.log.info(` + hexo.log.info(` ---------------------------------------------------- | | | __ ________ _____ | @@ -34,5 +16,4 @@ module.exports = (hexo) => { | | ---------------------------------------------------- `); - } -}; + }; diff --git a/scripts/events/lib/merge-configs.js b/scripts/events/lib/merge-configs.js index 2d6936d..473e838 100644 --- a/scripts/events/lib/merge-configs.js +++ b/scripts/events/lib/merge-configs.js @@ -4,17 +4,13 @@ const objUtil = require("../../utils/object"); const { isNotEmptyObject } = require("../../utils/object"); module.exports = (hexo) => { - const isZh = hexo.theme.i18n.languages[0].search(/zh-CN/i) !== -1; - + if (isNotEmptyObject(hexo.config.theme_config)) { hexo.theme.config = objUtil.merge( {}, hexo.theme.config, hexo.config.theme_config ); - if (isZh) { - hexo.log.info("[Ayer] 读取 _config.yml 中 theme_config 配置项覆盖配置"); - } else { hexo.log.info( "[Ayer] Merge theme config from theme_config in _config.yml" );