Where does the comma go?

In BrE, would the comma go inside or outside the introductory quote? I know the full stop goes inside but am unsure whether the comma goes inside or outside after 'That'. Is (1) or (2) correct below?

I would say (2) because the original sentence is 'That is nonsense', not 'That, is nonsense.' But I've seen it punctuated both ways in BrE, as shown below. Which would be your pick – (1) or (2) below? Thanks in advance.

(1) ‘That,’ he said, ‘is nonsense.’
(2) ‘That’, he said, ‘is nonsense.’

And, (1) or (2) below?

(1) ‘I,’ he said, ‘am disgusted with her.’
(2) ‘I’, he said, ‘am disgusted with her.’

Thanks.