Added locale resolution to the ChurchController