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

8 files changed, 10 insertions, 150 deletions

diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/en/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/en/messages.json
deleted file mode 100644
index 4dfd2de..0000000
--- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/en/messages.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": {
-    "message": "$Google$ Mail Checker",
-    "description": "Extension name in manifest.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "description": {
-    "message": "Displays the number of unread messages in your $Google$ Mail inbox. You can also click the button to open your inbox.",
-    "description": "Extension description in manifest.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "node_error": {
-    "message": "Error: feed retrieved, but no <fullcount> node found",
-    "description": "Missing node error."
-  },
-  "exception": {
-    "message": "exception: $exception$",
-    "description": "Exception message.",
-    "placeholders": {
-      "exception": {
-        "content": "$1",
-        "example": "xhr object error."
-      }
-    }
-  }
-}
diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/es/messages.json b/chrome/common/extensions/docs/examples/extensions/gmail/_locales/es/messages.json
deleted file mode 100644
index 87674fe..0000000
--- a/chrome/common/extensions/docs/examples/extensions/gmail/_locales/es/messages.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": {
-    "message": "$Google$ Mail Checker",
-    "description": "Nombre de la extensión en el manifiesto.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "description": {
-    "message": "Muestra el número de mensajes sin leer en tu bandeja de entrada de $Google$ Mail. También se puede acceder directamente a tu bandeja de entrada pulsando el botón.",
-    "description": "Descripción de la extensión en el manifiesto.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "node_error": {
-    "message": "Error: feed capturado, pero no se puede hallar el nodo <fullcount>",
-    "description": "Error de nodo no encontrado."
-  },
-  "exception": {
-    "message": "excepción: $exception$",
-    "description": "Mensaje de la excepción.",
-    "placeholders": {
-      "exception": {
-        "content": "$1",
-        "example": "Error en el objecto xhr."
-      }
-    }
-  }
-}
diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/background.html b/chrome/common/extensions/docs/examples/extensions/gmail/background.html
index 7f2b25f..0a0563f 100644
--- a/chrome/common/extensions/docs/examples/extensions/gmail/background.html
+++ b/chrome/common/extensions/docs/examples/extensions/gmail/background.html
@@ -163,7 +163,8 @@ function getInboxCount(onSuccess, onError) {
           handleSuccess(fullCountNode.textContent);
           return;
         } else {
-          console.error(chrome.i18n.getMessage("node_error"));
+          console.error("Error: feed retrieved, but no <fullcount> node " +
+                        "found");
         }
       }
 
@@ -177,7 +178,7 @@ function getInboxCount(onSuccess, onError) {
     xhr.open("GET", getFeedUrl(), true);
     xhr.send(null);
   } catch(e) {
-    console.error(chrome.i18n.getMessage("exception", e));
+    console.error("exception: " + e);
     handleError();
   }
 }
diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/manifest.json b/chrome/common/extensions/docs/examples/extensions/gmail/manifest.json
index 90101314..96a7588 100644
--- a/chrome/common/extensions/docs/examples/extensions/gmail/manifest.json
+++ b/chrome/common/extensions/docs/examples/extensions/gmail/manifest.json
@@ -1,6 +1,6 @@
 {
-  "name": "__MSG_name__",
-  "description": "__MSG_description__",
+  "name": "Google Mail Checker",
+  "description": "Displays the number of unread messages in your Google Mail inbox. You can also click the button to open your inbox.",
   "version": "3",
   "background_page": "background.html",
   "options_page": "options.html",
@@ -8,10 +8,9 @@
     "tabs", "http://*.google.com/", "https://*.google.com/"
    ],
   "browser_action": {
-    "default_title": ""
+      "default_title": ""
   },
   "icons": {
     "128": "icon_128.png"
-  },
-  "default_locale": "en"
+  }
 }
diff --git a/chrome/common/extensions/docs/examples/extensions/news_i18n/_locales/en/messages.json b/chrome/common/extensions/docs/examples/extensions/news_i18n/_locales/en/messages.json
index 9f5ea5d..0288725 100644
--- a/chrome/common/extensions/docs/examples/extensions/news_i18n/_locales/en/messages.json
+++ b/chrome/common/extensions/docs/examples/extensions/news_i18n/_locales/en/messages.json
@@ -54,10 +54,6 @@
         "example": "Google"
       }
     }
