Title: [175032] releases/WebKitGTK/webkit-2.4/Source/WebKit2
- Revision
- 175032
- Author
- [email protected]
- Date
- 2014-10-22 02:50:58 -0700 (Wed, 22 Oct 2014)
Log Message
Merge r172957 - [GTK] Translations are not initialized in the UI process
https://bugs.webkit.org/show_bug.cgi?id=136249
Reviewed by Philippe Normand.
This is breaking things like webkitContextMenuActionGetForContextMenuItem()
for non English locales in the cases where we use the action title to guess the
action, because the action title we get from the web process is translated while
the one in the UI process is in English.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(createDefaultWebContext): Initialize gettext right before
creating the default web context.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (175031 => 175032)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-10-22 09:48:54 UTC (rev 175031)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-10-22 09:50:58 UTC (rev 175032)
@@ -1,3 +1,19 @@
+2014-08-26 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Translations are not initialized in the UI process
+ https://bugs.webkit.org/show_bug.cgi?id=136249
+
+ Reviewed by Philippe Normand.
+
+ This is breaking things like webkitContextMenuActionGetForContextMenuItem()
+ for non English locales in the cases where we use the action title to guess the
+ action, because the action title we get from the web process is translated while
+ the one in the UI process is in English.
+
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (createDefaultWebContext): Initialize gettext right before
+ creating the default web context.
+
2014-09-30 Carlos Garcia Campos <[email protected]>
[GTK] The remote web inspector shows the HTML content as plain text
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (175031 => 175032)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-10-22 09:48:54 UTC (rev 175031)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-10-22 09:50:58 UTC (rev 175032)
@@ -46,6 +46,7 @@
#include <WebCore/FileSystem.h>
#include <WebCore/IconDatabase.h>
#include <WebCore/Language.h>
+#include <libintl.h>
#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassRefPtr.h>
@@ -223,6 +224,9 @@
static gpointer createDefaultWebContext(gpointer)
{
+ bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+
static GRefPtr<WebKitWebContext> webContext = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT, NULL)));
WebKitWebContextPrivate* priv = webContext->priv;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
