Skip to content

Sync with reactjs.org @ ddbd064d #237

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 37 commits into from
Aug 15, 2019
Merged

Sync with reactjs.org @ ddbd064d #237

merged 37 commits into from
Aug 15, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Aug 12, 2019

This PR was automatically generated.

Merge changes from reactjs.org at ddbd064

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.

3imed-jaberi and others added 30 commits August 7, 2019 16:33
* First pass at Profiler API docs
* Testing Docs

This expands the testing docs for reactjs.org. It adds 3 main docs -

- testing.md: An entry point to the testing docs
- testing-recipes.md: Common patterns when writing tests for React Components.
- testing-environments.md: Setting up your testing environment.

With help from @alexkrolick, @kentcdodds, @gaearon
* Update testing-recipes.md

Update timers section code to match described situation

* Missed a spot
Type fix 'Diffrent' ➡️ 'Different'
2 small changes 
- consistent data-testid everywhere 
- one wrong assertion
"enountered" -> "encountered"
Nothing, fancy, just a list of links to the sections on the page. Also took the opportunity to add dividers between sections, and Title Case the titles.
* Add a note about the codemod on the lifecycle warnings post

https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html

* missing fullstop.

* Update 2018-03-27-update-on-async-rendering.md
added react conf iran 2019 to the list.
Add a new ReactJS hosted in Canarias 🇮🇨 (Spain)
Add resource/guide to learning React Hooks. An article inspired by the ReactJS.org documentation.
Closing #2193
* Update meetups.md

Added Meetup link for the React Miami group

* Update meetups.md


Co-authored-by: Alexey Pyltsyn <[email protected]>
Lukasz Ostrowski and others added 5 commits August 12, 2019 10:08
* Links to React Redux hooks api

Since Hooks are already released for Redux, link the docs

* Update hooks-faq.md


Co-authored-by: Alexey Pyltsyn <[email protected]>
Spring is a popular library on top of motion with some useful developments
@@ -0,0 +1,119 @@
---
Copy link
Member

Choose a reason for hiding this comment

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

React.js 本体のアップデートによって追加コンテンツが生えてきたので、一旦追加コンテンツはマージした上で翻訳用 Issue 建てましょうか。

Copy link
Member

@smikitky smikitky Aug 13, 2019

Choose a reason for hiding this comment

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

新規ページは英語のまま導入してあとで翻訳するということですよね。いわゆる「コンフリクト」ではないのでそれで大丈夫だと思います

Copy link
Member

Choose a reason for hiding this comment

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

そうですね、その意図です。

@@ -0,0 +1,58 @@
---
Copy link
Member

Choose a reason for hiding this comment

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

ここも同様に。

Copy link
Member

Choose a reason for hiding this comment

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

その他も同様に〜

@netlify
Copy link

netlify bot commented Aug 12, 2019

Deploy preview for ja-reactjs ready!

Built with commit 6ff11de

https://deploy-preview-237--ja-reactjs.netlify.com

@smikitky smikitky self-assigned this Aug 13, 2019
Copy link
Member

@smikitky smikitky left a comment

Choose a reason for hiding this comment

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

既存記事の変更は軽微です。まったく新しい記事についてはとりあえず英語のままでmasterにマージする形になります。

「日本語版のサイトを見てたから最新のブログ記事に気づかない」という問題が発生しているっぽいので、早めに対応した方がよさそうです

@smikitky
Copy link
Member

あれ、CIがこけてますね…確認します

Copy link
Member

@koba04 koba04 left a comment

Choose a reason for hiding this comment

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

レビュー時に、conflictの解消漏れを見つけたので修正しておきました。

@smikitky smikitky merged commit c39182b into master Aug 15, 2019
@smikitky smikitky deleted the sync-ddbd064d branch August 15, 2019 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.