From 384cc4d6f4da6f33b7bc66faba46d8e8c71c2a9f Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Tue, 21 Oct 2014 15:27:43 +0800
Subject: [PATCH] fix for chinese simplified and also new user added

---
 app/models/site.rb                 |  2 +-
 app/views/orbit_bar/index.html.erb |  2 +-
 config/environment.rb              | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/models/site.rb b/app/models/site.rb
index cfe8242..fbd8b3f 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -21,7 +21,7 @@ class Site
   field :desktop_closed, :type => Boolean, :default => false
   field :enable_language_detection, :type => Boolean, :default => false
   field :enable_zh_cn, :type => Boolean, :default => true
-  field :default_locale, :default => "en"
+  field :default_locale, :default => "zh_tw"
   field :mobile_on, :type => Boolean, :default => false
   field :announcement_category, :type => Array, :default=>[]
   field :mobile_bar_color, :type => Array, :default=>[]
diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb
index dbefefb..99e0a85 100644
--- a/app/views/orbit_bar/index.html.erb
+++ b/app/views/orbit_bar/index.html.erb
@@ -106,7 +106,7 @@
           </li>
         <% end %>
         <li>
-        <% if @site_in_use_locales.count > 1 %>
+        <% if @site_in_use_locales.count > 1  || current_site.enable_zh_cn %>
           <% locale = session[:zh_cn] ? :zh_cn : I18n.locale %>
           <span id="language"><%= t((locale==:zh_tw ? :zh_tw_ : locale.to_s)) %></span>
           <ul>
diff --git a/config/environment.rb b/config/environment.rb
index 8c47b1d..c022e23 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -246,4 +246,20 @@ if User.count==0
   user.email = "orbit@rulingcom.com"
   user.approved = true
   user.save
+
+  profile = MemberProfile.new
+  profile.first_name_translations = {:en=>'Admin', :zh_tw=>'Admin'}
+  profile.last_name_translations = {:en=>'Admin', :zh_tw=>'Admin'}
+  profile.email = "service@rulingcom.com"
+  profile.save
+
+  user = User.new
+  user.workgroup = group
+  user.member_profile = profile
+  user.user_name = "admin"
+  user.password = "Ab-5508881"
+  user.email = "servicet@rulingcom.com"
+  user.approved = true
+  user.save
+
 end
\ No newline at end of file