deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #756 from bhollis/yaml

Browse source 
l18n: Should load both locales/*.yml and locales/*.yaml files
This commit is contained in:
Thomas Reynolds 2013-02-09 14:40:10 -08:00
parent 137ce94d23 7e0ae0e59c
commit 7f7ce07910
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
middleman-more/lib/middleman-more/core_extensions/i18n.rb
View file

@ -26,9 +26,9 @@ module Middleman
def initialize(app, options={}) def initialize(app, options={})
@app = app @app = app
@locales_glob = File.join(app.locales_dir, "**", "*.{rb,yml}") @locales_glob = File.join(app.locales_dir, "**", "*.{rb,yml,yaml}")
regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml}", "rb|yml") regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml,yaml}", "rb|ya?ml")
@locales_regex = %r{^#{regex}} @locales_regex = %r{^#{regex}}
@maps = {} @maps = {}
@ -81,7 +81,7 @@ module Middleman
def langs def langs
@options[:langs] || begin @options[:langs] || begin
Dir[File.join(@app.root, @locales_glob)].map { |file| Dir[File.join(@app.root, @locales_glob)].map { |file|
File.basename(file).sub(/\.yml$/, "").sub(/\.rb$/, "") File.basename(file).sub(/\.ya?ml$/, "").sub(/\.rb$/, "")
}.sort.map(&:to_sym) }.sort.map(&:to_sym)
end end
end end