Skip to content

Commit 2a31f0b

Browse files
authored
Merge pull request #54 from MathiasWP/master
Translated the norwegian ifelse article.
2 parents 3f53928 + 08ae57a commit 2a31f0b

File tree

12 files changed

+158
-164
lines changed

12 files changed

+158
-164
lines changed
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
**Yes, it will.**
1+
**Ja det vil den..**
22

3-
Any string except an empty one (and `"0"` is not empty) becomes `true` in the logical context.
3+
Husk at alle tekster (utenom en tom en `""`) vil bli lest som `true`.
44

5-
We can run and check:
5+
Vi kan kjøre koden og teste:
66

77
```js run
88
if ("0") {
9-
alert( 'Hello' );
9+
alert("Hello");
1010
}
1111
```
12-
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
importance: 5
1+
viktighet: 5
22

33
---
44

5-
# if (a string with zero)
5+
# if (setning med 0)
66

7-
Will `alert` be shown?
7+
Vil `alert` bli vist?
88

99
```js
1010
if ("0") {
11-
alert( 'Hello' );
11+
alert("Hello");
1212
}
1313
```
14-
Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
<!DOCTYPE html>
22
<html>
3+
<body>
4+
<script>
5+
"use strict";
36

4-
<body>
5-
<script>
6-
'use strict';
7-
8-
let value = prompt('What is the "official" name of JavaScript?', '');
9-
10-
if (value == 'ECMAScript') {
11-
alert('Right!');
12-
} else {
13-
alert("You don't know? ECMAScript!");
14-
}
15-
</script>
16-
17-
18-
</body>
7+
let value = prompt('What is the "official" name of JavaScript?', "");
198

9+
if (value == "ECMAScript") {
10+
alert("Right!");
11+
} else {
12+
alert("You don't know? ECMAScript!");
13+
}
14+
</script>
15+
</body>
2016
</html>
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
importance: 2
1+
viktighet: 2
22

33
---
44

5-
# The name of JavaScript
5+
# JavaScript sitt navn
66

7-
Using the `if..else` construct, write the code which asks: 'What is the "official" name of JavaScript?'
7+
Ved å bruke `if..else` skal du skrive kode som spør: 'Hva er det "offisielle" navnet til JavaScript'
88

9-
If the visitor enters "ECMAScript", then output "Right!", otherwise -- output: "Didn't know? ECMAScript!"
9+
Hvis brukeren skriver inn "ECMAScript", skal tilbakemeldingen være "Korrekt!". Ellers skal den være: "Visste du det ikke? ECMAScript!"
1010

1111
![](ifelse_task2.svg)
1212

1313
[demo src="ifelse_task2"]
14-
Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
<!DOCTYPE html>
22
<html>
3+
<body>
4+
<script>
5+
"use strict";
36

4-
<body>
5-
6-
<script>
7-
'use strict';
8-
9-
let value = prompt('Type a number', 0);
10-
11-
if (value > 0) {
12-
alert(1);
13-
} else if (value < 0) {
14-
alert(-1);
15-
} else {
16-
alert(0);
17-
}
18-
</script>
19-
20-
</body>
7+
let value = prompt("Type a number", 0);
218

9+
if (value > 0) {
10+
alert(1);
11+
} else if (value < 0) {
12+
alert(-1);
13+
} else {
14+
alert(0);
15+
}
16+
</script>
17+
</body>
2218
</html>
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
2-
31
```js run
4-
let value = prompt('Type a number', 0);
2+
let value = prompt("Type a number", 0);
53

64
if (value > 0) {
7-
alert( 1 );
5+
alert(1);
86
} else if (value < 0) {
9-
alert( -1 );
7+
alert(-1);
108
} else {
11-
alert( 0 );
9+
alert(0);
1210
}
1311
```
14-
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
importance: 2
1+
viktighet: 2
22

33
---
44

5-
# Show the sign
5+
# Vis en verdi
66

7-
Using `if..else`, write the code which gets a number via `prompt` and then shows in `alert`:
7+
Ved å bruke `if..else` skal du skrive kode som tar inn et tall via `prompt` og viser dette i `alert`:
88

9-
- `1`, if the value is greater than zero,
10-
- `-1`, if less than zero,
11-
- `0`, if equals zero.
9+
- `1`, hvis verdien er mer enn null,
10+
- `-1`, hvis verdien er mindre enn null,
11+
- `0`, hvis verdien er null.
1212

13-
In this task we assume that the input is always a number.
13+
I denne oppgaven antar vi at input vil alltid være et tall.
1414

1515
[demo src="if_sign"]
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
2-
31
```js
4-
result = (a + b < 4) ? 'Below' : 'Over';
2+
result = a + b < 4 ? "Below" : "Over";
53
```
6-

1-js/02-first-steps/10-ifelse/5-rewrite-if-question/task.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ importance: 5
22

33
---
44

5-
# Rewrite 'if' into '?'
5+
# Gjør om 'if' til '?'
66

7-
Rewrite this `if` using the ternary operator `'?'`:
7+
Gjør om denne `if` påstanden ved bruk av ternary operatøren`'?'`:
88

99
```js
1010
if (a + b < 4) {
11-
result = 'Below';
11+
result = "Below";
1212
} else {
13-
result = 'Over';
13+
result = "Over";
1414
}
1515
```
16-

1-js/02-first-steps/10-ifelse/6-rewrite-if-else-question/solution.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
2-
31
```js
4-
let message = (login == 'Employee') ? 'Hello' :
5-
(login == 'Director') ? 'Greetings' :
6-
(login == '') ? 'No login' :
7-
'';
2+
let message =
3+
login == "Employee"
4+
? "Hello"
5+
: login == "Director"
6+
? "Greetings"
7+
: login == ""
8+
? "No login"
9+
: "";
810
```
9-

0 commit comments

Comments
 (0)