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

Merged trunk r18398 through r18497 into geps023.

Browse Source 
Conflicts resolved in:
    NarrativeWeb.py


svn: r18498
This commit is contained in:
Tim G L Lyons
2011-11-24 18:15:53 +00:00
parent f0bb1205f3 421ab45a3d
commit 6cb761b010
32 changed files with 8402 additions and 8293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/plugins/lib/holidays.xml.in
View File

@@ -364,6 +364,29 @@
<date name="1. Weihnachtsfeiertag" type="religious" value="*/12/25" />
<date name="2. Weihnachtsfeiertag" type="religious" value="*/12/26" />
</country>
<country _name="Japan">
<date name="元日" value="*/1/1" />
<date name="成人の日" value="*/2/mon/jan" />
<date name="建国記念の日" value="*/2/11" />
<date name="春分の日" value="*/3/20" />
<date name="春分の日" value="*/3/21" />
<date name="昭和の日" value="*/4/29" />
<date name="憲法記念日" value="*/5/3" />
<date name="みどりの日" value="*/5/4" />
<date name="こどもの日" value="*/5/5" />
<date name="海の日" value="*/3/mon/jul" />
<date name="敬老の日" value="*/3/mon/sep" />
<date name="秋分の日" value="*/9/22" />
<date name="秋分の日" value="*/9/23" />
<date name="体育の日" value="*/2/mon/oct" />
<date name="文化の日" value="*/11/3" />
<date name="勤労感謝の日" value="*/11/23" />
<date name="天皇誕生日" value="*/12/23" />
<date name="皇太子明仁親王の結婚" value="1959/4/10" />
<date name="昭和天皇の大喪の礼" value="1989/2/24" />
<date name="天皇(明仁)即位記念" value="1990/11/12" />
<date name="皇太子徳仁親王の結婚" value="1993/6/9" />
</country>
<country _name="Sweden - Holidays">
<date name="Nyårsdagen" value="*/1/1" type="religious" />
<date name="Trettondagen" value="*/1/6" type="religious" />
@@ -394,19 +417,16 @@
<date name="April Fool's Day" value="*/4/1" type="secular" />
<date name="Arbor Day" value="*/-1/fri/apr" type="secular" />
<date name="Earth Day" value="*/4/22" type="secular" />
<date name="Easter" type="religious" value="> easter(y)" />
<date name="Ash Wednesday" type="religious" value="> easter(y)" offset="-46" />
<date name="Mardi Gras" type="religious" value="> easter(y)" offset="-47" />
<date name="Easter" value="> easter(y)" type="religious" />
<date name="Ash Wednesday" value="> easter(y)" type="religious" offset="-46" />
<date name="Mardi Gras" value="> easter(y)" type="religious" offset="-47" />
<date name="Daylight Saving begins" value="> dst(y)[0]" type="informational" />
<date name="Income Taxes due" value="*/4/15" type="national"
if="date.weekday().__cmp__(4)-1" />
<date name="Income Taxes due" value="*/4/16" type="national"
if="date.weekday() == 0" />
<date name="Income Taxes due" value="*/4/17" type="national"
if="date.weekday() == 0" />
<date name="Income Taxes due" value="*/4/15" type="national" if="date.weekday().__cmp__(4)-1" />
<date name="Income Taxes due" value="*/4/16" type="national" if="date.weekday() == 0" />
<date name="Income Taxes due" value="*/4/17" type="national" if="date.weekday() == 0" />
<date name="Daylight Saving ends" value="> dst(y)[1]" type="informational" />
<date name="Inauguration Day" value="*/1/20" if="(y - 1980) % 4 == 1" type="national" />
<date name="Passover" type="religious" value="> passover(y)" />
<date name="Inauguration Day" value="*/1/20" type="national" if="(y - 1980) % 4 == 1" />
<date name="Passover" value="> passover(y)" type="religious" />
<date name="Assistants' Day" value="*/-1/sat/apr" offset="-3" type="secular" />
<date name="Cinco de Mayo" value="*/5/5" type="secular" />
<date name="Armed Forces Day" value="*/3/sat/may" type="secular" />
@@ -417,20 +437,20 @@
<date name="Independence Day" value="*/7/4" type="national" />
<date name="Parents' Day" value="*/4/sun/jul" type="secular" />
<date name="Labor Day" value="*/1/mon/sep" type="national" />
<date name="Grandparents' Day" value="*/1/mon/sep" offset="6" type="secular" />
<date name="Grandparents' Day" value="*/1/mon/sep" type="secular" offset="6" />
<date name="Columbus Day" value="*/2/mon/oct" type="secular" />
<date name="Ramadan begins" value="2006/09/24" type="religious" />
<date name="Ramadan begins" value="2007/09/13" type="religious" />
<date name="Ramadan begins" value="2008/09/2" type="religious" />
<date name="Ramadan begins" value="2009/08/22" type="religious" />
<date name="Yom Kippur" type="religious" value="> passover(y)" offset="172" />
<date name="Yom Kippur" value="> passover(y)" type="religious" offset="172" />
<date name="United Nations Day" value="*/10/24" type="secular" />
<date name="Halloween" value="*/10/31" type="secular" />
<date name="Election Day" value="*/11/2" offset="tue" type="secular" />
<date name="Election Day" value="*/11/2" type="secular" offset="tue" />
<date name="Veterans Day" value="*/11/11" type="national" />
<date name="Thanksgiving" value="*/4/thu/nov" type="national" />
<date name="Hanukkah begins" type="religious" value="> hanuka(y)" />
<date name="Christmas" value="*/12/25" type="national" />
<date name="Hanukkah begins" value="> hanuka(y)" type="religious" />
<date name="Christmas" value="*/12/25" type="religious" />
<date name="Kwanzaa begins" value="*/12/26" type="religious" />
</country>
<country _name="Jewish Holidays">

