Standardize locale key location; fix articleId change to submissionId