diff --git a/ChangeLog b/ChangeLog index da09bc2b2..cfab44ca3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-12-16 Douglas S. Blank + * src/DbManager.py: typo %{}s -> %()s; fixed rcs -q issue + * src/Utils.py: typo %{}s -> %()s + 2007-12-16 Douglas S. Blank * src/plugins/ReadPkg.py: attempt to os.remove(directory) failed * src/GrampsDb/_GrampsDbFactories.py: import from gen.db diff --git a/src/DbManager.py b/src/DbManager.py index 47000386b..b1997d21f 100644 --- a/src/DbManager.py +++ b/src/DbManager.py @@ -491,7 +491,7 @@ class DbManager: rev = self.data_to_delete[0] parent = store[(path[0],)][0] QuestionDialog.QuestionDialog( - _("Remove the '%{revision}s' version of %{database}s") % { + _("Remove the '%(revision)s' version of '%(database)s'") % { 'revision' : rev, 'database' : parent }, @@ -533,7 +533,7 @@ class DbManager: rev = self.data_to_delete[PATH_COL] archive = os.path.join(db_dir, ARCHIVE_V) - cmd = [ "rcs", "-o%s" % rev, archive ] + cmd = [ "rcs", "-o%s" % rev, "-q", archive ] proc = subprocess.Popen(cmd, stderr = subprocess.PIPE) status = proc.wait() diff --git a/src/Utils.py b/src/Utils.py index 8d7905925..100d6d169 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -203,7 +203,7 @@ def family_upper_name(family, db): if father and mother: fname = father.get_primary_name().get_upper_name() mname = mother.get_primary_name().get_upper_name() - name = _("%{father}s and %{mother}s") % { + name = _("%(father)s and %(mother)s") % { 'father' : fname, 'mother' : mname }