Add a list of languages and fix a few issues with the schema. Also get

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

diff --git a/app/models/language.rb b/app/models/language.rb
index 9c7ca4c0e83b2df9dce973f69d632b1bd7608064..81441db5c4ff0665f845b7eb147d5d02446c1d34 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,6 +1,12 @@
 class Language < ActiveRecord::Base
-  set_primary_key :language_code
-  
+  set_primary_key :code
+
   has_many :users, :foreign_key => 'locale'
   has_many :diary_entries, :foreign_key => 'language'
+
+  def name
+    name = english_name
+    name += " (#{native_name})" unless native_name.nil?
+    name
+  end  
 end