Skip to content

Commit 46ce2c8

Browse files
authored
Merge branch 'master' into translate-dont-call-proptypes
2 parents 764d8c5 + 27120ba commit 46ce2c8

38 files changed

+745
-659
lines changed

content/blog/2019-02-23-is-react-translated-yet.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ In addition, the following three languages have completed translating most of th
1313

1414
Special congratulations to [Alejandro Ñáñez Ortiz](https://github.com/alejandronanez), [Rainer Martínez Fraga](https://github.com/carburo), [David Morales](https://github.com/dmorales), [Miguel Alejandro Bolivar Portilla](https://github.com/Darking360), and all the contributors to the Spanish translation for being the first to *completely* translate the core pages of the docs!
1515

16-
## Why Localization Matters
16+
## Why Localization Matters {#why-localization-matters}
1717

1818
React already has many meetups and conferences around the world, but many programmers don't use English as their primary language. We’d love to support local communities who use React by making our documentation available in most popular languages.
1919

2020
In the past, React community members have created unofficial translations for [Chinese](https://github.com/discountry/react), [Arabic](https://wiki.hsoub.com/React), and [Korean](https://github.com/reactjs/ko.reactjs.org/issues/4); by making an official channel for these translated docs we're hoping to make them easier to find and help make sure that non-English-speaking users of React aren't left behind.
2121

22-
## Contributing
22+
## Contributing {#contributing}
2323

2424
If you would like to help out on a current translation, check out the [Languages](/languages) page and click on the "Contribute" link for your language.
2525

2626
Can't find your language? If you'd like to maintain your langauge's translation fork, follow the instructions in the [translation repo](https://github.com/reactjs/reactjs.org-translation#starting-a-new-translation)!
2727

28-
## Backstory
28+
## Backstory {#backstory}
2929

3030
Hi everyone! I'm [Nat](https://twitter.com/tesseralis)! You may know me as the [polyhedra lady](https://www.youtube.com/watch?v=Ew-UzGC8RqQ). For the past few weeks, I've been helping the React team coordinate their translation effort. Here's how I did it.
3131

@@ -45,7 +45,7 @@ After the trial period, we were ready to accept more languages. I created [a scr
4545

4646
Because of the automation, the rest of the maintance went mostly smoothly. We eventually created a [Slack channel](https://rt-slack-invite.herokuapp.com) to make it easier for translators to share information, and I released a guide solidifying the [responsibilities of maintainers](https://github.com/reactjs/reactjs.org-translation/blob/master/maintainer-guide.md). Allowing translators to talk with each other was a great boon -- for example, the Arabic, Persian, and Hebrew translations were able to talk to each other in order to get [right-to-left text](https://en.wikipedia.org/wiki/Right-to-left) working!
4747

48-
## The Bot
48+
## The Bot {#the-bot}
4949

5050
The most challenging part was getting the bot to sync changes from the English version of the site. Initially we were using the [che-tsumi](https://github.com/vuejs-jp/che-tsumi) bot created by the Japanese Vue translation team, but we soon decided to build our own bot to suit our needs. In particular, the che-tsumi bot works by [cherry picking](https://git-scm.com/docs/git-cherry-pick) new commits. This ended up causing a cavalade of new issues that were interconnected, especially when [Hooks were released](/blog/2019/02/06/react-v16.8.0.html).
5151

@@ -63,13 +63,13 @@ There were other smaller issues that I ran into. I tried using the [Heroku Sched
6363

6464
There are, as always, improvements I want to make to the bot. Right now it doesn't check whether there is an outstanding pull request before pushing another one. It's still hard to tell the exact change that happened in the original source, and it's possible to miss out on a needed translation change. But I trust the maintainers we've chosen to work through these issues, and the bot is [open source](https://github.com/reactjs/reactjs.org-translation) if anyone wants to help me make these improvements!
6565

66-
## Thanks
66+
## Thanks {#thanks}
6767

6868
Finally, I would like to extend my gratitude to the following people and groups:
6969

7070
* All the translation maintainers and contributors who are helping translate React to more than thirty languages.
7171
* The [Vue.js Japan User Group](https://github.com/vuejs-jp) for initiating the idea of having bot-managed translations, and especially [Hanatani Takuma](https://github.com/potato4d) for helping us understand their approach and helping maintain the Japanese translation.
72-
* [Soichiro Miki](https://github.com/smikitki) for many [contributions](https://github.com/reactjs/reactjs.org/pull/1636) and thoughtful comments on the overall translation process, as well as for maintaining the Japanese translation.
72+
* [Soichiro Miki](https://github.com/smikitky) for many [contributions](https://github.com/reactjs/reactjs.org/pull/1636) and thoughtful comments on the overall translation process, as well as for maintaining the Japanese translation.
7373
* [Eric Nakagawa](https://github.com/ericnakagawa) for managing our previous translation process.
7474
* [Brian Vaughn](https://github.com/bvaughn) for setting up the [languages page](/languages) and managing all the subdomains.
7575

content/community/conferences.md

+15-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ 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-
### React Iran 2019 {#react-iran-2019}
16-
January 31, 2019 in Tehran, Iran
17-
[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)
18-
1915
### Reactathon 2019 {#reactathon-2019}
2016
March 30-31, 2019 in San Francisco, USA
2117

@@ -31,6 +27,11 @@ April 12, 2019 in Amsterdam, The Netherlands
3127

3228
[Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam) - [Facebook](https://www.facebook.com/reactamsterdam)
3329

30+
### ReactJS Girls Conference
31+
May 3, 2019 in London, UK
32+
33+
[Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls)
34+
3435
### ReactEurope 2019 {#reacteurope-2019}
3536
May 23-24, 2019 in Paris, France
3637

@@ -51,6 +52,11 @@ June 21, 2019 Chicago, Illinois USA
5152

5253
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
5354

55+
### React Week '19 {#RWNY19}
56+
July 15-21, 2019. New York City, USA
57+
58+
[Website](https://reactweek.nyc) - [Twitter](https://twitter.com/ReactWeek)
59+
5460
### ComponentsConf 2019 {#componentsconf-2019}
5561
September 6, 2019 in Melbourne, Australia
5662
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)
@@ -338,3 +344,8 @@ November 4 in Tel Aviv, Israel
338344
November 30, Berlin, Germany
339345

340346
[Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/channel/UC1EYHmQYBUJjkmL6OtK4rlw)
347+
348+
### React Iran 2019 {#react-iran-2019}
349+
January 31, 2019 in Tehran, Iran
350+
351+
[Website](http://reactiran.com) - [Instagram](https://www.instagram.com/reactiran/)

content/community/examples.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ There are many example projects created by the React community. Feel free to add
1111

1212
* **[Calculator](https://github.com/ahfarmer/calculator)** Implementation of the iOS calculator built in React
1313
* **[Emoji Search](https://github.com/ahfarmer/emoji-search)** Simple React app for searching emoji
14-
* **[Github Battle App](https://github.com/ReactTraining/react-fundamentals/tree/hosting)** Battle two Github users and see the most popular Github projects for any language.
14+
* **[Github Battle App](https://tm.dev/react-course-project/)** Battle two Github users and see the most popular Github projects for any language.
1515
* **[React Powered Hacker News Client](https://github.com/insin/react-hn)** A React & react-router-powered implementation of Hacker News using its Firebase API.
1616
* **[Pokedex](https://github.com/alik0211/pokedex)** The list of Pokémon with live search
17-
* **[Shopping Cart](https://github.com/jeffersonRibeiro/react-shopping-cart)** Simple ecommerce cart application built using React
17+
* **[Shopping Cart](https://github.com/jeffersonRibeiro/react-shopping-cart)** Simple ecommerce cart application built using React
1818
* **[Progressive Web Tetris](https://github.com/skidding/flatris)** Besides a beautiful, mobile-friendly implementation of Tetris, this project is a playground for integrating and experimenting with web technologies.
1919
* **[Product Comparison Page](https://github.com/Rhymond/product-compare-react)** Simple Product Compare page built in React
2020
* **[Hacker News Clone React/GraphQL](https://github.com/clintonwoo/hackernews-react-graphql)** Hacker News clone rewritten with universal JavaScript, using React and GraphQL.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Commonly, you might want to display React components in multiple places on the H
110110
111111
### Tip: Minify JavaScript for Production {#tip-minify-javascript-for-production}
112112

113-
Before deploying your website to production, be mindful that unminifed JavaScript can significantly slow down the page for your users.
113+
Before deploying your website to production, be mindful that unminified JavaScript can significantly slow down the page for your users.
114114

115115
If you already minify the application scripts, **your site will be production-ready** if you ensure that the deployed HTML loads the versions of React ending in `production.min.js`:
116116

content/docs/code-splitting.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ import("./math").then(math => {
102102
103103
When Webpack comes across this syntax, it automatically starts code-splitting
104104
your app. If you're using Create React App, this is already configured for you
105-
and you can [start using it](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#code-splitting) immediately. It's also supported
105+
and you can [start using it](https://facebook.github.io/create-react-app/docs/code-splitting) immediately. It's also supported
106106
out of the box in [Next.js](https://github.com/zeit/next.js/#dynamic-import).
107107

108108
If you're setting up Webpack yourself, you'll probably want to read Webpack's

0 commit comments

Comments
 (0)