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

Commit

Permalink
Unrevert i18n stuff only in the i18n branch for now
Browse files Browse the repository at this point in the history
  • Loading branch information
@beneater
beneater committed Feb 21, 2013
1 parent b122474 commit f91730c
Show file tree
Hide file tree
Showing 26 changed files with 721 additions and 342 deletions.
4 changes: 2 additions & 2 deletions exercises/arithmetic_word_problems_1.html
View file
Expand Up @@ -136,7 +136,7 @@
<div id="add-start">
<p class="problem">
Some cars were parked in the <var>store(1)</var> store parking lot.
<var>NUM2</var> more <var>plural('car')</var> <var>plural('parks', 'park', NUM2)</var> at the <var>store(1)</var> store,
<var>NUM2</var> more <var>plural('car')</var> <var>plural('parks', NUM2)</var> at the <var>store(1)</var> store,
and now there <var>plural('is', TOTAL)</var> <var>plural(TOTAL, 'car')</var> in the parking lot.
</p>
<p class="question">
Expand Down Expand Up @@ -183,7 +183,7 @@
<div id="add-result">
<p class="problem">
<var>plural(NUM1, 'car')</var> <var>plural('was', NUM1)</var> in the <var>store(1)</var> store parking lot.
<var>NUM2</var> more <var>plural('car', NUM2)</var> <var>plural('parks', 'park', NUM2)</var> at the <var>store(1)</var> store.
<var>NUM2</var> more <var>plural('car', NUM2)</var> <var>plural('parks', NUM2)</var> at the <var>store(1)</var> store.
</p>
<p class="question">
How many cars are in the parking lot now?
Expand Down
2 changes: 1 addition & 1 deletion exercises/creating_bar_charts_1.html
View file
Expand Up @@ -117,7 +117,7 @@
<div class="hints">
<div data-each="DATA as INDEX, NUM">
<p>
<code><var>NUM</var></code> <var>plural( RESPONDENT, NUM )</var> said <var>plural( randFromArray([ "his", "her" ]), "their", NUM )</var>
<code><var>NUM</var></code> <var>plural( RESPONDENT, NUM )</var> said their
favorite <var>SUBJECT</var> was <var>CATEGORIES[ INDEX ]</var>.
<span data-if="NUM > 0">
So the top of the bar for "<span style="text-transform: capitalize"><var>CATEGORIES[ INDEX ]</var></span>" should line up with the number
Expand Down
28 changes: 24 additions & 4 deletions exercises/least_common_multiple_and_greatest_common_divisor_word_problems.html
View file
Expand Up @@ -379,7 +379,12 @@
</p>
<p style="margin-left: 20px">
<span data-each="getFactors( A ) as F" class="hint_blue">
<var>plural( F, "team" )</var> with <var>plural( A / F, "sprinter" )</var> <var>plural( "", "each", F )</var><br />
<span data-if="F === 1">
1 team with <var>plural( A, "sprinter" )</var><br />
</span>
<span data-else>
<var>plural( F, "team" )</var> with <var>plural( A / F, "sprinter" )</var> each<br />
</span>
</span>
</p>
</div>
Expand All @@ -397,7 +402,12 @@
</p>
<p style="margin-left: 20px">
<span data-each="getFactors( B ) as F" class="hint_green">
<var>plural( F, "team" )</var> with <var>plural( B / F, "long-distance runner" )</var> <var>plural( "", "each", F )</var><br />
<span data-if="F === 1">
1 team with <var>plural( B, "long-distance runner" )</var><br />
</span>
<span data-else>
<var>plural( F, "team" )</var> with <var>plural( B / F, "long-distance runner" )</var> each<br />
</span>
</span>
</p>
</div>
Expand Down Expand Up @@ -504,7 +514,12 @@
</p>
<p style="margin-left: 20px">
<span data-each="getFactors( A ) as F" class="hint_blue">
<var>plural( F, "basket" )</var> with <var>plural( A / F, "chocolate chip cookie" )</var> <var>plural( "", "each", F )</var><br />
<span data-if="F === 1">
1 basket with <var>plural( A, "chocolate chip cookie" )</var><br />
</span>
<span data-else>
<var>plural( F, "basket" )</var> with <var>plural( A / F, "chocolate chip cookie" )</var> each<br />
</span>
</span>
</p>
</div>
Expand All @@ -522,7 +537,12 @@
</p>
<p style="margin-left: 20px">
<span data-each="getFactors( B ) as F" class="hint_green">
<var>plural( F, "basket" )</var> with <var>plural( B / F, "oatmeal cookie" )</var> <var>plural( "", "each", F )</var><br />
<span data-if="F === 1">
1 basket with <var>plural( B, "oatmeal cookie" )</var><br />
</span>
<span data-else>
<var>plural( F, "basket" )</var> with <var>plural( B / F, "oatmeal cookie" )</var> each<br />
</span>
</span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion exercises/reading_stem_and_leaf_plots.html
View file
Expand Up @@ -163,7 +163,7 @@
<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> <var>plural( "has", "have", SOLUTION )</var>
<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>
Expand Down
22 changes: 16 additions & 6 deletions exercises/visualizing_derivatives.html
View file
Expand Up @@ -34,12 +34,22 @@
</div>

<div class="question">
<p>
A function <code>f(x)</code> is shown in <span data-if="MOVE_DERIVATIVE" class="hint_purple" style="font-weight: bold">purple</span><span data-else class="hint_green" style="font-weight: bold">green</span>. The <span data-if="MOVE_DERIVATIVE" class="hint_green" style="font-weight: bold">sliding green window</span><span data-else class="hint_purple" style="font-weight: bold">sliding purple window</span> may contain a section of <b><var>MOVE_DERIVATIVE ? "its derivative" : "an antiderivative of the function,"</var> <code><var>MOVE_DERIVATIVE ? "f'(x)" : "F(x)"</var></code></b>.
</p>
<p>
Where does the function in the sliding window correspond to <code><b><var>MOVE_DERIVATIVE ? "f'(x)" : "F(x)"</var></b></code>?
</p>
<div data-if="MOVE_DERIVATIVE" data-unwrap>
<p>
A function <code>f(x)</code> is shown in <span class="hint_purple" style="font-weight: bold">purple</span>. The <span class="hint_green" style="font-weight: bold">sliding green window</span> may contain a section of <b>its derivative <code>f'(x)</code></b>.
</p>
<p>
Where does the function in the sliding window correspond to <code><b>f'(x)</b></code>?
</p>
</div>
<div data-else data-unwrap>
<p>
A function <code>f(x)</code> is shown in <span class="hint_green" style="font-weight: bold">green</span>. The <span class="hint_purple" style="font-weight: bold">sliding purple window</span> may contain a section of <b>an antiderivative of the function, <code>F(x)</code></b>.
</p>
<p>
Where does the function in the sliding window correspond to <code><b>F(x)</b></code>?
</p>
</div>
</div>

<div class="problem">
Expand Down

0 comments on commit f91730c

Please sign in to comment.