[Koha-bugs] [Bug 5172] Use other name rather than first name when referring to the user

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Mon Apr 4 14:50:43 CEST 2011


http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5172

claire.hernandez at biblibre.com <claire.hernandez at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |claire.hernandez at biblibre.c
                   |                            |om
       Patch Status|Needs Signoff               |Does not apply

--- Comment #9 from claire.hernandez at biblibre.com <claire.hernandez at biblibre.com> 2011-04-04 12:50:43 UTC ---
Failed to apply on current master

Applying: Bug 5172 - prefer 'other name' over 'first name' if available.
Using index info to reconstruct a base tree...
<stdin>:28: trailing whitespace.
    # 'showname' which is the alternate form the user's first name if 
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging C4/Members.pm
Auto-merging koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
Auto-merging opac/opac-sendbasket.pl
Auto-merging opac/opac-sendshelf.pl
Failed to merge in the changes.

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.


More information about the Koha-bugs mailing list