Added a patch for this. Most of the code was changed to support current langu...