Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/views/projects/invite_members_by_mail.html.erb

app/controllers/courses_controller.rb

@@ -759,7 +759,7 @@ class CoursesController < ApplicationController
   def homework
     if @course.is_public != 0 || User.current.member_of_course?(@course) || User.current.admin?
       @offset, @limit = api_offset_and_limit({:limit => 10})
-      @bids = @course.homeworks.order('deadline DESC')
+      @bids = @course.homeworks.order('deadline ASC')
       @bids = @bids.like(params[:name]) if params[:name].present?
       @bid_count = @bids.count
       @bid_pages = Paginator.new @bid_count, @limit, params['page']

app/helpers/watchers_helper.rb

@@ -284,7 +284,7 @@ module WatchersHelper
     def exit_project_link(project)
       link_to(l(:label_exit_project),exit_cur_project_path(project.id),
                 :remote => true, :confirm => l(:lable_sure_exit_project), 
-                :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 21px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" )
+                :style => "color: #fff; display:block;font-size:12px; padding: 0px 5px; margin-right: 10px; height: 20px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" )
     end  
     
     #项目关注、取消关注
@@ -293,14 +293,15 @@ module WatchersHelper
       return '' unless user && user.logged?
       objects = Array.wrap(objects)
       watched = objects.any? {|object| object.watched_by?(user)}
-      @watch_flag = objects.first.instance_of?(Project)     
-      text = @watch_flag ?  
-                    (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch))
+      @watch_flag = objects.first.instance_of?(Project)
+      id = watcher_css(objects)
+      text = @watch_flag ?
+                    (watched ? l(:button_unfollow) : l(:label_button_following)) : (watched ? l(:button_unwatch) : l(:label_button_following))
       url = watch_path(:object_type => objects.first.class.to_s.underscore,
                        :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort))
-      method = watched ? 'delete' : 'post' 
-      link_to text, url, :remote => true, :method => method, 
-                         :class => "project_watch_new"
+      method = watched ? 'delete' : 'post'
+      link_to text, url, :remote => true, :method => method,
+                         :class => "project_watch_new" ,:id=>id
      end
     
     #申请加入项目
@@ -312,12 +313,13 @@ module WatchersHelper
       if applied
         appliedid =  applied.id
       end
+      id = applied_css(project)
       url = appliedproject_path(
         :id=>appliedid,
         :user_id => user.id,
         :project_id => project.id)
       method = applied ? 'delete' : 'post'
-      link_to text, url,  :remote => true, :method => method , :class => "project_watch_new"
+      link_to text, url,  :remote => true, :method => method , :class => "project_watch_new",:id => id
     end
 
   end

app/models/mailer.rb

@@ -125,7 +125,7 @@ class Mailer < ActionMailer::Base
 
   end
 
-
+  # 公共讨论区发帖、回帖添加邮件发送信息
   def forum_message_added(memo)
     @memo = memo
     redmine_headers 'Memo' => memo.id
@@ -134,9 +134,11 @@ class Mailer < ActionMailer::Base
     @forum_url = url_for(:controller => 'forums', :action => 'show', :id => @forum.id)
     @issue_author_url = url_for(user_activities_url(@author))
     recipients ||= []
-    if @forum.author.mail_notification != 'day' && @forum.author.mail_notification != 'week'
+    #将帖子创建者邮箱地址加入数组
+    if @forum.creator.mail_notification != 'day' && @forum.creator.mail_notification != 'week'
       recipients << @forum.creator.mail
     end
+    #回复人邮箱地址加入数组
     if @author.mail_notification != 'day' && @author.mail_notification != 'week'
       recipients << @author.mail
     end

app/models/memo.rb

@@ -42,7 +42,7 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters! #, :sendmail#,:be_user_score -- 公共区发帖暂不计入得分
+	after_create :add_author_as_watcher, :reset_counters!, :sendmail
 	# after_update :update_memos_forum
 	after_destroy :reset_counters!#,:down_user_score  -- 公共区发帖暂不计入得分
 	# after_create :send_notification

app/views/applied_project/_set_applied.js.erb

@@ -1,5 +1,14 @@
 <% selector = ".#{applied_css(@project)}" %>
