Skip to content

Commit 4b35183

Browse files
author
react-translation-bot
committed
Merge branch 'master' of https://github.com/reactjs/reactjs.org into sync-de0dfde8
2 parents bb93bcf + de0dfde commit 4b35183

File tree

4 files changed

+26
-21
lines changed

4 files changed

+26
-21
lines changed

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

+5-5
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,7 +63,7 @@ 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

content/community/conferences.md

+5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ June 21, 2019 Chicago, Illinois USA
5151

5252
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
5353

54+
### React Week '19 {#RWNY19}
55+
July 15-21, 2019. New York City, USA
56+
57+
[Website](https://reactweek.nyc) - [Twitter](https://twitter.com/ReactWeek)
58+
5459
### ComponentsConf 2019 {#componentsconf-2019}
5560
September 6, 2019 in Melbourne, Australia
5661
[Website](https://www.componentsconf.com.au/) - [Twitter](https://twitter.com/componentsconf)

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.

yarn.lock

+14-14
Original file line numberDiff line numberDiff line change
@@ -10220,15 +10220,15 @@ react-dev-utils@^4.2.1:
1022010220
strip-ansi "3.0.1"
1022110221
text-table "0.2.0"
1022210222

10223-
react-dom@16.7.0-alpha.0:
10224-
version "16.7.0-alpha.0"
10225-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.7.0-alpha.0.tgz#8379158d4c76d63c989f325f45dfa5762582584f"
10226-
integrity sha512-/XUn1ldxmoV2B7ov0rWT5LMZaaHMlF9GGLkUsmPRxmWTJwRDOuAPXidSaSlmR/VOhDSI1s+v3+KzFqhhDFJxYA==
10223+
react-dom@16.8.3:
10224+
version "16.8.3"
10225+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.3.tgz#ae236029e66210783ac81999d3015dfc475b9c32"
10226+
integrity sha512-ttMem9yJL4/lpItZAQ2NTFAbV7frotHk5DZEHXUOws2rMmrsvh1Na7ThGT0dTzUIl6pqTOi5tYREfL8AEna3lA==
1022710227
dependencies:
1022810228
loose-envify "^1.1.0"
1022910229
object-assign "^4.1.1"
1023010230
prop-types "^15.6.2"
10231-
scheduler "^0.11.0-alpha.0"
10231+
scheduler "^0.13.3"
1023210232

1023310233
react-error-overlay@^3.0.0:
1023410234
version "3.0.0"
@@ -10282,15 +10282,15 @@ react-side-effect@^1.1.0:
1028210282
exenv "^1.2.1"
1028310283
shallowequal "^1.0.1"
1028410284

10285-
react@16.7.0-alpha.0:
10286-
version "16.7.0-alpha.0"
10287-
resolved "https://registry.yarnpkg.com/react/-/react-16.7.0-alpha.0.tgz#e2ed4abe6f268c9b092a1d1e572953684d1783a9"
10288-
integrity sha512-V0za4H01aoAF0SdzahHepvfvzTQ1xxkgMX4z8uKzn+wzZAlVk0IVpleqyxZWluqmdftNedj6fIIZRO/rVYVFvQ==
10285+
react@16.8.3:
10286+
version "16.8.3"
10287+
resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9"
10288+
integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==
1028910289
dependencies:
1029010290
loose-envify "^1.1.0"
1029110291
object-assign "^4.1.1"
1029210292
prop-types "^15.6.2"
10293-
scheduler "^0.11.0-alpha.0"
10293+
scheduler "^0.13.3"
1029410294

1029510295
read-all-stream@^3.0.0:
1029610296
version "3.1.0"
@@ -10964,10 +10964,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4:
1096410964
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
1096510965
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
1096610966

10967-
scheduler@^0.11.0-alpha.0:
10968-
version "0.11.0-alpha.0"
10969-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.0-alpha.0.tgz#7b132c726608993471db07866f2d59a52b9e190b"
10970-
integrity sha512-0tUDHYSyni/EHkMMBysVXVwfanCWWbLsulnDB1tGrQiWWrVuRVoclWCPHCYC/1iR5Rj34EQhxh3/F36V+F+ZpA==
10967+
scheduler@^0.13.3:
10968+
version "0.13.3"
10969+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.3.tgz#bed3c5850f62ea9c716a4d781f9daeb9b2a58896"
10970+
integrity sha512-UxN5QRYWtpR1egNWzJcVLk8jlegxAugswQc984lD3kU7NuobsO37/sRfbpTdBjtnD5TBNFA2Q2oLV5+UmPSmEQ==
1097110971
dependencies:
1097210972
loose-envify "^1.1.0"
1097310973
object-assign "^4.1.1"

0 commit comments

Comments
 (0)