i18n: Fix translation of --help [PR93759]

The first two hunks make sure we actually translate what has been marked
for translation, i.e. the cl_options[...].help strings, rather than those
strings ammended in various ways, like:
_("%s  Same as %s."), help, ...
or
"%s  %s", help, _(use_diagnosed_msg)

The exgettext changes attempt to make sure that the cl_options[...].help
strings are marked as no-c-format, because otherwise if they happen
to contain a % character, such as the 90% substring, they will be marked
as c-format, which they aren't.

2020-02-21  Jakub Jelinek  <jakub@redhat.com>

	PR translation/93759
	* opts.c (print_filtered_help): Translate help before appending
	messages to it rather than after that.

	* exgettext: For *.opt help texts, use __opt_help_text("...")
	rather than _("...") in the $emsg file and pass options that
	say that this implies no-c-format.

1 files changed, 4 insertions, 4 deletions

diff --git a/gcc/opts.c b/gcc/opts.c
index 7affeb4..ac160ed 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1309,10 +1309,13 @@ print_filtered_help (unsigned int include_flags,
 	  help = undocumented_msg;
 	}
 
+      /* Get the translation.  */
+      help = _(help);
+
       if (option->alias_target < N_OPTS
 	  && cl_options [option->alias_target].help)
 	{
-	  if (help == undocumented_msg)
+	  if (option->help == NULL)
 	    {
 	      /* For undocumented options that are aliases for other options
 		 that are documented, point the reader to the other option in
@@ -1347,9 +1350,6 @@ print_filtered_help (unsigned int include_flags,
 	  help = new_help;
 	}
 
-      /* Get the translation.  */
-      help = _(help);
-
       /* Find the gap between the name of the
 	 option and its descriptive text.  */
       tab = strchr (help, '\t');