Browse Source

Adds firstname initials+lastname user format.

git-svn-id: http://svn.redmine.org/redmine/trunk@12690 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/2.5.0
Jean-Philippe Lang 10 years ago
parent
commit
6e6c6fac5c
2 changed files with 10 additions and 0 deletions
  1. 5
    0
      app/models/user.rb
  2. 5
    0
      test/unit/user_test.rb

+ 5
- 0
app/models/user.rb View File

@@ -32,6 +32,11 @@ class User < Principal
:order => %w(firstname lastname id),
:setting_order => 2
},
:firstinitial_lastname => {
:string => '#{firstname.to_s.gsub(/(([[:alpha:]])[[:alpha:]]*\.?)/, \'\2.\')} #{lastname}',
:order => %w(firstname lastname id),
:setting_order => 2
},
:firstname => {
:string => '#{firstname}',
:order => %w(firstname id),

+ 5
- 0
test/unit/user_test.rb View File

@@ -442,6 +442,11 @@ class UserTest < ActiveSupport::TestCase
def test_name_format
assert_equal 'John S.', @jsmith.name(:firstname_lastinitial)
assert_equal 'Smith, John', @jsmith.name(:lastname_coma_firstname)
assert_equal 'J. Smith', @jsmith.name(:firstinitial_lastname)
assert_equal 'J.-P. Lang', User.new(:firstname => 'Jean-Philippe', :lastname => 'Lang').name(:firstinitial_lastname)
end

def test_name_should_use_setting_as_default_format
with_settings :user_format => :firstname_lastname do
assert_equal 'John Smith', @jsmith.reload.name
end

Loading…
Cancel
Save