aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionview/lib/action_view.rb')
-rw-r--r--actionview/lib/action_view.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionview/lib/action_view.rb b/actionview/lib/action_view.rb
index ba6755be82..53a83d48f6 100644
--- a/actionview/lib/action_view.rb
+++ b/actionview/lib/action_view.rb
@@ -1,5 +1,5 @@
#--
-# Copyright (c) 2004-2016 David Heinemeier Hansson
+# Copyright (c) 2004-2017 David Heinemeier Hansson
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -23,7 +23,7 @@
require "active_support"
require "active_support/rails"
-require "action_view/version"
+require_relative "action_view/version"
module ActionView
extend ActiveSupport::Autoload
@@ -92,5 +92,5 @@ end
require "active_support/core_ext/string/output_safety"
ActiveSupport.on_load(:i18n) do
- I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"
+ I18n.load_path << File.expand_path("action_view/locale/en.yml", __dir__)
end