Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

Conflicts:
	config/environments/development.rb

config/application.rb

@@ -47,7 +47,7 @@ module PrototypeR4
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    config.i18n.default_locale = :en
+    config.i18n.default_locale = :zh_tw
 
     # JavaScript files you want as :defaults (application.js is always included).
     # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)

config/environments/development.rb

@@ -28,7 +28,7 @@ PrototypeR4::Application.configure do
   #   :email_prefix => "[R4_error]",
   #   :sender_address => %{"notifier" <redmine@rulingcom.com>},
   #   :exception_recipients => %w{chris@rulingcom.com}
-  #   
+
   # config.action_mailer.delivery_method = :smtp
   # config.action_mailer.smtp_settings = {
   #   :tls => true,

config/locales/en.yml

@@ -32,6 +32,7 @@ en:
   password: Password
   register: Register
   remember_me: Remember me
+  search_nccu: Search NCCU
   show: Show
   submit: Submit
   sure?: Are you sure?

config/locales/zh_tw.yml

@@ -17,7 +17,7 @@ zh_tw:
   edit: 編輯
   email: 電子郵件
   enable: 啟用
-  forget_password: 忘記密碼?
+  forgot_password: 忘記密碼?
   help: 協助
   hide: 隱藏
   homepage: 首頁
@@ -25,10 +25,11 @@ zh_tw:
   logout: 登出
   no_: "No"
   nothing: 無
-  or_lower: 或者
+  or_lower: 或
   password: 密碼
   register: 註冊
   remember_me: 記住我
+  search_nccu: 搜尋政大
   show: 顯示
   submit: 送出
   sure?: 您肯定嗎?