Revert 36565 - Modifying three main samples of docs (gmail checker, news feed, subscribe to feed) to i18n versions. Only "news feed" is saved as a separate version to keep the noni18n one.

Landing it on behalf of ernestd(at)google.com

TBR=finnur


TBR=cira@chromium.org
Review URL: http://codereview.chromium.org/552052

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

5 files changed, 10 insertions, 136 deletions

diff --git a/chrome/test/data/extensions/subscribe_page_action/_locales/en/messages.json b/chrome/test/data/extensions/subscribe_page_action/_locales/en/messages.json
deleted file mode 100644
index 47d4d15..0000000
--- a/chrome/test/data/extensions/subscribe_page_action/_locales/en/messages.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": {
-    "message": "RSS Subscription Extension (by Google)",
-    "description": "Extension name in manifest."
-  },
-  "description": {
-    "message": "Adds one-click subscription to your toolbar.",
-    "description": "Extension description in manifest."
-  },
-  "default_title": {
-    "message": "Subscribe to this feed",
-    "description": "Extension browser action tooltip text in manifest."
-  },
-  "action_title": {
-    "message": "Click to subscribe...",
-    "description": "Extension browser action tooltip text."
-  },
-  "unknown_feed_name": {
-    "message": "Unknown feed name",
-    "description": "Error message for unknown name."
-  },
-  "manage_option": {
-    "message": "Manage...",
-    "description": "The Manage label in the feed reader drop down."
-  },
-  "feed_for": {
-    "message": "Feed for $feed$",
-    "description": "The label showing the feed name.",
-    "placeholders": {
-      "feed": {
-        "content": "$1",
-        "example": "cnn.com"
-      }
-    }
-  },
-  "error_fetching": {
-    "message": "Error fetching feed",
-    "description": "The error shown when feed fetching fails."
-  },
-  "not_valid_feed": {
-    "message": "Not a valid feed.",
-    "description": "The error shown when validation of the feed fails."
-  },
-  "no_entries": {
-    "message": "This feed contains no entries.",
-    "description": "The error shown when the feed is empty."
-  },
-  "one_entry_required": {
-    "message": "There must be at least one entry in this list",
-    "description": "The error shown when trying to remove the last item in the list."
-  },
-  "remove_confirmation": {
-    "message": "Are you sure you want to remove $feed$",
-    "description": "Confirmation message before removing a feed reader from the list.",
-    "placeholders": {
-      "feed": {
-        "content": "$1",
-        "example": "Google Reader."
-      }
-    }
-  }
-}
diff --git a/chrome/test/data/extensions/subscribe_page_action/_locales/es/messages.json b/chrome/test/data/extensions/subscribe_page_action/_locales/es/messages.json
deleted file mode 100644
index d72e248..0000000
--- a/chrome/test/data/extensions/subscribe_page_action/_locales/es/messages.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": {
-    "message": "Extensión de subscripción RSS (de Google)",
-    "description": "Nombre de la extensión en el manifiesto."
-  },
-  "description": {
-    "message": "Añade subscripciones en la barra del navegador en un clic.",
-    "description": "Descripción de la extensión en el manifiesto."
-  },
-  "default_title": {
-    "message": "Subscríbete a este feed",
-    "description": "Texto de la acción de menú de la extension en el manifiesto."
-  },
-  "action_title": {
-    "message": "Pulsa aqui para subscribirte...",
-    "description": "Texto de la acción de menú de la extensión."
-  },
-  "unknown_feed_name": {
-    "message": "Nombre del feed desconocideo",
-    "description": "Mensaje de error para nombre desconocido."
-  },
-  "manage_option": {
-    "message": "Administrar...",
-    "description": "Valor para la opción por defecto del menú."
-  },
-  "feed_for": {
-    "message": "Feed para $feed$",
-    "description": "Mensaje en la etiqueta.",
-    "placeholders": {
-      "feed": {
-        "content": "$1",
-        "example": "cnn.com"
-      }
-    }
-  },
-  "error_fetching": {
-    "message": "Error al capturar el feed",
-    "description": "Mensaje de error en la captura del feed."
-  },
-  "not_valid_feed": {
-    "message": "Feed no válido.",
-    "description": "Mensaje de error después de verificación."
-  },
-  "no_entries": {
-    "message": "Este Feed no contiene ninguna entrada.",
-    "description": "Mensaje de error para un feed vacio."
-  },
-  "one_entry_required": {
-    "message": "Tiene que haber como mínimo una entrada en la lista.",
-    "description": "Mensaje de error si no hay entradas."
-  },
-  "remove_confirmation": {
-    "message": "Estas seguro que quieras eliminar $feed$",
-    "description": "Mensaje de confirmación antes de eliminar.",
-    "placeholders": {
-      "feed": {
-        "content": "$1",
-        "example": "Google Reader."
-      }
-    }
-  }
-}
diff --git a/chrome/test/data/extensions/subscribe_page_action/background.html b/chrome/test/data/extensions/subscribe_page_action/background.html
index cb20089..c97d48f 100644
--- a/chrome/test/data/extensions/subscribe_page_action/background.html
+++ b/chrome/test/data/extensions/subscribe_page_action/background.html
@@ -17,7 +17,7 @@
         // Enable the page action icon.
         feedData[sender.tab.id] = request.feeds;
         chrome.pageAction.setTitle({ tabId: sender.tab.id,
-          title: chrome.i18n.getMessage("action_title")
+          title: "Click to subscribe..."
         });
         chrome.pageAction.show(sender.tab.id);
       }
