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

update padrino i18n hack

Browse source
This commit is contained in:
Trevor Wennblom 2012-04-13 07:44:51 -05:00
parent 96eac33118
commit 4652736cea
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/lib/middleman-core/vendor/padrino-core-0.10.6/lib/padrino-core/support_lite.rb vendored
View file

@ -191,7 +191,7 @@ end
##
# Loads our locale configuration files
#
I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)
### I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n) ### !!! FIXME middleman ###
##
# Used to determine if this file has already been required

7
middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.6/lib/padrino-helpers.rb vendored
View file

@ -1,6 +1,7 @@
require 'padrino-core/support_lite' unless defined?(SupportLite)
require 'middleman-core/vendor/padrino-core-0.10.6/lib/padrino-core/support_lite' unless defined?(SupportLite) ### !!! FIXME middleman ###
### require 'padrino-core/support_lite' unless defined?(SupportLite) ### !!! FIXME middleman ###
require 'cgi'
require 'i18n'
### require 'i18n' ### !!! FIXME middleman ###
require 'enumerator'
require 'active_support/core_ext/string/conversions' # to_date
require 'active_support/core_ext/float/rounding' # round
@ -11,7 +12,7 @@ require 'active_support/inflector' # humanize
FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)
# Load our locales
I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"]
### I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"] ### !!! FIXME middleman ###
module Padrino
##