DevTools l10n: inhibit until agreeded that it is needed.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/173570

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24648 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 36 deletions

diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index c82cac11..2520f0f 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -153,26 +153,8 @@ 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;
-
-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() {
+WebInspector.loaded = function() {
   devtools.tools = new devtools.ToolsAgent();
   devtools.tools.reset();
 
@@ -199,18 +181,6 @@ function devToolsHandleLoaded() {
 };
 
 
-// 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;
-}
-
-})();
-
-
 /**
  * This override is necessary for adding script source asynchronously.
  * @override
@@ -353,6 +323,15 @@ WebInspector.ScriptsPanel.prototype.__defineGetter__(
 })();
 
 
+/*
+ * @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() {
diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js
index 12aeb3b..1a18a45 100644
--- a/webkit/glue/devtools/js/inspector_controller_impl.js
+++ b/webkit/glue/devtools/js/inspector_controller_impl.js
@@ -109,11 +109,10 @@ devtools.InspectorControllerImpl.prototype.localizedStringsURL =
     function(opt_prefix) {
   // l10n is turned off in test mode because delayed loading of strings
   // causes test failures.
-  if (!window.___interactiveUiTestsMode && !DevToolsHost.isStub) {
+  if (false) {
     var locale = DevToolsHost.getApplicationLocale();
     locale = locale.replace('_', '-');
-    var prefix = opt_prefix || 'inspectorStrings';
-    return 'l10n/' + prefix + '_' + locale + '.js';
+    return 'l10n/localizedStrings_' + locale + '.js';
   } else {
     return undefined;
   }
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index cd40e35..70c2ec1 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1263,9 +1263,7 @@
       'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09',
       'dependencies': [
         '../net/net.gyp:net',
-        'devtools_strings',
         'inspector_resources',
-        'inspector_strings',
         'webcore',
         'webkit',
         'webkit_resources',