amalgam 2.1.3 → 2.1.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -37,7 +37,7 @@ module Amalgam
|
|
|
37
37
|
|
|
38
38
|
def extract_locale_from_subdomain
|
|
39
39
|
res = request.subdomains.first
|
|
40
|
-
res if !request.subdomains.empty? and res != request.host and available_locales.include? res
|
|
40
|
+
res if !request.subdomains.empty? and res != request.host and ::I18n::available_locales.collect{|m| m.to_s}.include? res
|
|
41
41
|
end
|
|
42
42
|
end
|
|
43
43
|
end
|
data/lib/amalgam/version.rb
CHANGED
|
@@ -30,7 +30,7 @@ Amalgam.setup do |config|
|
|
|
30
30
|
# admin_routes 后台的routes, 在block里填写后台需要编辑的模型的routes, 后台会根据对应的routes生成顶栏
|
|
31
31
|
# 链接
|
|
32
32
|
# 例如
|
|
33
|
-
# config.admin_routes
|
|
33
|
+
# config.admin_routes doÏ
|
|
34
34
|
# resources :pages, :except => [:show]
|
|
35
35
|
# # resources :posts, :except => [:show]
|
|
36
36
|
# resources :appointments, :except => [:edit,:update,:create,:new]
|