Merge pull request #54 from MathiasWP/master

JonasJore · web-flow · commit 2a31f0be643b · 2021-05-08T12:44:13.000+02:00
Translated the norwegian ifelse article.
diff --git a/1-js/02-first-steps/10-ifelse/1-if-zero-string/solution.md b/1-js/02-first-steps/10-ifelse/1-if-zero-string/solution.md
@@ -1,12 +1,11 @@
-**Yes, it will.**
+**Ja det vil den..**
 
-Any string except an empty one (and `"0"` is not empty) becomes `true` in the logical context.
+Husk at alle tekster (utenom en tom en `""`) vil bli lest som `true`.
 
-We can run and check:
+Vi kan kjøre koden og teste:
 
 ```js run
 if ("0") {
-  alert( 'Hello' );
+  alert("Hello");
 }
 ```
-
diff --git a/1-js/02-first-steps/10-ifelse/1-if-zero-string/task.md b/1-js/02-first-steps/10-ifelse/1-if-zero-string/task.md
@@ -1,14 +1,13 @@
-importance: 5
+viktighet: 5
 
 ---
 
-# if (a string with zero)
+# if (setning med 0)
 
-Will `alert` be shown?
+Vil `alert` bli vist?
 
 ```js
 if ("0") {
-  alert( 'Hello' );
+  alert("Hello");
 }
 ```
-
diff --git a/1-js/02-first-steps/10-ifelse/2-check-standard/ifelse_task2/index.html b/1-js/02-first-steps/10-ifelse/2-check-standard/ifelse_task2/index.html
@@ -1,20 +1,16 @@
 <!DOCTYPE html>
 <html>
+  <body>
+    <script>
+      "use strict";
 
-<body>
-  <script>
-    'use strict';
-
-    let value = prompt('What is the "official" name of JavaScript?', '');
-
-    if (value == 'ECMAScript') {
-      alert('Right!');
-    } else {
-      alert("You don't know? ECMAScript!");
-    }
-  </script>
-
-
-</body>
+      let value = prompt('What is the "official" name of JavaScript?', "");
 
+      if (value == "ECMAScript") {
+        alert("Right!");
+      } else {
+        alert("You don't know? ECMAScript!");
+      }
+    </script>
+  </body>
 </html>
diff --git a/1-js/02-first-steps/10-ifelse/2-check-standard/task.md b/1-js/02-first-steps/10-ifelse/2-check-standard/task.md
@@ -1,14 +1,13 @@
-importance: 2
+viktighet: 2
 
 ---
 
-# The name of JavaScript
+# JavaScript sitt navn
 
-Using the `if..else` construct, write the code which asks: 'What is the "official" name of JavaScript?'
+Ved å bruke `if..else` skal du skrive kode som spør: 'Hva er det "offisielle" navnet til JavaScript'
 
-If the visitor enters "ECMAScript", then output "Right!", otherwise -- output: "Didn't know? ECMAScript!"
+Hvis brukeren skriver inn "ECMAScript", skal tilbakemeldingen være "Korrekt!". Ellers skal den være: "Visste du det ikke? ECMAScript!"
 
 ![](ifelse_task2.svg)
 
 [demo src="ifelse_task2"]
-
diff --git a/1-js/02-first-steps/10-ifelse/3-sign/if_sign/index.html b/1-js/02-first-steps/10-ifelse/3-sign/if_sign/index.html
@@ -1,22 +1,18 @@
 <!DOCTYPE html>
 <html>
+  <body>
+    <script>
+      "use strict";
 
-<body>
-
-  <script>
-    'use strict';
-
-    let value = prompt('Type a number', 0);
-
-    if (value > 0) {
-      alert(1);
-    } else if (value < 0) {
-      alert(-1);
-    } else {
-      alert(0);
-    }
-  </script>
-
-</body>
+      let value = prompt("Type a number", 0);
 
+      if (value > 0) {
+        alert(1);
+      } else if (value < 0) {
+        alert(-1);
+      } else {
+        alert(0);
+      }
+    </script>
+  </body>
 </html>
diff --git a/1-js/02-first-steps/10-ifelse/3-sign/solution.md b/1-js/02-first-steps/10-ifelse/3-sign/solution.md
@@ -1,14 +1,11 @@
-
-
 ```js run
-let value = prompt('Type a number', 0);
+let value = prompt("Type a number", 0);
 
 if (value > 0) {
-  alert( 1 );
+  alert(1);
 } else if (value < 0) {
-  alert( -1 );
+  alert(-1);
 } else {
-  alert( 0 );
+  alert(0);
 }
 ```
