<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211871] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211871">211871</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-08 08:20:19 -0800 (Wed, 08 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Fix translatable form validation messages
https://bugs.webkit.org/show_bug.cgi?id=167984
Reviewed by Michael Catanzaro.
Most of them are just wrong. Use the same mesages than mac, which also makes some tests pass.
Fixes: fast/forms/validation-message-maxLength.html
fast/forms/validationMessage.html
* platform/gtk/LocalizedStringsGtk.cpp:
(WebCore::validationMessageValueMissingText):
(WebCore::validationMessageValueMissingForCheckboxText):
(WebCore::validationMessageValueMissingForFileText):
(WebCore::validationMessageValueMissingForMultipleFileText):
(WebCore::validationMessageValueMissingForRadioText):
(WebCore::validationMessageValueMissingForSelectText):
(WebCore::validationMessageTypeMismatchText):
(WebCore::validationMessageTypeMismatchForEmailText):
(WebCore::validationMessageTypeMismatchForMultipleEmailText):
(WebCore::validationMessageTypeMismatchForURLText):
(WebCore::validationMessagePatternMismatchText):
(WebCore::validationMessageTooShortText):
(WebCore::validationMessageTooLongText):
(WebCore::validationMessageRangeUnderflowText):
(WebCore::validationMessageRangeOverflowText):
(WebCore::validationMessageStepMismatchText):
(WebCore::validationMessageBadInputForNumberText):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkLocalizedStringsGtkcpp">trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211870 => 211871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-08 15:39:38 UTC (rev 211870)
+++ trunk/Source/WebCore/ChangeLog 2017-02-08 16:20:19 UTC (rev 211871)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2017-02-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Fix translatable form validation messages
+ https://bugs.webkit.org/show_bug.cgi?id=167984
+
+ Reviewed by Michael Catanzaro.
+
+ Most of them are just wrong. Use the same mesages than mac, which also makes some tests pass.
+
+ Fixes: fast/forms/validation-message-maxLength.html
+ fast/forms/validationMessage.html
+
+ * platform/gtk/LocalizedStringsGtk.cpp:
+ (WebCore::validationMessageValueMissingText):
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForMultipleFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+ (WebCore::validationMessageTypeMismatchText):
+ (WebCore::validationMessageTypeMismatchForEmailText):
+ (WebCore::validationMessageTypeMismatchForMultipleEmailText):
+ (WebCore::validationMessageTypeMismatchForURLText):
+ (WebCore::validationMessagePatternMismatchText):
+ (WebCore::validationMessageTooShortText):
+ (WebCore::validationMessageTooLongText):
+ (WebCore::validationMessageRangeUnderflowText):
+ (WebCore::validationMessageRangeOverflowText):
+ (WebCore::validationMessageStepMismatchText):
+ (WebCore::validationMessageBadInputForNumberText):
+
</ins><span class="cx"> 2017-02-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for enhanced privacy diagnostic logging
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkLocalizedStringsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp (211870 => 211871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2017-02-08 15:39:38 UTC (rev 211870)
+++ trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2017-02-08 16:20:19 UTC (rev 211871)
</span><span class="lines">@@ -756,93 +756,93 @@
</span><span class="cx">
</span><span class="cx"> String validationMessageValueMissingText()
</span><span class="cx"> {
</span><del>- return String::fromUTF8(_("value missing"));
</del><ins>+ return String::fromUTF8(_("Fill out this field"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageValueMissingForCheckboxText()
</span><span class="cx"> {
</span><del>- notImplemented();
- return validationMessageValueMissingText();
</del><ins>+ return String::fromUTF8(_("Select this checkbox"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageValueMissingForFileText()
</span><span class="cx"> {
</span><del>- notImplemented();
- return validationMessageValueMissingText();
</del><ins>+ return String::fromUTF8(_("Select a file"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageValueMissingForMultipleFileText()
</span><span class="cx"> {
</span><del>- notImplemented();
- return validationMessageValueMissingText();
</del><ins>+ return validationMessageValueMissingForFileText();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageValueMissingForRadioText()
</span><span class="cx"> {
</span><del>- notImplemented();
- return validationMessageValueMissingText();
</del><ins>+ return String::fromUTF8(_("Select one of these options"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageValueMissingForSelectText()
</span><span class="cx"> {
</span><del>- notImplemented();
- return validationMessageValueMissingText();
</del><ins>+ return String::fromUTF8(_("Select an item in the list"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageTypeMismatchText()
</span><span class="cx"> {
</span><del>- notImplemented();
- return String::fromUTF8(_("type mismatch"));
</del><ins>+ return String::fromUTF8(_("Invalid value"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageTypeMismatchForEmailText()
</span><span class="cx"> {
</span><del>- notImplemented();
- return validationMessageTypeMismatchText();
</del><ins>+ return String::fromUTF8(_("Enter an email address"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageTypeMismatchForMultipleEmailText()
</span><span class="cx"> {
</span><del>- notImplemented();
- return validationMessageTypeMismatchText();
</del><ins>+ return validationMessageTypeMismatchForEmailText();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageTypeMismatchForURLText()
</span><span class="cx"> {
</span><del>- notImplemented();
- return validationMessageTypeMismatchText();
</del><ins>+ return String::fromUTF8(_("Enter a URL"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessagePatternMismatchText()
</span><span class="cx"> {
</span><del>- return String::fromUTF8(_("pattern mismatch"));
</del><ins>+ return String::fromUTF8(_("Match the requested format"));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String validationMessageTooShortText(int, int)
</del><ins>+String validationMessageTooShortText(int, int minLength)
</ins><span class="cx"> {
</span><del>- return String::fromUTF8(_("too short"));
</del><ins>+ GUniquePtr<char> string(g_strdup_printf(ngettext("Use at least one character", "Use at least %d characters", minLength), minLength));
+ return String::fromUTF8(string.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String validationMessageTooLongText(int, int)
</del><ins>+String validationMessageTooLongText(int, int maxLength)
</ins><span class="cx"> {
</span><del>- return String::fromUTF8(_("too long"));
</del><ins>+ GUniquePtr<char> string(g_strdup_printf(ngettext("Use no more than one character", "Use no more than %d characters", maxLength), maxLength));
+ return String::fromUTF8(string.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String validationMessageRangeUnderflowText(const String&)
</del><ins>+String validationMessageRangeUnderflowText(const String& minimum)
</ins><span class="cx"> {
</span><del>- return String::fromUTF8(_("range underflow"));
</del><ins>+ GUniquePtr<char> string(g_strdup_printf(_("Value must be greater than or equal to %s"), minimum.utf8().data()));
+ return String::fromUTF8(string.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-String validationMessageRangeOverflowText(const String&)
</del><ins>+String validationMessageRangeOverflowText(const String& maximum)
</ins><span class="cx"> {
</span><del>- return String::fromUTF8(_("range overflow"));
</del><ins>+ GUniquePtr<char> string(g_strdup_printf(_("Value must be less than or equal to %s"), maximum.utf8().data()));
+ return String::fromUTF8(string.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String validationMessageStepMismatchText(const String&, const String&)
</span><span class="cx"> {
</span><del>- return String::fromUTF8(_("step mismatch"));
</del><ins>+ return String::fromUTF8(_("Enter a valid value"));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+String validationMessageBadInputForNumberText()
+{
+ return String::fromUTF8(_("Enter a number"));
+}
+
</ins><span class="cx"> String unacceptableTLSCertificate()
</span><span class="cx"> {
</span><span class="cx"> return String::fromUTF8(_("Unacceptable TLS certificate"));
</span><span class="lines">@@ -853,12 +853,6 @@
</span><span class="cx"> return String::fromUTF8(key, strlen(key));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String validationMessageBadInputForNumberText()
-{
- notImplemented();
- return validationMessageTypeMismatchText();
-}
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> String textTrackSubtitlesText()
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>