locomotivecms_mounter 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 873ec299623a72321f56112830c2ccb8a682d41d
-  data.tar.gz: 9b425fcd0ffd321e495c3d19023e9be4a1623c9d
+  metadata.gz: ed7a36b0bfe0218fb12928ff8ea035b96d986562
+  data.tar.gz: d5a7882dacf040bc121fa20b0be5d1f7b2357973
 SHA512:
-  metadata.gz: 28513dfc8b36d13a7d6757c96ac6a0ad038a32f6db7dc8c38e3d7c41c9187e358c4a0b5b2a63f521d5297b564b0c66afb28a1fa004b469ebd49c492b3c95993c
-  data.tar.gz: 6406797ad1da5407d7a81dd86b2a1a8aa4f3ad675a7bbddaaf65953d013fa52b73eef9a0df871387da6d27069c242d526bc006ca485f2e79128525fc4441ce80
+  metadata.gz: ab0588d4b36bd438b6c28161fe96ef3091171335bd31819cd8b3b9ca22bb4d113ccb241ed717b38cea9f6bb88a9da527341ee1513a445270cf1bbd7f0b1c37ba
+  data.tar.gz: b9bf2f3ff894b385cb9156fe2280705a2b5301045cc536f393cf621294428cb99b5ff433ba8bfcb35674d4970e11799f708c06e3ee78038bbb7154a29bd0e83b

data/lib/locomotive/mounter/models/page.rb

@@ -60,15 +60,17 @@ module Locomotive
         # @return [ String ] The safe full path or nil if the page is not translated in the current locale
         #
         def safe_fullpath
-          return nil unless self.translated_in?(Locomotive::Mounter.locale)
-
-          # puts "[safe_fullpath] page = #{self.slug.inspect} / #{self.fullpath.inspect} / #{self.parent.inspect}"
-
           if self.index_or_404?
             self.slug
           else
             base  = self.parent.safe_fullpath
-            _slug = self.templatized? ? '*' : self.slug
+            _slug = if self.templatized?
+              '*'
+            elsif !self.translated_in?(Locomotive::Mounter.locale)
+              self.slug_translations[self.mounting_point.default_locale]
+            else
+              self.slug
+            end
             (base == 'index' ? _slug : File.join(base, _slug)).dasherize
           end
         end
@@ -245,7 +247,7 @@ module Locomotive
         def localize_fullpath(locales = nil)
           locales ||= self.translated_in
           _parent_fullpath  = self.parent.try(:fullpath)
-          _fullpath, _slug  = self.fullpath.try(:clone), self.slug.clone
+          _fullpath, _slug  = self.fullpath.try(:clone), self.slug.to_s.clone
 
           locales.each do |locale|
             Locomotive::Mounter.with_locale(locale) do

data/lib/locomotive/mounter/version.rb

@@ -2,7 +2,7 @@
 module Locomotive
   module Mounter #:nodoc
 
-    VERSION = '1.2.4'
+    VERSION = '1.2.5'
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt