CMS i18n changes from Tsinghua

@singingwolfboy these changes were left over after you landed the cms i18n changes. Can you review them?