diff options
| author | Wincent Colaiuta <win@wincent.com> | 2010-07-03 12:12:50 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-03 22:42:31 +0200 |
| commit | 75b32a69a185e2e802934bc4000f6c0efbc5c2e7 (patch) | |
| tree | 7491cd11ccdd605bb9f5a228ca30dfb31cd87779 /actionmailer/lib | |
| parent | 070c24232f74c75b60757ff2bd3cc00ea662d5a6 (diff) | |
| download | rails-75b32a69a185e2e802934bc4000f6c0efbc5c2e7.tar.gz rails-75b32a69a185e2e802934bc4000f6c0efbc5c2e7.tar.bz2 rails-75b32a69a185e2e802934bc4000f6c0efbc5c2e7.zip | |
Fixes for "router" and "routes" terminology
Commit f7ba614c2db improved the internal consistency of the different
means of accessing routes, but it introduced some problems at the level
of code comments and user-visible strings.
This commit applies fixes on three levels:
Firstly, we remove or replace grammatically invalid constructs such as
"a routes" or "a particular routes".
Secondly, we make sure that we always use "the router DSL" or "the
router syntax", because this has always been the official terminology.
Finally, we make sure that we only use "routes" when referring to the
application-specific set of routes that are defined in the
"config/routes.rb" file, we use "router" when referring on a more
abstract level to "the code in Rails used to handle routing", and we use
"routing" when we need an adjective to apply to nouns such as
"url_helpers. Again this is consistent with historical practice and
other places in the documentation.
Note that this is not a sweep over the entire codebase to ensure
consistent usage of language; it is just a revision of the changes
introduced in commit f7ba614c2db.
Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 8b86d83301..ed4bea0c77 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -737,13 +737,13 @@ module ActionMailer #:nodoc: raise "You can no longer call ActionMailer::Base.default_url_options " \ "directly. You need to set config.action_mailer.default_url_options. " \ "If you are using ActionMailer standalone, you need to include the " \ - "url_helpers of a routes directly." + "routing url_helpers directly." end end # This module will complain if the user tries to set default_url_options # directly instead of through the config object. In Action Mailer's Railtie, - # we include the url_helpers of the routes, which will override this module + # we include the router's url_helpers, which will override this module. extend DeprecatedUrlOptions ActiveSupport.run_load_hooks(:action_mailer, self) |