5
src/plugins/lib/libgedcom.py
View File

@@ -5558,7 +5558,10 @@ class GedcomParser(UpdateCallback):
"""
if not state.location:
state.location = gen.lib.Location()
self.__parse_note(line, state.event, state.level+1)
if state.event:
self.__parse_note(line, state.event, state.level+1)
else:
self.__not_recognized(line, state.level)
def __optional_note(self, line, state):
"""

12
src/plugins/lib/libodfbackend.py
View File

@@ -122,19 +122,17 @@ class OdfBackend(DocBackend):
if tagtype not in self.SUPPORTED_MARKUP:
return None
if ( tagtype == DocBackend.FONTCOLOR ):
return ('<text:span text:style-name=\"FontColor__%s__\">' %
self.ESCAPE_FUNC()(value),
return ('<text:span text:style-name=\"FontColor__%s__\">' % value,
'</text:span>')
elif ( tagtype == DocBackend.FONTFACE ):
return ('<text:span text:style-name=\"FontFace__%s__\">' %
self.ESCAPE_FUNC()(value),
return ('<text:span text:style-name=\"FontFace__%s__\">' %
self.ESCAPE_FUNC()(value),
'</text:span>')
elif ( tagtype == DocBackend.FONTSIZE ):
return ('<text:span text:style-name=\"FontSize__%d__\">' % value,
return ('<text:span text:style-name=\"FontSize__%d__\">' % value,
'</text:span>')
else: #elif ( tagtype == DocBackend.HIGHLIGHT ):
return ('<text:span text:style-name=\"FontHighlight__%s__\">' %
self.ESCAPE_FUNC()(value),
return ('<text:span text:style-name=\"FontHighlight__%s__\">' % value,
'</text:span>')
def format_link(self, value):

8
src/plugins/lib/maps/grampsmaps.py
View File

@@ -160,10 +160,10 @@ class osmGpsMap():
def build_widget(self):
self.vbox = gtk.VBox(False, 0)
cache_path = os.path.join(const.HOME_DIR, 'maps')
cache_path = config.get('geography.path')
if not os.path.isdir(cache_path):
try:
os.mkdir(cache_path, 0750)
os.makedirs(cache_path, 0755) # create dir like mkdir -p
except:
ErrorDialog(_("Can't create tiles cache directory %s") %
cache_path )
@@ -178,10 +178,10 @@ class osmGpsMap():
self.osm.image_remove_all()
self.vbox.remove(self.osm)
self.osm.destroy()
tiles_path=os.path.join(GEOGRAPHY_PATH, constants.tiles_path[map_type])
tiles_path=os.path.join(config.get('geography.path'), constants.tiles_path[map_type])
if not os.path.isdir(tiles_path):
try:
os.mkdir(tiles_path, 0750)
os.makedirs(tiles_path, 0755) # create dir like mkdir -p
except:
ErrorDialog(_("Can't create tiles cache directory for '%s'.") %
constants.map_title[map_type])