Commit Graph

2999 Commits

Author SHA1 Message Date
Jeremy Kemper
172606e21f Harmonize framework require strategy. Don't add self to load path since Rails initializer and RubyGems handle it. 2008-08-25 21:22:34 -07:00
Joshua Peek
f2d8d13c64 Performance: Cache modules that extend the view context for JavaScriptGenerator 2008-08-25 21:50:26 -05:00
Joshua Peek
ba0d621695 Include all helpers into ActionView::Helper 2008-08-25 21:50:26 -05:00
Joshua Peek
a916c2e3d3 The view context always responds to controller, check if controller available instead 2008-08-25 15:37:19 -05:00
Joshua Peek
fe2640549b Base path may be nil if template is at the root of the view path 2008-08-25 15:36:11 -05:00
Sven Fuchs
d0a4d9b73a Update translations for pluralization key change from 'many' to 'other' 2008-08-25 11:41:51 +02:00
Sven Fuchs
e464f9b6b9 Merge commit 'rails/master' into i18n 2008-08-25 11:11:08 +02:00
Sven Fuchs
90a9637d41 I18n: add aliases #t and #l to TranslationHelper#translate and #localize 2008-08-25 11:06:18 +02:00
Jeremy Kemper
8a4d7233aa Update translations for pluralization key change from 'other' to 'many' 2008-08-24 11:10:15 -07:00
Jeremy Kemper
2efdeb7a95 Ruby 1.9 compat: set source encoding 2008-08-23 16:06:54 -07:00
Sven Fuchs
d6989aa0e1 I18n: use :other instead of :many as default key for pluralization to better conform w/ cldr pluralization rules
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2008-08-23 21:23:00 +02:00
Sven Fuchs
23fb26a0dc I18n: use :other instead of :many as default key for pluralization to better conform w/ cldr pluralization rules 2008-08-23 19:43:57 +02:00
Jeremy Kemper
9dac5547ad Merge branch 'master' into i18n 2008-08-22 13:01:53 -07:00
Jeremy Kemper
a6e05b18d6 Merge commit 'sven/i18n' into i18n 2008-08-22 12:44:14 -07:00
Ryan Bates
9a5ffaa01e Ensure :partial => @collection and :collection => @collection behaves same. [#884 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-08-22 18:15:53 +01:00
Joshua Peek
0096f55869 Removed template_public? because it will always be true since the default template is never a partial 2008-08-21 21:34:03 -05:00
Joshua Peek
ba516b40f5 Tidy up pick partial template logic 2008-08-21 21:25:33 -05:00
Ryan Bates
1129a24caf Cleanup around partial rendering
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-08-21 21:03:33 -05:00
Jeremy Kemper
e6a66cbd05 update rack tests for default response content_type and charset 2008-08-21 18:16:16 -07:00
Jeremy Kemper
b99442933d deprecate Base#assign_default_content_type_and_charset 2008-08-21 18:14:32 -07:00
Jeremy Kemper
f8f077945f Move default content type and charset from Base to Response. Handle charset = nil. 2008-08-21 18:11:09 -07:00
Tarmo Tänav
98fb161dbb Allow polymorphic_url helper to take url options. [#880 state:resolved]
All *_polymorphic_url, *_polymorphic_path helpers can now accept
an options hash which will be passed on to the named route
making it possible to generate polymorphic routes with additional
url parameters.

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-08-21 20:26:00 +01:00
Sven Fuchs
aad429a46e Merge branch 'master' into i18n 2008-08-21 19:04:39 +02:00
Darragh Curran
7e4ea5f4a2 Allow overriding id for feed and entry with atom_feed_builder. [#485 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-08-21 13:37:26 +01:00
Joshua Peek
6be8251ec8 Simplified and renamed CallbackChain union method to replace_or_append! 2008-08-21 00:51:06 -05:00
Joshua Peek
f388725bd6 Partial revert of 2681685 premature TypeArray abstraction 2008-08-21 00:28:25 -05:00
Joshua Peek
47cd8b81cc Switched integration test runner to use Rack processor instead of CGI 2008-08-20 13:37:18 -05:00
Joshua Peek
a74dbe6c52 Improve test coverage for integration tests cookie header 2008-08-20 13:22:36 -05:00
Sven Fuchs
950b9792ba fixing actionpack yml translations 2008-08-20 18:44:18 +02:00
Iain Hecker
7ee01c8c54 Changed locale file to yml for actionpack, but still broken 2008-08-20 18:04:36 +02:00
Joshua Peek
3a2ff17af6 Don't shadow query string method 2008-08-19 20:24:34 -05:00
Joshua Peek
6f530de944 Test coverage for integration testing with parameters 2008-08-19 20:15:51 -05:00
Ryan Bates
a8ece12fe2 Return nil instead of a space when passing an empty collection or nil to 'render :partial' [#791 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-08-19 19:09:04 -05:00
Joshua Peek
71c4ff07ab Delegate xhr helper method to integration session 2008-08-19 18:53:46 -05:00
Jamis Buck
6e4ea66dc0 Make AbstractRequest.if_modified_sense return nil if the header could not be parsed 2008-08-19 16:07:17 -06:00
Joshua Peek
977317da55 hack around CGI session close 2008-08-19 16:29:02 -05:00
Joshua Peek
c1a8690d58 Consistently use the framework's configured logger and avoid reverting to RAILS_DEFAULT_LOGGER unless necessary. 2008-08-18 23:36:13 -05:00
Ryan Bates
38c7d73e73 pass yielded arguments to block for ActionView::Base#render with :layout [#847 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-08-17 19:29:24 -05:00
Joshua Peek
dbb0abfb7e More integration test coverage 2008-08-17 19:18:18 -05:00
Joshua Peek
f245658495 Use Response status accessor instead of the Status header 2008-08-17 19:13:49 -05:00
Joshua Peek
b8e930aa01 Merge RackProcess#normalize_headers logic into AbstractResponse#prepare! 2008-08-17 19:09:38 -05:00
Joshua Peek
894f9ccc53 Use RackRequest as a mock instead of StubCGI into RequestTest 2008-08-17 19:04:01 -05:00
Jeremy Kemper
8aad8cb390 Set cache control to require revalidation if cache freshness response headers are set. Don't set Content-Length header if 304 status. 2008-08-14 21:45:14 -07:00
Jeremy Kemper
f1f4e84a7e Fix asset file paths with dangling queries in mtime check 2008-08-14 12:28:02 -07:00
Iain Hecker
ffeab4e0c1 Cleaned up ActiveRecord i18n scoping 2008-08-14 10:48:33 +02:00
Jeremy Kemper
c7e09a8fb2 TestRequest#recycle! uses unmemoize_all to reset cached request method, accepts, etc. 2008-08-13 17:26:27 -07:00
Joshua Peek
3b9324e62f Fix rendering partials at the top level [#795 state:resolved] 2008-08-13 19:15:35 -05:00
Josh Susser
2561be005b Refactor Filter predicate methods to use inheritance. [#815 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-08-13 21:48:37 +01:00
Sven Fuchs
f26380b775 switch to using I18n.load_translations instead of requiring plain ruby files 2008-08-13 09:53:25 +02:00
Jeremy Kemper
1b127fcdea Set asset-cached file ctime and mtime to the max mtime of the combined files. Allows for consistent ETag generation without having a shared filesystem. 2008-08-12 20:18:03 -07:00