Bug 922983 - fix locale inconsistent for zh-TW
Merge pull request #12810 from cctuan/922983

Bug 922983 - fix locale inconsistent for zh-TW