From 6c6519e595fd07ed08c56bd27db3a3eab9e49e77 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 4 Feb 2012 11:14:23 +0000
Subject: [PATCH] Merged r8231, r8235, r8236, 8237 from trunk (#9795).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8768 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/group.rb     |  8 ++++++++
 test/unit/group_test.rb | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/app/models/group.rb b/app/models/group.rb
index 03ca4b3ba..c79b98111 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -51,6 +51,14 @@ class Group < Principal
     end
   end
 
+  def self.human_attribute_name(attribute_key_name)
+    attr_name = attribute_key_name
+    if attr_name == 'lastname'
+      attr_name = "name"
+    end
+    super(attr_name)
+  end
+
   private
 
   # Removes references that are not handled by associations
diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb
index 8ce032dfa..8b1ae81b3 100644
--- a/test/unit/group_test.rb
+++ b/test/unit/group_test.rb
@@ -28,11 +28,29 @@ class GroupTest < ActiveSupport::TestCase
            :workflows,
            :groups_users
 
+  include Redmine::I18n
+
   def test_create
     g = Group.new(:lastname => 'New group')
     assert g.save
   end
 
+  def test_blank_name_error_message
+    set_language_if_valid 'en'
+    g = Group.new
+    assert !g.save
+    assert_include "Name can't be blank", g.errors.full_messages
+  end
+
+  def test_blank_name_error_message_fr
+    set_language_if_valid 'fr'
+    str = "Nom doit \xc3\xaatre renseign\xc3\xa9(e)"
+    str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
+    g = Group.new
+    assert !g.save
+    assert_include str, g.errors.full_messages
+  end
+
   def test_roles_given_to_new_user
     group = Group.find(11)
     user = User.find(9)