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

1、修改了git的用法 

2、修改了国际化
This commit is contained in:
baiyu 2013-09-02 21:06:08 +08:00
parent f882a2d9b4
commit 5dd8ca1f37
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/git_usage/ch_usage.html.erb
View File

@ -1,3 +1,4 @@
<!-- added by baiyu -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@ -49,6 +50,12 @@ body table tr td p span4 {
body table tr td p span4 {
font-weight: bold;
}
body table tr td span5 {
color: #F00;
}
body table tr td span5 {
font-weight: bold;
}
</style>
</head>
@ -126,7 +133,8 @@ body table tr td p span4 {
<td><p >在桌面上点击鼠标右键，选择TortoiseGit的Settings进行设置</p></td>
</tr>
<tr>
<td align="left">Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到, 其中的name和email要和forge.trustie.net上的登陆名和密码保持一致，方便代码贡献统计 ）。 </td>
<td align="left">Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到,<span5> 其中的name和email要和forge.trustie.net上的登陆名和密码保持一致</span5>
，方便代码贡献统计 ）。 </td>
</tr>
<tr>
<td align="left"><p >接着可以定制上下文菜单：</p>

9
app/views/git_usage/en_usage.html.erb
View File

@ -45,6 +45,12 @@ span3 {
span4 {
color: #F00;
}
body table tr td p span5 {
color: #F00;
}
body table tr td p span5 {
font-weight: bold;
}
</style>
</head>
@ -122,7 +128,8 @@ span4 {
<table width="900" border="0">
<tr>
<td><p>Right-click on the desktop and select the &quot;Settings&quot; in the &quot;TortoiseGit&quot;</p>
<p>User name and email are used to set your own user name and contact information( user.name and user.email must be completed because these will be used when submitting the repository, the name and email must be the same with login name and email you registed in the forge.trustie.net). </p>
<p>User name and email are used to set your own user name and contact information( user.name and user.email must be completed because these will be used when submitting the repository, <span5> the name and email must be the same with login name and email you registed in the forge.trustie.net</span5>
). </p>
<p>Then you can customize the &quot;Context Menu&quot;:</p>
<p>Please check the &quot;<span>Clone</span>&quot;,&quot;<span>Sync</span>&quot; and &quot;<span>Commit</span>&quot; options in the &quot;<span>Context Menu</span>&quot;,</p>
<p>check the &quot;<span>Import Svn Ignore</span>&quot;, &quot;<span>Show Reflog</span>&quot;, &quot;<span>Browse References</span>&quot;, &quot;<span>Stash Apply</span>&quot; and &quot;<span>Submodule Sync</span>&quot; in the &quot;<span>Set Extend Menu Item</span>&quot;.</p></td>

4
app/views/users/show.html.erb
View File

@ -85,9 +85,9 @@
<% when 'Principal' %>
<tr>
<% if e.user == User.current%>
<td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter">新建了用户</span></td>
<td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_user) %></span></td>
<% else %>
<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter">新建了用户</span></td>
<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_user) %></span></td>
<% end %>
</tr>
<tr>

3
config/locales/en.yml
View File

@ -552,6 +552,7 @@ en:
label_overall_activity: Overall activity
label_user_activity: "%{value}'s activity"
label_new: New
label_new_user: registered a new account
label_logged_as: Logged in as
label_environment: Environment
label_authentication: Authentication
@ -1100,7 +1101,7 @@ en:
label_logged_as_new: Current user
button_register: Register
issue_list: Issue list
lastest_respond: Lastest respond
lastest_respond: Lastest reply
label_news_lastest: Lastest news
label_version_display_settings: Display settings
label_versions_progress: Complete schedule

1
config/locales/zh.yml
View File

@ -527,6 +527,7 @@ zh:
label_overall_activity: 活动概览
label_user_activity: "%{value} 的活动"
label_new: 新建
label_new_user: 注册了一个新用户 # added by bai
label_logged_as: 登录为
label_environment: 环境
label_authentication: 认证