enjoy_cms 0.3.7.1 → 0.3.7.2
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/app/controllers/concerns/enjoy/localizeable.rb +1 -1
- data/app/controllers/concerns/enjoy/nav_menu.rb +2 -1
- data/lib/enjoy/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5f1cb1feaa0b839df0a8128985310e1c4c38a356
|
|
4
|
+
data.tar.gz: e8bb0a7c98be9e948611b92cd705fd12a2e3b4cd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 74e9903e8f49ce914c5aed3e9a4df33af7af34b9b90086f9ca65acfc6bebe50913aefefa4f8420fb33302d1306bee6db4ce8ec46b69e511a4ce5890cd01bad6c
|
|
7
|
+
data.tar.gz: 1f4aee3b89eea66ddc74656bdc12c624d2168a97028f81cbb4549ff6aaabfd128867c5fcfffde7f2823c30129d47c90367f51b6f581c58269dab1d7e9626d0f2
|
data/Gemfile.lock
CHANGED
|
@@ -39,7 +39,7 @@ module Enjoy::Localizeable
|
|
|
39
39
|
_url = item.redirect.blank? ? item.fullpath : item.redirect
|
|
40
40
|
end
|
|
41
41
|
_localizable_regexp = Regexp.new("^(#{I18n.available_locales.map { |l| "\\/#{l}"}.join("|")})")
|
|
42
|
-
((params[:locale].blank? or _url
|
|
42
|
+
((params[:locale].blank? or _url =~ _localizable_regexp) ? "" : "/#{params[:locale]}") + _url
|
|
43
43
|
end
|
|
44
44
|
def find_seo_extra(path)
|
|
45
45
|
_localizable_regexp = Regexp.new("^(#{I18n.available_locales.map { |l| "\\/#{l}"}.join("|")})")
|
|
@@ -56,7 +56,8 @@ module Enjoy::NavMenu
|
|
|
56
56
|
if _connectable and _connectable.enabled
|
|
57
57
|
begin
|
|
58
58
|
_routes_namespace = _connectable.respond_to?(:routes_namespace) ? _connectable.routes_namespace : :main_app
|
|
59
|
-
send(_routes_namespace.to_sym).url_for([_connectable, {only_path: true}])
|
|
59
|
+
_url = send(_routes_namespace.to_sym).url_for([_connectable, {only_path: true}])
|
|
60
|
+
_url
|
|
60
61
|
rescue Exception => exception
|
|
61
62
|
Rails.logger.error exception.message
|
|
62
63
|
Rails.logger.error exception.backtrace.join("\n")
|
data/lib/enjoy/version.rb
CHANGED