Menu
▾
▴
[Translate-cvs] SF.net SVN: translate: [6782] src/trunk/translate/convert
|
From: <dwa...@us...> - 2007-12-21 15:23:27
|
Revision: 6782
http://translate.svn.sourceforge.net/translate/?rev=6782&view=rev
Author: dwaynebailey
Date: 2007-12-21 07:21:51 -0800 (Fri, 21 Dec 2007)
Log Message:
-----------
Rename: convertfile -> convertstore
Modified Paths:
--------------
src/trunk/translate/convert/po2csv.py
src/trunk/translate/convert/po2dtd.py
src/trunk/translate/convert/po2html.py
src/trunk/translate/convert/po2ini.py
src/trunk/translate/convert/po2oo.py
src/trunk/translate/convert/po2prop.py
src/trunk/translate/convert/po2ts.py
src/trunk/translate/convert/po2txt.py
src/trunk/translate/convert/po2xliff.py
src/trunk/translate/convert/test_po2csv.py
src/trunk/translate/convert/test_po2dtd.py
src/trunk/translate/convert/test_po2oo.py
src/trunk/translate/convert/test_po2prop.py
src/trunk/translate/convert/test_po2ts.py
src/trunk/translate/convert/test_po2xliff.py
Modified: src/trunk/translate/convert/po2csv.py
===================================================================
--- src/trunk/translate/convert/po2csv.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/po2csv.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -49,7 +49,7 @@
csvunit.target = inputunit.target.strings[1]
return csvunit
- def convertfile(self, inputstore, columnorder=None):
+ def convertstore(self, inputstore, columnorder=None):
outputstore = csvl10n.csvfile(fieldnames=columnorder)
for inputunit in inputstore.units:
outputunit = self.convertunit(inputunit)
@@ -68,7 +68,7 @@
if inputstore.isempty():
return 0
convertor = po2csv()
- outputstore = convertor.convertfile(inputstore,columnorder)
+ outputstore = convertor.convertstore(inputstore, columnorder)
outputfile.write(str(outputstore))
return 1
Modified: src/trunk/translate/convert/po2dtd.py
===================================================================
--- src/trunk/translate/convert/po2dtd.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/po2dtd.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -154,7 +154,7 @@
def __init__(self, dtdfile):
self.dtdfile = dtdfile
- def convertfile(self, inputstore, includefuzzy=False):
+ def convertstore(self, inputstore, includefuzzy=False):
# translate the strings
for inunit in inputstore.units:
# there may be more than one entity due to msguniq merge
@@ -214,7 +214,7 @@
self.convertstrings(inputunit, dtdunit)
return dtdunit
- def convertfile(self, inputstore, includefuzzy=False):
+ def convertstore(self, inputstore, includefuzzy=False):
outputstore = dtd.dtdfile()
self.currentgroups = []
for inputunit in inputstore.units:
@@ -231,7 +231,7 @@
else:
templatestore = dtd.dtdfile(templatefile)
convertor = redtd(templatestore)
- outputstore = convertor.convertfile(inputstore, includefuzzy)
+ outputstore = convertor.convertstore(inputstore, includefuzzy)
outputfile.write(str(outputstore))
return 1
Modified: src/trunk/translate/convert/po2html.py
===================================================================
--- src/trunk/translate/convert/po2html.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/po2html.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -45,7 +45,7 @@
return message
return "\n".join([textwrap.fill(line, self.wrap, replace_whitespace=False) for line in message.split("\n")])
- def convertfile(self, inputstore, includefuzzy):
+ def convertstore(self, inputstore, includefuzzy):
"""converts a file to .po format"""
htmlresult = ""
for inputunit in inputstore.units:
@@ -57,7 +57,7 @@
htmlresult += self.wrapmessage(inputunit.source) + "\n" + "\n"
return htmlresult.encode('utf-8')
- def mergefile(self, inputstore, templatetext, includefuzzy):
+ def mergestore(self, inputstore, templatetext, includefuzzy):
"""converts a file to .po format"""
htmlresult = templatetext.replace("\n", " ")
if isinstance(htmlresult, str):
@@ -86,10 +86,10 @@
inputstore = po.pofile(inputfile)
convertor = po2html(wrap=wrap)
if templatefile is None:
- outputstring = convertor.convertfile(inputstore, includefuzzy)
+ outputstring = convertor.convertstore(inputstore, includefuzzy)
else:
templatestring = templatefile.read()
- outputstring = convertor.mergefile(inputstore, templatestring, includefuzzy)
+ outputstring = convertor.mergestore(inputstore, templatestring, includefuzzy)
outputfilepos = outputfile.tell()
outputfile.write(outputstring)
return 1
Modified: src/trunk/translate/convert/po2ini.py
===================================================================
--- src/trunk/translate/convert/po2ini.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/po2ini.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -35,7 +35,7 @@
self.templatestore = ini.inifile(templatefile)
self.inputdict = {}
- def convertfile(self, inputstore, includefuzzy=False):
+ def convertstore(self, inputstore, includefuzzy=False):
self.makestoredict(inputstore, includefuzzy)
for unit in self.templatestore.units:
for location in unit.getlocations():
@@ -59,7 +59,7 @@
raise ValueError("must have template file for ini files")
else:
convertor = reini(templatefile)
- outputstring = convertor.convertfile(inputstore, includefuzzy)
+ outputstring = convertor.convertstore(inputstore, includefuzzy)
outputfile.write(outputstring)
return 1
Modified: src/trunk/translate/convert/po2oo.py
===================================================================
--- src/trunk/translate/convert/po2oo.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/po2oo.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -148,7 +148,7 @@
if makecopy:
theoo.addline(part2)
- def convertfile(self, sourcestore):
+ def convertstore(self, sourcestore):
self.p = sourcestore
# translate the strings
for unit in self.p.units:
@@ -212,7 +212,7 @@
raise ValueError("must have template file for oo files")
else:
convertor = reoo(templatefile, languages=languages, timestamp=timestamp, includefuzzy=includefuzzy, long_keys=multifilestyle != "single", filteraction=filteraction)
- outputstore = convertor.convertfile(inputstore)
+ outputstore = convertor.convertstore(inputstore)
# TODO: check if we need to manually delete missing items
outputfile.write(str(outputstore))
return True
Modified: src/trunk/translate/convert/po2prop.py
===================================================================
--- src/trunk/translate/convert/po2prop.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/po2prop.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -35,7 +35,7 @@
self.templatefile = templatefile
self.inputdict = {}
- def convertfile(self, inputstore, personality, includefuzzy=False):
+ def convertstore(self, inputstore, personality, includefuzzy=False):
self.personality = personality
self.inmultilinemsgid = 0
self.inecho = 0
@@ -117,7 +117,7 @@
# convertor = po2prop()
else:
convertor = reprop(templatefile)
- outputproplines = convertor.convertfile(inputstore, personality, includefuzzy)
+ outputproplines = convertor.convertstore(inputstore, personality, includefuzzy)
outputfile.writelines(outputproplines)
return 1
Modified: src/trunk/translate/convert/po2ts.py
===================================================================
--- src/trunk/translate/convert/po2ts.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/po2ts.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -27,7 +27,7 @@
from translate.storage import ts
class po2ts:
- def convertfile(self, inputstore, templatefile=None):
+ def convertstore(self, inputstore, templatefile=None):
"""converts a .po file to .ts format (using a template .ts file if given)"""
if templatefile is None:
tsfile = ts.QtTsParser()
@@ -62,7 +62,7 @@
if inputstore.isempty():
return 0
convertor = po2ts()
- outputstring = convertor.convertfile(inputstore, templatefile)
+ outputstring = convertor.convertstore(inputstore, templatefile)
outputfile.write(outputstring)
return 1
Modified: src/trunk/translate/convert/po2txt.py
===================================================================
--- src/trunk/translate/convert/po2txt.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/po2txt.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -40,7 +40,7 @@
return message
return "\n".join([textwrap.fill(line, self.wrap, replace_whitespace=False) for line in message.split("\n")])
- def convertfile(self, inputstore, includefuzzy):
+ def convertstore(self, inputstore, includefuzzy):
"""converts a file to txt format"""
txtresult = ""
for unit in inputstore.units:
@@ -52,7 +52,7 @@
txtresult += self.wrapmessage(unit.source) + "\n" + "\n"
return txtresult.rstrip()
- def mergefile(self, inputstore, templatetext, includefuzzy):
+ def mergestore(self, inputstore, templatetext, includefuzzy):
"""converts a file to txt format"""
txtresult = templatetext
# TODO: make a list of blocks of text and translate them individually
@@ -72,10 +72,10 @@
inputstore = factory.getobject(inputfile)
convertor = po2txt(wrap=wrap)
if templatefile is None:
- outputstring = convertor.convertfile(inputstore, includefuzzy)
+ outputstring = convertor.convertstore(inputstore, includefuzzy)
else:
- templatetext = templatefile.read().decode(encoding)
- outputstring = convertor.mergefile(inputstore, templatetext, includefuzzy)
+ templatestring = templatefile.read().decode(encoding)
+ outputstring = convertor.mergestore(inputstore, templatestring, includefuzzy)
outputfile.write(outputstring.encode('utf-8'))
return 1
Modified: src/trunk/translate/convert/po2xliff.py
===================================================================
--- src/trunk/translate/convert/po2xliff.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/po2xliff.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -77,7 +77,7 @@
contexts.append(("linenumber", linenumber))
return contexts
- def convertfile(self, inputstore, templatefile=None, **kwargs):
+ def convertstore(self, inputstore, templatefile=None, **kwargs):
"""converts a .po file to .xlf format"""
if templatefile is None:
outputstore = poxliff.PoXliffFile(**kwargs)
@@ -96,7 +96,7 @@
if inputstore.isempty():
return 0
convertor = po2xliff()
- outputstring = convertor.convertfile(inputstore, templatefile)
+ outputstring = convertor.convertstore(inputstore, templatefile)
outputfile.write(outputstring)
return 1
Modified: src/trunk/translate/convert/test_po2csv.py
===================================================================
--- src/trunk/translate/convert/test_po2csv.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/test_po2csv.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -13,7 +13,7 @@
inputfile = wStringIO.StringIO(posource)
inputpo = po.pofile(inputfile)
convertor = po2csv.po2csv()
- outputcsv = convertor.convertfile(inputpo)
+ outputcsv = convertor.convertstore(inputpo)
return outputcsv
def csv2po(self, csvsource, template=None):
Modified: src/trunk/translate/convert/test_po2dtd.py
===================================================================
--- src/trunk/translate/convert/test_po2dtd.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/test_po2dtd.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -21,7 +21,7 @@
inputfile = wStringIO.StringIO(posource)
inputpo = po.pofile(inputfile)
convertor = po2dtd.po2dtd()
- outputdtd = convertor.convertfile(inputpo)
+ outputdtd = convertor.convertstore(inputpo)
return outputdtd
def merge2dtd(self, dtdsource, posource):
@@ -31,7 +31,7 @@
templatefile = wStringIO.StringIO(dtdsource)
templatedtd = dtd.dtdfile(templatefile)
convertor = po2dtd.redtd(templatedtd)
- outputdtd = convertor.convertfile(inputpo)
+ outputdtd = convertor.convertstore(inputpo)
return outputdtd
def convertdtd(self, posource, dtdtemplate):
Modified: src/trunk/translate/convert/test_po2oo.py
===================================================================
--- src/trunk/translate/convert/test_po2oo.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/test_po2oo.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -128,7 +128,7 @@
def merge2oo(self, oosource, posource):
"""helper that merges po translations to oo source through files"""
- outputoo = convertor.convertfile(inputpo)
+ outputoo = convertor.convertstore(inputpo)
return outputoo
def convertoo(self, posource, ootemplate, language="en-US"):
Modified: src/trunk/translate/convert/test_po2prop.py
===================================================================
--- src/trunk/translate/convert/test_po2prop.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/test_po2prop.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -12,7 +12,7 @@
inputfile = wStringIO.StringIO(posource)
inputpo = po.pofile(inputfile)
convertor = po2prop.po2prop()
- outputprop = convertor.convertfile(inputpo)
+ outputprop = convertor.convertstore(inputpo)
return outputprop
def merge2prop(self, propsource, posource, personality="java"):
@@ -22,7 +22,7 @@
templatefile = wStringIO.StringIO(propsource)
#templateprop = properties.propfile(templatefile)
convertor = po2prop.reprop(templatefile)
- outputprop = convertor.convertfile(inputpo, personality=personality)
+ outputprop = convertor.convertstore(inputpo, personality=personality)
print outputprop
return outputprop
Modified: src/trunk/translate/convert/test_po2ts.py
===================================================================
--- src/trunk/translate/convert/test_po2ts.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/test_po2ts.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -11,7 +11,7 @@
inputfile = wStringIO.StringIO(posource)
inputpo = po.pofile(inputfile)
convertor = po2ts.po2ts()
- outputts = convertor.convertfile(inputpo)
+ outputts = convertor.convertstore(inputpo)
return outputts
def singleelement(self, storage):
Modified: src/trunk/translate/convert/test_po2xliff.py
===================================================================
--- src/trunk/translate/convert/test_po2xliff.py 2007-12-21 14:32:53 UTC (rev 6781)
+++ src/trunk/translate/convert/test_po2xliff.py 2007-12-21 15:21:51 UTC (rev 6782)
@@ -9,9 +9,9 @@
def po2xliff(self, posource, sourcelanguage='en', targetlanguage=None):
"""helper that converts po source to xliff source without requiring files"""
- pofile = po.pofile(posource)
+ postore = po.pofile(posource)
convertor = po2xliff.po2xliff()
- outputxliff = convertor.convertfile(pofile, None, sourcelanguage=sourcelanguage, targetlanguage=targetlanguage)
+ outputxliff = convertor.convertstore(postore, None, sourcelanguage=sourcelanguage, targetlanguage=targetlanguage)
return poxliff.PoXliffFile(outputxliff)
def getnode(self, xliff):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|