Skip to content

Commit 9eb51a0

Browse files
authored
Merge pull request #364 from reactjs/sync-31895292
Sync with react.dev @ 3189529
2 parents e2cba56 + 03b84f3 commit 9eb51a0

File tree

6 files changed

+23
-13
lines changed

6 files changed

+23
-13
lines changed

src/components/Layout/Feedback.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ function SendFeedback({onSubmit}: {onSubmit: () => void}) {
6262
const [isSubmitted, setIsSubmitted] = useState(false);
6363
return (
6464
<div className="max-w-xs w-80 lg:w-auto py-3 shadow-lg rounded-lg m-4 bg-wash dark:bg-gray-95 px-4 flex">
65-
<p className="w-full font-bold text-primary dark:text-primary-dark text-lg me-4">
66-
{isSubmitted ? 'Thank you for your feedback!' : 'Is this page useful?'}
65+
<p className="w-full font-bold text-primary dark:text-primary-dark text-lg mr-4">
66+
{isSubmitted
67+
? 'Санал өгсөнд баярлалаа!'
68+
: 'Энэ хуудас хэрэг болж байна уу?'}
6769
</p>
6870
{!isSubmitted && (
6971
<button

src/components/Layout/Footer.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,7 @@ export function Footer() {
319319
<FooterLink href="/community/docs-contributors">
320320
Docs Contributors
321321
</FooterLink>
322-
<FooterLink href="/community/acknowledgements">
323-
Талархал
324-
</FooterLink>
322+
<FooterLink href="/community/acknowledgements">Талархал</FooterLink>
325323
</div>
326324
<div className="flex flex-col">
327325
<FooterLink isHeader={true}>Илүү их</FooterLink>

src/components/Layout/HomeContent.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ export function HomeContent() {
489489
<div className="mt-20 px-5 lg:px-0 mb-6 max-w-4xl text-center text-opacity-80">
490490
<Logo className="text-link dark:text-link-dark w-24 lg:w-28 mb-10 lg:mb-8 mt-12 h-auto mx-auto self-start" />
491491
<Header>
492-
React-ын нэгдэлд <br className="hidden lg:inline" />
492+
React-ын нэгдэлд <br className="" />
493493
тавтай морилно уу
494494
</Header>
495495
<ButtonLink

src/content/community/conferences.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@ August 17 & 18, 2023. Salt Lake City, UT, USA
1515

1616
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
1717

18+
### React Native EU 2023 {/*react-native-eu-2023*/}
19+
September 7 & 8, 2023. Wrocław, Poland
20+
21+
[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu)
22+
23+
1824
### React India 2023 {/*react-india-2023*/}
19-
Oct 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remote day
25+
October 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remote day
2026

2127
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w)
2228

src/content/reference/react/use-client.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ When a file marked `'use client'` is imported from a server component, [compatib
5151
## Usage {/*usage*/}
5252
5353
<Wip>
54+
This section is a work in progress.
5455
55-
This section is incomplete. See also the [Next.js documentation for Server Components](https://beta.nextjs.org/docs/rendering/server-and-client-components).
56-
57-
</Wip>
56+
This API can be used in any framework that supports React Server Components. You may find additional documentation from them.
57+
* [Next.js documentation](https://nextjs.org/docs/getting-started/react-essentials)
58+
* More coming soon
59+
</Wip>

src/content/reference/react/use-server.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ Alternatively, add `'use server';` at the very top of a file to mark all exports
4949
## Usage {/*usage*/}
5050

5151
<Wip>
52+
This section is a work in progress.
5253

53-
This section is incomplete. See also the [Next.js documentation for Server Components](https://beta.nextjs.org/docs/rendering/server-and-client-components).
54-
55-
</Wip>
54+
This API can be used in any framework that supports React Server Components. You may find additional documentation from them.
55+
* [Next.js documentation](https://nextjs.org/docs/getting-started/react-essentials)
56+
* More coming soon
57+
</Wip>

0 commit comments

Comments
 (0)