| 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 | -1/+9 |
| | | | | | | | | 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 | -13/+8 |
| | | | | | | | | | | | | | | | 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/+3 |
| | | |||||
| * | _html translation should escape interpolated arguments | lest | 2011-11-17 | 1 | -4/+9 |
| | | |||||
| * | Revert "warn the user values are directly interpolated into _html ↵ | Xavier Noria | 2011-11-17 | 1 | -2/+0 |
| | | | | | | | | | | | translation strings" Reason: After another round of discussion, it has been decided to let interpolation deal with unsafe strings as it should do. This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b. | ||||
| * | warn the user values are directly interpolated into _html translation strings | Xavier Noria | 2011-11-17 | 1 | -0/+2 |
| | | |||||
| * | now the documentation reflects the actual returned value for a missing ↵ | gnagno | 2011-07-23 | 1 | -1/+1 |
| | | | | | translation | ||||
| * | simplify to only one condition | Damien Mathieu | 2011-06-15 | 1 | -5/+1 |
| | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
| * | Make MissingTranslation exception handler respect :rescue_format | Andrew White | 2011-06-15 | 1 | -1/+5 |
| | | |||||
| * | Fix styiling issue on TranslationHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -4/+4 |
| | | |||||
| * | Remove dependency from _template. | José Valim | 2011-05-01 | 1 | -2/+2 |
| | | |||||
| * | bump the i18n gem to 0.6.0beta1 and update docs for the i18n exception ↵ | Sven Fuchs | 2011-04-26 | 1 | -3/+3 |
| | | | | | | | handler [#6739 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Action Pack typos. | R.T. Lechow | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | Allow back passing :rescue_format => nil and test added | Santiago Pastorino | 2010-12-04 | 1 | -1/+1 |
| | | |||||
| * | Use ||= here | Santiago Pastorino | 2010-12-04 | 1 | -1/+1 |
| | | |||||
| * | Make TranslationHelper#translate use the :rescue_format option in I18n 0.5.0 | Sven Fuchs | 2010-12-04 | 1 | -7/+25 |
| | | | | | | | 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 | -9/+9 |
| | | | | | 's/[ \t]*$//' -i {} \;) | ||||
| * | Added titles and description. | Rizwan Reza | 2010-06-16 | 1 | -10/+17 |
| | | |||||
| * | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 1 | -2/+2 |
| | | |||||
| * | i18n: t() handles single keys returning an Array, also | Jeremy Kemper | 2010-05-24 | 1 | -2/+5 |
| | | |||||
| * | translate method doesn't support arrays anymore and is optimized to be used ↵ | Santiago Pastorino | 2010-05-24 | 1 | -18/+10 |
| | | | | | | | 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 | -25/+25 |
| | | | | | | | | | 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 | -25/+25 |
| | | | | | | | | | where values for keys of the form (.|_)html keys are html_safe [#4675] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Speed up I18n helpers in views and add entry to CHANGELOG. | José Valim | 2010-05-01 | 1 | -7/+3 |
| | | |||||
| * | Changed translate helper so that it doesn’t mark every translation as safe ↵ | Craig Davey | 2010-04-13 | 1 | -3/+23 |
| | | | | | | | 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 | -2/+3 |
| | | | | | | | 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/+1 |
| | | | | | | | [#4194 status:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Change array entries to safe doesn't worth then the array is joined as a ↵ | Santiago Pastorino | 2010-03-16 | 1 | -1/+1 |
| | | | | | | | string losing the safe property of his entries [#4134 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Bump i18n for new public I18n.normalize_keys | Jeremy Kemper | 2010-02-25 | 1 | -1/+1 |
| | | |||||
| * | ruby 1.9 array.to_s returns a string representing an escaped array | Santiago Pastorino | 2010-02-18 | 1 | -1/+1 |
| | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
| * | i18n translate with arrays issue solved | Santiago Pastorino | 2010-02-18 | 1 | -2/+3 |
| | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
| * | For performance reasons, you can no longer call html_safe! on Strings. ↵ | Yehuda Katz | 2010-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe. | ||||
| * | Fix t('.helper'). | José Valim | 2010-01-26 | 1 | -2/+6 |
| | | |||||
| * | Translated strings in the view are assumed html_safe (Closes #3401) | David Heinemeier Hansson | 2009-12-24 | 1 | -1/+1 |
| | | |||||
| * | Fix some Ruby warnings: `*' interpreted as argument prefix | Bryan Helmkamp | 2009-11-09 | 1 | -1/+1 |
| | | |||||
| * | Added partial scoping to TranslationHelper#translate, so if you call ↵ | David Heinemeier Hansson | 2009-02-10 | 1 | -1/+19 |
| | | | | | translate('.foo') from the people/index.html.erb template, you'll actually be calling I18n.translate(people.index.foo) [DHH] | ||||
| * | A little less hokus pokus | David Heinemeier Hansson | 2008-10-28 | 1 | -5/+4 |
| | | |||||
| * | I18n: add aliases #t and #l to TranslationHelper#translate and #localize | Sven Fuchs | 2008-08-25 | 1 | -0/+2 |
| | | |||||
| * | fixing another timezone dependent test | Sven Fuchs | 2008-07-16 | 1 | -1/+1 |
| | | |||||
| * | Added localize helper method | Luca Guidi | 2008-07-08 | 1 | -0/+4 |
| | | |||||
| * | align with changes in i18n | Sven Fuchs | 2008-07-06 | 1 | -3/+3 |
| | | |||||
| * | add a translation helper | Sven Fuchs | 2008-07-06 | 1 | -0/+16 |
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |