899f61a51d
Fix locale with suffix Original-merge: b14d76a3d40ca35ea5d8f68c8241c397e1792f50 Merged-by: Bill Thornton <thornbill@users.noreply.github.com> Backported-by: Bill Thornton <thornbill@users.noreply.github.com>