Sync with upstream @ 71ff8f81#7
Closed
javascript-translate-bot wants to merge 286 commits intomasterfrom
Closed
Conversation
So here JavaScript assumes that we have a code block, but why there's an error. --> Makes no sense so replaced "but" with "that's"
Fixed spelling error
Better grammatically.
Update article.md
Wording of initial explanation of spread operator.
sync to upstream
Fixed a typo
Update article.md
1. Since is general statement, thought might be better to use general function name. 2. "Do the following steps" is a bit awkward, in that usually one doesn't "do" steps (but rather "takes", or "follows", or "executes" steps, perhaps). But it does convey the meaning, and perhaps it's a relatively new usage in business or tech that I'm not familiar with. For me, it comes off a bit awkward. Leaving out "steps" works grammatically and preserves the sense. Or could find another verb to replace "do" -- but nothing perfect came to mind. Not that bad the way it is, but since I was already changing the sentence...
Says "is the same object as:", but what's below is an assignment (that includes an object). I didn't have any problem understanding it, didn't even notice it at first, but I thought it would be more accurate this way without sacrificing clarity.
Qualify that while cachingDecorator() will now work with any number of arguments, the hash() function given will not. Or, perhaps better, could just change the hash function to something like:
function hash(args) {
return [...args].join();
}
Update article.md
Update article.md
Update article.md
Replace 'cause' with 'case'.
Update article.md
Minor grammar fixes
Update article.md
Give results of 'alert' ('true') rather than description of method. Code seems pretty self-explanatory.
Replaced 'the ... property ... works since" with "the ... property ... has worked since".
Replaced ":"s with ","s. I edited these lines before, and thought they were a little awkward w/ ":"s, but didn't see fit to change it then. But now ","s seem clearly better. Think of it as successive approximations.
[Fetch: Cross-Origin Requests] Fix grammatical errors
Add results of 2nd alert
object constructor -> the object's constructor
'chapter' -> 'article'
Minor fixes for consistency
Remove unnecessary code syntax inside buttons
Update article.md
Update article.md
Update article.md
Update article.md
Update article.md
Update article.md
Update article.md
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated to merge changes from en.javascript.info at 71ff8f8
Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.
Alternatively, you can close this PR and merge conflicting changes manually.
The following files have conflicts and may need updates of the translations:
To merge changes manually (instead of merging this PR):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterThis PR will be closed and replaced with a new one in a few days.