mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-23 17:38:54 +02:00
Partially revert 10c490cdfe
This commit broke some tests, and I don't have the time to fix up all the expected output, so I'll revert the changes to the affected files for now. This needs to be redone with the necessary test fixes.
This commit is contained in:
Matthias Clasen
@@ -459,7 +459,7 @@ slow_name_validate (GMarkupParseContext *context,
|
||||
if (!g_utf8_validate (name, strlen (name), NULL))
|
||||
{
|
||||
set_error (context, error, G_MARKUP_ERROR_BAD_UTF8,
|
||||
_("Invalid UTF-8 encoded text in name — not valid “%s”"), name);
|
||||
_("Invalid UTF-8 encoded text in name - not valid '%s'"), name);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -470,7 +470,7 @@ slow_name_validate (GMarkupParseContext *context,
|
||||
g_unichar_isalpha (g_utf8_get_char (p))))))
|
||||
{
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("“%s” is not a valid name"), name);
|
||||
_("'%s' is not a valid name"), name);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -486,7 +486,7 @@ slow_name_validate (GMarkupParseContext *context,
|
||||
g_unichar_isalpha (g_utf8_get_char (p))))))
|
||||
{
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("“%s” is not a valid name: “%c”"), name, *p);
|
||||
_("'%s' is not a valid name: '%c'"), name, *p);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
@@ -542,7 +542,7 @@ text_validate (GMarkupParseContext *context,
|
||||
if (!g_utf8_validate (p, len, NULL))
|
||||
{
|
||||
set_error (context, error, G_MARKUP_ERROR_BAD_UTF8,
|
||||
_("Invalid UTF-8 encoded text in name — not valid “%s”"), p);
|
||||
_("Invalid UTF-8 encoded text in name - not valid '%s'"), p);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
@@ -673,10 +673,10 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
{
|
||||
set_unescape_error (context, error,
|
||||
from, G_MARKUP_ERROR_PARSE,
|
||||
_("Failed to parse “%-.*s”, which "
|
||||
_("Failed to parse '%-.*s', which "
|
||||
"should have been a digit "
|
||||
"inside a character reference "
|
||||
"(ê for example) — perhaps "
|
||||
"(ê for example) - perhaps "
|
||||
"the digit is too large"),
|
||||
(int)(end - from), from);
|
||||
return FALSE;
|
||||
@@ -689,7 +689,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
"semicolon; "
|
||||
"most likely you used an ampersand "
|
||||
"character without intending to start "
|
||||
"an entity — escape ampersand as &"));
|
||||
"an entity - escape ampersand as &"));
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
@@ -711,7 +711,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
{
|
||||
set_unescape_error (context, error,
|
||||
from, G_MARKUP_ERROR_PARSE,
|
||||
_("Character reference “%-.*s” does not "
|
||||
_("Character reference '%-.*s' does not "
|
||||
"encode a permitted character"),
|
||||
(int)(end - from), from);
|
||||
return FALSE;
|
||||
@@ -749,7 +749,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
if (*from == ';')
|
||||
set_unescape_error (context, error,
|
||||
from, G_MARKUP_ERROR_PARSE,
|
||||
_("Empty entity “&;” seen; valid "
|
||||
_("Empty entity '&;' seen; valid "
|
||||
"entities are: & " < > '"));
|
||||
else
|
||||
{
|
||||
@@ -757,7 +757,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
if (end)
|
||||
set_unescape_error (context, error,
|
||||
from, G_MARKUP_ERROR_PARSE,
|
||||
_("Entity name “%-.*s” is not known"),
|
||||
_("Entity name '%-.*s' is not known"),
|
||||
(int)(end - from), from);
|
||||
else
|
||||
set_unescape_error (context, error,
|
||||
@@ -765,7 +765,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
_("Entity did not end with a semicolon; "
|
||||
"most likely you used an ampersand "
|
||||
"character without intending to start "
|
||||
"an entity — escape ampersand as &"));
|
||||
"an entity - escape ampersand as &"));
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
@@ -1208,8 +1208,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("“%s” is not a valid character following "
|
||||
"a “<” character; it may not begin an "
|
||||
_("'%s' is not a valid character following "
|
||||
"a '<' character; it may not begin an "
|
||||
"element name"),
|
||||
utf8_str (context->iter, buf));
|
||||
}
|
||||
@@ -1250,8 +1250,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Odd character “%s”, expected a “>” character "
|
||||
"to end the empty-element tag “%s”"),
|
||||
_("Odd character '%s', expected a '>' character "
|
||||
"to end the empty-element tag '%s'"),
|
||||
utf8_str (context->iter, buf),
|
||||
current_element (context));
|
||||
}
|
||||
@@ -1331,8 +1331,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Odd character “%s”, expected a “=” after "
|
||||
"attribute name “%s” of element “%s”"),
|
||||
_("Odd character '%s', expected a '=' after "
|
||||
"attribute name '%s' of element '%s'"),
|
||||
utf8_str (context->iter, buf),
|
||||
current_attribute (context),
|
||||
current_element (context));
|
||||
@@ -1372,9 +1372,9 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Odd character “%s”, expected a “>” or “/” "
|
||||
_("Odd character '%s', expected a '>' or '/' "
|
||||
"character to end the start tag of "
|
||||
"element “%s”, or optionally an attribute; "
|
||||
"element '%s', or optionally an attribute; "
|
||||
"perhaps you used an invalid character in "
|
||||
"an attribute name"),
|
||||
utf8_str (context->iter, buf),
|
||||
@@ -1416,9 +1416,9 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Odd character “%s”, expected an open quote mark "
|
||||
_("Odd character '%s', expected an open quote mark "
|
||||
"after the equals sign when giving value for "
|
||||
"attribute “%s” of element “%s”"),
|
||||
"attribute '%s' of element '%s'"),
|
||||
utf8_str (context->iter, buf),
|
||||
current_attribute (context),
|
||||
current_element (context));
|
||||
@@ -1549,8 +1549,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("“%s” is not a valid character following "
|
||||
"the characters “</”; “%s” may not begin an "
|
||||
_("'%s' is not a valid character following "
|
||||
"the characters '</'; '%s' may not begin an "
|
||||
"element name"),
|
||||
utf8_str (context->iter, buf),
|
||||
utf8_str (context->iter, buf));
|
||||
@@ -1585,9 +1585,9 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("“%s” is not a valid character following "
|
||||
"the close element name “%s”; the allowed "
|
||||
"character is “>”"),
|
||||
_("'%s' is not a valid character following "
|
||||
"the close element name '%s'; the allowed "
|
||||
"character is '>'"),
|
||||
utf8_str (context->iter, buf),
|
||||
close_name->str);
|
||||
}
|
||||
@@ -1596,7 +1596,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Element “%s” was closed, no element "
|
||||
_("Element '%s' was closed, no element "
|
||||
"is currently open"),
|
||||
close_name->str);
|
||||
}
|
||||
@@ -1605,8 +1605,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Element “%s” was closed, but the currently "
|
||||
"open element is “%s”"),
|
||||
_("Element '%s' was closed, but the currently "
|
||||
"open element is '%s'"),
|
||||
close_name->str,
|
||||
current_element (context));
|
||||
}
|
||||
@@ -1772,7 +1772,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
|
||||
case STATE_AFTER_OPEN_ANGLE:
|
||||
set_error_literal (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("Document ended unexpectedly just after an open angle bracket “<”"));
|
||||
_("Document ended unexpectedly just after an open angle bracket '<'"));
|
||||
break;
|
||||
|
||||
case STATE_AFTER_CLOSE_ANGLE:
|
||||
@@ -1780,8 +1780,8 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
{
|
||||
/* Error message the same as for INSIDE_TEXT */
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("Document ended unexpectedly with elements still open — "
|
||||
"“%s” was the last element opened"),
|
||||
_("Document ended unexpectedly with elements still open - "
|
||||
"'%s' was the last element opened"),
|
||||
current_element (context));
|
||||
}
|
||||
break;
|
||||
@@ -1825,8 +1825,8 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
case STATE_INSIDE_TEXT:
|
||||
g_assert (context->tag_stack != NULL);
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("Document ended unexpectedly with elements still open — "
|
||||
"“%s” was the last element opened"),
|
||||
_("Document ended unexpectedly with elements still open - "
|
||||
"'%s' was the last element opened"),
|
||||
current_element (context));
|
||||
break;
|
||||
|
||||
@@ -1835,7 +1835,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
case STATE_AFTER_CLOSE_TAG_NAME:
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("Document ended unexpectedly inside the close tag for "
|
||||
"element “%s”"), current_element (context));
|
||||
"element '%s'"), current_element (context));
|
||||
break;
|
||||
|
||||
case STATE_INSIDE_PASSTHROUGH:
|
||||
|
||||
Reference in New Issue
Block a user