From 251133748da4b123967aebada582059d7435d73c Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Thu, 25 Jun 2015 17:38:23 +0800
Subject: [PATCH] fixed zh-cn conversion and also back page from page not
 available page.

---
 app/controllers/pages_controller.rb | 2 +-
 public/411.html                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index bc6b237..434b841 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -586,7 +586,7 @@ class PagesController < ApplicationController
  
   def change_to_language(final_html)
      if session[:zh_cn]
-        final_html =  ZhConv.convert("zh-cn", final_html)
+        final_html =  ZhConv.convert("zh-cn", final_html,false)
         final_html.gsub!('/zh_tw/','/zh_cn/')
         final_html.sub!('<a href="'+request.path+'">繁体中文</a>','<a href="'+(request.path.sub('/zh_cn/','/zh_tw/'))+'">繁体中文</a>')
       end
diff --git a/public/411.html b/public/411.html
index 0fd2be7..384d0da 100644
--- a/public/411.html
+++ b/public/411.html
@@ -58,7 +58,7 @@
       <section class="message">
         <h1>OOPS!</h1>
         <h2>Page not available</h2>
-        <p>Sorry, This page is not available for this language<br> You can go back to <a class="home" href="/">home</a> or <a class="prev-page" href="#" onclick="window.history.back();">previous</a> page.</p>
+        <p>Sorry, This page is not available for this language<br> You can go back to <a class="home" href="/">home</a> or <a class="prev-page" href="#" onclick="window.history.back();return false;">previous</a> page.</p>
       </section>
   </div>