-  },
-  "newsUrl": {
-    "message": "http://news.google.com",
-    "description": "Url to Google News."
   }
 }
 
diff --git a/chrome/common/extensions/docs/examples/extensions/news_i18n/_locales/es/messages.json b/chrome/common/extensions/docs/examples/extensions/news_i18n/_locales/es/messages.json
deleted file mode 100644
index 2093149..0000000
--- a/chrome/common/extensions/docs/examples/extensions/news_i18n/_locales/es/messages.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "name": {
-    "message": "Lector de noticias",
-    "description": "Nombre de la extensión en el manifiesto."
-  },
-  "description": {
-    "message": "Muestra los primeros 5 eventos de '$Google$ noticias - destacados' RSS feed en una ventana.",
-    "description": "Descripción de la extensión en el manifiesto.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "default_title": {
-    "message": "$Google$ noticias",
-    "description": "Texto de la accion de menú de la extension en el manifiesto.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "unknown_title": {
-    "message": "Título desconocido",
-    "description": "Noticia con título desconocido."
-  },
-  "error": {
-    "message": "Error: $error$",
-    "description": "Plantilla de error genérico. Hace falta pasar un parámetro de error.",
-    "placeholders": {
-      "error": {
-        "content": "$1",
-        "example": "Fallo al capturar el RSS feed."
-      }
-    }
-  },
-  "failed_to_fetch_rss": {
-    "message": "Fallo al capturar el RSS feed.",
-    "description": "Mensaje de error visible para el usuario."
-  },
-  "not_a_valid_feed": {
-    "message": "Feed no válido.",
-    "description": "Mensaje de error visible para el usuario."
-  },
-  "more_stories": {
-    "message": "Ir a $Google$ noticias \u00BB",
-    "description": "Nombre del enlace a Google noticias.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "newsUrl": {
-    "message": "http://news.google.es",
-    "description": "Dirección de Google News."
-  }
-}
-
diff --git a/chrome/common/extensions/docs/examples/extensions/news_i18n/feed.html b/chrome/common/extensions/docs/examples/extensions/news_i18n/feed.html
index 902b0de..4d7ca01 100644
--- a/chrome/common/extensions/docs/examples/extensions/news_i18n/feed.html
+++ b/chrome/common/extensions/docs/examples/extensions/news_i18n/feed.html
@@ -102,7 +102,7 @@ function messageHandler(event) {
 </script>
 <script>
 // Feed URL.
-var feedUrl = chrome.i18n.getMessage('newsUrl') + '/?output=rss';
+var feedUrl = 'http://news.google.com/?output=rss';
 
 // The XMLHttpRequest object that tries to load and parse the feed.
 var req;
@@ -280,7 +280,7 @@ function iframeMessageHandler(e) {
           iframes[i].style.height = msg.size + "px";
         } else if (msg.type == "show") {
           var url = msg.url;
-          if (url.indexOf(chrome.i18n.getMessage('newsUrl')) == 0) {
+          if (url.indexOf("http://news.google.com") == 0) {
             // If the URL is a redirect URL, strip of the destination and go to
             // that directly.  This is necessary because the Google news
             // redirector blocks use of the redirects in this case.
diff --git a/chrome/common/extensions/docs/examples/extensions/news_i18n/manifest.json b/chrome/common/extensions/docs/examples/extensions/news_i18n/manifest.json
index 3b60601..681d6ef 100644
--- a/chrome/common/extensions/docs/examples/extensions/news_i18n/manifest.json
+++ b/chrome/common/extensions/docs/examples/extensions/news_i18n/manifest.json
@@ -10,8 +10,7 @@
   },
   "permissions": [
     "tabs",
-    "http://news.google.com/*",
-    "http://news.google.es/*"
+    "http://news.google.com/*"
   ],
   "default_locale": "en"
 }