Permalink
Browse files

Revert i18n stuff for now

Test Plan:
    blinky:/Users/eater/khan/eater/khan-exercises> git diff 3967e6a
    blinky:/Users/eater/khan/eater/khan-exercises>

Reviewers: alpert, cbhl

Reviewed By: alpert

Differential Revision: http://phabricator.khanacademy.org/D2061
  • Loading branch information...
1 parent 2de2385 commit b122474dc6c972cfcc2700bfbdb6ad682e70e970 @beneater beneater committed Feb 21, 2013
@@ -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', NUM2)</var> at the <var>store(1)</var> store,
+ <var>NUM2</var> more <var>plural('car')</var> <var>plural('parks', 'park', 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">
@@ -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', NUM2)</var> at the <var>store(1)</var> store.
+ <var>NUM2</var> more <var>plural('car', NUM2)</var> <var>plural('parks', 'park', NUM2)</var> at the <var>store(1)</var> store.
</p>
<p class="question">
How many cars are in the parking lot now?
@@ -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 their
+ <code><var>NUM</var></code> <var>plural( RESPONDENT, NUM )</var> said <var>plural( randFromArray([ "his", "her" ]), "their", NUM )</var>
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
@@ -379,12 +379,7 @@
</p>
<p style="margin-left: 20px">
<span data-each="getFactors( A ) as F" class="hint_blue">
- <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>
+ <var>plural( F, "team" )</var> with <var>plural( A / F, "sprinter" )</var> <var>plural( "", "each", F )</var><br />
</span>
</p>
</div>
@@ -402,12 +397,7 @@
</p>
<p style="margin-left: 20px">
<span data-each="getFactors( B ) as F" class="hint_green">
- <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>
+ <var>plural( F, "team" )</var> with <var>plural( B / F, "long-distance runner" )</var> <var>plural( "", "each", F )</var><br />
</span>
</p>
</div>
@@ -514,12 +504,7 @@
</p>
<p style="margin-left: 20px">
<span data-each="getFactors( A ) as F" class="hint_blue">
- <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>
+ <var>plural( F, "basket" )</var> with <var>plural( A / F, "chocolate chip cookie" )</var> <var>plural( "", "each", F )</var><br />
</span>
</p>
</div>
@@ -537,12 +522,7 @@
</p>
<p style="margin-left: 20px">
<span data-each="getFactors( B ) as F" class="hint_green">
- <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>
+ <var>plural( F, "basket" )</var> with <var>plural( B / F, "oatmeal cookie" )</var> <var>plural( "", "each", F )</var><br />
</span>
</p>
</div>
@@ -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> had
+ <var>plural( SOLUTION, LOCATION )</var> <var>plural( "has", "have", SOLUTION )</var>
<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>
@@ -34,22 +34,12 @@
</div>
<div class="question">
- <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>
+ <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>
<div class="problem">
Oops, something went wrong.

0 comments on commit b122474

Please sign in to comment.