diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 1f278b578..9d2780716 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -9,7 +9,7 @@ <% if e.event_author == User.current%> - + <% else %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 5b1a59ed1..5901725b9 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -238,7 +238,7 @@
<%= link_to("我", user_path(e.event_author)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title(e.event_title), e.event_url %> <%= link_to("#{l(:label_i)}", user_path(e.event_author)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title(e.event_title), e.event_url %> <%= link_to(h(e.event_author), user_path(e.event_author)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title(e.event_title), e.event_url %>
- + diff --git a/config/locales/en.yml b/config/locales/en.yml index 48d912285..753d679a8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1108,7 +1108,7 @@ en: label_file_new: Download label_user_edit: "Edit information" label_user_info: "User information" #huang 添加 - label_user_watcher: "Follower" # huang添加的 + label_user_watcher: "Followers" # huang添加的 label_user_fans: "Fans" label_user_commits: "Code commits" label_user_watchered: "Followed" # huang添加的 @@ -1201,4 +1201,10 @@ en: label_create_course: Create courses label_news: News label_milestone: Milestone - label_features: Features \ No newline at end of file + label_features: Features + label_has_praisers: praisers(%{count}) + label_has_watchers: watchers(%{count}) + label_has_fans: fans(%{count}) + label_me: me + label_my: my + label_i: I \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index bca508b3e..31c7599a9 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1213,4 +1213,7 @@ zh: label_features: 特性 label_has_praisers: 赞(%{count}) label_has_watchers: 关注(%{count}) - label_has_fans: 粉丝(%{count}) \ No newline at end of file + label_has_fans: 粉丝(%{count}) + label_me: 我 + label_my: 我 + label_i: 我 \ No newline at end of file
<%= l(:label_board) %><%= l(:project_module_boards) %>   <%= l(:label_news) %>