Merge 15722:15806 from head and adjust new views to rails 2 style names.

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

diff --git a/app/models/language.rb b/app/models/language.rb
index 150341cc70f50fe2e5f8398bd25cb53ba6d5f64d..a33c76081c786ae594fe86cffea721da6406e812 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,14 +1,11 @@
 class Language < ActiveRecord::Base
   set_primary_key :code
 
-  has_many :users, :foreign_key => 'locale'
   has_many :diary_entries, :foreign_key => 'language'
-  
-  def self.generate(code, name, translation_available)
-    Language.create do |l|
-      l.code = code
-      l.name = name
-      l.translation_available = translation_available
-    end
-  end
+
+  def name
+    name = english_name
+    name += " (#{native_name})" unless native_name.nil?
+    name
+  end  
 end