From: <dwa...@us...> - 2010-09-28 19:04:43
|
Revision: 15924 http://translate.svn.sourceforge.net/translate/?rev=15924&view=rev Author: dwaynebailey Date: 2010-09-28 19:04:34 +0000 (Tue, 28 Sep 2010) Log Message: ----------- Drop wrap and tidy options Modified Paths: -------------- src/trunk/translate/convert/po2html.py src/trunk/translate/convert/test_po2html.py Modified: src/trunk/translate/convert/po2html.py =================================================================== --- src/trunk/translate/convert/po2html.py 2010-09-28 18:55:47 UTC (rev 15923) +++ src/trunk/translate/convert/po2html.py 2010-09-28 19:04:34 UTC (rev 15924) @@ -26,15 +26,6 @@ usage instructions """ -try: - import textwrap -except ImportError: - textwrap = None -try: - import tidy -except ImportError: - tidy = None - from translate.storage import po @@ -42,16 +33,6 @@ """po2html can take a po file and generate html. best to give it a template file otherwise will just concat msgstrs""" - def __init__(self, wrap=None, usetidy=None): - self.wrap = wrap - self.tidy = tidy and usetidy - - def wrapmessage(self, message): - """rewraps text as required""" - if self.wrap is None: - return message - return "\n".join([textwrap.fill(line, self.wrap, replace_whitespace=False) for line in message.split("\n")]) - def mergestore(self, inputstore, templatetext, includefuzzy): """converts a file to .po format""" htmlresult = templatetext.replace("\n", " ") @@ -66,26 +47,22 @@ msgid = inputunit.source msgstr = None if includefuzzy or not inputunit.isfuzzy(): - msgstr = self.wrapmessage(inputunit.target) + msgstr = inputunit.target else: - msgstr = self.wrapmessage(inputunit.source) + msgstr = inputunit.source if msgstr.strip(): # TODO: "msgid" is already html-encoded ("&" -> "&"), while # "msgstr" is not encoded -> thus the replace fails # see test_po2html.py in line 67 htmlresult = htmlresult.replace(msgid, msgstr, 1) - htmlresult = htmlresult.encode('utf-8') - if self.tidy: - htmlresult = str(tidy.parseString(htmlresult)) - return htmlresult + return htmlresult.encode('utf-8') -def converthtml(inputfile, outputfile, templatefile, wrap=None, - includefuzzy=False, usetidy=True): +def converthtml(inputfile, outputfile, templatefile, includefuzzy=False): """reads in stdin using fromfileclass, converts using convertorclass, writes to stdout""" inputstore = po.pofile(inputfile) - convertor = po2html(wrap=wrap, usetidy=usetidy) + convertor = po2html() if templatefile is None: raise ValueError("must have template file for HTML files") else: @@ -109,15 +86,6 @@ } parser = convert.ConvertOptionParser(formats, usetemplates=True, description=__doc__) - if textwrap is not None: - parser.add_option("-w", "--wrap", dest="wrap", default=None, - type="int", metavar="WRAP", - help="set number of columns to wrap html at") - parser.passthrough.append("wrap") - if tidy is not None: - parser.add_option("", "--notidy", dest="usetidy", default=True, - help="disables the use of HTML tidy", action="store_false") - parser.passthrough.append("usetidy") parser.add_fuzzy_option() parser.run(argv) Modified: src/trunk/translate/convert/test_po2html.py =================================================================== --- src/trunk/translate/convert/test_po2html.py 2010-09-28 18:55:47 UTC (rev 15923) +++ src/trunk/translate/convert/test_po2html.py 2010-09-28 19:04:34 UTC (rev 15924) @@ -95,11 +95,5 @@ """tests getting help""" options = test_convert.TestConvertCommand.test_help(self) options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE") - options = self.help_check(options, "-w WRAP, --wrap=WRAP") options = self.help_check(options, "--fuzzy") - try: - import tidy - options = self.help_check(options, "--notidy") - except ImportError, e: - pass options = self.help_check(options, "--nofuzzy", last=True) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |