In the marriage certificate, if a person is baptized outside France, it is still impossible to put the names of the diocese and the country... except by hand on the pdf document generated by Enoria.