# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1315575338 -3600
# Node ID 1ee95265342fdd6a0de1cd6723f929f565b62c1b
# Parent  0c5674b65db066082ed116e05fd6f1d7779f3748# Parent  0c872fe7779700fa0425723baf96fd8fd78ccab4
Merge

diff -r 0c872fe77797 -r 1ee95265342f vendor/plugins/redmine_bibliography/app/models/publication.rb
--- 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
         
diff -r 0c872fe77797 -r 1ee95265342f vendor/plugins/redmine_bibliography/config/locales/en.yml
--- 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"