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

fix url for zh_cn

This commit is contained in:
manson 2014-07-08 19:59:46 +08:00
parent 6747c00045
commit a2c25c4192
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -12,7 +12,7 @@ class ApplicationController < ActionController::Base
def set_locale def set_locale
in_use_locales = current_site.in_use_locales in_use_locales = current_site.in_use_locales
if params[:locale].eql?("zh_cn") if params[:locale].eql?("zh_cn") or (!params[:locale] and session[:zh_cn])
params[:locale] = "zh_tw" params[:locale] = "zh_tw"
I18n.locale = session[:locale] I18n.locale = session[:locale]
session[:zh_cn] = true session[:zh_cn] = true

10
app/controllers/pages_controller.rb
View File

@ -33,7 +33,10 @@ class PagesController < ApplicationController
OrbitHelper.set_params params OrbitHelper.set_params params
OrbitHelper.set_site_locale locale OrbitHelper.set_site_locale locale
final_page = render_final_page("home",page,true) final_page = render_final_page("home",page,true)
final_page = session[:zh_cn] ? ZhConv.convert("zh-cn", final_page) : final_page if session[:zh_cn]
final_page = ZhConv.convert("zh-cn", final_page)
final_page.gsub!('/zh_tw/','/zh_cn/')
end
render :html => final_page.html_safe render :html => final_page.html_safe
end end
@ -86,7 +89,10 @@ class PagesController < ApplicationController
impressionist(page) impressionist(page)
final_page = render_final_page("#{module_app}/#{params[:target_action]}",page,layout) final_page = render_final_page("#{module_app}/#{params[:target_action]}",page,layout)
final_page = session[:zh_cn] ? ZhConv.convert("zh-cn", final_page) : final_page if session[:zh_cn]
final_page = ZhConv.convert("zh-cn", final_page)
final_page.gsub!('/zh_tw/','/zh_cn/')
end
render :html => final_page.html_safe render :html => final_page.html_safe
else else
render :file => "#{Rails.root}/public/404.html", :layout => false, :status => :not_found render :file => "#{Rails.root}/public/404.html", :layout => false, :status => :not_found