diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 8879c381b..77cdf9a1d 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -6,7 +6,7 @@
<% if @user.auth_source_id.nil? %>

<%= f.text_field :login, :size => 25, :required => true %> - 至多25个字符。

+ <%= l(:label_max_number) %>

<%= f.password_field :password, :size => 25, :required => true %> <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %>

diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb index 739e1c48a..c05658707 100644 --- a/app/views/repositories/_form.html.erb +++ b/app/views/repositories/_form.html.erb @@ -18,7 +18,7 @@

<%= f.text_field :url, :size => 60, :required => true, :disabled => !@repository.safe_attribute?('url') %> - <%= "定义已有版本库URL路径,定义格式file:///, http://, https://, svn://, svn+[tunnelscheme]://" %> + <%= "#{l(:label_exist_repository_path)}" %>

<%= f.text_field :login, :size => 30 %>

<%= f.password_field :password, :size => 30, :name => 'ignore', :value => ((@repository.new_record? || @repository.password.blank?) ? '' : ('x'*15)), diff --git a/app/views/tags/_show_issues.html.erb b/app/views/tags/_show_issues.html.erb index 99a57c71e..9c874ff9d 100644 --- a/app/views/tags/_show_issues.html.erb +++ b/app/views/tags/_show_issues.html.erb @@ -5,7 +5,7 @@ <% issues_results.each do |issue| %>

  • - 问题:<%= link_to "#{issue.subject}",:controller => "issues",:action => "show",:id => issue.id %> + <%= l(:label_tags_issue) %><%= link_to "#{issue.subject}",:controller => "issues",:action => "show",:id => issue.id %>
  • <% end %> diff --git a/app/views/tags/_show_projects.html.erb b/app/views/tags/_show_projects.html.erb index 01d2161e7..9368d1c6d 100644 --- a/app/views/tags/_show_projects.html.erb +++ b/app/views/tags/_show_projects.html.erb @@ -4,8 +4,8 @@

    Projects:

    <% projects_results.each do |prj| %>
    -

    项目名称:<%= link_to "#{prj.name}",:controller => "projects",:action => "show",:id => prj.id %>

    -

    项目描述:<%= prj.description %>;

    +

    <%= l(:label_tags_project_name) %><%= link_to "#{prj.name}",:controller => "projects",:action => "show",:id => prj.id %>

    +

    <%= l(:label_tags_project_description) %><%= prj.description %>;

    <% end %> diff --git a/app/views/tags/_show_users.html.erb b/app/views/tags/_show_users.html.erb index fc2e94969..c7574d0bd 100644 --- a/app/views/tags/_show_users.html.erb +++ b/app/views/tags/_show_users.html.erb @@ -5,10 +5,10 @@ <% users_results.each do |user| %>
  • - 用户名:<%= link_to ("#{user.firstname+user.lastname}"), + <%= l(:label_username) %><%= link_to ("#{user.firstname+user.lastname}"), :controller => "users",:action => "show",:id => user.id%>
    - 用户邮箱:<%= mail_to(h(user.mail)) %> + <%= l(:label_tags_user_mail) %><%= mail_to(h(user.mail)) %>
  • <% end %> <% end %> diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb index 83a30af13..98a009f3b 100644 --- a/app/views/tags/index.html.erb +++ b/app/views/tags/index.html.erb @@ -18,10 +18,10 @@

    Search Results

    - Tag统计: - Issue(<%= @issues_tags_num %>)| - Project(<%= @projects_tags_num %>)| - User(<%= @users_tags_num %>) + <%= l(:label_tags_numbers) %> + <%= l(:label_issue_plural) %>(<%= @issues_tags_num %>)| + Projects(<%= @projects_tags_num %>)| + Users(<%= @users_tags_num %>)
    <%= render :partial => "tag_search_results",:locals => {:issues_results => @issues_results, diff --git a/config/locales/en.yml b/config/locales/en.yml index dbc0ed67e..f2f75e0f1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1233,8 +1233,14 @@ en: label_repository_no: have no repository? label_welcome_page_to: Participate %{project_count} projects! label_repository_path_not_null: repository path can't be null - label_password_not_null: password can't be null。 + label_password_not_null: password can't be blank label_exist_repository_path: Define exist repository's path of URL and format must be file:///, http://, https://, svn:// label_project_no_activity: The project has no activities now! label_follow_no_requirement: You don't have followed any requirements! - label_no_user_respond_you: There is no respond for you! \ No newline at end of file + label_no_user_respond_you: There is no respond for you! + label_tags_issue: issue: + label_tags_project_name: Project name: + label_tags_project_description: Project description: + label_tags_user_mail: User E-mail: + label_tags_numbers: Tag numbers: + label_max_number: Must be at most 25 characters long. \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index bc4d34193..b25987649 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1056,7 +1056,7 @@ zh: one: 1 问题 other: "%{count} 问题" #add by tan - label_repository_new: 配置SVN版本库 + label_repository_new: 连接到已有的SVN版本库 label_repository_no: 还没有版本库? label_repository_new_repos: 新建版本库 #end @@ -1249,4 +1249,10 @@ zh: label_exist_repository_path: 定义已有版本库URL路径,定义格式file:///, http://, https://, svn:// label_project_no_activity: 该项目暂无动态! label_follow_no_requirement: 暂未关注任何需求! - label_no_user_respond_you: 暂无任何用户对您进行反馈! \ No newline at end of file + label_no_user_respond_you: 暂无任何用户对您进行反馈! + label_tags_issue: 问题: + label_tags_project_name: 项目名称: + label_tags_project_description: 项目描述: + label_tags_user_mail: 用户邮箱: + label_tags_numbers: Tag统计: + label_max_number: 至多25个字符。 \ No newline at end of file