-
diff --git a/1-js/02-first-steps/10-ifelse/3-sign/task.md b/1-js/02-first-steps/10-ifelse/3-sign/task.md
@@ -1,15 +1,15 @@
-importance: 2
+viktighet: 2
 
 ---
 
-# Show the sign
+# Vis en verdi
 
-Using `if..else`, write the code which gets a number via `prompt` and then shows in `alert`:
+Ved å bruke `if..else` skal du skrive kode som tar inn et tall via `prompt` og viser dette i `alert`:
 
-- `1`, if the value is greater than zero,
-- `-1`, if less than zero,
-- `0`, if equals zero.
+- `1`, hvis verdien er mer enn null,
+- `-1`, hvis verdien er mindre enn null,
+- `0`, hvis verdien er null.
 
-In this task we assume that the input is always a number.
+I denne oppgaven antar vi at input vil alltid være et tall.
 
 [demo src="if_sign"]
diff --git a/1-js/02-first-steps/10-ifelse/5-rewrite-if-question/solution.md b/1-js/02-first-steps/10-ifelse/5-rewrite-if-question/solution.md
@@ -1,6 +1,3 @@
-
-
 ```js
-result = (a + b < 4) ? 'Below' : 'Over';
+result = a + b < 4 ? "Below" : "Over";
 ```
-
diff --git a/1-js/02-first-steps/10-ifelse/5-rewrite-if-question/task.md b/1-js/02-first-steps/10-ifelse/5-rewrite-if-question/task.md
@@ -2,15 +2,14 @@ importance: 5
 
 ---
 
-# Rewrite 'if' into '?'
+# Gjør om 'if' til '?'
 
-Rewrite this `if` using the ternary operator `'?'`:
+Gjør om denne `if` påstanden ved bruk av ternary operatøren`'?'`:
 
 ```js
 if (a + b < 4) {
-  result = 'Below';
+  result = "Below";
 } else {
-  result = 'Over';
+  result = "Over";
 }
 ```
-
diff --git a/1-js/02-first-steps/10-ifelse/6-rewrite-if-else-question/solution.md b/1-js/02-first-steps/10-ifelse/6-rewrite-if-else-question/solution.md
@@ -1,9 +1,10 @@
-
-
 ```js
-let message = (login == 'Employee') ? 'Hello' :
-  (login == 'Director') ? 'Greetings' :
-  (login == '') ? 'No login' :
-  '';
+let message =
+  login == "Employee"
+    ? "Hello"
+    : login == "Director"
+    ? "Greetings"
+    : login == ""
+    ? "No login"
+    : "";
 ```
-
diff --git a/1-js/02-first-steps/10-ifelse/6-rewrite-if-else-question/task.md b/1-js/02-first-steps/10-ifelse/6-rewrite-if-else-question/task.md
@@ -2,22 +2,22 @@ importance: 5
 
 ---
 
-# Rewrite 'if..else' into '?'
+# Gjør om 'if..else' til '?'
 
-Rewrite `if..else` using multiple ternary operators `'?'`.
+Gjør om `if..else` påstanden under ved bruk av spørsmålstegn `'?'`.
 
-For readability, it's recommended to split the code into multiple lines.
+Det er anbefalt å dele opp koden inn i flere linjer for bedre lesbarhet.
 
 ```js
 let message;
 
-if (login == 'Employee') {
-  message = 'Hello';
-} else if (login == 'Director') {
-  message = 'Greetings';
-} else if (login == '') {
-  message = 'No login';
+if (login == "Employee") {
+  message = "Hello";
+} else if (login == "Director") {
+  message = "Greetings";
+} else if (login == "") {
+  message = "No login";
 } else {
-  message = '';
+  message = "";
 }
 ```
diff --git a/1-js/02-first-steps/10-ifelse/article.md b/1-js/02-first-steps/10-ifelse/article.md

-Original file line number
+Diff line change
@@ @@ -1,6 +1,3 @@ @@
+-
+-
 ```js
 -result = (a + b < 4) ? 'Below' : 'Over';
 +result = a + b < 4 ? "Below" : "Over";
 ```
+-