amalgam 2.1.3 → 2.1.3.1

data/lib/amalgam/globalize/helpers.rb

@@ -37,7 +37,7 @@ module Amalgam
 
       def extract_locale_from_subdomain
         res = request.subdomains.first
-        res if !request.subdomains.empty? and res != request.host and available_locales.include? res
+        res if !request.subdomains.empty? and res != request.host and ::I18n::available_locales.collect{|m| m.to_s}.include? res
       end
     end
   end

data/lib/amalgam/version.rb

@@ -1,3 +1,3 @@
 module Amalgam
-  VERSION = "2.1.3"
+  VERSION = "2.1.3.1"
 end

data/lib/generators/templates/amalgam.rb

@@ -30,7 +30,7 @@ Amalgam.setup do |config|
   # admin_routes 后台的routes, 在block里填写后台需要编辑的模型的routes, 后台会根据对应的routes生成顶栏
   # 链接
   # 例如
-  # config.admin_routes do
+  # config.admin_routes doÏ
   #   resources :pages, :except => [:show]
   #   # resources :posts, :except => [:show]
   #   resources :appointments, :except => [:edit,:update,:create,:new]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amalgam
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.3.1
   prerelease: 
 platform: ruby
 authors: