@@ -5,6 +5,11 @@ from translate.search import match from translate.storage import base from xmlrpclib import ServerProxy +# TODO: move this into Pootle as soon as it's usable +try: + import json +except ImportError: + import simplejson as json class opentran(match.matcher): """A class to communicate and receive suggestions from open-tran.eu""" @@ -47,20 +52,18 @@ class opentran(match.matcher): return result -def unit2json(store): +# TODO: move this into Pootle +def store2json(store): """ - Converts units retrieved from a suggestion service to a suitable format. + Converts a store retrieved from a suggestion service to JSON format. """ - #TODO: use the simplejson module to return data in JSON format - response = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n" - response += "<entries>\n" + response = {"num_results": len(store.getunits()), + "source_lang": store.sourcelanguage, + "target_lang": store.targetlanguage, + "units": []} for unit in store.getunits(): - response += " <entry>\n" - response += " <source lang=\"%s\">%s</source>\n" % (store.sourcelanguage, - unit.source) - response += " <target lang=\"%s\">%s</target>\n" % (store.targetlanguage, - unit.target) - response += " </entry>\n" - response += "</entries>\n" - return response + newunit = {"source": unit.source, + "target": unit.target} + response["units"].append(newunit) + return json.dumps(response, sort_keys=True, indent=4) search/suggestions.py 24c466f4605dc7f61b1fc4d02b9a312e1dc81aee Julen Ruiz Aizpuru julenx@gmail.com http://github.com/julen/translate/commit/e05b7b25a7dc733353b233b66ed4789bc6b78000 e05b7b25a7dc733353b233b66ed4789bc6b78000 2008-11-22T04:54:00-08:00 2008-11-22T04:54:00-08:00 Replace dirty XML code with JSON. This inserts a dependency with the simplejson module. The simplejson module is available in Python 2.6 as json. 2f35d4167f20124a704660e993e241f231ced101 Julen Ruiz Aizpuru julenx@gmail.com