Skip to content

Commit 7e29451

Browse files
authored
Merge pull request #701 from Philippus/issue/typo
Issue/typo
2 parents 8839be4 + b2413f3 commit 7e29451

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

ba/cheatsheets/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ language: ba
5858
| `for (x <- xs if x%2 == 0) yield x*10` _isto kao_ <br>`xs.filter(_%2 == 0).map(_*10)` | for komprehensija: filter/map. |
5959
| `for ((x,y) <- xs zip ys) yield x*y` _isto kao_ <br>`(xs zip ys) map { case (x,y) => x*y }` | for komprehensija: destrukturirajuće vezivanje. |
6060
| `for (x <- xs; y <- ys) yield x*y` _isto kao_ <br>`xs flatMap {x => ys map {y => x*y}}` | for komprehensija: međuproizvod (vektorski proizvod). |
61-
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x,y, x*y))`<br>`}` | for komprehensija: imperativ-asto.<br>[sprintf-stil.](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
61+
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x, y, x/y.toFloat))`<br>`}` | for komprehensija: imperativ-asto.<br>[sprintf-stil.](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
6262
| `for (i <- 1 to 5) {`<br> `println(i)`<br>`}` | for komprehensija: iteracija uključujući gornju granicu. |
6363
| `for (i <- 1 until 5) {`<br> `println(i)`<br>`}` | for komprehensija: iteracija ne uključujući gornju granicu. |
6464
| <span id="pattern_matching" class="h2">podudaranje uzoraka (pattern matching)</span> | |

cheatsheets/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ languages: [ba, fr, ja, pl, pt-br]
5757
| `for (x <- xs if x%2 == 0) yield x*10` _same as_ <br>`xs.filter(_%2 == 0).map(_*10)` | for comprehension: filter/map |
5858
| `for ((x,y) <- xs zip ys) yield x*y` _same as_ <br>`(xs zip ys) map { case (x,y) => x*y }` | for comprehension: destructuring bind |
5959
| `for (x <- xs; y <- ys) yield x*y` _same as_ <br>`xs flatMap {x => ys map {y => x*y}}` | for comprehension: cross product |
60-
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x,y, x*y))`<br>`}` | for comprehension: imperative-ish<br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
60+
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x, y, x/y.toFloat))`<br>`}` | for comprehension: imperative-ish<br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
6161
| `for (i <- 1 to 5) {`<br> `println(i)`<br>`}` | for comprehension: iterate including the upper bound |
6262
| `for (i <- 1 until 5) {`<br> `println(i)`<br>`}` | for comprehension: iterate omitting the upper bound |
6363
| <span id="pattern_matching" class="h2">pattern matching</span> | |

es/tutorials/tour/_posts/2017-02-13-tour-of-scala.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: tutorial
3-
title: Introduction
3+
title: Introducción
44

55
disqus: true
66

fr/cheatsheets/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ language: fr
5858
| `for (x <- xs if x%2 == 0) yield x*10` _est équivalent à_ <br>`xs.filter(_%2 == 0).map(_*10)` | *for comprehension*: filter/map |
5959
| `for ((x,y) <- xs zip ys) yield x*y` _est équivalent à_ <br>`(xs zip ys) map { case (x,y) => x*y }` | *for comprehension* : liaison déstructurée |
6060
| `for (x <- xs; y <- ys) yield x*y` _est équivalent à_ <br>`xs flatMap {x => ys map {y => x*y}}` | *for comprehension* : produit cartésien. |
61-
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x,y, x*y))`<br>`}` | *for comprehension* : à la manière impérative <br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
61+
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x, y, x/y.toFloat))`<br>`}` | *for comprehension* : à la manière impérative <br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
6262
| `for (i <- 1 to 5) {`<br> `println(i)`<br>`}` | *for comprehension* : itère jusqu'à la borne supérieure comprise. |
6363
| `for (i <- 1 until 5) {`<br> `println(i)`<br>`}` | *for comprehension* : itère jusqu'à la borne supérieure non comprise. |
6464
| <span id="pattern_matching" class="h2">pattern matching</span> | |

