Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update Chinese README #601

Merged
merged 3 commits into from
Jun 11, 2024
Merged

update Chinese README #601

merged 3 commits into from
Jun 11, 2024

Conversation

eMUQI
Copy link
Contributor

@eMUQI eMUQI commented Jun 3, 2024

Update the Chinese translation of the readme, synchronized to 412be00 version

#596

@xiantang xiantang self-requested a review June 3, 2024 14:00
xiantang
xiantang reviewed Jun 3, 2024
View reviewed changes
README-zh_cn.md Outdated
@@ -22,7 +22,7 @@ Air 是为 Go 应用开发设计的另外一个热重载的命令行工具。只
* 在 Air 启动之后，允许监听新创建的路径
* 更棒的构建过程

### ✨ beta 版本的特性
### 从参数覆盖指定配置
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

从参数覆盖指定配置 -> 使用参数覆盖指定配置

xiantang
xiantang reviewed Jun 3, 2024
View reviewed changes
README-zh_cn.md Outdated
@@ -86,9 +96,48 @@ docker run -it --rm \
cosmtrek/air
```

#### Docker/Podman .${SHELL}rc
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

duplicate？

xiantang
xiantang reviewed Jun 3, 2024
View reviewed changes
README-zh_cn.md Outdated
## 使用方法

您可以添加 `alias air='~/.air'` 到您的 `.bashrc` 或 `.zshrc` 后缀的文件.
为了减少输入，您可以添加 `alias air='~/.air'` 到您的 `.bashrc` 或 `.zshrc` 文件中.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为了方便输入

xiantang
xiantang reviewed Jun 3, 2024
View reviewed changes
README-zh_cn.md Outdated

* 确保你的静态文件在 `include_dir`、`include_ext` 或 `include_file` 中。
* 确保你的 HTML 有一个 `</body>` 标签。
* 通过配置以下内容激活代理：
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

通过配置以下内容开启代理：

@eMUQI
Copy link
Contributor Author

eMUQI commented Jun 4, 2024 •
edited
Loading

Hi, @xiantang .
I noticed a conflict in my PR because I missed some changes when making my second commit. I'm not very skilled at resolving git conflicts(I only know how to commit over the conflicting parts). Could you help me with this, or should I submit another commit to manually resolve it?
Thanks!

@xiantang
Copy link
Collaborator

xiantang commented Jun 5, 2024

Hi, @xiantang . I noticed a conflict in my PR because I missed some changes when making my second commit. I'm not very skilled at resolving git conflicts(I only know how to commit over the conflicting parts). Could you help me with this, or should I submit another commit to manually resolve it? Thanks!

OK let me do it

@xiantang xiantang merged commit 6697b69 into air-verse:master Jun 11, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xiantang xiantang xiantang left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@eMUQI @xiantang