Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13183 from sorah/never_ignore_i18n_translate_raise_option | Carlos Antonio da Silva | 2013-12-04 | 1 | -0/+6 |
| | | | | | | | Escalate missing error when :raise is true in translate helper, fix regression introduced by security fix. Conflicts: actionpack/CHANGELOG.md | ||||
* | Stop using i18n's built in HTML error handling. | Michael Koziarski | 2013-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | i18n doesn't depend on active support which means it can't use our html_safe code to do its escaping when generating the spans. Rather than try to sanitize the output from i18n, just revert to our old behaviour of rescuing the error and constructing the tag ourselves. Fixes: CVE-2013-4491 Conflicts: actionpack/lib/action_view/helpers/translation_helper.rb Backport: 50afd8eec9d088ad5a2d41f00a05520d5b78a6a0 | ||||
* | Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. | Jon Leighton | 2011-11-19 | 1 | -1/+11 |
| | |||||
* | _html translation should escape interpolated arguments | lest | 2011-11-17 | 1 | -0/+6 |
| | |||||
* | Make MissingTranslation exception handler respect :rescue_format | Andrew White | 2011-06-15 | 1 | -0/+8 |
| | |||||
* | Allow back passing :rescue_format => nil and test added | Santiago Pastorino | 2010-12-04 | 1 | -0/+5 |
| | |||||
* | Make TranslationHelper#translate use the :rescue_format option in I18n 0.5.0 | Sven Fuchs | 2010-12-04 | 1 | -27/+40 |
| | | | | | | Don't catch exceptions here. Instead only declare that we want exceptions to be rescued as :html, but also let users configure reactions to exceptions in I18n. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Clean up unused methods from AV::Base and pass in the template object on ↵ | José Valim | 2010-10-10 | 1 | -2/+2 |
| | | | | rendering. | ||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -4/+4 |
| | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | i18n: t() handles single keys returning an Array, also | Jeremy Kemper | 2010-05-24 | 1 | -0/+10 |
| | |||||
* | translate method doesn't support arrays anymore and is optimized to be used ↵ | Santiago Pastorino | 2010-05-24 | 1 | -14/+2 |
| | | | | | | with strings or symbols Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Revert "translation method for arrays on TranslationHelper module returns an ↵ | Santiago Pastorino | 2010-05-24 | 1 | -15/+14 |
| | | | | | | | | array where values for keys of the form (.|_)html keys are html_safe" This reverts commit 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | translation method for arrays on TranslationHelper module returns an array ↵ | Santiago Pastorino | 2010-05-24 | 1 | -14/+15 |
| | | | | | | | | where values for keys of the form (.|_)html keys are html_safe [#4675] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Changed translate helper so that it doesn’t mark every translation as safe ↵ | Craig Davey | 2010-04-13 | 1 | -1/+16 |
| | | | | | | HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | scope_key_by_partial fix for Ruby 1.9 when there's virtual_path [#4202 ↵ | Santiago Pastorino | 2010-03-16 | 1 | -0/+6 |
| | | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | translation method of TranslationHelper module returns always SafeBuffer ↵ | Santiago Pastorino | 2010-03-16 | 1 | -1/+8 |
| | | | | | | [#4194 status:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Revert "i18n translate with arrays issue solved" | Yehuda Katz | 2010-02-19 | 1 | -5/+0 |
| | | | | This reverts commit e7055e5b084f5e29e9cf8dab8d56943da65ccb43. | ||||
* | i18n translate with arrays issue solved | Santiago Pastorino | 2010-02-19 | 1 | -0/+5 |
| | |||||
* | i18n translate with arrays issue solved | Santiago Pastorino | 2010-02-18 | 1 | -0/+5 |
| | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
* | Fix t('.helper'). | José Valim | 2010-01-26 | 1 | -5/+5 |
| | |||||
* | Fix tests | David Heinemeier Hansson | 2009-12-25 | 1 | -2/+2 |
| | |||||
* | Added partial scoping to TranslationHelper#translate, so if you call ↵ | David Heinemeier Hansson | 2009-02-10 | 1 | -0/+6 |
| | | | | translate('.foo') from the people/index.html.erb template, you'll actually be calling I18n.translate(people.index.foo) [DHH] | ||||
* | Bump mocha requirement for Ruby 1.9 compat. Remove uses_mocha. | Jeremy Kemper | 2009-02-03 | 1 | -19/+17 |
| | |||||
* | use :en as a default locale (in favor of :en-US) | Sven Fuchs | 2008-11-18 | 1 | -3/+3 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Proper API for reloading translations | David Heinemeier Hansson | 2008-10-29 | 1 | -2/+2 |
| | |||||
* | fixing another timezone dependent test | Sven Fuchs | 2008-07-16 | 1 | -25/+5 |
| | |||||
* | Added localize helper method | Luca Guidi | 2008-07-08 | 1 | -0/+6 |
| | |||||
* | add a translation helper | Sven Fuchs | 2008-07-06 | 1 | -0/+42 |