-$("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript applied_link(@project, User.current) %>")});
+<% id_selector = "#{applied_css(@project)}" %>
+if($("<%= selector %>").get(0) == undefined)
+{
+    $("#<%= id_selector %>").each(function(){$(this).replaceWith("<%= escape_javascript join_in_project_link(@project, User.current) %>")});
+}
+else
+{
+    $("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript applied_link(@project, User.current) %>")});
+}
+
 if (window.Messenger) {
   Messenger.options = {
       extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right',

app/views/attachments/_links.html.erb

@@ -7,9 +7,9 @@
   <% end%>
       <span title="<%= attachment.filename%>" id = "attachment_">
         <% if options[:length] %>
-          <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
+          <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
         <% else %>
-          <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+          <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
         <% end %>
       </span>
   <%if is_float%>

app/views/bids/_bid_homework_show.html.erb

@@ -165,7 +165,7 @@
             <tr>
               <td colspan="2" width="580px" >
                 <span class="font_description">
-                  <%= textilizable bid, :description %>
+                  <%=h sanitize(bid.description.html_safe) %>                                  
                 </span>
               </td>
             </tr>

app/views/files/_course_list.html.erb

@@ -14,9 +14,10 @@
   </p>
 </div>
 <div class="cl"></div>
+<div class="for_img_thumbnails">
 <% curse_attachments.each do |file| %>
     <div class="re_con_box">
-      <div class=" ">
+      <div class="">
         <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %>
         <% if User.current.logged? %>
           <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
@@ -50,6 +51,7 @@
       <div class="cl"></div>
     </div><!---re_con_box end-->
 <% end %>
+</div>
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
 </ul>

app/views/files/create.js.erb

@@ -31,4 +31,5 @@ closeModal();
 $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
 <%end%>
 <% end %>
+$(document).ready(img_thumbnails);
 

app/views/issues/index.html.erb

@@ -1,5 +1,5 @@
 <div class="project_r_h">
-  <h2 class="project_h2">问题跟踪</h2>
+  <h2 class="project_h2"><%= l(:label_issue_tracking) %></h2>
 </div>
 <div class="problem_top">
   <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
@@ -12,7 +12,7 @@
                     :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
       </span>
   <% end %>
-  <span class="problem_p fr">问题总数：<span><%= @project.issues.count %></span> 未解决：<span><%= @project.issues.where('status_id in (1,2,4,6)').count  %></span></span>
+  <span class="problem_p fr"><%= l(:label_issues_sum) %>：<span><%= @project.issues.count %></span> <%= l(:lable_issues_undo) %> <span><%= @project.issues.where('status_id in (1,2,4,6)').count  %></span></span>
 </div>
 <div class="contextual">
   <% if !@query.new_record? && @query.editable_by?(User.current) %>

app/views/layouts/_base_feedback.html.erb

@@ -121,15 +121,15 @@ function cookiesave(n, v, mins, dn, path)
 {
     if(n)
     {
-		
+
 	    if(!mins) mins = 365 * 24 * 60;
 		if(!path) path = "/";
 	    var date = new Date();
-		
+
 	    date.setTime(date.getTime() + (mins * 60 * 1000));
-		
+
 	    var expires = "; expires=" + date.toGMTString();
-		
+
 	    if(dn) dn = "domain=" + dn + "; ";
 	    document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path;
 
@@ -170,8 +170,8 @@ function cookieget(n)
           			<%= f.hidden_field :content, :required => true , :value => l(:label_feedback_value) %>
 		  			 <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
           			<a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();"><%= l(:label_submit)%></a>
-				  <% end %>   			   			                
-                </div>                               
+				  <% end %>
+                </div>
                 <div class="msgserver">
                    	<a href="http://user.trustie.net/users/12/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>黄井泉</a>
                     <a href="http://user.trustie.net/users/34/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>

app/views/layouts/_point_browser.html.erb

@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>升级浏览器</title>
+  <script src="jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js" type="text/javascript"></script>
+  <style type="text/css">
+      body{ font-size:12px; font-family:"微软雅黑","宋体"; background: #F2F2F2; font-style:normal;}
+      .update{ border-bottom:1px solid #d7d7d7; color:#fea254; text-align:center; width:100%; font-size:10px; height:30px; background:#fdffd9; padding:2px 0;z-index:1000;}
+      a.green_btn{ padding:2px 10px; background:#3caf3f; font-size:12px;color:#fff;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+      a:hover.green_btn{ background:#289c2b;}
+      a.close_btn{ background:url(images/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px;  float:right; margin:7px 5px 0 0;}
+      a:hover.close_btn{ background:url(images/img_floatbox.png) -20px -63px no-repeat;}
+  </style>
+  <script type="text/javascript">
+      function close_window(){
+          $('#light').slideUp(400);
+      }
+      if ((navigator.userAgent.indexOf('MSIE 8.0') >= 0) && (navigator.userAgent.indexOf('Opera') < 0))
+      {alert('你是使用IE')}else
+      if (navigator.userAgent.indexOf('Firefox') >= 0)
+      Document.html{
+          div class="update" id="light">
+                  <p>您的浏览器版本过低，建议升级您的浏览器。
+      <a href="#" onClick="close_window();" class="close_btn" ></a>
+          </p>
+          <div class="cl"></div>
+          </div>
+      }
+      {alert('你是使用Firefox')}else
+      if (navigator.userAgent.indexOf('Opera') >= 0){alert('你是使用Opera')}else
+      {alert('你是使用其他的浏览器浏览网页！')}
+  </script>
+</head>
+
+<body style=" height:1500px;">
+<div class="update" id="light">
+  <span style="font-size: 14px;line-height:2.2;">您当前使用的是IE8浏览器，建议升级您的浏览器。
+    <a href="#" onClick="close_window();" class="close_btn" ></a>
+  </span>
+  <div class="cl"></div>
+</div>
+
+</body>
+</html>
+<!DOCTYPE html PUBLIC "-

app/views/layouts/base.html.erb

@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8" />
 <title><%=h html_title %></title>
+	<%= render :partial => "layouts/point_browser" %>
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>

app/views/layouts/base_projects.html.erb

@@ -153,7 +153,7 @@
 												<span  class="subnav_num">(<%= @project.issues.count %>)</span><span>
 											<% end %>
                                             <% if User.current.member_of?(@project) %>
-                                            	<%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %></span>
+                                            	<%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px !important;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %></span>
                                             <% end %>
 										</div>
 										<% end %>
@@ -164,7 +164,7 @@
 												<span  class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
 											<% end %>
                                             <% if User.current.member_of?(@project) %>
-											    <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:0px 3px 3px 3px;height:16px;margin-top:5px;background:#28be6c;float:right;line-height:20px;" %>
+											    <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px !important;color:#fff; padding:0px 3px 3px 3px;height:16px;margin-top:5px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
                                       	<% end%>
@@ -175,7 +175,7 @@
 												<span  class="subnav_num">(<%= attaments_num  %>)</span>
 											<% end %>
                                             <% if User.current.member_of?(@project) %>
-                                                <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
+                                                <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px !important;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
                                       	<% end%>

app/views/memos/show.html.erb

@@ -7,7 +7,7 @@
 <div class="lz">
   <!-- 在这里添加赞和踩-->
   <span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span>
-	<div class="lz-left">	
+	<div class="lz-left">
 		<div>
           <%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %>
         </div>
@@ -30,7 +30,7 @@
 				:remote => true,
 				:method => 'get',
 				:title => l(:button_quote)
-				)if !@memo.locked? && User.current.logged? %>			
+				)if !@memo.locked? && User.current.logged? %>
 
 			<%= link_to(
 				#image_tag('edit.png'),
@@ -64,7 +64,7 @@
         </div>
 		<div class="memo-content" id="memo-content_div">
 		<%= textAreailizable(@memo,:content) %>
-			<p>							
+			<p>
 				<% if @memo.attachments.any?%>
 				<% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
 				<%= render :partial => 'attachments/links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %>
@@ -100,7 +100,7 @@
 				:method => 'get',
 				:title => l(:button_quote)
 				)if !@memo.locked? && User.current.logged? %>
-				
+
 			<%= link_to(
 				#image_tag('edit.png'),
                 l(:button_edit),
@@ -120,7 +120,7 @@
 				:method => :delete,
 				:data => {:confirm => l(:text_are_you_sure)},
 				:title => l(:button_delete)
-				) if reply.destroyable_by?(User.current) %> 			
+				) if reply.destroyable_by?(User.current) %>
 
 		</div>
         <br/>
@@ -146,7 +146,7 @@
                   <%= authoring reply.created_at, reply.author %>
                 </td>
 			</tr>
-		</table>    
+		</table>
 	</div>
 	<% end %>
 	<div class="pagination">

app/views/my/account.html.erb

@@ -118,7 +118,7 @@
     <div>
     <!-- 昵称 -->
     <p style="width:630px;padding-left: 40px;">
-      <%= f.text_field :login, :required => true, :size => 25, :name => "login", :readonly => true, :style =>  'border:1px solid #d3d3d3;'%>
+      <%= f.text_field :login, :required => true, :size => 25, :name => "login", :style =>  'border:1px solid #d3d3d3;'%>
       <span class='font_lighter'><%= l(:label_max_number) %></span>
       <br/>
     </p>

app/views/poll/publish_poll.js.erb

@@ -1,7 +1,7 @@
 $("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
 $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>");
 showModal('ajax-modal', '250px');
-$('#ajax-modal').css('height','111px');
+//$('#ajax-modal').css('height','111px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='#' onclick='close_alert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");

app/views/poll/republish_poll.js.erb

@@ -1,7 +1,7 @@
 $("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
 $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>");
 showModal('ajax-modal', '250px');
-$('#ajax-modal').css('height','80px');
+//$('#ajax-modal').css('height','80px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='#' onclick='close_alert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");

app/views/projects/invite_members_by_mail.html.erb

@@ -24,7 +24,7 @@
         var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
         if(email == "")
         {
-            $("#valid_email").html("电子邮件不能为空");
+            $("#valid_email").html("邮箱地址不能为空！");
         }
         else if (filter.test(email)) {
             $("#valid_email").html("");
@@ -32,7 +32,7 @@
         }
         else
         {
-            $("#valid_email").html("您所填写的电子邮件格式不正确");
+            $("#valid_email").html("您输入的邮箱格式不正确！");
         }
         return false;
     }

app/views/repositories/newrepo.html.erb

@@ -1,5 +1,7 @@
 <!-- new repository  ，new  by xianbo-->
-<h3><%= l(:label_repository_new_repos) %></h3>
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_repository_new_repos) %></h2>
+</div>
 <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form'} do |f| %>
   <%= render :partial => 'form_create', :locals => {:f => f} %>
 

app/views/tags/_tag_name.html.erb

@@ -34,7 +34,12 @@
             <!--项目暂时单独出来，后面重构-->
             <% if object_flag == '2' %>
                 <span class="re_tag f_l">
-                <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %></span>
+                <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
+                <% if (ProjectInfo.find_by_project_id(obj.id)).try(:user_id) == User.current.id %>               	
+                    	<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
+                                         :taggable_id => obj.id, :taggable_type => object_flag %>
+                <% end %>
+                </span>     
             <% else %>
                 <div id="tag">
                 <span class="tag_show">
@@ -47,7 +52,7 @@
                            <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
                                                         :taggable_id => obj.id, :taggable_type => object_flag %>
                          </span>
-                      <% end %>
+                      <% end %>                    
                      <% when '3' %>
                        <% if (ProjectInfo.find_by_project_id(obj.project_id)).try(:user_id) == User.current.id %>
                         <span class='del'>

app/views/versions/index.html.erb

@@ -20,7 +20,7 @@
   <%= hidden_field_tag 'with_subprojects', 0 %>
   <label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
 <% end %>
-<%= submit_tag l(:button_apply), :class => 'button-small', :style => "height:20px;padding: 1px 1px;font-size:11px;margin-left:10px;", :name => nil %>
+<%= submit_tag l(:button_apply), :class => 'button', :name => nil %>
 <% end %>
 
 <!-- <h3><%= l(:label_version_plural) %></h3>

app/views/versions/new.html.erb

@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_roadmap) %></h2>
+</div>
 <h3>
   <%=l(:label_version_new)%>
 </h3>

app/views/watchers/_set_watcher.js.erb

@@ -1,2 +1,11 @@
 <% selector = ".#{watcher_css(watched)}" %>
-$("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link(watched, user) %>")});
+<% id_selector = "#{watcher_css(watched)}" %>
+if($("<%= selector %>").get(0) == undefined)
+{
+    $("#<%= id_selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link_for_project(watched, user) %>")});
+}
+else
+{
+   $("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link(watched, user) %>")});
+}
+

config/locales/projects/zh.yml

@@ -36,6 +36,7 @@ zh:
   label_project_id: "项目ID:"
     
   label_apply_project: "+申请加入"
+  label_button_following: "+关注"
   label_exit_project: 退出项目
   label_apply_project_waiting: 已处理申请，请等待管理员审核
   label_unapply_project: 取消申请
@@ -48,6 +49,8 @@ zh:
   
   label_issue_tracking: 问题跟踪
   label_release_issue: 发布问题
+  label_issues_sum: 问题总数：
+  lable_issues_undo: 未解决：
 
   project_module_boards: 讨论区
   project_module_boards_post: 发帖
@@ -199,7 +202,7 @@ zh:
   label_invite_join: 邀请加入
   label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
   notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
-  label_email_format_error: 您所填写的电子邮件格式不正确
+  label_email_format_error: 您输入的邮箱格式不正确！
   label_user_role_null: 用户和角色不能留空！
   label_send_email: 免费发送
   label_input_email: 请输入邮箱地址