X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/53b4d645d80cbe4ac397cfc004e8985317aed6a8..5b3b288fc2c4dace76f5c6c60199cf434e2646b9:/app/models/language.rb

diff --git a/app/models/language.rb b/app/models/language.rb
index 9c7ca4c0e..81441db5c 100644
--- 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