Skip to content

Commit 475d635

Browse files
changkunchangkun
committed
see changkun#12: support english website
1 parent 7c88f42 commit 475d635

File tree

19 files changed

+3958
-55
lines changed

19 files changed

+3958
-55
lines changed

‎.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ pdf/zh-cn/*.md
3636

3737
website/db.json
3838
website/public/*
39-
website/src/modern-cpp/book/*
39+
website/src/modern-cpp/zh-cn/*
40+
website/src/modern-cpp/en-us/*
41+
website/src/modern-cpp/exercises
42+
website/src/modern-cpp/code
43+
website/src/modern-cpp/assets/cover-2nd-en.png
4044
website/src/modern-cpp/assets/cover-2nd.png
45+
website/src/modern-cpp/assets/qq-group.png
4146
website/src/modern-cpp/assets/figures/*

‎README-zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# 《高速上手 C++11/14/17/20》
44

5-
[![](https://img.shields.io/badge/language-English-blue.svg?style=flat-square)](./README.md) [![](https://img.shields.io/badge/language-简体中文-red.svg?style=flat-square)](./README-zh-cn.md) [![](https://img.shields.io/badge/€-donate-ff69b4.svg?style=flat-square)](./DONATE.md) [![](https://img.shields.io/badge/chat-community-667ed5.svg?style=flat-square)](./COMMUNITY.md)
5+
[![](https://img.shields.io/badge/language-English-blue.svg?style=flat-square)](./README.md) [![](https://img.shields.io/badge/language-简体中文-red.svg?style=flat-square)](./README-zh-cn.md) [![](https://img.shields.io/badge/€-donate-ff69b4.svg?style=flat-square)](./assets/donate.md) [![](https://img.shields.io/badge/chat-community-667ed5.svg?style=flat-square)](./assets/community.md)
66

77
## 本书目的
88

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# C++11/14/17/20 On the Fly
44

5-
[![](https://img.shields.io/badge/language-English-blue.svg?style=flat-square)](./README.md) [![](https://img.shields.io/badge/language-简体中文-red.svg?style=flat-square)](./README-zh-cn.md) [![](https://img.shields.io/badge/€-donate-ff69b4.svg?style=flat-square)](./DONATE.md) [![](https://img.shields.io/badge/chat-community-667ed5.svg?style=flat-square)](./COMMUNITY.md)
5+
[![](https://img.shields.io/badge/language-English-blue.svg?style=flat-square)](./README.md) [![](https://img.shields.io/badge/language-简体中文-red.svg?style=flat-square)](./README-zh-cn.md) [![](https://img.shields.io/badge/€-donate-ff69b4.svg?style=flat-square)](./assets/donate.md) [![](https://img.shields.io/badge/chat-community-667ed5.svg?style=flat-square)](./assets/community.md)
66

77
## Purpose
88

‎COMMUNITY.md renamed to ‎assets/community.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
# Community
1+
---
2+
title: 社区
3+
type: about
4+
order: 2
5+
---
6+
7+
## Community
28

39
The book offers a telegram chat group, feel free to join if you are interested:
410

511
[![](https://img.shields.io/badge/chat-telegram-blue.svg?style=popout-square&logo=telegram)](https://t.me/joinchat/FEeulBM5OVYzuDI4phQ9Mg)
612

7-
# 交流
13+
## 交流
814

915
本书有以下读者 QQ 交流群，有兴趣的读者可以加入，加群需正确回答加群密码：
1016

11-
![](./assets/qq-group.png)
17+
![](../assets/qq-group.png)
1218

1319
> 提示: `bW9kZXJuLWNwcC10dXRvcmlhbC1naXRodWI=`

‎DONATE.md renamed to ‎assets/donate.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ type: about
44
order: 1
55
---
66

7-
# Donate
7+
## Donate
88

99
I would love if you support me to make the book better:
1010

1111
[![](https://img.shields.io/badge/donate-PayPal-104098.svg?style=popout-square&logo=PayPal)](https://www.paypal.me/ouchangkun/4.99eur)
1212

13-
# 资助
13+
## 资助
1414

1515
如果你认为本书对你起到了帮助，并希望赞助作者，可以通过下面的二维码给予支持：
1616

1717
|微信|支付宝|
1818
|:--:|:--:|
19-
|![](./assets/wechat.jpg) | ![](./assets/alipay.jpg)|
19+
|![](../assets/wechat.jpg) | ![](../assets/alipay.jpg)|
2020

‎website/Makefile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@ all: clean
22
node install.js
33
python3 filter.py
44
cp ../assets/cover-2nd.png ./src/modern-cpp/assets/cover-2nd.png
5+
cp ../assets/cover-2nd-en.png ./src/modern-cpp/assets/cover-2nd-en.png
56
cp ../assets/alipay.jpg ./src/modern-cpp/assets/alipay.jpg
67
cp ../assets/wechat.jpg ./src/modern-cpp/assets/wechat.jpg
7-
cp ../DONATE.md ./src/modern-cpp/about/
8+
cp ../assets/qq-group.png ./src/modern-cpp/assets/qq-group.png
9+
cp ../assets/donate.md ./src/modern-cpp/about/
10+
cp ../assets/community.md ./src/modern-cpp/about/
811
cp -r ../assets/figures ./src/modern-cpp/assets/figures
9-
cp -r ../exercises ./src/modern-cpp/book/
10-
cp -r ../code ./src/modern-cpp/book/
12+
cp -r ../exercises ./src/modern-cpp/
13+
cp -r ../code ./src/modern-cpp/
1114
hexo generate
1215
mv public/index.html public/modern-cpp/index.html
1316
s: all
1417
node_modules/serve/bin/serve.js ./public
1518
clean:
1619
rm -rf ./src/modern-cpp/assets/cover-2nd.png
1720
rm -rf ./src/modern-cpp/assets/figures
18-
rm -rf public db.json src/modern-cpp/book
21+
rm -rf public db.json src/modern-cpp/zh-cn
22+
rm -rf public db.json src/modern-cpp/en-us
1923
rm -rf ./src/modern-cpp/assets/alipay.jpg
2024
rm -rf ./src/modern-cpp/assets/wechat.jpg
21-
rm -rf ./src/modern-cpp/about/donate.md
25+
rm -rf ./src/modern-cpp/about/donate.md
26+
rm -rf ./src/modern-cpp/about/community.md
27+
rm -rf ./src/modern-cpp/code
28+
rm -rf ./src/modern-cpp/exercises
29+

‎website/filter.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
import re
55

66
source_dir = [
7-
'../book/zh-cn/'
7+
'../book/zh-cn/',
8+
'../book/en-us/'
89
]
910

1011
destination_dir = [
11-
'./src/modern-cpp/book/'
12+
'./src/modern-cpp/zh-cn/',
13+
'./src/modern-cpp/en-us/'
1214
]
1315

1416
chapters = ['00-preface.md', '01-intro.md', '02-usability.md', '03-runtime.md', '04-containers.md', '05-pointers.md', '06-regex.md', '07-thread.md', '08-filesystem.md', '09-others.md', '10-cpp20.md', 'appendix1.md', 'appendix2.md']
1517

16-
ignores = ['TOC', '返回目录', '许可', 'license']
18+
ignores = ['TOC', '返回目录', '许可', 'license', 'Table of Content', 'License']
1719

1820
for index, source in enumerate(source_dir):
1921
for chapter in chapters:

0 commit comments

Comments
 (0)