diff --git a/chrome/test/data/extensions/subscribe_page_action/manifest.json b/chrome/test/data/extensions/subscribe_page_action/manifest.json
index c333dee..be13375 100644
--- a/chrome/test/data/extensions/subscribe_page_action/manifest.json
+++ b/chrome/test/data/extensions/subscribe_page_action/manifest.json
@@ -1,7 +1,6 @@
 {
-  "name": "__MSG_name__",
-  "description": "__MSG_description__",
-  "default_locale": "en",
+  "name": "RSS Subscription Extension (by Google)",
+  "description": "Adds one-click subscription to your toolbar.",
   "version": "1.9.1",
   "permissions": [
     "tabs",
@@ -18,7 +17,7 @@
   ],
   "icons": { "128": "feed-icon-128x128.png" },
   "page_action": {
-    "default_title": "__MSG_default_title__",
+    "default_title": "Subscribe to this feed",
     "default_icon": "feed-icon-16x16.png",
     "popup": "popup.html"
   }
diff --git a/chrome/test/data/extensions/subscribe_page_action/subscribe.js b/chrome/test/data/extensions/subscribe_page_action/subscribe.js
index c4a423e..6234dfa 100644
--- a/chrome/test/data/extensions/subscribe_page_action/subscribe.js
+++ b/chrome/test/data/extensions/subscribe_page_action/subscribe.js
@@ -28,7 +28,7 @@ var styleSheet = "";
 var frameScript = "";
 
 // What to show when we cannot parse the feed name.
-var unknownName = chrome.i18n.getMessage("unknown_feed_name");
+var unknownName = "Unknown feed name";
 
 // A list of feed readers, populated by localStorage if available, otherwise
 // hard coded.
@@ -76,8 +76,7 @@ function main() {
   if (storageEnabled) {
     // Add the "Manage..." entry to the dropdown and show the checkbox asking
     // if we always want to use this reader in the future (skip the preview).
-    var manageText = chrome.i18n.getMessage("manage_option");
-    readerDropdown.options[i] = new Option(manageText, "");
+    readerDropdown.options[i] = new Option("Manage...", "");
     document.getElementById('alwaysUseSpan').style.display = "block";
   }
 
@@ -121,12 +120,12 @@ function main() {
 // Sets the title for the feed.
 function setFeedTitle(title) {
   var titleTag = document.getElementById('title');
-  titleTag.textContent = chrome.i18n.getMessage("feed_for", title);
+  titleTag.textContent = "Feed for '" + title + "'";
 }
 
 // Handles errors during the XMLHttpRequest.
 function handleError() {
-  handleFeedParsingFailed(chrome.i18n.getMessage("error_fetching"));
+  handleFeedParsingFailed("Error fetching feed");
 }
 
 // Handles feed parsing errors.
@@ -174,7 +173,7 @@ function handleResponse() {
 
   var doc = req.responseXML;
   if (!doc) {
-    handleFeedParsingFailed(chrome.i18n.getMessage("not_valid_feed"));
+    handleFeedParsingFailed("Not a valid feed.");
     return;
   }
 
@@ -183,7 +182,7 @@ function handleResponse() {
   if (entries.length == 0)
     entries = doc.getElementsByTagName('item');
   if (entries.length == 0) {
-    handleFeedParsingFailed(chrome.i18n.getMessage("no_entries"));
+    handleFeedParsingFailed("This feed contains no entries.")
     return;
   }