From 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Wed, 10 Jul 2024 11:48:48 -0400 Subject: [PATCH 1/5] Update /link/legacy-context to removal blog post (#7047) --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 9edafb3d4..eac0efb9c 100644 --- a/vercel.json +++ b/vercel.json @@ -91,7 +91,7 @@ }, { "source": "/link/legacy-context", - "destination": "https://legacy.reactjs.org/docs/legacy-context.html", + "destination": "https://react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-removing-legacy-context", "permanent": false }, { From de726d2add494d569740467ec1eeb7ae27ab0ba7 Mon Sep 17 00:00:00 2001 From: Ryan Bonnell Date: Fri, 19 Jul 2024 23:19:54 -0700 Subject: [PATCH 2/5] Update verb usage in sentence (#7070) --- src/content/learn/adding-interactivity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/learn/adding-interactivity.md b/src/content/learn/adding-interactivity.md index 0d4a3b23f..5c87a3e79 100644 --- a/src/content/learn/adding-interactivity.md +++ b/src/content/learn/adding-interactivity.md @@ -265,7 +265,7 @@ setCount(count + 1); // Request a re-render with 1 console.log(count); // Still 0! ``` -This behavior help you avoid subtle bugs. Here is a little chat app. Try to guess what happens if you press "Send" first and *then* change the recipient to Bob. Whose name will appear in the `alert` five seconds later? +This behavior helps you avoid subtle bugs. Here is a little chat app. Try to guess what happens if you press "Send" first and *then* change the recipient to Bob. Whose name will appear in the `alert` five seconds later? From 6274d4faf5afcef74357871d06191558050e23d3 Mon Sep 17 00:00:00 2001 From: ramadevsign <50571688+orama254@users.noreply.github.com> Date: Sat, 20 Jul 2024 09:20:45 +0300 Subject: [PATCH 3/5] docs: Add RenderCon Kenya 2024 conference (#6914) --- src/content/community/conferences.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md index bebc17157..5070fbc41 100644 --- a/src/content/community/conferences.md +++ b/src/content/community/conferences.md @@ -40,6 +40,10 @@ September 19-21, 2024. Alicante, Spain. [Website](https://reactalicante.es/) - [Twitter](https://twitter.com/ReactAlicante) - [YouTube](https://www.youtube.com/channel/UCaSdUaITU1Cz6PvC97A7e0w) +### RenderCon Kenya 2024 {/*rendercon-kenya-2024*/} +October 04 - 05, 2024. Nairobi, Kenya + +[Website](https://rendercon.org/) - [Twitter](https://twitter.com/renderconke) - [LinkedIn](https://www.linkedin.com/company/renderconke/) - [YouTube](https://www.youtube.com/channel/UC0bCcG8gHUL4njDOpQGcMIA) ### React India 2024 {/*react-india-2024*/} October 17 - 19, 2024. In-person in Goa, India (hybrid event) + Oct 15 2024 - remote day From 635a92fe54e5aac29b161b469b075cb79e1b1e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A3=A8=EB=B0=80LuMir?= Date: Wed, 24 Jul 2024 19:32:35 +0900 Subject: [PATCH 4/5] fix: EN lint to KO link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 영문 링크 한글 링크로 수정 --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index eac0efb9c..c1c753b48 100644 --- a/vercel.json +++ b/vercel.json @@ -91,7 +91,7 @@ }, { "source": "/link/legacy-context", - "destination": "https://react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-removing-legacy-context", + "destination": "https://ko.react.dev/blog/2024/04/25/react-19-upgrade-guide#removed-removing-legacy-context", "permanent": false }, { From e002dde3e213bbc12dc647b6bb48cb713e3e5e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A3=A8=EB=B0=80LuMir?= Date: Wed, 24 Jul 2024 19:36:12 +0900 Subject: [PATCH 5/5] fix: conflict resolve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit conflict가 발생하는 부분 수정하였습니다. 새로 추가된 부분이 기존에 번역된 내용이어서, 큰 수정 없이 삭제만 진행하였습니다. --- src/content/learn/adding-interactivity.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/content/learn/adding-interactivity.md b/src/content/learn/adding-interactivity.md index 91e5ee552..1e63676f8 100644 --- a/src/content/learn/adding-interactivity.md +++ b/src/content/learn/adding-interactivity.md @@ -265,11 +265,7 @@ setCount(count + 1); // Request a re-render with 1 console.log(count); // Still 0! ``` -<<<<<<< HEAD -이 동작은 미묘한 버그를 피하는 데 도움이 됩니다. 간단한 채팅 앱을 예시로 들겠습니다. "Send"를 먼저 누른 다음 수신자를 Bob으로 변경하면 어떻게 될지 추측해 보세요. 5초 후에 `alert`에 어떤 이름이 나타날까요? -======= -This behavior helps you avoid subtle bugs. Here is a little chat app. Try to guess what happens if you press "Send" first and *then* change the recipient to Bob. Whose name will appear in the `alert` five seconds later? ->>>>>>> 6274d4faf5afcef74357871d06191558050e23d3 +이 동작은 미묘한 버그를 피하는 데 도움이 됩니다. 간단한 채팅 앱을 예시로 들겠습니다. "Send"를 먼저 누른 *다음* 수신자를 Bob으로 변경하면 어떻게 될지 추측해 보세요. 5초 후에 `alert`에 어떤 이름이 나타날까요?