From 0db4afe643aa340ff4e788787b788ce2e5bd39a6 Mon Sep 17 00:00:00 2001
From: spen <spen@rulingcom.com>
Date: Mon, 31 Mar 2014 17:25:40 +0800
Subject: [PATCH] Update announcement and change user account characters

---
 app/models/user/user.rb  | 2 +-
 built_in_extensions.rb   | 2 +-
 config/locales/en.yml    | 2 +-
 config/locales/zh_tw.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/user/user.rb b/app/models/user/user.rb
index 7a417ba..0a7be86 100644
--- a/app/models/user/user.rb
+++ b/app/models/user/user.rb
@@ -89,7 +89,7 @@ class User
 
   validates :user_id,
             :presence => { :message => I18n.t("users.user_id_not_null") } , 
-            :length => {:minimum => 3, :maximum => 50, :message => I18n.t("users.user_id_length") },
+            :length => {:minimum => 2, :maximum => 50, :message => I18n.t("users.user_id_length") },
             :uniqueness => true
 
   scope :approval_pending, where(:approved => false)
diff --git a/built_in_extensions.rb b/built_in_extensions.rb
index 94ea6d7..2e13080 100644
--- a/built_in_extensions.rb
+++ b/built_in_extensions.rb
@@ -1,6 +1,6 @@
 #built-in-modules
 gem 'archive', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-archive.git'
-gem 'announcement', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-announcement.git', :branch => 'approval'
+gem 'announcement', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-announcement.git'
 gem 'gallery', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-gallery.git'
 gem 'member', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-member.git'
 gem 'member_staff', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-memberstaff.git'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 139f1c7..6e9fd4f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -600,7 +600,7 @@ en:
     user_id: User Account
     user_id_note: Should be more than 3 characters and less than 50 characters
     user_id_not_null: User account cannot be null 
-    user_id_length: User account should be more than 3 characters 
+    user_id_length: User account should be more than 2 characters 
     user_id_error: Someone already use that user account 
     user_basic_id_form: Account Info.
     user_basic_data: Personal Profile
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 847de14..1a1fa62 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -600,7 +600,7 @@ zh_tw:
     user_id: 使用者帳號
     user_id_note: 需介於3個字元至50個字元之間
     user_id_not_null: 使用者帳號不能是空值
-    user_id_length: 使用者帳號至少需要3個字元
+    user_id_length: 使用者帳號至少需要2個字元
     user_id_error: 該使用者帳號已被使用
     user_basic_id_form: 帳號資料
     user_basic_data: 個人資料