0
@@ -54,14 +54,17 @@
0
     rescue ActiveRecord::RecordInvalid
0
       show_article_with 'errors' => @comment.errors.full_messages, 'submitted' => params[:comment]
0
     rescue Article::CommentNotAllowed
0
-      show_article_with 'errors' => ["Commenting has been disabled on this article"]
0
+      commenting_disabled = site.call_render(nil, :__commenting_disabled, {}, nil, :layout => false) rescue "Commenting has been disabled on this article"
0
+      show_article_with 'errors' => [commenting_disabled]
0
     rescue Comment::Previewing
0
-      show_article_with 'errors' => ["Previewing your comment"], 'submitted' => params[:comment]
0
+      previewing_comment = site.call_render(nil, :__previewing_comment, {}, nil, :layout => false) rescue "Previewing your comment"
0
+      show_article_with 'errors' => [previewing_comment], 'submitted' => params[:comment]
0
     end
0
     
0
     def dispatch_comment
0
       @skip_caching = true
0
-      show_article_with 'message' => 'Thanks for the comment!'
0
+      message = site.call_render(nil, :__thanks_for_comment, {}, nil, :layout => false) rescue "Thanks for the comment!"
0
+      show_article_with 'message' => message
0
     end
0
 
0
     def dispatch_archives

0
@@ -193,13 +193,19 @@
0
     comment_age.to_i > -1
0
   end
0
 
0
-  def call_render(section, template_type, assigns = {}, controller = nil)
0
+  def call_render(section, template_type, assigns = {}, controller = nil, options = {})
0
     assigns.update('site' => to_liquid(section), 'mode' => template_type)
0
     assigns.update(default_assigns) unless default_assigns.empty?
0
+    options.reverse_merge!(:layout => true)
0
     template = set_content_template(section, template_type)
0
-    layout = set_layout_template(section, template_type)
0
     handler = @@template_handlers[theme.extension] || @@template_handlers[".liquid"]
0
-    handler.new(self).render(section, layout, template, assigns, controller)
0
+    
0
+    if options[:layout]
0
+      layout = set_layout_template(section, template_type)
0
+      handler.new(self).render(section, layout, template, assigns, controller)
0
+    else
0
+      handler.new(self).parse_inner_template(template, assigns, controller)
0
+    end
0
   end
0
   
0
   def to_liquid(current_section = nil)

0
@@ -31,6 +31,11 @@
0
     <dt><label for="site_timezone">Website Timezone</label></dt>
0
     <dd><%= select_tag 'site_timezone', options_for_select(['UTC'] + TZInfo::Timezone.all.map{|tz| [tz.to_s, tz.name]}.sort, @site.timezone.name), :name => 'site[timezone]' %></dd>
0
     <dt>
0
+      <label for="site_lang">Site language</label>
0
+      <span class="hint">Used to specify language in your site feeds</span>
0
+    </dt>
0
+    <dd><%= f.text_field :lang %></dd>
0
+    <dt>
0
       <label for="site_current_theme_path">Current Theme Path</label>
0
       <span class="hint">This is the path to the current template in /themes/site-<%= site.id %>.  Be careful with this setting!</span>
0
     </dt>

0
@@ -1,6 +1,6 @@
0
 xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
0
 
0
-xml.feed "xml:lang" => "en-US", "xmlns" => 'http://www.w3.org/2005/Atom' do
0
+xml.feed "xml:lang" => "#{site.lang || 'en-US'}", "xmlns" => 'http://www.w3.org/2005/Atom' do
0
   xml.title       "#{site.title || 'Mephisto'} - #{@section ? @section.name : 'All'}#{' Comments' if @comments && @articles.nil?}"
0
   xml.id          "tag:#{request.host},#{Time.now.utc.year}:mephisto#{"/#{@section.path}" if @section}#{ '/comments' if @comments && @articles.nil?}"
0
   xml.generator   "Mephisto #{Mephisto::Version::TITLE}", :uri => "http://mephistoblog.com", :version => "#{Mephisto::Version::STRING}"

0
@@ -16,6 +16,7 @@
0
   username: root
0
   password:
0
   host: localhost
0
+  encoding: utf8
0
 
0
 # Warning: The database defined as 'test' will be erased and
0
 # re-generated from your development database when you run 'rake'.
0
@@ -26,6 +27,7 @@
0
   username: root
0
   password:
0
   host: localhost
0
+  encoding: utf8
0
 
0
 production:
0
   adapter: mysql
0
@@ -33,6 +35,7 @@
0
   username: root
0
   password: 
0
   host: localhost
0
+  encoding: utf8
0
 
0
 
0
 ### Example database connections.  You can safely delete these. ###

0
@@ -1 +1,10 @@
0
+class AddLangToSites < ActiveRecord::Migration
0
+  def self.up
0
+    add_column :sites, :lang, :string, :null => false, :default => 'en-US'
0
+  end
0
+
0
+  def self.down
0
+    remove_column :sites, :lang
0
+  end
0
+end