From 780386d7f1e58225b4fa8aaff8227b645cd0f4aa Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Thu, 26 Jul 2012 06:02:22 +0800
Subject: [PATCH] Remove i18n_variable for parser

---
 lib/parsers/parser_common.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 30862023..c0297699 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -28,7 +28,7 @@ module ParserCommon
     res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page))
     res << "'>"
     root = "/"
-    res << "<a href='#{edit ? root + admin_page_path(page.id) : (page._type.eql?('Page') ? root + page.path : page.url)}'><span>#{page.i18n_variable[I18n.locale]}</span></a>"
+    res << "<a href='#{edit ? root + admin_page_path(page.id) : (page._type.eql?('Page') ? root + page.path : page.url)}'><span>#{page.title}</span></a>"
     if page.visible_children.size > 0 && current < menu.levels
       res << "<span class='dot'></span>"
       res << menu_level(page, current_page, current + 1, menu, edit)
@@ -68,7 +68,7 @@ module ParserCommon
         printable_ad_images.shuffle!
         printable_ad_images.each  do |ad_image|  #TODO Need Reflact
           res << "<img src='#{ad_image.file}' "
-          res << "alt='#{ad_image.title[I18n.locale] || ' '}' "
+          res << "alt='#{ad_image.title || ' '}' "
           res << "time_to_next='#{ad_banner.transition_msec}' "
           res << "link_open='#{ad_image.link_open}' "
           # res << "link_url='#{(ad_image.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
@@ -116,12 +116,12 @@ module ParserCommon
       res = ''
       if menu_page && menu_page.visible_children.size > 0
         res << "<div class='category_list'>"
-        res << "<h3 class='h3'>#{menu_page.i18n_variable[I18n.locale]}</h3>"
+        res << "<h3 class='h3'>#{menu_page.title}</h3>"
         res << "<ul class='list'>"
         menu_page.visible_children.each do |child|
           res << "<li class='#{page.id.eql?(child.id) ? 'active' : nil}'>"
           root = "/"
-          res << "<a href='#{edit ? root + admin_page_path(child.id) : (child._type.eql?('Page') ? root + child.path : child.url)}'>#{child.i18n_variable[I18n.locale]}</a>"
+          res << "<a href='#{edit ? root + admin_page_path(child.id) : (child._type.eql?('Page') ? root + child.path : child.url)}'>#{child.title}</a>"
           res << "</li>"
         end
         res << "</ul>"
@@ -138,7 +138,7 @@ module ParserCommon
     page_footer = body.css('.page_footer').first
     if page_footer
       res = "<div id='#{page_footer['id']}', class='#{page_footer['class']}'>"
-      res << @site.footer[I18n.locale] rescue nil
+      res << @site.footer rescue nil
       res << "</div>"
       fragment = Nokogiri::HTML::DocumentFragment.new(body ,res)
       page_footer.swap(fragment) rescue nil
@@ -152,7 +152,7 @@ module ParserCommon
     page_sub_menu = body.css('.page_sub_menu').first
     if page_sub_menu
       res = "<div id='#{page_sub_menu['id']}', class='#{page_sub_menu['class']}'>"
-      res << @site.sub_menu[I18n.locale] rescue nil
+      res << @site.sub_menu rescue nil
       res << "</div>"
       fragment = Nokogiri::HTML::DocumentFragment.new(body ,res)
       page_sub_menu.swap(fragment) rescue nil
@@ -175,7 +175,7 @@ module ParserCommon
         ret << "'></div>"
       else
         part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
-        part_title = part.title[I18n.locale] rescue nil
+        part_title = part.title rescue nil
         if edit
           ret << "<div id='#{content['name']}' part_id='#{part.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>" if part
           ret << "<div class='edit_link' style='display:none'>"
@@ -184,7 +184,7 @@ module ParserCommon
         end
         case part.kind
         when 'text'
-          ret << part.i18n_variable[I18n.locale] rescue ''
+          ret << part.content rescue ''
         when 'module_widget'
           url = "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true"
           options = "&category_id=#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=#{!part[:tag].blank? ? part[:tag] : tag}&page=#{params[:page]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}"