Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

typo fixes

Browse Source 
svn: r6170
This commit is contained in:
Don Allingham 2006-03-18 03:21:03 +00:00
parent 84648709d4
commit 45e12f1a52
5 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps2/intltool-extract.in
View File

@ -32,7 +32,7 @@
## Release information ## Release information
my $PROGRAM = "intltool-extract"; my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool"; my $PACKAGE = "intltool";
my $VERSION = "0.34.2"; my $VERSION = "0.34.1";
## Loaded modules ## Loaded modules
use strict; use strict;
@ -485,12 +485,10 @@ sub parseTree
sub intltool_tree_comment sub intltool_tree_comment
{ {
my $expat = shift; my $expat = shift;
my $data = $expat->original_string(); my $data = shift;
my $clist = $expat->{Curlist}; my $clist = $expat->{Curlist};
my $pos = $#$clist; my $pos = $#$clist;
$data =~ s/^<!--//s;
$data =~ s/-->$//s;
push @$clist, 1 => $data; push @$clist, 1 => $data;
} }

6
gramps2/intltool-merge.in
View File

@ -35,7 +35,7 @@
## Release information ## Release information
my $PROGRAM = "intltool-merge"; my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool"; my $PACKAGE = "intltool";
my $VERSION = "0.34.2"; my $VERSION = "0.34.1";
## Loaded modules ## Loaded modules
use strict; use strict;
@ -91,7 +91,7 @@ my $OUTFILE;
my %po_files_by_lang = (); my %po_files_by_lang = ();
my %translations = (); my %translations = ();
my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@"; my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
# Use this instead of \w for XML files to handle more possible characters. # Use this instead of \w for XML files to handle more possible characters.
@ -257,7 +257,7 @@ sub gather_po_files
sub get_local_charset sub get_local_charset
{ {
my ($encoding) = @_; my ($encoding) = @_;
my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias"; my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias";
# seek character encoding aliases in charset.alias (glib) # seek character encoding aliases in charset.alias (glib)

28
gramps2/intltool-update.in
View File

@ -30,7 +30,7 @@
## Release information ## Release information
my $PROGRAM = "intltool-update"; my $PROGRAM = "intltool-update";
my $VERSION = "0.34.2"; my $VERSION = "0.34.1";
my $PACKAGE = "intltool"; my $PACKAGE = "intltool";
## Loaded modules ## Loaded modules
@ -80,8 +80,7 @@ my $ini_support =
"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec "directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec
"soundlist(?:\\.in)+|". # GNOME specific "soundlist(?:\\.in)+|". # GNOME specific
"keys(?:\\.in)+|". # GNOME Mime database specific "keys(?:\\.in)+|". # GNOME Mime database specific
"theme(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec "theme(?:\\.in)+"; # http://www.freedesktop.org/Standards/icon-theme-spec
"service(?:\\.in)+"; # DBus specific
my $buildin_gettext_support = my $buildin_gettext_support =
"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py"; "c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py";
@ -611,7 +610,7 @@ sub GenerateHeaders
# #
sub GeneratePOTemplate sub GeneratePOTemplate
{ {
my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@"; my $XGETTEXT = $ENV{"XGETTEXT"} || "/usr/bin/xgettext";
my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
chomp $XGETTEXT; chomp $XGETTEXT;
@ -782,7 +781,7 @@ sub POFile_Update
{ {
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@"; my $MSGMERGE = $ENV{"MSGMERGE"} || "/usr/bin/msgmerge";
my ($lang, $outfile) = @_; my ($lang, $outfile) = @_;
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
@ -825,7 +824,7 @@ sub POFile_GetLanguage ($)
sub Console_Write_TranslationStatus sub Console_Write_TranslationStatus
{ {
my ($lang, $output_file) = @_; my ($lang, $output_file) = @_;
my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt";
$output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
@ -834,7 +833,7 @@ sub Console_Write_TranslationStatus
sub Console_Write_CoverageReport sub Console_Write_CoverageReport
{ {
my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt";
&GatherPOFiles; &GatherPOFiles;
@ -992,9 +991,9 @@ sub FindPackageName
($name, $version) = ($1, $2); ($name, $version) = ($1, $2);
$name =~ s/[\[\]\s]//g; $name =~ s/[\[\]\s]//g;
$version =~ s/[\[\]\s]//g; $version =~ s/[\[\]\s]//g;
$varhash{"PACKAGE_NAME"} = $name; $varhash{"AC_PACKAGE_NAME"} = $name;
$varhash{"PACKAGE"} = $name; $varhash{"PACKAGE"} = $name;
$varhash{"PACKAGE_VERSION"} = $version; $varhash{"AC_PACKAGE_VERSION"} = $version;
$varhash{"VERSION"} = $version; $varhash{"VERSION"} = $version;
} }
@ -1003,18 +1002,19 @@ sub FindPackageName
($name, $version) = ($1, $2); ($name, $version) = ($1, $2);
$name =~ s/[\[\]\s]//g; $name =~ s/[\[\]\s]//g;
$version =~ s/[\[\]\s]//g; $version =~ s/[\[\]\s]//g;
$varhash{"PACKAGE_NAME"} = $name; $varhash{"AC_PACKAGE_NAME"} = $name;
$varhash{"PACKAGE"} = $name; $varhash{"PACKAGE"} = $name;
$varhash{"PACKAGE_VERSION"} = $version; $varhash{"AC_PACKAGE_VERSION"} = $version;
$varhash{"VERSION"} = $version; $varhash{"VERSION"} = $version;
} }
# \s makes this not work, why? # \s makes this not work, why?
$name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m; $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;
# m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value # prepend '$' to auto* internal variables, usually they are
# as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables. # used in configure.in/ac without the '$'
$name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g; $name =~ s/AC_/\$AC_/g;
$name =~ s/\$\$/\$/g;
$name = $domain if $domain; $name = $domain if $domain;

4
gramps2/src/DataViews/_FamilyList.py
View File

@ -158,10 +158,10 @@ class FamilyListView(PageView.ListView):
import GrampsDb import GrampsDb
mlist = [] mlist = []
self.selection.selected_foreach(self.blist,mlist) self.selection.selected_foreach(self.blist, mlist)
for handle in mlist: for handle in mlist:
GrampsDb.remove_family_relationships(handle) GrampsDb.remove_family_relationships(self.dbstate.db, handle)
self.build_tree() self.build_tree()
def edit(self,obj): def edit(self,obj):

14
gramps2/src/GrampsDb/_DbUtils.py
View File

@ -22,7 +22,7 @@
def remove_family_relationships(db, family_handle, trans=None): def remove_family_relationships(db, family_handle, trans=None):
family = db.get_family_from_handle(handle) family = db.get_family_from_handle(family_handle)
if trans == None: if trans == None:
need_commit = True need_commit = True
@ -34,18 +34,18 @@ def remove_family_relationships(db, family_handle, trans=None):
family.get_mother_handle()]: family.get_mother_handle()]:
if phandle: if phandle:
person = db.get_person_from_handle(phandle) person = db.get_person_from_handle(phandle)
person.remove_family_handle(handle) person.remove_family_handle(family_handle)
db.commit_person(person,trans) db.commit_person(person, trans)
for phandle in family.get_child_handle_list(): for phandle in family.get_child_handle_list():
person = db.get_person_from_handle(phandle) person = db.get_person_from_handle(phandle)
person.remove_parent_family_handle(handle) person.remove_parent_family_handle(family_handle)
db.commit_person(person,trans) db.commit_person(person, trans)
db.remove_family(handle,trans) db.remove_family(family_handle, trans)
if need_commit: if need_commit:
db.transaction_commit(trans,_("Remove Family")) db.transaction_commit(trans, _("Remove Family"))
def remove_parent_from_family(db, person_handle, family_handle, trans=None): def remove_parent_from_family(db, person_handle, family_handle, trans=None):
""" """