[ticket/12730] Minor formatting fixes

PHPBB3-12730
[ticket/12730] Use string template for Google+ CPF instead of a new one

PHPBB3-12730