alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2015-06-25 17:41:22 +08:00
parent 804fdd044d 251133748d
commit a4e7a396dc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pages_controller.rb
View File

@ -586,7 +586,7 @@ class PagesController < ApplicationController
def change_to_language(final_html) def change_to_language(final_html)
if session[:zh_cn] 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.gsub!('/zh_tw/','/zh_cn/')
final_html.sub!('<a href="'+request.path+'">繁体中文</a>','<a href="'+(request.path.sub('/zh_cn/','/zh_tw/'))+'">繁体中文</a>') final_html.sub!('<a href="'+request.path+'">繁体中文</a>','<a href="'+(request.path.sub('/zh_cn/','/zh_tw/'))+'">繁体中文</a>')
end end

2
public/411.html
View File

@ -58,7 +58,7 @@
<section class="message"> <section class="message">
<h1>OOPS!</h1> <h1>OOPS!</h1>
<h2>Page not available</h2> <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> </section>
</div> </div>