Skip to content

Commit 8c476a9

Browse files
authored
Merge branch 'master' into Translating-reference-dom-elements.md
2 parents f7db710 + 4c45400 commit 8c476a9

Some content is hidden

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

52 files changed

+1818
-1242
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
.idea
44
node_modules
55
public
6-
yarn-error.log
6+
yarn-error.log

README.md

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,44 @@ This repo contains the source code and documentation powering [ar.reactjs.org](h
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/ar.reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections.
3030

31-
### Fork and Setup Repo
31+
### Steps
32+
33+
1. Check that no one else has claimed your page in the checklist and comments of [Arabic Translation Progress](https://github.com/reactjs/ar.reactjs.org/issues/1) and the pull requests.
34+
2. Comment at [Arabic Translation Progress](https://github.com/reactjs/ar.reactjs.org/issues/1) with the name of the page you would like to translate. **Please take only one page at a time.**
35+
3. [Fork and Setup Repo](https://github.com/reactjs/ar.reactjs.org#fork-and-setup-repo), translate your page, and submit a pull request!
36+
37+
Before contributing, read the [glossary](https://github.com/reactjs/ar.reactjs.org/wiki/Glossary) and [style guide](https://github.com/reactjs/reactjs.org-translation/blob/master/style-guide.md) to understand how to translate various technical and React-specific terms.
38+
39+
And use [Hsoub's translation](https://wiki.hsoub.com/React) as a reference.
40+
41+
42+
#### Fork and Setup Repo
3243
1. Fork the repo
33-
1. Clone forked repo on your local machine
34-
1. `cd ar.reactjs.org` to go into the project root
35-
1. `git remote add upstream https://github.com/reactjs/ar.reactjs.org` to add original repo as an upstream
36-
1. `yarn` to install the website's npm dependencies
44+
2. Clone forked repo on your local machine
45+
3. `cd ar.reactjs.org` to go into the project root
46+
4. `git remote add upstream https://github.com/reactjs/ar.reactjs.org` to add original repo as an upstream
47+
5. `yarn` to install the website's npm dependencies
3748

38-
### Create a branch
49+
#### Create a branch
3950

4051
1. `git checkout master` from any folder in your local `ar.reactjs.org` repository
4152
1. `git pull upstream master` to ensure you have the latest main code
4253
1. `git checkout -b the-name-of-my-branch` (replacing `the-name-of-my-branch` with a suitable name) to create a branch
4354

44-
### Make the change
55+
#### Make the change
4556

4657
1. Follow the ["Running locally"](#running-locally) instructions
4758
1. Save the files and check in the browser
4859
1. Changes to React components in `src` will hot-reload
4960
1. Changes to markdown files in `content` will hot-reload
5061
1. If working with plugins, you may need to remove the `.cache` directory and restart the server
5162

52-
### Test the change
63+
#### Test the change
5364

5465
1. If possible, test any visual changes in all latest versions of common browsers, on both desktop and mobile.
5566
1. Run `yarn check-all` from the project root. (This will run Prettier, ESLint, and Flow.)
5667

57-
### Push it
68+
#### Push it
5869

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

content/blog/2014-09-24-testing-flux-applications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The first steps toward working with Jest are as follows:
1717

1818
1. Get the module dependencies for the application installed by running `npm install`.
1919
2. Create a directory `__tests__/` with a test file, in this case TodoStore-test.js
20-
3. Run `npm install jest-cli save-dev`
20+
3. Run `npm install jest-cli --save-dev`
2121
4. Add the following to your package.json
2222

2323
```javascript

content/blog/2018-10-01-create-react-app-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Here's a short summary of what's new in this release:
2525
* 🃏 We updated to [Jest 23](https://jestjs.io/blog/2018/05/29/jest-23-blazing-fast-delightful-testing.html), which includes an [interactive mode](https://jestjs.io/blog/2018/05/29/jest-23-blazing-fast-delightful-testing#interactive-snapshot-mode) for reviewing snapshots.
2626
* 💄 We added [PostCSS](https://preset-env.cssdb.org/features#stage-3) so you can use new CSS features in old browsers.
2727
* 💎 You can use [Apollo](https://github.com/leoasis/graphql-tag.macro#usage), [Relay Modern](https://github.com/facebook/relay/pull/2171#issuecomment-411459604), [MDX](https://github.com/facebook/create-react-app/issues/5149#issuecomment-425396995), and other third-party [Babel Macros](https://babeljs.io/blog/2017/09/11/zero-config-with-babel-macros) transforms.
28-
* 🌠 You can now [import an SVG as a React component](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-svgs), and use it in JSX.
28+
* 🌠 You can now [import an SVG as a React component](https://facebook.github.io/create-react-app/docs/adding-images-fonts-and-files#adding-svgs), and use it in JSX.
2929
* 🐈 You can try the experimental [Yarn Plug'n'Play mode](https://github.com/yarnpkg/rfcs/pull/101) that removes `node_modules`.
3030
* 🕸 You can now [plug your own proxy implementation](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#configuring-the-proxy-manually) in development to match your backend API.
3131
* 🚀 You can now use [packages written for latest Node versions](https://github.com/sindresorhus/ama/issues/446#issuecomment-281014491) without breaking the build.

content/blog/2019-02-06-react-v16.8.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ Assuming you already have ESLint installed, run:
140140

141141
```sh
142142
# npm
143-
npm install eslint-plugin-react-hooks@next --save-dev
143+
npm install eslint-plugin-react-hooks --save-dev
144144

145145
# yarn
146-
yarn add eslint-plugin-react-hooks@next --dev
146+
yarn add eslint-plugin-react-hooks --dev
147147
```
148148

149149
Then add it to your ESLint configuration:

content/community/articles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permalink: community/articles.html
1010
- [9 things every React.js beginner should know](https://camjackson.net/post/9-things-every-reactjs-beginner-should-know) - Cam Jackson's guide for beginners.
1111
- [React "Aha" Moments](https://tylermcginnis.com/react-aha-moments/) - Tyler McGinnis' article on his collection of "Aha" moments with React.
1212
- [You're missing the point of React](https://medium.com/@dan_abramov/youre-missing-the-point-of-react-a20e34a51e1a) - Dan Abramov's article about the best parts of React.
13-
- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's reccommended timeline for learning React and the React ecosystem.
13+
- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's recommended timeline for learning React and the React ecosystem.
1414
- [Simple React Development in 2017](https://hackernoon.com/simple-react-development-in-2017-113bd563691f) - Joshua Comeau's guide to showcase how easy it can be to start modern React development.
1515
- [React FAQ](https://reactfaq.site/) - An external site with articles that try to answer frequently asked questions about React.
1616
- [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state.

content/community/conferences.md

Lines changed: 55 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,21 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
1212

1313
## Upcoming Conferences {#upcoming-conferences}
1414

15-
### Reactathon 2019 {#reactathon-2019}
16-
March 30-31, 2019 in San Francisco, USA
17-
18-
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
19-
20-
### App.js Conf 2019 {#appjs-conf-2019}
21-
April 4-5, 2019 in Kraków, Poland
22-
23-
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
24-
25-
### React Amsterdam 2019 {#react-amsterdam-2019}
26-
April 12, 2019 in Amsterdam, The Netherlands
15+
### React Finland 2019 {#react-finland-2019}
16+
April 24-26 in Helsinki, Finland
2717

28-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam)
18+
[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland)
2919

30-
### ReactJS Girls Conference
20+
### ReactJS Girls Conference {#reactjs-girls-conference}
3121
May 3, 2019 in London, UK
3222

3323
[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls)
3424

25+
### <React.NotAConf /> 2019 {#reactnotaconf--2019}
26+
May 11 in Sofia, Bulgaria
27+
28+
[Website](http://react-not-a-conf.com/) - [Twitter](https://twitter.com/reactnotaconf) - [Facebook](https://www.facebook.com/events/780891358936156)
29+
3530
### ReactEurope 2019 {#reacteurope-2019}
3631
May 23-24, 2019 in Paris, France
3732

@@ -52,13 +47,19 @@ June 21, 2019 Chicago, Illinois USA
5247

5348
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
5449

55-
### React Week '19 {#RWNY19}
56-
July 15-21, 2019. New York City, USA
50+
### Chain React 2019 {#chain-react-2019}
51+
July 11-12, 2019. Portland, OR, USA.
52+
53+
[Website](https://infinite.red/ChainReactConf)
54+
55+
### React Rally 2019 {#react-rally-2019}
56+
August 22-23, 2019. Salt Lake City, USA.
5757

58-
[Website](https://reactweek.nyc) - [Twitter](https://twitter.com/ReactWeek)
58+
[Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
5959

6060
### ComponentsConf 2019 {#componentsconf-2019}
6161
September 6, 2019 in Melbourne, Australia
62+
6263
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
6364

6465
### React Native EU 2019 {#react-native-eu-2019}
@@ -71,11 +72,31 @@ September 13th, 2019. New York, USA
7172

7273
[Website](https://reactnewyork.com/) - [Twitter](https://twitter.com/reactnewyork)
7374

75+
### React Boston 2019 {#react-boston-2019}
76+
September 21-22, 2019 in Boston, Massachusetts USA
77+
78+
[Website](https://www.reactboston.com/) - [Twitter](https://twitter.com/reactboston)
79+
7480
### React India 2019 {#react-india-2019}
7581
September 26-28, 2019 in Goa, India
7682

7783
[Website](https://www.reactindia.io/) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia)
7884

85+
### React Alicante 2019 {#react-alicante-2019}
86+
September 26-28, 2019 in Alicante, Spain
87+
88+
[Website](http://reactalicante.es/) - [Twitter](https://twitter.com/reactalicante) - [Facebook](https://www.facebook.com/ReactAlicante)
89+
90+
### React Advanced 2019 {#react-advanced-2019}
91+
October 25, 2019 in London, UK
92+
93+
[Website](https://reactadvanced.com) - [Twitter](http://twitter.com/reactadvanced) - [Facebook](https://www.facebook.com/ReactAdvanced) - [Videos](https://youtube.com/c/ReactConferences)
94+
95+
### React Day Berlin 2019 {#react-day-berlin-2019}
96+
December 6, 2019 in Berlin, Germany
97+
98+
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin)
99+
79100
## Past Conferences {#past-conferences}
80101

81102
### React.js Conf 2015 {#reactjs-conf-2015}
@@ -103,7 +124,7 @@ February 22 & 23 in San Francisco, CA
103124
### React Amsterdam 2016 {#react-amsterdam-2016}
104125
April 16 in Amsterdam, The Netherlands
105126

106-
[Website](https://react.amsterdam/2016) - [Videos](https://youtu.be/sXDZBxbRRag?list=PLNBNS7NRGKMG3uLrm5fgY02hJ87Wzb4IU)
127+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
107128

108129
### ReactEurope 2016 {#reacteurope-2016}
109130
June 2 & 3 in Paris, France
@@ -153,7 +174,7 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/)
153174
### React Amsterdam 2017 {#react-amsterdam-2017}
154175
April 21st in Amsterdam, The Netherlands
155176

156-
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://www.youtube.com/watch?v=NQyL-Dm7Kig&list=PLNBNS7NRGKMHxfm0CcYNuINLdRw7r4a9M)
177+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
157178

158179
### ReactEurope 2017 {#reacteurope-2017}
159180
May 18th & 19th in Paris, France
@@ -349,3 +370,18 @@ November 30, Berlin, Germany
349370
January 31, 2019 in Tehran, Iran
350371

351372
[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)
373+
374+
### Reactathon 2019 {#reactathon-2019}
375+
March 30-31, 2019 in San Francisco, USA
376+
377+
[Website](https://www.reactathon.com/) - [Twitter](https://twitter.com/reactathon)
378+
379+
### App.js Conf 2019 {#appjs-conf-2019}
380+
April 4-5, 2019 in Kraków, Poland
381+
382+
[Website](https://appjs.co) - [Twitter](https://twitter.com/appjsconf)
383+
384+
### React Amsterdam 2019 {#react-amsterdam-2019}
385+
April 12, 2019 in Amsterdam, The Netherlands
386+
387+
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)

content/community/meetups.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
8888

8989
## Pakistan {#pakistan}
9090
* [Karachi](https://www.facebook.com/groups/902678696597634/)
91+
* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
9192

9293
## Peru {#peru}
9394
* [Lima](https://www.meetup.com/ReactJS-Peru/)
@@ -130,8 +131,8 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
130131
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
131132
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
132133
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
133-
* [New York, NY - ReactNYC](https://www.meetup.com/ReactNYC/)
134134
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
135+
* [Philadelphia, PA - ReactJS](https://www.meetup.com/RQ-React/)
135136
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
136137
* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
137138
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)

content/community/nav.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- title: Community Resources
1+
- title: مصادر المجتمع
22
items:
33
- id: support
44
title: Support
@@ -18,7 +18,7 @@
1818
title: Videos
1919
- id: external-resources
2020
title: External Resources
21-
- title: Tools
21+
- title: أدوات
2222
items:
2323
- id: debugging-tools
2424
title: Debugging

content/docs/add-react-to-a-website.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ return (
149149

150150
These two code snippets are equivalent. While **JSX is [completely optional](/docs/react-without-jsx.html)**, many people find it helpful for writing UI code -- both with React and with other libraries.
151151

152-
You can play with JSX using [this online converter](https://babeljs.io/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=Q&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2%2Cstage-3&prettier=true&targets=Node-6.12&version=6.26.0&envVersion=).
152+
You can play with JSX using [this online converter](https://babeljs.io/en/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=DwIwrgLhD2B2AEcDCAbAlgYwNYF4DeAFAJTw4B88EAFmgM4B0tAphAMoQCGETBe86WJgBMAXJQBOYJvAC-RGWQBQ8FfAAyaQYuAB6cFDhkgA&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&timeTravel=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2&prettier=false&targets=&version=7.4.3).
153153

154154
### Quickly Try JSX {#quickly-try-jsx}
155155

0 commit comments

Comments
 (0)