Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
General nit: please use 2 underscores over one to indicate a placeholder. It's not super necessary here but it's to avoid accidental override of the i18n functionality.