Skip to content

Commit 43f33a9

Browse files
author
react-translation-bot
committed
merging all conflicts
2 parents 54239b4 + de0dfde commit 43f33a9

File tree

4 files changed

+41
-7
lines changed

4 files changed

+41
-7
lines changed

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

Lines changed: 5 additions & 5 deletions
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

Lines changed: 5 additions & 0 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10882,15 +10882,26 @@ react-dev-utils@^4.2.1:
1088210882
strip-ansi "3.0.1"
1088310883
text-table "0.2.0"
1088410884

10885+
<<<<<<< HEAD
1088510886
1088610887
version "16.8.2"
1088710888
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.2.tgz#7c8a69545dd554d45d66442230ba04a6a0a3c3d3"
1088810889
integrity sha512-cPGfgFfwi+VCZjk73buu14pYkYBR1b/SRMSYqkLDdhSEHnSwcuYTPu6/Bh6ZphJFIk80XLvbSe2azfcRzNF+Xg==
10890+
=======
10891+
10892+
version "16.8.3"
10893+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.3.tgz#ae236029e66210783ac81999d3015dfc475b9c32"
10894+
integrity sha512-ttMem9yJL4/lpItZAQ2NTFAbV7frotHk5DZEHXUOws2rMmrsvh1Na7ThGT0dTzUIl6pqTOi5tYREfL8AEna3lA==
10895+
>>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
1088910896
dependencies:
1089010897
loose-envify "^1.1.0"
1089110898
object-assign "^4.1.1"
1089210899
prop-types "^15.6.2"
10900+
<<<<<<< HEAD
1089310901
scheduler "^0.13.2"
10902+
=======
10903+
scheduler "^0.13.3"
10904+
>>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
1089410905

1089510906
react-error-overlay@^3.0.0:
1089610907
version "3.0.0"
@@ -10944,15 +10955,26 @@ react-side-effect@^1.1.0:
1094410955
exenv "^1.2.1"
1094510956
shallowequal "^1.0.1"
1094610957

10958+
<<<<<<< HEAD
1094710959
1094810960
version "16.8.2"
1094910961
resolved "https://registry.yarnpkg.com/react/-/react-16.8.2.tgz#83064596feaa98d9c2857c4deae1848b542c9c0c"
1095010962
integrity sha512-aB2ctx9uQ9vo09HVknqv3DGRpI7OIGJhCx3Bt0QqoRluEjHSaObJl+nG12GDdYH6sTgE7YiPJ6ZUyMx9kICdXw==
10963+
=======
10964+
10965+
version "16.8.3"
10966+
resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9"
10967+
integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==
10968+
>>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
1095110969
dependencies:
1095210970
loose-envify "^1.1.0"
1095310971
object-assign "^4.1.1"
1095410972
prop-types "^15.6.2"
10973+
<<<<<<< HEAD
1095510974
scheduler "^0.13.2"
10975+
=======
10976+
scheduler "^0.13.3"
10977+
>>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
1095610978

1095710979
read-all-stream@^3.0.0:
1095810980
version "3.1.0"
@@ -11663,10 +11685,17 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4:
1166311685
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
1166411686
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
1166511687

11688+
<<<<<<< HEAD
1166611689
scheduler@^0.13.2:
1166711690
version "0.13.2"
1166811691
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.2.tgz#969eaee2764a51d2e97b20a60963b2546beff8fa"
1166911692
integrity sha512-qK5P8tHS7vdEMCW5IPyt8v9MJOHqTrOUgPXib7tqm9vh834ibBX5BNhwkplX/0iOzHW5sXyluehYfS9yrkz9+w==
11693+
=======
11694+
scheduler@^0.13.3:
11695+
version "0.13.3"
11696+
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.3.tgz#bed3c5850f62ea9c716a4d781f9daeb9b2a58896"
11697+
integrity sha512-UxN5QRYWtpR1egNWzJcVLk8jlegxAugswQc984lD3kU7NuobsO37/sRfbpTdBjtnD5TBNFA2Q2oLV5+UmPSmEQ==
11698+
>>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
1167011699
dependencies:
1167111700
loose-envify "^1.1.0"
1167211701
object-assign "^4.1.1"

0 commit comments

Comments
 (0)