Skip to content

Commit e78e527

Browse files
committed
Merge pull request #256 from vsn4ik/en
Port #255 for en version
2 parents 168d074 + b62a137 commit e78e527

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

1-js/1-getting-started/1-intro/article.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ But what's great -- eventually all browsers tend to follow the standard. There a
147147
The trend: browsers, though eager for new features, tend to be compatible with the standard.
148148
[/summary]
149149

150-
## New EcmaScript
150+
## New ECMAScript
151151

152-
JavaScript evolves. The upcoming EcmaScript-2016 standard adds more language-level features which make the syntax more capable and expressive.
152+
JavaScript evolves. The upcoming ECMAScript-2016 standard adds more language-level features which make the syntax more capable and expressive.
153153

154154
Modern browsers improve their engines to raise JavaScript execution script, fix bugs and try to follow the standards.
155155

1-js/2-first-steps/12-ifelse/2-check-standard/ifelse_task2/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
let value = prompt('What is the "official" name of JavaScript?', '');
99

10-
if (value == 'EcmaScript') {
10+
if (value == 'ECMAScript') {
1111
alert('Right!');
1212
} else {
13-
alert("Didn't know? EcmaScript!");
13+
alert("Didn't know? ECMAScript!");
1414
}
1515
</script>
1616

1-js/2-first-steps/12-ifelse/2-check-standard/task.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
Using the `if..else` construct, write the code which asks: 'What is the "official" name of JavaScript?'
66

7-
If the visitor enters "EcmaScript", then output "Right!", otherwise -- output: "Didn't know? EcmaScript!"
7+
If the visitor enters "ECMAScript", then output "Right!", otherwise -- output: "Didn't know? ECMAScript!"
88

99
<img src="ifelse_task2.png">
1010

11-
[demo src="ifelse_task2"]
11+
[demo src="ifelse_task2"]

1-js/2-first-steps/4-strict-mode/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ For a long time JavaScript was evolving without compatibility issues. New featur
44

55
That had the benefit of never breaking the existing code. But the back side is that any mistake or an imprefect decision made by JavaScript creators got stuck in the language forever.
66

7-
It had been so before EcmaScript 5 (ES5) appeared which added new features to the language and modified some of the existing ones.
7+
It had been so before ECMAScript 5 (ES5) appeared which added new features to the language and modified some of the existing ones.
88

99
To keep the old code working, most modifications of the pre-existing features are off by default. One need to enable them explicitly with a special directive `"use strict"`.
1010

1-js/4-data-structures/11-datetime/article.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ alert( ms ); // 1327611110417 (число миллисекунд)
482482
483483
484484
[smart header="Формат дат для IE8-"]
485-
До появления спецификации EcmaScript 5 формат не был стандартизован, и браузеры, включая IE8-, имели свои собственные форматы дат. Частично, эти форматы пересекаются.
485+
До появления спецификации ECMAScript 5 формат не был стандартизован, и браузеры, включая IE8-, имели свои собственные форматы дат. Частично, эти форматы пересекаются.
486486
487487
Например, код ниже работает везде, включая старые IE:
488488

0 commit comments

Comments
 (0)