jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

邀请邮件国际化；js冲突

This commit is contained in:
whimlex 2015-03-26 10:45:14 +08:00
parent 05d17361e9
commit 4de0255ce6
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View File

@ -340,7 +340,7 @@ class ProjectsController < ApplicationController
@is_zhuce =false
flash[:notice] = l(:notice_email_sent, :value => email)
else
flash[:error] = l(:notice_registed_success, :value => email)
flash[:error] = l(:notice_registed_error, :value => email)
@is_zhuce = true
end
respond_to do |format|

6
app/views/layouts/_point_browser.html.erb
View File

@ -9,8 +9,8 @@
.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;}
a.close_buttton{ 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_buttton{ background:url(images/img_floatbox.png) -20px -63px no-repeat;}
</style>
<script type="text/javascript">
function close_window(){
@ -36,7 +36,7 @@
<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>
<a href="#" onClick="close_window();" class="close_buttton" ></a>
</span>
<div class="cl"></div>
</div>

2
app/views/projects/_regested.html.erb
View File

@ -1,3 +1,3 @@
<% if isregisted %>
<p style="color: #ff0000"><%= l(:notice_registed_success) %></p>
<p style="color: #ff0000"><%= l(:notice_registed_error) %></p>
<% end %>

4
config/locales/projects/en.yml
View File

@ -194,13 +194,15 @@ en:
label_invite_new_user: "Send email to invite users"
label_invite_join: Invite
label_invite_email_tips: Enter the email address, Trustie will automatically register a user for the email address!
notice_registed_success: Email address is blank or has been registered!
notice_registed_error: Email address is blank or has been registered!
label_input_email_blank: Email address is blank!
label_email_format_error: Email format is incorrect!
label_send_email: Send
label_input_email: Please input email address
label_invite_trustie_user: "Invite Trustie registered users"
label_invite_trustie_user_tips: "Type to find users"
label_user_role_null: User and Role can not be blank！
label_invite_project: "invites you to join the project"
label_invite_success: Successful invitation
label_invite_members: Invite

7
config/locales/projects/zh.yml
View File

@ -200,15 +200,16 @@ zh:
#
label_invite_new_user: "发送邮件邀请新用户"
label_invite_join: 邀请加入
label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
label_invite_email_tips: 输入好友的邮箱地址，Trustie会自动为该好友注册邮箱用户！
notice_registed_error: 您输入的邮箱地址为空或者该邮箱已被注册!
label_input_email_blank: 您输入的邮箱地址为空！
label_email_format_error: 您输入的邮箱格式不正确！
label_user_role_null: 用户和角色不能留空！
label_send_email: 免费发送
label_input_email: 请输入邮箱地址
label_invite_trustie_user: "邀请Trustie注册用户"
label_invite_trustie_user_tips: "请输入用户名称来搜索好友"
label_user_role_null: 用户和角色不能留空！
label_invite_project: 邀请您加入项目
label_invite_success: 邀请成功
label_invite_members: 邀请用户

1
config/locales/zh.yml
View File

@ -14,7 +14,6 @@ zh:
notice_successful_create: 创建成功
notice_successful_update: 更新成功
notice_successful_delete: 删除成功
notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
notice_failed_delete: 删除失败
notice_successful_connection: 连接成功
notice_successful_join: 加入成功