Skip to content

9-regular-expressions tiny update #590

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.

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

Merged
merged 7 commits into from
Feb 2, 2020

Conversation

yyxygit
Copy link
Contributor

@yyxygit yyxygit commented Jan 17, 2020

目标章节:9-regular-expressions

当前上游最新 commit:90b7de0

所做更改如下:

文件名 参考上游 commit 更改(理由)
1-js/05-data-types/09-keys-values-entries/article.md ebfd95f line 14 同步英文版
1-js/05-data-types/11-date/6-get-seconds-today/task.md ebfd95f line 15 翻译
9-regular-expressions/05-regexp-multiline-mode/article.md 566b67d line 58 翻译
9-regular-expressions/07-regexp-escaping/article.md 566b67d 新增 Summary 翻译
9-regular-expressions/08-regexp-character-sets-and-ranges/article.md 566b67d line 29 同步英文版
9-regular-expressions/09-regexp-quantifiers/2-find-html-colors-6hex/solution.md 566b67d 浏览器运行alert输出与注释不符
9-regular-expressions/10-regexp-greedy-and-lazy/article.md 566b67d line 145 同步英文版
9-regular-expressions/11-regexp-groups/02-find-webcolor-3-or-6/solution.md 566b67d line 28 同步英文版

ps: 貌似PR587部分也在改动的文件列表里?

@yyxygit yyxygit changed the title 9-regular-expressions tiny proofreading 9-regular-expressions tiny update Jan 17, 2020
@bemself
Copy link
Collaborator

bemself commented Jan 24, 2020

@yyxygit 有冲突文件了,麻烦看一下?

@bemself bemself added question Further information is requested and removed 正在校对 labels Jan 24, 2020
@yyxygit
Copy link
Contributor Author

yyxygit commented Jan 30, 2020

@bemself 冲突已解决,抱歉,这几天有事,改得晚了

@bemself bemself added 正在校对 and removed question Further information is requested labels Feb 2, 2020
Copy link
Collaborator

@bemself bemself left a comment

Choose a reason for hiding this comment

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

@yyxygit 感谢校正,校对完成,有一点小修改请查看~

@javascript-translate-bot

Please make the requested changes. After it, add a comment "/done".
Then I'll ask for a new review 👻

@yyxygit
Copy link
Contributor Author

yyxygit commented Feb 2, 2020

/done

Copy link
Collaborator

@bemself bemself left a comment

Choose a reason for hiding this comment

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

@yyxygit 感谢!

@bemself bemself merged commit 95a4b67 into javascript-tutorial:master Feb 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants