[I18N] local field and fix conflict

Merged Uriel Mayo requested to merge i18n into 15.0-stage

Merge request reports