Skip to content

Commit eca2c21

Browse files
committed
merge conflicts
2 parents bbb08a5 + 7e65f35 commit eca2c21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2785
-2643
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
Thank you for your interest in contributing to the React Docs!
44

5+
We are currently in the first translation phase and we will be relying completely on [Hsoub's translation](https://wiki.hsoub.com/React) as it is.
6+
57
## Code of Conduct
68

79
Facebook has adopted a Code of Conduct that we expect project

README.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# react.dev
1+
# reactjs.org
22

3-
This repo contains the source code and documentation powering [react.dev](https://react.dev/).
3+
This repo contains the source code and documentation powering [reactjs.org](https://reactjs.org/).
44

55
## Getting started
66

@@ -10,12 +10,12 @@ This repo contains the source code and documentation powering [react.dev](https:
1010
1. Node: any 12.x version starting with v12.0.0 or greater
1111
1. Yarn: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
1212
1. A fork of the repo (for any contributions)
13-
1. A clone of the [react.dev repo](https://github.com/reactjs/react.dev) on your local machine
13+
1. A clone of the [ar.react.dev repo](https://github.com/reactjs/ar.react.dev) on your local machine
1414

1515
### Installation
1616

17-
1. `cd react.dev` to go into the project root
18-
3. `yarn` to install the website's npm dependencies
17+
1. `cd ar.react.dev` to go into the project root
18+
1. `yarn` to install the website's npm dependencies
1919

2020
### Running locally
2121

@@ -28,26 +28,25 @@ This repo contains the source code and documentation powering [react.dev](https:
2828

2929
The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/react.dev/blob/main/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections.
3030

31-
### Create a branch
3231

33-
1. `git checkout main` from any folder in your local `react.dev` repository
32+
1. `git checkout main` from any folder in your local `ar.react.dev` repository
3433
1. `git pull origin main` to ensure you have the latest main code
3534
1. `git checkout -b the-name-of-my-branch` (replacing `the-name-of-my-branch` with a suitable name) to create a branch
3635

37-
### Make the change
36+
#### Make the change
3837

3938
1. Follow the ["Running locally"](#running-locally) instructions
4039
1. Save the files and check in the browser
4140
1. Changes to React components in `src` will hot-reload
4241
1. Changes to markdown files in `content` will hot-reload
4342
1. If working with plugins, you may need to remove the `.cache` directory and restart the server
4443

45-
### Test the change
44+
#### Test the change
4645

4746
1. If possible, test any visual changes in all latest versions of common browsers, on both desktop and mobile.
4847
2. Run `yarn check-all`. (This will run Prettier, ESLint and validate types.)
4948

50-
### Push it
49+
#### Push it
5150

5251
1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fix header logo on Android`) to stage and commit your changes
5352
1. `git push my-fork-name the-name-of-my-branch`

src/content/blog/2023/05/03/react-canaries.md

Lines changed: 43 additions & 46 deletions
Large diffs are not rendered by default.

src/content/community/index.md

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
11
---
2-
title: React Community
2+
title: من أين تحصل على المساعدة
33
---
44

55
<Intro>
66

7-
React has a community of millions of developers. On this page we've listed some React-related communities that you can be a part of; see the other pages in this section for additional online and in-person learning materials.
7+
يتكون مجتمع React من ملايين المطوّرين
8+
9+
في هذه الصفحة عدّدنا لكم بعضا من المجتمعات المتعلّقة بـ React والتي يمكن لك الإنضمام إليها.
10+
ستجد كذلك في هذا القسم مصادر التعلّم عن بعد عبر الإنترنت أو التعلم المباشر وجها لوجه مع مدرّب.
811

912
</Intro>
1013

1114
## Code of Conduct {/*code-of-conduct*/}
1215

13-
Before participating in React's communities, [please read our Code of Conduct.](https://github.com/facebook/react/blob/main/CODE_OF_CONDUCT.md) We have adopted the [Contributor Covenant](https://www.contributor-covenant.org/) and we expect that all community members adhere to the guidelines within.
16+
قبل المشاركة، الرجاء منك [أن تقرأ قواعدنا السلوكية](https://github.com/facebook/react/blob/master/CODE_OF_CONDUCT.md)، لقد تبنّينا [ميثاق القواعد السلوكية للمساهمين](https://www.contributor-covenant.org/ar/version/1/4/code-of-conduct) ونتطلّع إلى أن يحترم أعضاء المجتمع قواعده.
1417

1518
## Stack Overflow {/*stack-overflow*/}
1619

17-
Stack Overflow is a popular forum to ask code-level questions or if you're stuck with a specific error. Read through the [existing questions](https://stackoverflow.com/questions/tagged/reactjs) tagged with **reactjs** or [ask your own](https://stackoverflow.com/questions/ask?tags=reactjs)!
20+
يعتبر موقع Stack Overflow منتدى مشهور لطرح الأسئلة المتعلّقة بالشفرات البرمجية، إن علقت مع أحد الأخطاء يمكنك البحث في [الأسئلة المطروحة](https://stackoverflow.com/questions/tagged/reactjs) ذات الوسم **reactjs** أو [قم بطرح سؤالك](https://stackoverflow.com/questions/ask?tags=reactjs).
1821

19-
## Popular Discussion Forums {/*popular-discussion-forums*/}
22+
## منتديات المٌحادثة المعروفة {/*popular-discussion-forums*/}
2023

21-
There are many online forums which are a great place for discussion about best practices and application architecture as well as the future of React. If you have an answerable code-level question, Stack Overflow is usually a better fit.
24+
يوجد العديد من المنتديات والتي تعدّ مكانا ممتازا للحديث عن الطرق المثلى و الأساليب المتفق عليها وعن هيكلة التطبيقات وكذلك عن مستقبل React. إن كان لديك سؤال قابل للإجابة حول شفرة برمجية، فإن موقع Stack Overflow يعدّ الأنسب لذلك.
2225

23-
Each community consists of many thousands of React users.
26+
يتكوّن كل مجتمع من عدة آلاف من مستخدمي React.
2427

25-
* [DEV's React community](https://dev.to/t/react)
26-
* [Hashnode's React community](https://hashnode.com/n/reactjs)
27-
* [Reactiflux online chat](https://discord.gg/reactiflux)
28-
* [Reddit's React community](https://www.reddit.com/r/reactjs/)
28+
* [مجتمع React على DEV](https://dev.to/t/react)
29+
* [مجتمع React على Hashnode](https://hashnode.com/n/reactjs)
30+
* [قاعة المحادثة الإفتراضية Reactiflux](https://discord.gg/reactiflux)
31+
* [مجتمع React على Reddit](https://www.reddit.com/r/reactjs/)
32+
* [مجتمع React على Spectrum](https://spectrum.chat/react)
2933

30-
## News {/*news*/}
34+
## الأخبار {/*news*/}
3135

32-
For the latest news about React, [follow **@reactjs** on Twitter](https://twitter.com/reactjs) and the [official React blog](/blog/) on this website.
36+
لمتابعة آخر الأخبار حول React، [تابع **@reactjs** على Twitter](https://twitter.com/reactjs) وكذلك [مدوّنة React الرسمة](/blog/) على هذا الموقع.

src/content/community/meetups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,4 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
219219
* [Seattle, WA - ReactJS](https://www.meetup.com/seattle-react-js/)
220220
* [Tampa, FL - ReactJS](https://www.meetup.com/ReactJS-Tampa-Bay/)
221221
* [Tucson, AZ - ReactJS](https://www.meetup.com/Tucson-ReactJS-Meetup/)
222-
* [Washington, DC - ReactJS](https://www.meetup.com/React-DC/)
222+
* [Washington, DC - ReactJS](https://www.meetup.com/React-DC/)

0 commit comments

Comments
 (0)