aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/rails_info.rb15
2 files changed, 11 insertions, 6 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index f32e60ce8c..1920ebaf13 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Help script/about print the correct svn revision when in a non-English locale. #4026 [babie7a0@ybb.ne.jp]
+
* Add 'app' accessor to script/console as an instance of Integration::Session [Jamis Buck]
* Generator::Base#usage takes an optional message argument which defaults to Generator::Base#usage_message. [Jeremy Kemper]
diff --git a/railties/lib/rails_info.rb b/railties/lib/rails_info.rb
index eb60955db5..ec88f9baef 100644
--- a/railties/lib/rails_info.rb
+++ b/railties/lib/rails_info.rb
@@ -51,13 +51,16 @@ module Rails
table << '</table>'
end
end
-
- protected
- def svn_info
- Dir.chdir("#{RAILS_ROOT}/vendor/rails") do
- silence_stderr { `svn info` }
+
+ protected
+ def svn_info
+ env_lang, ENV['LC_ALL'] = ENV['LC_ALL'], 'C'
+ Dir.chdir("#{RAILS_ROOT}/vendor/rails") do
+ silence_stderr { `svn info` }
+ end
+ ensure
+ ENV['LC_ALL'] = env_lang
end
- end
end
# The Ruby version and platform, e.g. "1.8.2 (powerpc-darwin8.2.0)".