ja/cheatsheets/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ language: ja
5858
| `for (x <- xs if x%2 == 0) yield x*10` <br>_(_ `xs.filter(_%2 == 0).map(_*10)` _と同じ)_ | for 内包表記: filter/map |
5959
| `for ((x,y) <- xs zip ys) yield x*y` <br>_(_ `(xs zip ys) map { case (x,y) => x*y }` _と同じ)_ | for 内包表記: 構造化代入 |
6060
| `for (x <- xs; y <- ys) yield x*y` <br>_(_ `xs flatMap {x => ys map {y => x*y}}` _と同じ)_ | for 内包表記: 直積 |
61-
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x,y, x*y))`<br>`}` | for 内包表記: 命令型の記述<br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
61+
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x, y, x/y.toFloat))`<br>`}` | for 内包表記: 命令型の記述<br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
6262
| `for (i <- 1 to 5) {`<br> `println(i)`<br>`}` | for 内包表記: 上限を含んだ走査 |
6363
| `for (i <- 1 until 5) {`<br> `println(i)`<br>`}` | for 内包表記: 上限を除いた走査 |
6464
| <span id="pattern_matching" class="h2">パターンマッチング</span> | |

overviews/parallel-collections/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Summing via `fold` on a `ParArray`:
104104
#### filter
105105

106106
Using a parallel `filter` to select the last names that come alphabetically
107-
after the letter "K".
107+
after the letter "I".
108108

109109
scala> val lastNames = List("Smith","Jones","Frankenstein","Bach","Jackson","Rodin").par
110110
lastNames: scala.collection.parallel.immutable.ParSeq[String] = ParVector(Smith, Jones, Frankenstein, Bach, Jackson, Rodin)

pl/cheatsheets/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ language: pl
5858
| `for (x <- xs if x%2 == 0) yield x*10` _to samo co_ <br>`xs.filter(_%2 == 0).map(_*10)` | instrukcja for: filtrowanie / mapowanie |
5959
| `for ((x,y) <- xs zip ys) yield x*y` _to samo co_ <br>`(xs zip ys) map { case (x,y) => x*y }` | instrukcja for: przypisanie z podziałem |
6060
| `for (x <- xs; y <- ys) yield x*y` _to samo co_ <br>`xs flatMap {x => ys map {y => x*y}}` | instrukcja for: iloczyn kartezjański |
61-
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x,y, x*y))`<br>`}` | instrukcja for: imperatywnie<br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
61+
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x, y, x/y.toFloat))`<br>`}` | instrukcja for: imperatywnie<br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
6262
| `for (i <- 1 to 5) {`<br> `println(i)`<br>`}` | instrukcja for: iterowanie aż do górnej granicy |
6363
| `for (i <- 1 until 5) {`<br> `println(i)`<br>`}` | instrukcja for: iterowanie poniżej górnej granicy |
6464
| <span id="pattern_matching" class="h2">pattern matching (dopasowywanie wzorca)</span> | |

pt-br/cheatsheets/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ language: pt-br
5858
| `for (x <- xs if x%2 == 0) yield x*10` _o mesmo que_ <br>`xs.filter(_%2 == 0).map(_*10)` | for: filter/map |
5959
| `for ((x,y) <- xs zip ys) yield x*y` _o mesmo que_ <br>`(xs zip ys) map { case (x,y) => x*y }` | for: associação desestruturada |
6060
| `for (x <- xs; y <- ys) yield x*y` _o mesmo que_ <br>`xs flatMap {x => ys map {y => x*y}}` | for: produto cruzado |
61-
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x,y, x*y))`<br>`}` | for: estilo imperativo<br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
61+
| `for (x <- xs; y <- ys) {`<br> `println("%d/%d = %.1f".format(x, y, x/y.toFloat))`<br>`}` | for: estilo imperativo<br>[sprintf-style](http://java.sun.com/javase/6/docs/api/java/util/Formatter.html#syntax) |
6262
| `for (i <- 1 to 5) {`<br> `println(i)`<br>`}` | for: itera incluindo o limite superior |
6363
| `for (i <- 1 until 5) {`<br> `println(i)`<br>`}` | for: itera omitindo o limite superior |
6464
| <span id="pattern_matching" class="h2">pattern matching</span> | |

0 commit comments

Comments
 (0)