fullstack-cms 0.2.17 → 0.2.18

data/VERSION

@@ -1 +1 @@
-0.2.17
+0.2.18

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])
+    s = Setting.global("#{key}", :autocreate => false, :default => value, :group => group, :options => opts[:options], :locale => (opts[:locale] == false ? nil : I18n.locale.to_s))
    
   end
     

data/app/views/admin/settings/_collection.html.erb

@@ -31,7 +31,7 @@
                   <%= link_to t(stg.key, :scope => "helpers.label", :default => stg.key.to_s.humanize), [:edit, :admin, stg] %>
                 </th>
                 <td style="width: 10%">
-                  <%= locale ? t("locale_names.#{locale}", :default => "#{locale}".humanize) : "-" %>
+                  <%= stg.locale ? t("locale_names.#{stg.locale}", :default => "#{stg.locale}".humanize) : "-" %>
                 </td>
                 <td>
                   <% if stg.value %>

data/fullstack-cms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.2.17"
+  s.version = "0.2.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]

data/lib/generators/fullstack/cms/templates/rails/app/views/site/_google_analytics.html.erb

@@ -1,5 +1,5 @@
   <script>
-    var _gaq=[['_setAccount','<%= setting("google_analytics_code", "UA-xxxxxx-x") %>'],['_trackPageview']];
+    var _gaq=[['_setAccount','<%= setting("google_analytics_code", "UA-xxxxxx-x", :locale => false) %>'],['_trackPageview']];
     (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
     g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
     s.parentNode.insertBefore(g,s)}(document,'script'));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
   prerelease: 
 platform: ruby
 authors:
@@ -333,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1948632129761737289
+      hash: 1287581399845633310
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: