fullstack-cms 0.2.18 → 0.2.19

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.19

data/app/helpers/settings_helper.rb

@@ -10,7 +10,7 @@ module SettingsHelper
     namespaced_key = namespaced_key.to_s
     group, key =  namespaced_key.include?(namespace_separator) ? namespaced_key.split(namespace_separator) : [nil, namespaced_key]
     
-    s = Setting.global("#{key}", :autocreate => false, :default => value, :group => group, :options => opts[:options], :locale => (opts[:locale] == false ? nil : I18n.locale.to_s))
+    s = Setting.global("#{key}", :autocreate => false, :default => value, :group => group, :options => opts[:options], :locale => ((Fullstack::Cms.localized == false || opts[:locale] == false) ? nil : I18n.locale.to_s))
    
   end
     

data/app/models/pageable.rb

@@ -121,7 +121,10 @@ module Pageable
        end
      }
      
-     path_segments.unshift(locale.to_s)
+     if Fullstack::Cms.prepend_locale_to_path
+         path_segments.unshift(locale.to_s)
+     end
+     
      "/" + path_segments.join("/")
    end
    
@@ -166,7 +169,7 @@ module Pageable
  end
 
  def load_current_page
-   if Fullstack::Cms.config.localize 
+   if Fullstack::Cms.localized?
      @current_page.reload if @current_page = self.class.pages["#{action_name}@#{I18n.locale}"]
    else
      @current_page.reload if @current_page = self.class.pages[action_name]

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.2.18"
+  s.version = "0.2.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-09-12"
+  s.date = "2012-09-13"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [

data/lib/fullstack/cms/configuration.rb

@@ -2,7 +2,7 @@ module Fullstack
   module Cms
     
     class Configuration
-      attr_writer :linkables, :localized 
+      attr_writer :linkables, :localized, :prepend_locale_to_path
           
       def default_locale
         "#{I18n.default_locale}" || "en"
@@ -14,6 +14,9 @@ module Fullstack
       alias :localize :localized
       alias :localized? :localized
 
+      def prepend_locale_to_path
+        @prepend_locale_to_path.nil? ? true : @prepend_locale_to_path
+      end
       
       def linkables
         @linkables || []
@@ -83,7 +86,7 @@ module Fullstack
         config
       end
       
-      delegate :linkables, :localized, :localized?, :resources, :to => :config
+      delegate :linkables, :localized, :localized?, :resources, :prepend_locale_to_path, :to => :config
       
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack-admin
@@ -333,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1287581399845633310
+      hash: -1432430026618138619
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: