1 files changed, 30 insertions, 10 deletions
diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index e8e63ca..830895e 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -153,8 +153,26 @@ var context = {};  // Used by WebCore's inspector routines.
 ///////////////////////////////////////////////////////////////////////////////
 // Here and below are overrides to existing WebInspector methods only.
 // TODO(pfeldman): Patch WebCore and upstream changes.
+(function () {
+
 var oldLoaded = WebInspector.loaded;
-WebInspector.loaded = function() {
+
+function loadDevToolsStrings() {
+  var locale = DevToolsHost.getApplicationLocale();
+  locale = locale.replace('_', '-');
+
+  var devtoolsStringsScriptElement = document.createElement('script');
+  devtoolsStringsScriptElement.addEventListener(
+      "load",
+      devToolsHandleLoaded.bind(WebInspector),
+      false);
+  devtoolsStringsScriptElement.type = 'text/javascript';
+  devtoolsStringsScriptElement.src = 'l10n/devtoolsStrings_' + locale + '.js';
+  document.getElementsByTagName("head").item(0).appendChild(
+      devtoolsStringsScriptElement);
+};
+
+function devToolsHandleLoaded() {
   devtools.tools = new devtools.ToolsAgent();
   devtools.tools.reset();
 
@@ -180,6 +198,17 @@ WebInspector.loaded = function() {
   DevToolsHost.loaded();
 };
 
+// l10n is turned off in tests mode because delayed loading of strings
+// causes test failures.
+if (!window.___interactiveUiTestsMode) {
+  window.localizedStrings = {};
+  WebInspector.loaded = loadDevToolsStrings;
+} else {
+  WebInspector.loaded = devToolsHandleLoaded;
+}
+
+})();
+
 
 var webkitUpdateChildren =
     WebInspector.ElementsTreeElement.prototype.updateChildren;
@@ -533,15 +562,6 @@ WebInspector.ScriptsPanel.prototype.doEvalInCallFrame =
 })();
 
 
-/*
- * @override	
- * TODO(mnaganov): Restore l10n when it will be agreed that it is needed.	
- */	
-WebInspector.UIString = function(string) {	
-  return String.vsprintf(string, Array.prototype.slice.call(arguments, 1));	
-};
-
-
 // There is no clear way of setting frame title yet. So sniffing main resource
 // load.
 (function OverrideUpdateResource() {