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

Merge pull request #298 from bhollis/i18n-helpers

Browse source 
Fix Padrino helpers that require an i18n locale to be present
This commit is contained in:
Thomas Reynolds 2012-03-09 10:19:15 -08:00
commit 8d22fee8d8
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
View file

@ -1,13 +1,4 @@
require "middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite"
# require 'i18n'
require 'enumerator'
# require 'active_support/core_ext/string/conversions' # to_date
require 'active_support/core_ext/float/rounding' # round
require 'active_support/option_merger' # with_options
require 'active_support/core_ext/object/with_options' # with_options
# require 'active_support/inflector' # humanize
FileSet.glob_require('../vendor/padrino-helpers-0.10.5/lib/padrino-helpers/**/*.rb', __FILE__)
require 'middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers'
# Built-in helpers
module Middleman::CoreExtensions::DefaultHelpers
@ -27,9 +18,10 @@ module Middleman::CoreExtensions::DefaultHelpers
app.helpers Helpers
# app.ready do
# ::I18n.load_path = Dir["#{File.join(root, 'locales', '*.yml')}"]
# end
app.ready do
::I18n.load_path += Dir["#{File.join(root, 'locales','*.yml')}"]
::I18n.load_path += Dir["#{File.dirname(__FILE__)}/../vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/*.yml"]
end
end
alias :included :registered
end

2
middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers.rb vendored
View file

@ -1,4 +1,4 @@
require 'padrino-core/support_lite' unless defined?(SupportLite)
require 'middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite' unless defined?(SupportLite)
require 'cgi'
# require 'i18n'
require 'enumerator'