Skip to content
Commits on Oct 22, 2015
  1. @csilvers

    Change from $._ and $.ngettext over to i18n._ and i18n.ngettext.

    Summary:
    With D22593 and followups, we can now move from $._ to i18n._,
    removing an (arbitrary) dependence of translation code on jquery.
    
    This is a mostly-automated process: .  First I found files that use $._
    and changed them to i18n._.  Then I added the necessary require lines,
    either reusing an existing require of i18n.js if it exists, or adding
    a new one if it didn't:
    
        git grep -l '$\._(' | xargs perl -pli -e 's/\$\._/i18n._/g'
        git grep -l '$\.ngettext(' | xargs perl -pli -e 's/\$\.ngettext/i18n.ngettext/g'
    
    I then cleaned up lint_i18n_strings.py, particularly
    StringInVarFilter.
    
    I also had to add 'no-undef' eslint directives to a bunch of files,
    since khan-exercises doesn't have a proper require() system, and
    depends on i18n being a global.
    
    Test Plan:
    build/lint_i18n_strings_test.py
    
    Ran
       python -mSimpleHTTPServer
    and visited
       http://localhost:8000/exercises-packed/adding_decimals.html
    and saw it render properly.
    
    Reviewers: john
    
    Reviewed By: john
    
    Subscribers: emily
    
    Differential Revision: https://phabricator.khanacademy.org/D22647
    csilvers committed Oct 22, 2015
Commits on Nov 20, 2014
  1. @xymostech @alopatin

    Rearrange answer area content within some exercises

    See https://docs.google.com/a/khanacademy.org/spreadsheets/d/1wCONrsK1ujRCLal7bcxS0cVkfpfKiPzapt3SsMJ_zqI/edit#gid=0
    
    Color: Green
    
    Test Plan:
    Take all hints and succesfully answer a question within each problem
    type for all modified exercises.
    
    Auditors: alex
    xymostech committed with alopatin Nov 13, 2014
  2. @alopatin

    Move all answer area content to the bottom of the question area

    Summary:
    This commit moves the entire #solutionarea div to the bottom of the
    question area, unless the question contains an element with the class
    name "render-answer-area-here" (in which case the div is placed
    immediately after this element).
    
    In addition, this commit removes entirely the old "acceptable formats"
    section at the top of the answer area in favor of tooltips attached
    directly to individual input elements. This is basically backporting the
    approach we've taken in Perseus to khan-exercises. Speaking of which,
    this commit also brings the expression editor in khan-exercises more in
    line with the Perseus version (rendered output above input) which is a
    necessary change because otherwise the tooltip obscures the output.
    
    Test Plan:
    Most of these changes were in place during the answer area moving party,
    and so in general all exercises should be confirmed to work. Tooltips
    were only finished afterwards though, so I've spot-checked the various
    answer types myself.
    
    Reviewers: aria
    
    Reviewed By: aria
    
    Subscribers: emily
    
    Differential Revision: http://phabricator.khanacademy.org/D14745
    alopatin committed Nov 13, 2014
Commits on Mar 20, 2014
  1. @justinj

    Remove `debugger;`

    Summary:
    I'm not really sure why this doesn't seem to be a problem in the live
    site - it goes into debug mode serving the exercises locally, but
    doesn't when I open up the exercise on webapp.
    
    Either way, I don't see a good reason to keep it (and it keeps showing
    up in my greps).
    
    Test Plan:
    * Open http://localhost:8000/exercises/triangle_inequality_theorem.html
    * Refresh a few times, should not get debugger.
    
    Reviewers: eater
    
    Reviewed By: eater
    
    Subscribers: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D7559
    justinj committed Mar 20, 2014
Commits on Mar 5, 2014
  1. @spicyj

    Use requirejs for module loading

    Summary: Also did some misc cleanup in khan-exercise.js, mostly related to module-y things ("151 ++----"). I combined local jquery-ui into one file to make it easier to load.
    
    Test Plan:
    Opened addition_1, deriviative_intuition, graphing_points_2 locally, and all looked fine.
    
    In webapp/khan-exercises/, ran:
    
    ```
    npm install -g requirejs
    r.js -o requirejs.config.js
    ```
    
    then saw that /exercises/addition_1 looked right.
    
    Reviewers: eater, jack
    
    Reviewed By: jack
    
    CC: alex
    
    Differential Revision: http://phabricator.khanacademy.org/D7095
    spicyj committed Mar 5, 2014
