Merge "languages: encode for utf-8 in the appropriate places." into a…

…ndroid-9.0

scripts/language_helper.py

@@ -78,7 +78,7 @@ def toprettyxml(xdoc, encoding):
 for disnode in otherdisplay:
 	if disnode.nodeType == disnode.ELEMENT_NODE:
 		language.appendChild(disnode)
-		otherlang = disnode.firstChild.data
+		otherlang = disnode.firstChild.data.encode("utf-8")
 		print otherlang
 
 # resources
@@ -128,7 +128,7 @@ def toprettyxml(xdoc, encoding):
 							resources.appendChild(others)
 						break
 				if found == False:
-					print "'%s' present in English and not in %s" % (child.attributes['name'].value, otherlang)
+					print "'%s' present in English and not in %s" % (child.attributes['name'].value.encode("utf-8"), otherlang)
 					notfound_err = "NOT FOUND " + child.toxml()
 					notfound_comment = doc.createComment(notfound_err)
 					resources.appendChild(notfound_comment)