Remove unnecessary answer types

Summary: Change answer type from rational to proper so only the relevant types show up, as per email request from Priya. Also make more i18n friendly. Reviewers: emily, eater Reviewed By: eater Differential Revision: https://phabricator.khanacademy.org/D17345
Khan · Jun 19, 2015 · dff0c92 · dff0c92
1 parent b800696
commit dff0c92
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/exercises/converting_decimals_to_fractions_1.html b/exercises/converting_decimals_to_fractions_1.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html data-require="math math-format">
+<html data-require="math math-format word-problems">
 <head>
     <title>Converting decimals to fractions 1</title>
     <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
@@ -13,11 +13,17 @@
                 <var id="D">randRange( 1, 9 ) / 10</var>
                 <var id="T">floor( D * 10 )</var>
             </div>
-            <p class="question">Express <code><var>localeToFixed(D, 1 )</var></code> as a fraction.</p>
-            <p class="solution" data-simplify="optional" data-type="rational"><var>D</var></p>
+            <p class="question">Express <code><var>localeToFixed(D, 1)</var></code> as a fraction.</p>
+            <p class="solution" data-simplify="optional" data-forms="proper"><var>D</var></p>
             <div class="hints">
-                <p>The number <code><var>T</var></code> is in the tenths place, so we have <var>cardinalThrough20( T )</var> tenth<span data-if="T !== 1">s</span>.</p>
-                <p><var>CardinalThrough20( T )</var> tenth<span data-if="T !== 1">s</span> can be written as <code><var>fraction( T, 10 )</var></code>.</p>
+                <p>
+                    The number <code><var>T</var></code> is in the tenths place,
+                    so we have <var>cardinalThrough20(T)</var> <var>plural_form(decimalPlaceNames[1], T)</var>.
+                </p>
+                <p>
+                    <var>CardinalThrough20(T)</var> <var>plural_form(decimalPlaceNames[1], T)</var>
+                    can be written as <code><var>fraction(T, 10)</var></code>.
+                </p>
             </div>
         </div>
 
@@ -28,12 +34,15 @@
                 <var id="H">round( D * 100 ) % 10</var>
             </div>
             <p class="question">Express <code><var>localeToFixed(D, 2 )</var></code> as a fraction.</p>
-            <p class="solution" data-simplify="optional" data-type="rational"><var>D</var></p>
-            <div class="hints">
-                <p>The number <code><var>T</var></code> is in the tenths place, so we have <var>cardinalThrough20( T )</var> tenth<span data-if="T !== 1">s</span>.</p>
-                <p><var>CardinalThrough20( T )</var> tenth<span data-if="T !== 1">s</span> can be written as <code><var>fraction( T, 10 )</var></code>.</p>
-                <p>The number <code><var>H</var></code> is in the hundredths place, so we have <var>cardinalThrough20( H )</var> hundredth<span data-if="H !== 1">s</span>.</p>
-                <p><var>CardinalThrough20( H )</var> hundredth<span data-if="H !== 1">s</span> can be written as <code><var>fraction( H, 100 )</var></code>.</p>
+            <p class="solution" data-simplify="optional" data-forms="proper"><var>D</var></p>
+            <div class="hints" data-apply="appendContents">
+                <p>
+                    The number <code><var>H</var></code> is in the hundredths place,
+                    so we have <var>cardinalThrough20(H)</var> <var>plural_form(decimalPlaceNames[2], H)</var>.</p>
+                <p>
+                    <var>CardinalThrough20(H)</var> <var>plural_form(decimalPlaceNames[2], H)</var>
+                    can be written as <code><var>fraction(H, 100)</var></code>.
+                </p>
                 <div>
                     <p>Add the two parts together.</p>
                     <p><code><var>fraction( T, 10 )</var> + <var>fraction( H, 100 )</var></code></p>

diff --git a/exercises/converting_decimals_to_fractions_2.html b/exercises/converting_decimals_to_fractions_2.html
@@ -15,7 +15,7 @@
                 <var id="D">NUMERATOR / 10000</var>
             </div>
             <p class="question">Express <code><var>localeToFixed(D, 4)</var></code> as a fraction.</p>
-            <p class="solution" data-type="rational" data-simplify="optional"><var>D</var></p>
+            <p class="solution" data-forms="proper" data-simplify="optional"><var>D</var></p>
             <div class="hints">
                 <div>
                     <p><code><var>localeToFixed(D, 4)</var></code> can be represented as follows.</p>