Skip to content

Sync with reactjs.org @ bab2a349 #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 25, 2019
Merged

Sync with reactjs.org @ bab2a349 #147

merged 10 commits into from
Feb 25, 2019

Conversation

reactjs-translation-bot
Copy link
Contributor

@reactjs-translation-bot reactjs-translation-bot commented Feb 25, 2019

This PR was automatically generated.

Merge changes from reactjs.org at bab2a34

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.

gaearon and others added 8 commits February 23, 2019 11:29
* Revert "Small typo fix"

* Update hooks-faq.md
adding a hello world template on glitch.com to the list of online playgrounds 🎏
* Added language selector page

* PR nits

* Fix typo in variable name

* Added language icon. Show search icon in mobile.

* Tweaked header alignment

* Split languages into 3 categories based on progress:
complete, partially translated, and needs contributors

* Lower-cased pt-* language codes

* Re-added locale sort

* Renamed 'Partially Translated' header to 'In Progress'
* Translation blog post

* look ma Im an author

* sophie updates

* exclamation police

* Final tweaks

* Don't single out Spanish translation since it's already mentioned at the top
* Rename the post

* Last tweaks

* Last tweaks v2

* Last tweaks v3
* Hide horizontal scrollbar in header

* Tweak topbar breakpoints

* Simplify breakpoints to fix animation
@netlify
Copy link

netlify bot commented Feb 25, 2019

Deploy preview for ja-reactjs ready!

Built with commit a3d7d35

https://deploy-preview-147--ja-reactjs.netlify.com

@smikitky smikitky merged commit 0922d7e into master Feb 25, 2019
@smikitky
Copy link
Member

しまった、これ系は git merge master しないんでした…まあ実害はないのでこのままで

@potato4d
Copy link
Member

@smikitky
あー、多分問題があって、本家 che-tsumi の内容を考えるとコミットログから差分をとって cherry-pick / Pull Request を作っているので、もしかしたら次の sync で同じ内容が入ってくるかもしれないです。
一応 revert して再度入れておくほうが良いかもですー。

@smikitky
Copy link
Member

@potato4d squash したわけではなく、このPRに先に "git merge master" しただけであり、個別のコミット自体(これとか)は何も失われていないので、よほど妙な実装でない限り2回やってこないと思うのですが、ダメですかね…

@potato4d
Copy link
Member

あーなるほど、なら問題なさそうです 👌

@potato4d
Copy link
Member

失礼しました 🙇

@potato4d potato4d deleted the sync-bab2a349 branch March 5, 2019 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants