* Chase cfdict format change

(cherry picked from commit 802c4b4)

translation-data/xml2txt.py

@@ -7,7 +7,7 @@
 from lxml import etree
 from collections import defaultdict as dd
 
-pinyinRE = re.compile(ur"(?P<pinyin>[^\]1-5A-Z]+\d)", re.UNICODE)
+pinyinRE = re.compile(ur"(?P<py>[^\]1-5A-Z]+\d)", re.UNICODE)
 alphaRE = re.compile(ur"(?P<alpha>[A-Z]+)", re.UNICODE)
 
 cfdictXMLFile = "./translation-data/cfdict.xml"
@@ -26,8 +26,8 @@ def read_xml_dict(infile):
 			if ele.tag != None:
 				if ele.text != None:
 					text = ele.text.strip(' ')
-					if ele.tag == 'pinyin':
-						text = pinyinRE.sub(ur"\g<pinyin> ", text, re.UNICODE)
+					if ele.tag == 'py':
+						text = pinyinRE.sub(ur"\g<py> ", text, re.UNICODE)
 						text = alphaRE.sub(ur"\g<alpha> ", text, re.UNICODE)
 						text = text.rstrip(' ')
 					parsed_word[ele.tag].append(text)
@@ -40,11 +40,11 @@ def read_xml_dict(infile):
 
 f = codecs.open(cfdictFile, 'w', 'utf-8')
 for item in cfdict:
-	if len(item['traditional']) > 0:
-		line = item['traditional'][0] + " " + item['simplified'][0] + " [" + item['pinyin'][0] + "] "
-		for trans in item['translation']:
+	if len(item['trad']) > 0:
+		line = item['trad'][0] + " " + item['simp'][0] + " [" + item['py'][0] + "] "
+		for trans in item['fr']:
 			line = line + "/" + trans
-		if len(item['translation']) > 0:
+		if len(item['fr']) > 0:
 			line = line + "/"
    		f.write(line)
 		f.write("\n")