locomotive_cms 2.2.1 → 2.2.2
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -46,8 +46,8 @@ module Locomotive
|
|
|
46
46
|
def localized_page_fullpath(page, locale = nil)
|
|
47
47
|
return nil if page.fullpath_translations.blank?
|
|
48
48
|
|
|
49
|
-
locale
|
|
50
|
-
fullpath
|
|
49
|
+
locale = (locale || I18n.locale).to_s
|
|
50
|
+
fullpath = page.fullpath_translations[locale] || page.fullpath_translations[self.default_locale]
|
|
51
51
|
|
|
52
52
|
if locale == self.default_locale.to_s # no need to specify the locale
|
|
53
53
|
page.index? ? '' : fullpath
|
|
@@ -31,7 +31,13 @@ module Locomotive
|
|
|
31
31
|
end
|
|
32
32
|
|
|
33
33
|
def asset_url(path)
|
|
34
|
-
|
|
34
|
+
# keep the query string safe
|
|
35
|
+
path.gsub!(/(\?+.+)$/, '')
|
|
36
|
+
query_string = $1
|
|
37
|
+
|
|
38
|
+
url = ThemeAssetUploader.url_for(@context.registers[:site], path)
|
|
39
|
+
|
|
40
|
+
query_string ? "#{url}#{query_string}" : url
|
|
35
41
|
end
|
|
36
42
|
|
|
37
43
|
def absolute_url(url)
|
data/lib/locomotive/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: locomotive_cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.2.
|
|
4
|
+
version: 2.2.2
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2013-07-
|
|
12
|
+
date: 2013-07-16 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rake
|
|
@@ -114,7 +114,7 @@ dependencies:
|
|
|
114
114
|
requirements:
|
|
115
115
|
- - ~>
|
|
116
116
|
- !ruby/object:Gem::Version
|
|
117
|
-
version: 1.0.
|
|
117
|
+
version: 1.0.3
|
|
118
118
|
type: :runtime
|
|
119
119
|
prerelease: false
|
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -122,7 +122,7 @@ dependencies:
|
|
|
122
122
|
requirements:
|
|
123
123
|
- - ~>
|
|
124
124
|
- !ruby/object:Gem::Version
|
|
125
|
-
version: 1.0.
|
|
125
|
+
version: 1.0.3
|
|
126
126
|
- !ruby/object:Gem::Dependency
|
|
127
127
|
name: mongoid_migration
|
|
128
128
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -1416,7 +1416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
1416
1416
|
version: '0'
|
|
1417
1417
|
segments:
|
|
1418
1418
|
- 0
|
|
1419
|
-
hash:
|
|
1419
|
+
hash: 3728677471282995061
|
|
1420
1420
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1421
1421
|
none: false
|
|
1422
1422
|
requirements:
|
|
@@ -1425,7 +1425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
1425
1425
|
version: '0'
|
|
1426
1426
|
segments:
|
|
1427
1427
|
- 0
|
|
1428
|
-
hash:
|
|
1428
|
+
hash: 3728677471282995061
|
|
1429
1429
|
requirements: []
|
|
1430
1430
|
rubyforge_project:
|
|
1431
1431
|
rubygems_version: 1.8.23
|