From 7047da9ffa3b9ba76ba664e3340382426d17a456 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 20 Sep 2003 19:56:27 +0000 Subject: [PATCH] update svn: r2152 --- ChangeLog | 1 + TODO | 4 ++++ configure | 2 +- configure.in | 2 +- gramps.spec | 8 ++++++-- src/EditPerson.py | 7 ++++--- src/Makefile.in | 2 +- src/plugins/Makefile.in | 6 +++--- src/po/Makefile.in | 5 +++++ 9 files changed, 26 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39b62da88..ec72ff59b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * src/gramps_main.py: pass list of filtered people to find dialog * src/Find.py: pass list of filtered people to find dialog * src/po/hu.po: set character set to ISO-8859-2, fix typo + * src/Date.py: Reset date if a empty text string is passed 2003-09-20 Egyeki Gergely * src/po/hu.po: Hungarian translation diff --git a/TODO b/TODO index 659ccb938..511782030 100644 --- a/TODO +++ b/TODO @@ -25,4 +25,8 @@ the adding of media objects as well, since this will cause gramps to try to create a thumbnail in a readonly database. * Startup tips. +* Add sequence number to childlist in family view +* Add completeness level to person/family +* Add string substitutions for web page generation (name, report name, + date, etc). * And a whole lot more.... diff --git a/configure b/configure index c42529c5a..9af2f9871 100755 --- a/configure +++ b/configure @@ -1706,7 +1706,7 @@ echo "${ECHO_T}no" >&6 fi -LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv" +LANGUAGES="hu zh_CN cs da_DK de es fr it nl pl pt_BR ro ru sv" DISTLANGS= diff --git a/configure.in b/configure.in index 627e1c750..ebb6b851b 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ AC_SUBST(VERSIONSTRING) AC_PATH_PROG(MSGFMT, msgfmt) AC_PATH_PROG(MSGCONV, msgconv) -LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv" +LANGUAGES="hu zh_CN cs da_DK de es fr it nl pl pt_BR ro ru sv" AC_SUBST(LANGUAGES) DISTLANGS= diff --git a/gramps.spec b/gramps.spec index cdbac01ed..592d08c51 100644 --- a/gramps.spec +++ b/gramps.spec @@ -1,5 +1,5 @@ %define ver 0.9.4 -%define rel 0.CVS20030908 +%define rel 0.CVS20030919 %define prefix /usr %define localstatedir /var/lib # Ensure that internal RPM macros for configure & makeinstall @@ -78,7 +78,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %{_datadir}/pixmaps/gramps.png -%{_datadir}/gramps/* +%{_libdir}/gramps +%{_datadir}/gramps %{_datadir}/omf/gramps %post @@ -88,6 +89,9 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi %changelog +* Fri Sep 19 2003 Tim Waugh +- Own %%{_datadir/gramps directory. +- Ship %%{_libdir}/gramps. * Mon May 20 2003 Donald Peterson - Override RPMs default of localstatedir to /var/lib.. This is done in accordance with GNOME and FHS compliance guidelines diff --git a/src/EditPerson.py b/src/EditPerson.py index 2a963fa04..f912ac693 100644 --- a/src/EditPerson.py +++ b/src/EditPerson.py @@ -919,6 +919,7 @@ class EditPerson: def did_data_change(self): """Check to see if any of the data has changed from the original record""" + surname = unicode(self.surname_field.get_text()) if GrampsCfg.capitalize: surname = surname.upper() @@ -1281,6 +1282,9 @@ class EditPerson: name = self.pname + self.birth.setDate(self.bdate.get_text()) + self.birth.setPlace(self.get_place(self.bplace,1)) + if idval != self.person.getId(): m = self.db.getPersonMap() if not m.has_key(idval): @@ -1342,9 +1346,6 @@ class EditPerson: p = self.db.getPlaceDisplay(key) self.pdmap[p[0]] = key - self.birth.setDate(self.bdate.get_text()) - self.birth.setPlace(self.get_place(self.bplace,1)) - if not self.person.getBirth().are_equal(self.birth): self.person.setBirth(self.birth) Utils.modified() diff --git a/src/Makefile.in b/src/Makefile.in index 664e49772..a38d3405e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -563,7 +563,7 @@ install-data-local: $(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications $(INSTALL_DATA) $(srcdir)/gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications $(INSTALL) -d $(pkglibdir) - $(INSTALL_DATA) $(srcdir)/grampslib.so $(pkglibdir) + $(INSTALL_DATA) grampslib.so $(pkglibdir) uninstall-local: -rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index fd2a1a0a2..c12a664d4 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -147,10 +147,10 @@ pkgpython_PYTHON = \ WritePkg.py\ WriteCD.py\ rel_ru.py\ - eval.py\ + eval.py\ leak.py\ - SimpleBookTitle.py\ - CustomBookText.py + SimpleBookTitle.py\ + CustomBookText.py GLADEFILES = \ diff --git a/src/po/Makefile.in b/src/po/Makefile.in index 22db22e34..feaad51e7 100644 --- a/src/po/Makefile.in +++ b/src/po/Makefile.in @@ -246,6 +246,11 @@ uninstall-local: @MSGCONV@ --to-code=UTF-8 $< -o temp.po $(MSGFMT) -v temp.po -o $@ rm temp.po + +zh_CN.mo: zh_CN.po + iconv -f GB2312 -t UTF-8 zh_CN.po > temp.po + $(MSGFMT) -v temp.po -o $@ + rm temp.po # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: