# HG changeset patch # User Chris Cannam # Date 1312984185 -3600 # Node ID e98a5b2fe3b8e2d752a31ca3c10a435f57d83e19 # Parent c5858d96b9a493e922857875c8c83726b486c9b7# Parent 724c97fc03dc0e09b4db4c4bfea8eecf7d593ec1 Merge diff -r 724c97fc03dc -r e98a5b2fe3b8 vendor/plugins/redmine_bibliography/app/views/publications/index.html.erb --- a/vendor/plugins/redmine_bibliography/app/views/publications/index.html.erb Wed Aug 10 14:40:05 2011 +0100 +++ b/vendor/plugins/redmine_bibliography/app/views/publications/index.html.erb Wed Aug 10 14:49:45 2011 +0100 @@ -3,8 +3,11 @@
-

Publications#index

- + <% if @project %> +

<%= l(:label_all_publications_for_project, :project => @project.name) %>

+ <% else %> +

<%= l(:label_all_publications) %>

+ <% end %> @@ -30,4 +33,4 @@ <% content_for :sidebar do %> Sidebar <% end %> - \ No newline at end of file + diff -r 724c97fc03dc -r e98a5b2fe3b8 vendor/plugins/redmine_bibliography/config/locales/en.yml --- a/vendor/plugins/redmine_bibliography/config/locales/en.yml Wed Aug 10 14:40:05 2011 +0100 +++ b/vendor/plugins/redmine_bibliography/config/locales/en.yml Wed Aug 10 14:49:45 2011 +0100 @@ -6,6 +6,9 @@ name: "Name" publications_box: "My Publications" label_my_publications_box: "My Publications" + + label_all_publications: All Publications + label_all_publications_for_project: Publications associated with %{project} field_publication_title: Title field_publication_authors: Authors @@ -27,11 +30,11 @@ label_publications_plural: "Publications" label_publication_new: "Create New Publication" label_publication_index: "List of Publication" - label_add_publication_to_project: "Add Publication to this project" + label_add_publication_to_project: "Add publication to this project" label_publication_edit: "Edit Publication" label_publication_show: "Publication Details" - label_add_project_to_publication: "Add Project to Publication" - label_project_search: "Search by name: " + label_add_project_to_publication: "Add this publication to a project" + label_project_search: "Find project by name: " label_publication_project_index: "Projects associated with this publication" label_publication_index: "View all publications"