I suggest that you back out patch #43, and then apply patch #44 instead. It is a cleaned up version of Henry's set of internationalization changes which does what my patch #43 did and a lot more.