Commits on Sep 25, 2013
  1. @benkomalo

    Get rid of some 'the the' in comments and hints

    Auditors: alex
    
    Test Plan:
    lint
    benkomalo committed Sep 25, 2013
Commits on Jul 3, 2013
  1. @xymostech

    Fix a problem with rounding in inequality

    Sometimes, it didn't round the numbers correctly, so when it added them
    they would be added wrong. This rounds them before adding, so they work
    correctly.
    
    Auditors: alpert
    xymostech committed Jul 3, 2013
Commits on Jul 2, 2013
  1. @xymostech

    Fix i18n issues in triangle_inequality_theorem

    Summary:
    This exercise was doing sentence building, as well as doing math on
    `localeToFixed`ed numbers, which was causing errors. This fixes all of that.
    Closes T1133.
    
    Test Plan:
    `make i18n`. Open the problem with lang=en. Ensure that all numbers
    are shown with only one decimal place everywhere. Make sure that the math in
    the hints makes sense (i.e. no rounding errors). Open the problem with lang=es.
    Ensure that all of the strings are translated, that all the numbers use a comma
    instead of a decimal point. Ensure that there are no `NaN`s, and that the
    correct answer is accepted.
    
    Reviewers: john
    
    Reviewed By: john
    
    CC: aatashparikh, alpert
    
    Maniphest Tasks: T1133
    
    Differential Revision: http://phabricator.khanacademy.org/D2882
    xymostech committed Jul 2, 2013
Commits on Jun 5, 2013
  1. @xymostech

    Fix typo

    Fixes #46571
    
    Auditors: alpert
    xymostech committed Jun 4, 2013
Commits on Jun 4, 2013
  1. @xymostech

    Typos and explicitly reference KhanUtil

    Auditors: alpert, csilvers
    xymostech committed Jun 3, 2013
  2. @xymostech

    Replace toFixed with localeToFixed

    Summary:
    Replace all the instances of toFixed with localeToFixed in the
    exercises. Also, include math-format in the exercises.
    
    Test Plan:
    Visit the exercises in local mode, ensure that the there are no
    errors and that the numbers are formatted correctly.
    
    Reviewers: john, csilvers
    
    Reviewed By: csilvers
    
    CC: alpert
    
    Maniphest Tasks: T1038
    
    Differential Revision: http://phabricator.khanacademy.org/D2520
    xymostech committed Jun 3, 2013
  3. @xymostech

    Manually i18nize all of the minor exercises

    Summary:
    Manually make modifications to all the exercises for i18n. Most of the problems revolved around:
    
    - Wrapping Strings in variables or graphies with `$._`
    - `data-if`s in the middle of sentences, that needed to be pulled out around the entire sentence
    - Strings that needed to be put into Plural objects for pluralization
    - Decoupling strings from logic
    
    Test Plan:
    Visit the changed exercises. Make sure the question renders
    correctly and there are no javascript errors. Take all the hints and make sure
    nothing is rendered incorrectly. Do the translations into box language, and
    make sure that everything from the languages is boxy.
    
    Reviewers: csilvers, john
    
    Reviewed By: csilvers
    
    CC: alpert, eater
    
    Differential Revision: http://phabricator.khanacademy.org/D2504
    xymostech committed Jun 3, 2013
Commits on Apr 25, 2013
  1. @jeresig

    Run clean-exercises on the HTML exercises, fixing the entities inside…

    … the data-if attributes.
    jeresig committed Apr 25, 2013
Commits on Apr 24, 2013
  1. @jeresig
Commits on Apr 22, 2013
  1. @jeresig

    Clean up the newly-changed HTML exercises and also fix up the constan…

    …tly-expanding whitespace problem in the cleaner.
    jeresig committed Apr 22, 2013
Commits on Apr 17, 2013
  1. @cbhl
Commits on Apr 16, 2013
  1. @cbhl
  2. @jeresig
  3. @jeresig
