Merge changes between 2.0.1 and 2.0.2 with the main trunk

svn: r4785
2005-06-05 04:01:56 +00:00
parent 97b0b31fab
commit 9ee0f10127
49 changed files with 11834 additions and 11636 deletions
--- a/src/NameDisplay.py
+++ b/src/NameDisplay.py
@ -83,7 +83,7 @@ class NameDisplay:
        @rtype: str
        """
        name = person.get_primary_name()
-        if name.display_as == RelLib.Name.FNLN:
+        if name.get_sort_as() == RelLib.Name.FNLN:
            return self._fnln(name)
        else:
            return self._lnfn(name)