changeset 654:1ee95265342f feature_36

Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 09 Sep 2011 14:35:38 +0100
parents 0c5674b65db0 (diff) 0c872fe77797 (current diff)
children 70c163e49aea a4775b8e352f
files vendor/plugins/redmine_bibliography/app/models/publication.rb
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/vendor/plugins/redmine_bibliography/app/models/publication.rb	Fri Sep 09 14:19:25 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/app/models/publication.rb	Fri Sep 09 14:35:38 2011 +0100
@@ -18,7 +18,18 @@
   
   before_save :set_initial_author_order
   after_save :notify_authors
-  
+
+  # Ensure error message uses proper text instead of
+  # bibtex_entry.entry_type (#268).  There has to be a better way to
+  # do this!
+  def self.human_attribute_name(k)
+    if k == 'bibtex_entry.entry_type'
+      l(:field_entry_type)
+    else
+      super
+    end
+  end
+
   # Returns the mail adresses of users that should be notified
   def notify_authors
         
--- a/vendor/plugins/redmine_bibliography/config/locales/en.yml	Fri Sep 09 14:19:25 2011 +0100
+++ b/vendor/plugins/redmine_bibliography/config/locales/en.yml	Fri Sep 09 14:35:38 2011 +0100
@@ -34,7 +34,6 @@
   field_identify_author_yes: "Yes"
   field_identify_author_correct: "Corrections"
   field_identify_author_no: "No"
-  entry_type: "Bibtex Entry Type"
   
   label_author_is_me: "(I am this author)"
   label_add_me_as_author: "Add me as an author"