Commits on Apr 12, 2013
  1. @spicyj

    Update the title tags to match real display names

    Auditors: eater
    spicyj committed Apr 11, 2013
Commits on Feb 21, 2013
  1. @beneater

    Consolidate answer input box width CSS so it doesn't leak between exe…

    …rcises #FIXIT
    
    Test Plan: Locally check each exercise/problem type still looks the same(ish)
    
    Reviewers: alpert, cbhl
    
    Reviewed By: cbhl
    
    Differential Revision: http://phabricator.khanacademy.org/D2056
    beneater committed Feb 21, 2013
Commits on Jan 21, 2013
  1. @cbhl

    Use integer data forms on All the Exercises!

    Summary:
    Okay, not all of them. But a lot of them.
    
    Use number field on Changing Decimals to Percents.
    
    Use integer data form for Converting Between Point Slope and Slope Intercept.
    
    Use type=number fields on Converting Between Point Slope and Standard Form.
    
    Use integer data form in Domain and Range of a Function 0.5.
    
    Use integer data form in EQuation of a Circle 1, 2
    
    Use integer data form on Equation of an Ellipse.
    
    Use integer, decimal data forms for Inscribed Angles 1, 2, 3
    
    Use integer data form on Matrix Addition and Subtraction.
    
    Use integer data forms for Matrix Dimensions.
    
    Use integer data forms on Matrix Transpose.
    
    Use integer data forms for Measuring Angles.
    
    Use integer data form on Multiplying a Matrix by a Matrix.
    
    Use integer data form on Multiplying a Matrix by a Vector.
    
    Use integer, decimal data forms on Multiplying and Dividing Scientific Notation.
    
    Use integer, decimal data forms on Multiplying Complex Numbers.
    
    Use integer data form in One Step Equations.
    
    Use integer data form in Perimeter 1.
    
    Use integer data form in Perimeter of Squares and Rectangles.
    
    Use integer data form in Pile Patterns.
    
    Use integer, decimal data forms in Plugging in Values.
    
    Use integer data form for Quadrilateral Angles.
    
    Use integer and decimal data forms for Range of a Function.
    
    Use integer data form for Reading Bar Charts 1.
    
    Use integer, decimal data forms for Reading Line Charts 1.
    
    Allow decimal data form for Reading Pictograms 2.
    
    Use integer data form for Reading Tables 1,2.
    
    Use integer, decimal data forms on Scientific Notation.
    
    Use integer data form in Simplifying Expressions with Exponents.
    
    Use integer data form in Solid Geometry.
    
    Use integer, decimal data forms with Square Roots.
    
    Use integer data form with Square Roots 2.
    
    Use integer data forms with Scalar Matrix Multiplication.
    
    Use integer data form on Telling Time 0.5
    
    Test Plan: locally
    
    Reviewers: tom, eater, stephanie
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D1048
    cbhl committed Jan 21, 2013
Commits on Sep 19, 2012
  1. @beneater

    Fix up exercises that are too wide for tutorials

    Reviewers: marcos, tom, desmond
    
    Differential Revision: http://phabricator.khanacademy.org/D737
    beneater committed Sep 19, 2012
Commits on Apr 10, 2012
  1. @beneater
Commits on Jan 4, 2012
  1. @spicyj
Commits on Nov 22, 2011
  1. @coffenbacher

    Switching to new 'sides' argument for Triangle, in turn improving for…

    …matting, removing reliance on deprecated code, and fixing 6861
    coffenbacher committed Nov 21, 2011
  2. @coffenbacher
Commits on Nov 10, 2011
  1. @beneater

    Correct triangle_inequality hints

    fixes #5157; fixes #5344; fixes #5896; fixes #4855
    beneater committed Nov 9, 2011
Commits on Nov 8, 2011
  1. @beneater
Commits on Sep 17, 2011
  1. @igorT

    fix #2801

    igorT committed Sep 17, 2011
Commits on Sep 16, 2011
  1. @igorT

    polish of geometry

    igorT committed Sep 16, 2011
  2. @igorT
Commits on Sep 14, 2011
  1. @igorT
Commits on Sep 13, 2011
  1. @igorT
Something went wrong with that request. Please try again.