Go back to using to_sentence now that we are using rails 2.3 for the site.

[rails.git] / app / models / language.rb

diff --git a/app/models/language.rb b/app/models/language.rb
index 9c7ca4c0e83b2df9dce973f69d632b1bd7608064..a33c76081c786ae594fe86cffea721da6406e812 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,6 +1,11 @@
 class Language < ActiveRecord::Base
 class Language < ActiveRecord::Base

-  set_primary_key :language_code
-  
-  has_many :users, :foreign_key => 'locale'
+  set_primary_key :code
+

   has_many :diary_entries, :foreign_key => 'language'
   has_many :diary_entries, :foreign_key => 'language'

+
+  def name
+    name = english_name
+    name += " (#{native_name})" unless native_name.nil?
+    name
+  end  

 end
 end