Skip to content
This repository has been archived by the owner on May 11, 2021. It is now read-only.

Commit

Permalink
Fix some additional, ambiguous, i18n cases.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeresig
jeresig committed Apr 15, 2013
1 parent 403a6d0 commit fa76de5
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 25 deletions.
7 changes: 4 additions & 3 deletions exercises/area_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,11 @@
});
</div>
<p>
The length is <var>plural(L, UNIT_TEXT)</var> and
the width is <var>plural(W, UNIT_TEXT)</var>, so the
<span>The length is <var>plural(L, UNIT_TEXT)</var>.</span>
<span>The width is <var>plural(W, UNIT_TEXT)</var>.</span>
<span>Thus the
area is <code><var>L</var>\times<var>W</var></code>
square <var>plural(UNIT_TEXT)</var>.
square <var>plural(UNIT_TEXT)</var>.</span>
</p>
</div>
<div>
Expand Down
7 changes: 4 additions & 3 deletions exercises/area_of_squares_and_rectangles.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,11 @@
});
</div>
<p>
The length is <var>plural(L, UNIT_TEXT)</var> and
the width is <var>plural(W, UNIT_TEXT)</var>, so the
<span>The length is <var>plural(L, UNIT_TEXT)</var>.</span>
<span>The width is <var>plural(W, UNIT_TEXT)</var>.</span>
<span>Thus the
area is <code><var>L</var>\times<var>W</var></code>
square <var>plural(UNIT_TEXT)</var>.
square <var>plural(UNIT_TEXT)</var>.</span>
</p>
</div>
<div>
Expand Down
27 changes: 16 additions & 11 deletions exercises/area_of_triangles_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,13 @@
});
</div>
<p>
The base of the triangle is
<var>pluralTex(B, UNIT_TEXT)</var> and the height is
<var>pluralTex(H, UNIT_TEXT)</var>, so the area of the
<span>The base of the triangle is
<var>pluralTex(B, UNIT_TEXT)</var>.</span>
<span>The height of the triangle is
<var>pluralTex(H, UNIT_TEXT)</var>.</span>
<span>Thus the area of the
<em>rectangle</em> shown above is <code><var>B</var>
\times <var>H</var></code>.
\times <var>H</var></code>.</span>
</p>
</div>
<p>
Expand Down Expand Up @@ -149,11 +151,13 @@
TOP / B &gt; 0.5 ? "left" : "left");
</div>
<p>
The base of the triangle is
<var>pluralTex(B, UNIT_TEXT)</var> and the height is
<var>pluralTex(H, UNIT_TEXT)</var>, so the area of the
<span>The base of the triangle is
<var>pluralTex(B, UNIT_TEXT)</var>.</span>
<span>The height of the triangle is
<var>pluralTex(H, UNIT_TEXT)</var>.</span>
<span>Thus the area of the
<em>rectangle</em> shown above is <code><var>B</var>
\times <var>H</var></code>.
\times <var>H</var></code>.</span>
</p>
</div>
<div>
Expand Down Expand Up @@ -270,9 +274,10 @@
<br>
</p>
<p>
The base of the triangle is
<var>pluralTex(B, UNIT_TEXT)</var> and the height is
<var>pluralTex(H, UNIT_TEXT)</var>.
<span>The base of the triangle is
<var>pluralTex(B, UNIT_TEXT)</var>.</span>
<span>The height of the triangle is
<var>pluralTex(H, UNIT_TEXT)</var>.</span>
</p>
<p><code>
\text{area} = \frac{1}{2} \times <var>B</var> \times
Expand Down
7 changes: 5 additions & 2 deletions exercises/comparing_fractions_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@
</div>
</div>
<p>Note that cutting a pizza into more slices will result in smaller slices.</p>
<p>The left fraction represents a pizza with <var>DEN_1 > DEN_2 ? "more" : "fewer"</var> slices, and so each slice is <var>SMALLER</var>.</p>
<p><var>NUM_1</var> <var>DEN_1 > DEN_2 ? "smaller" : "bigger"</var> slice<var>plural( NUM_1 )</var> is <var>DEN_1 > DEN_2 ? "less" : "more"</var> pizza than <var>NUM_2</var> <var>DEN_1 > DEN_2 ? "bigger" : "smaller"</var> slice<var>plural( NUM_2 )</var>.</p>
<p>The left fraction represents a pizza with <var>DEN_1 > DEN_2 ? "more" : "fewer"</var> slices, and so each slice is <var>DEN_1 > DEN_2 ? "smaller" : "bigger"</var>.</p>
<p>
<span>There are <var>NUM_1</var> <var>DEN_1 > DEN_2 ? "smaller" : "bigger"</var> slice<var>plural( NUM_1 )</var>.</span>
<span>This is <var>DEN_1 > DEN_2 ? "less" : "more"</var> pizza than <var>NUM_2</var> <var>DEN_1 > DEN_2 ? "bigger" : "smaller"</var> slice<var>plural( NUM_2 )</var>.</span>
</p>
<p>So, <code>\dfrac{<var>NUM_1</var>}{<var>DEN_1</var>} <var>SOLUTION</var> \dfrac{<var>NUM_2</var>}{<var>DEN_2</var>}</code>.</p>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion exercises/factoring_polynomials_1_video_hint.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
</div>

<p>
The factored expression is <code>(x <var>A &lt; 0 ? "+" : ""</var> <var>-A</var>)
<span>The factored expression is:</span>
<code>(x <var>A &lt; 0 ? "+" : ""</var> <var>-A</var>)
(x <var>B &lt; 0 ? "+" : ""</var> <var>-B</var>)</code>
</p>
</div>
Expand Down
12 changes: 7 additions & 5 deletions exercises/reading_stem_and_leaf_plots.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,13 @@
<span data-if="TYPE === 'smallest'">The <var>LOCATION</var> with the fewest <var>plural( ITEM )</var> had <var>plural( SOLUTION, ITEM )</var>.</span>
<span data-else-if="TYPE === 'largest'">The <var>LOCATION</var> with the most <var>plural( ITEM )</var> had <var>plural( SOLUTION, ITEM)</var>.</span>
<span data-else>
<var>plural( SOLUTION, LOCATION )</var> had
<span data-if="TYPE === 'how-many'">exactly</span>
<span data-if="TYPE === 'less-than'">fewer than</span>
<span data-if="TYPE === 'greater-than'">more than</span>
<var>plural( AMOUNT, ITEM )</var>.
<span>There are <var>plural( SOLUTION, LOCATION )</var>.</span>
<span>This is
<span data-if="TYPE === 'how-many'">exactly</span>
<span data-if="TYPE === 'less-than'">fewer than</span>
<span data-if="TYPE === 'greater-than'">more than</span>
<var>plural( AMOUNT, ITEM )</var>.
</span>
</span>
</strong></p>
</div>
Expand Down

0 comments on commit fa76de5

Please sign in to comment.