diff options
| author | Karel Minarik <karmi@karmi.cz> | 2011-05-14 09:03:30 +0200 |
|---|---|---|
| committer | Karel Minarik <karmi@karmi.cz> | 2011-05-14 09:03:30 +0200 |
| commit | 47003f8cdf7afbfa1d78939f17d8b49c9c4348f7 (patch) | |
| tree | f483499c652a2538c0f0e52cae150fff5aab3bf9 | |
| parent | 159e605d1935671d9997bb717dd508dcbf53b506 (diff) | |
| download | rails-47003f8cdf7afbfa1d78939f17d8b49c9c4348f7.tar.gz rails-47003f8cdf7afbfa1d78939f17d8b49c9c4348f7.tar.bz2 rails-47003f8cdf7afbfa1d78939f17d8b49c9c4348f7.zip | |
[GUIDES] Changed the `LANGUAGE` variable to `GUIDES_LANGUAGE` to minimize conflicts with regular environment variables (eg. in Ubuntu)
| -rw-r--r-- | railties/guides/rails_guides/generator.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb index 154355cac1..14d671c8f3 100644 --- a/railties/guides/rails_guides/generator.rb +++ b/railties/guides/rails_guides/generator.rb @@ -38,9 +38,10 @@ # Note that if you are working on a guide generation will by default process # only that one, so ONLY is rarely used nowadays. # -# LANGUAGE -# Use LANGUAGE when you want to generate translated guides in <tt>source/<LANGUAGE></tt> -# folder (such as <tt>source/es</tt>). Ignore it when generating English guides. +# GUIDES_LANGUAGE +# Use GUIDES_LANGUAGE when you want to generate translated guides in +# <tt>source/<GUIDES_LANGUAGE></tt> folder (such as <tt>source/es</tt>). +# Ignore it when generating English guides. # # EDGE # Set to "1" to indicate generated guides should be marked as edge. This @@ -67,7 +68,7 @@ module RailsGuides GUIDES_RE = /\.(?:textile|html\.erb)$/ def initialize(output=nil) - @lang = ENV['LANGUAGE'] + @lang = ENV['GUIDES_LANGUAGE'] initialize_dirs(output) create_output_dir_if_needed set_flags_from_environment |