Clean up the installation process.
svn: r8
This commit is contained in:
73
src/Date.py
73
src/Date.py
@@ -35,7 +35,10 @@ class Date:
|
||||
formatCode = 0
|
||||
BadFormat = _("Unknown Format")
|
||||
|
||||
fmt = re.compile("\s*(from|between|bet)(.+)(and|to)(.+)\s*$",
|
||||
from_str = _("(from|between|bet)")
|
||||
to_str = _("(and|to)")
|
||||
|
||||
fmt = re.compile("\s*" + from_str + "(.+)" + to_str + "(.+)\s*$",
|
||||
re.IGNORECASE)
|
||||
|
||||
def __init__(self):
|
||||
@@ -74,7 +77,8 @@ class Date:
|
||||
function = SingleDate.fmtFunc[Date.formatCode]
|
||||
|
||||
if self.range:
|
||||
return "from " + function(self.start) + " to " + function(self.stop)
|
||||
return _("from") + " " + function(self.start) + " " + \
|
||||
_("to") + " " + function(self.stop)
|
||||
else:
|
||||
return function(self.start)
|
||||
|
||||
@@ -128,11 +132,27 @@ class SingleDate:
|
||||
"may" : 4, "jun" : 5, "jul" : 6, "aug" : 7,
|
||||
"sep" : 8, "oct" : 9, "nov" : 10,"dec" : 11 }
|
||||
|
||||
m2v = { "abt" : about , "about" : about, "est" : about ,
|
||||
"circa" : about, "around": about, "before": before,
|
||||
"bef" : before, "after" : after, "aft" : after }
|
||||
m2v = { _("abt") : about ,
|
||||
_("about") : about,
|
||||
_("est") : about ,
|
||||
_("circa") : about,
|
||||
_("around") : about,
|
||||
_("before") : before,
|
||||
_("bef") : before,
|
||||
_("after") : after,
|
||||
_("aft") : after }
|
||||
|
||||
modifiers = "(abt|about|est|circa|around|before|after|aft|bef)"
|
||||
modifiers = "(" + \
|
||||
_("abt") + '|' + \
|
||||
_("about") + '|' + \
|
||||
_("est") + '|' + \
|
||||
_("circa") + '|' + \
|
||||
_("around") + '|' + \
|
||||
_("before") + '|' + \
|
||||
_("after") + '|' + \
|
||||
_("aft") + '|' + \
|
||||
_("bef") + ")"
|
||||
|
||||
start = "^\s*" + modifiers + "?\s*"
|
||||
|
||||
fmt1 = re.compile(start + "(\S+)(\s+\d+\s*,)?\s*(\d+)?\s*$",
|
||||
@@ -256,6 +276,17 @@ class SingleDate:
|
||||
else:
|
||||
self.month = -1
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
#
|
||||
#--------------------------------------------------------------------
|
||||
def setMonthStrEng(self,text):
|
||||
if SingleDate.m2num.has_key(string.lower(text[0:3])):
|
||||
self.month = SingleDate.m2num[string.lower(text[0:3])]
|
||||
else:
|
||||
self.month = -1
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
@@ -300,14 +331,14 @@ class SingleDate:
|
||||
elif self.mode == SingleDate.about:
|
||||
month = SingleDate.mname[self.month]
|
||||
if self.year == -1:
|
||||
retval = "about %s %d, ????" % (month,self.day)
|
||||
retval = _("about") + " %s %d, ????" % (month,self.day)
|
||||
else:
|
||||
retval = "about %s %d, %d" % (month,self.day,self.year)
|
||||
retval = _("about") + " %s %d, %d" % (month,self.day,self.year)
|
||||
|
||||
if self.mode == SingleDate.before:
|
||||
retval = "before " + retval
|
||||
retval = _("before") +" " + retval
|
||||
elif self.mode == SingleDate.after:
|
||||
retval = "after " + retval
|
||||
retval = _("after") + " " + retval
|
||||
|
||||
return retval
|
||||
|
||||
@@ -346,9 +377,9 @@ class SingleDate:
|
||||
retval = "ABT %s %s, ????" % (string.upper(month[0:3]),self.day,self.year)
|
||||
|
||||
if self.mode == SingleDate.before:
|
||||
retval = "BEFORE " + retval
|
||||
retval = _("BEFORE") + " " + retval
|
||||
elif self.mode == SingleDate.after:
|
||||
retval = "AFTER " + retval
|
||||
retval = _("AFTER") + " " + retval
|
||||
|
||||
return retval
|
||||
|
||||
@@ -383,9 +414,9 @@ class SingleDate:
|
||||
if self.mode == SingleDate.about:
|
||||
retval = "ABT " + retval
|
||||
elif self.mode == SingleDate.before:
|
||||
retval = "BEFORE " + retval
|
||||
retval = _("BEFORE") + " " + retval
|
||||
elif self.mode == SingleDate.after:
|
||||
retval = "AFTER " + retval
|
||||
retval = _("AFTER") + " " + retval
|
||||
|
||||
return retval
|
||||
|
||||
@@ -449,9 +480,9 @@ class SingleDate:
|
||||
retval = "ABT %d-%d-%d" % (self.month+1,self.day,self.year)
|
||||
|
||||
if self.mode == SingleDate.before:
|
||||
retval = "BEFORE " + retval
|
||||
retval = _("BEFORE") + " " + retval
|
||||
elif self.mode == SingleDate.after:
|
||||
retval = "AFTER " + retval
|
||||
retval = _("AFTER") + " " + retval
|
||||
|
||||
return retval
|
||||
|
||||
@@ -482,9 +513,9 @@ class SingleDate:
|
||||
retval = "ABT %d/%d/%d" % (self.day,self.month+1,self.year)
|
||||
|
||||
if self.mode == SingleDate.before:
|
||||
retval = "BEFORE " + retval
|
||||
retval = _("BEFORE") + " " + retval
|
||||
elif self.mode == SingleDate.after:
|
||||
retval = "AFTER " + retval
|
||||
retval = _("AFTER") + " " + retval
|
||||
|
||||
return retval
|
||||
|
||||
@@ -515,9 +546,9 @@ class SingleDate:
|
||||
retval = "ABT %d-%d-%d" % (self.day,self.month+1,self.year)
|
||||
|
||||
if self.mode == SingleDate.before:
|
||||
retval = "BEFORE " + retval
|
||||
retval = _("BEFORE") + " " + retval
|
||||
elif self.mode == SingleDate.after:
|
||||
retval = "AFTER " + retval
|
||||
retval = _("AFTER") + " " + retval
|
||||
|
||||
return retval
|
||||
|
||||
@@ -658,7 +689,7 @@ class SingleDate:
|
||||
if match != None:
|
||||
matches = match.groups()
|
||||
self.setMode(matches[0])
|
||||
self.setMonthStr(matches[2])
|
||||
self.setMonthStrEng(matches[2])
|
||||
self.setDay(string.atoi(matches[1]))
|
||||
if len(matches) == 4:
|
||||
val = matches[3]
|
||||
|
@@ -6,6 +6,7 @@ INSTALL = @INSTALL@
|
||||
srcdir = @top_srcdir@
|
||||
pycomp = ${srcdir}/py-compile
|
||||
CFLAGS = -fPIC -shared -O -I/usr/include/python1.5 -I/usr/lib/python1.5/config
|
||||
LANG = sv
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
@@ -23,11 +24,10 @@ install:
|
||||
${INSTALL} -c gramps.png ${prefix}/share/pixmaps
|
||||
${INSTALL} -d ${prefix}/share/gnome/apps/Applications
|
||||
${INSTALL} -c gramps.desktop ${prefix}/share/gnome/apps/Applications
|
||||
for i in locale/*; do\
|
||||
base=`basename $$i`;\
|
||||
${INSTALL} -d ${prefix}/share/locale/$$base; \
|
||||
${INSTALL} -d ${prefix}/share/locale/$$base/LC_MESSAGES; \
|
||||
${INSTALL} $$i/LC_MESSAGES/gramps.mo ${prefix}/share/locale/$$base/LC_MESSAGES; \
|
||||
for i in ${LANG}; do\
|
||||
${INSTALL} -d ${prefix}/share/locale/$$i; \
|
||||
${INSTALL} -d ${prefix}/share/locale/$$i/LC_MESSAGES; \
|
||||
${INSTALL} locale/$$i/LC_MESSAGES/gramps.mo ${prefix}/share/locale/$$i/LC_MESSAGES; \
|
||||
done
|
||||
|
||||
uninstall:
|
||||
|
@@ -402,79 +402,3 @@ class OpenOfficeDoc(TextDoc):
|
||||
self.f.write('</office:meta>\n')
|
||||
self.f.write('</office:document-meta>\n')
|
||||
self.f.close()
|
||||
|
||||
if __name__ == "__main__":
|
||||
doc = OpenOfficeDoc(PAPER_US_LETTER,PAPER_PORTRAIT)
|
||||
foo = FontStyle()
|
||||
foo.set_type_face(FONT_SANS_SERIF)
|
||||
foo.set_color((255,0,0))
|
||||
foo.set_size(24)
|
||||
|
||||
para = ParagraphStyle()
|
||||
para.set_font(foo)
|
||||
para.set_alignment(PARA_ALIGN_RIGHT)
|
||||
doc.add_style("MyTitle",para)
|
||||
|
||||
para = ParagraphStyle()
|
||||
para.set_left_margin(1)
|
||||
para.set_right_margin(1)
|
||||
para.set_alignment(PARA_ALIGN_JUSTIFY)
|
||||
doc.add_style("Normal",para)
|
||||
|
||||
table = TableStyle()
|
||||
table.set_width(10)
|
||||
table.set_columns(2)
|
||||
table.set_column_width(0,2)
|
||||
table.set_column_width(1,8)
|
||||
doc.add_table_style("Table1",table)
|
||||
|
||||
|
||||
para = ParagraphStyle()
|
||||
font = FontStyle()
|
||||
font.set_type_face(FONT_SANS_SERIF)
|
||||
font.set_bold(1)
|
||||
font.set_size(16)
|
||||
para.set_font(font)
|
||||
doc.add_style("TableEntry",para)
|
||||
|
||||
cell = TableCellStyle()
|
||||
cell.set_bottom_border(1)
|
||||
cell.set_top_border(1)
|
||||
doc.add_cell_style("TableHeader",cell)
|
||||
|
||||
cell = TableCellStyle()
|
||||
doc.add_cell_style("TableContents",cell)
|
||||
|
||||
doc.open("/home/dona/oo_test.sxw")
|
||||
doc.start_paragraph("MyTitle")
|
||||
doc.write_text("This is my Title")
|
||||
doc.end_paragraph()
|
||||
|
||||
doc.start_paragraph("Normal")
|
||||
doc.write_text("This is a test of the emergency broadcast system. ")
|
||||
doc.write_text("This is a only a test. Repeat. This is only a test. ")
|
||||
doc.write_text("Had this been an actual emergency, we would not be here ")
|
||||
doc.write_text("to give you this message.")
|
||||
doc.end_paragraph()
|
||||
doc.start_table("MyTable","Table1")
|
||||
|
||||
doc.start_row()
|
||||
doc.start_cell("TableHeader",2)
|
||||
doc.start_paragraph("TableEntry")
|
||||
doc.write_text("This is my Title")
|
||||
doc.end_paragraph()
|
||||
doc.end_cell()
|
||||
doc.end_row()
|
||||
|
||||
doc.start_row()
|
||||
doc.start_cell("TableContents")
|
||||
doc.write_text("Hello")
|
||||
doc.end_cell()
|
||||
doc.start_cell("TableContents")
|
||||
doc.write_text("Goodbye")
|
||||
doc.end_cell()
|
||||
doc.end_row()
|
||||
|
||||
doc.end_table()
|
||||
doc.close()
|
||||
|
||||
|
@@ -11,11 +11,11 @@ pycomp = ${srcdir}/py-compile
|
||||
all:
|
||||
|
||||
install:
|
||||
-mkdir ${data}
|
||||
${INSTALL} -c *.sxw ${data}
|
||||
${INSTALL} -d ${data}
|
||||
${INSTALL} -c *.sxd table.* ${data}
|
||||
|
||||
uninstall:
|
||||
rm ${data}/*.sxw
|
||||
rm -f ${data}/*.sxd ${data}/table.html ${data}/table.sxc
|
||||
-rmdir ${data}
|
||||
|
||||
clean:
|
||||
|
@@ -13,7 +13,7 @@ all:
|
||||
${pycomp} *.py
|
||||
|
||||
install:
|
||||
-mkdir ${filters}
|
||||
${INSTALL} -d ${filters}
|
||||
${INSTALL} -c *.py *.pyo ${datadir}/filters
|
||||
|
||||
uninstall:
|
||||
|
@@ -14,7 +14,7 @@ all:
|
||||
|
||||
|
||||
install:
|
||||
-mkdir ${plugins}
|
||||
${INSTALL} -d ${plugins}
|
||||
${INSTALL} -c *.py *.pyo *.glade ${plugins}
|
||||
|
||||
uninstall:
|
||||
|
Reference in New Issue
Block a user