@@ -236,15 +236,24 @@ class DeprecatedRemoved(Directive):
236236 final_argument_whitespace = True
237237 option_spec = {}
238238
239- _label = 'Deprecated since version {deprecated}, will be removed in version {removed}'
239+ _deprecated_label = 'Deprecated since version {deprecated}, will be removed in version {removed}'
240+ _removed_label = 'Deprecated since version {deprecated}, removed in version {removed}'
240241
241242 def run (self ):
242243 node = addnodes .versionmodified ()
243244 node .document = self .state .document
244245 node ['type' ] = 'deprecated-removed'
245246 version = (self .arguments [0 ], self .arguments [1 ])
246247 node ['version' ] = version
247- label = translators ['sphinx' ].gettext (self ._label )
248+ env = self .state .document .settings .env
249+ current_version = tuple (int (e ) for e in env .config .version .split ('.' ))
250+ removed_version = tuple (int (e ) for e in self .arguments [1 ].split ('.' ))
251+ if current_version < removed_version :
252+ label = self ._deprecated_label
253+ else :
254+ label = self ._removed_label
255+
256+ label = translators ['sphinx' ].gettext (label )
248257 text = label .format (deprecated = self .arguments [0 ], removed = self .arguments [1 ])
249258 if len (self .arguments ) == 3 :
250259 inodes , messages = self .state .inline_text (self .arguments [2 ],
0 commit comments