From 3e92281f283fac046baa06907d5ad6d7e5a3509a Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Tue, 3 Jun 2014 16:42:55 +0800
Subject: [PATCH] readme.txt gbk ==> utf-8

---
 ReadMe.txt | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ReadMe.txt b/ReadMe.txt
index ad9f0512d..9d223259a 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,18 +1,18 @@
 patch: 
-用户姓名的部分，根据issues#655。
-为了修改方便
-alias：
-方法     之前显示            调整之后
+鐢ㄦ埛濮撳悕鐨勯儴鍒嗭紝鏍规嵁issues#655銆�
+涓轰簡淇敼鏂逛究
+alias锛�
+鏂规硶     涔嬪墠鏄剧ず            璋冩暣涔嬪悗
 name     firstname+lastname  login
 nickname xxx                 login
 realname xxx                 firstname+lastname
 
-User model经过修改，已经完全集成了user_extensions的功能
-例如
+User model缁忚繃淇敼锛屽凡缁忓畬鍏ㄩ泦鎴愪簡user_extensions鐨勫姛鑳�
+渚嬪
 user.gender=1
 user.save
-user_extensions字段会自动保存
-不必要每次user.user_extensions.xxx以及判断是否为空
+user_extensions瀛楁浼氳嚜鍔ㄤ繚瀛�
+涓嶅繀瑕佹瘡娆ser.user_extensions.xxx浠ュ強鍒ゆ柇鏄惁涓虹┖
 ================================================================================
 app/models/setting.rb :165
   # fixed domain url in development. tantantan's bug
@@ -21,22 +21,22 @@ app/models/setting.rb :165
       define_singleton_method m do; nil; end if m.to_s =~ /([a-zA-Z]+_domain)$/
     end
   end
-  程序部分链接中制定了subdomain参数，使链接在二级域名中来回跳转。
-  为了开发方便，使之功能在development模式下失效。 
+  绋嬪簭閮ㄥ垎閾炬帴涓埗瀹氫簡subdomain鍙傛暟锛屼娇閾炬帴鍦ㄤ簩绾у煙鍚嶄腑鏉ュ洖璺宠浆銆�
+  涓轰簡寮�鍙戞柟渚匡紝浣夸箣鍔熻兘鍦╠evelopment妯″紡涓嬪け鏁堛�� 
   # => nyan
 ================================================================================
 app/controller/projects_controller.rb ===> projects#fake
-  fake filter: 修改了传到页面中的Count后缀的数量
-  改为正确的数量，删掉fake过滤器即可
+  fake filter: 淇敼浜嗕紶鍒伴〉闈腑鐨凜ount鍚庣紑鐨勬暟閲�
+  鏀逛负姝ｇ‘鐨勬暟閲忥紝鍒犳帀fake杩囨护鍣ㄥ嵆鍙�
 ================================================================================
-#导航栏匹配域名显示和改变
+#瀵艰埅鏍忓尮閰嶅煙鍚嶆樉绀哄拰鏀瑰彉
 app\helper\application_helper.rb
 # rewrite navigation 
 
 app\views\layouts\_base_header.html.erb
 # reset navigation by domain name and url through regular match
 ================================================================================
-#首页根据域名匹配进入不同的页面
+#棣栭〉鏍规嵁鍩熷悕鍖归厤杩涘叆涓嶅悓鐨勯〉闈�
 app\controller\welcome_controller.rb
   def entry_select_user
     if request.original_url.match(/user\.trustie\.net/)