SVN copy didn't work for me so I somehow changed news extension instead of commiting i18n_news. Reverting.

TBR=aa

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

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

4 files changed, 9 insertions, 128 deletions

diff --git a/chrome/common/extensions/docs/examples/extensions/news/_locales/en/messages.json b/chrome/common/extensions/docs/examples/extensions/news/_locales/en/messages.json
deleted file mode 100644
index 0288725..0000000
--- a/chrome/common/extensions/docs/examples/extensions/news/_locales/en/messages.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "name": {
-    "message": "News Reader",
-    "description": "Extension name in manifest."
-  },
-  "description": {
-    "message": "Displays the first 5 items from the '$Google$ News - top news' RSS feed in a popup.",
-    "description": "Extension description in manifest.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "default_title": {
-    "message": "$Google$ News",
-    "description": "Extension browser action tooltip text in manifest.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "unknown_title": {
-    "message": "Unknown title",
-    "description": "Unknown news title."
-  },
-  "error": {
-    "message": "Error: $error$",
-    "description": "Generic error template. Expects error parameter to be passed in.",
-    "placeholders": {
-      "error": {
-        "content": "$1",
-        "example": "Failed to fetch RSS feed."
-      }
-    }
-  },
-  "failed_to_fetch_rss": {
-    "message": "Failed to fetch RSS feed.",
-    "description": "User visible error message."
-  },
-  "not_a_valid_feed": {
-    "message": "Not a valid feed.",
-    "description": "User visible error message."
-  },
-  "more_stories": {
-    "message": "To $Google$ News \u00BB",
-    "description": "Link name to more Google News.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  }
-}
-
diff --git a/chrome/common/extensions/docs/examples/extensions/news/_locales/sr/messages.json b/chrome/common/extensions/docs/examples/extensions/news/_locales/sr/messages.json
deleted file mode 100644
index 7d43d7a..0000000
--- a/chrome/common/extensions/docs/examples/extensions/news/_locales/sr/messages.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "name": {
-    "message": "Читач вести",
-    "description": "Назив екстензије у манифесту."
-  },
-  "description": {
-    "message": "Приказује првих 5 вести са '$Google$ Вести - главне вести' у прозорчићу.",
-    "description": "Опис екстензије у манифесту.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "default_title": {
-    "message": "$Google$ Вести",
-    "description": "Назив дугмета екстензије.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  },
-  "unknown_title": {
-    "message": "Непознат наслов",
-    "description": "Непознат наслов вести."
-  },
-  "error": {
-    "message": "Грешка - $error$",
-    "description": "Општи облик грешке.",
-    "placeholders": {
-      "error": {
-        "content": "$1",
-        "example": "фид је недоступан."
-      }
-    }
-  },
-  "failed_to_fetch_rss": {
-    "message": "фид је недоступан.",
-    "description": "Порука грешке коју види корисник када је фид недоступан."
-  },
-  "not_a_valid_feed": {
-    "message": "неисправан фид.",
-    "description": "Порука грешке коју види корисник када је фид неисправан."
-  },
-  "more_stories": {
-    "message": "Ка $Google$ Вестима \u00BB",
-    "description": "Назив везе ка још вести.",
-    "placeholders": {
-      "google": {
-        "content": "Google",
-        "example": "Google"
-      }
-    }
-  }
-}
-
diff --git a/chrome/common/extensions/docs/examples/extensions/news/feed.html b/chrome/common/extensions/docs/examples/extensions/news/feed.html
index 4d7ca01..6592a87 100644
--- a/chrome/common/extensions/docs/examples/extensions/news/feed.html
+++ b/chrome/common/extensions/docs/examples/extensions/news/feed.html
@@ -119,19 +119,19 @@ function main() {
 function handleFeedParsingFailed(error) {
   var feed = document.getElementById("feed");
   feed.className = "error";
-  feed.innerText = chrome.i18n.getMessage("error", error);
+  feed.innerText = "Error: " + error;
 }
 
 // Handles errors during the XMLHttpRequest.
 function handleError() {
-  handleFeedParsingFailed(chrome.i18n.getMessage('failed_to_fetch_rss'));
+  handleFeedParsingFailed('Failed to fetch RSS feed.');
 }
 
 // Handles parsing the feed data we got back from XMLHttpRequest.
 function handleResponse() {
   var doc = req.responseXML;
   if (!doc) {
-    handleFeedParsingFailed(chrome.i18n.getMessage('not_a_valid_feed'));
+    handleFeedParsingFailed("Not a valid feed.");
     return;
   }
   buildPreview(doc);
@@ -190,7 +190,7 @@ function buildPreview(doc) {
     if (itemTitle) {
       itemTitle = itemTitle.textContent;
     } else {
-      itemTitle = chrome.i18n.getMessage("unknown_title");
+      itemTitle = "Unknown title";
     }
 
     // Grab the description.
@@ -235,7 +235,7 @@ function buildPreview(doc) {
   if (moreStoriesUrl) {
     var more = document.createElement("a");
     more.className = "more";
-    more.innerText = chrome.i18n.getMessage("more_stories");
+    more.innerText = "More stories \u00BB";
     more.addEventListener("click", moreStories);
     feed.appendChild(more);
   }
diff --git a/chrome/common/extensions/docs/examples/extensions/news/manifest.json b/chrome/common/extensions/docs/examples/extensions/news/manifest.json
index 681d6ef..f0c7e0e 100644
--- a/chrome/common/extensions/docs/examples/extensions/news/manifest.json
+++ b/chrome/common/extensions/docs/examples/extensions/news/manifest.json
@@ -1,16 +1,15 @@
 {
-  "name": "__MSG_name__",
+  "name": "News Reader",
   "version": "1.1",
-  "description": "__MSG_description__",
+  "description": "Displays the first 5 items from the 'Google News - top news' RSS feed in a popup.",
   "icons": { "128": "news_icon.png" },
   "browser_action": {
-    "default_title": "__MSG_default_title__",
+    "default_title": "Google News",
     "default_icon": "news_action.png",
     "popup": "feed.html"
   },
   "permissions": [
     "tabs",
     "http://news.google.com/*"
-  ],
-  "default_locale": "en"
+  ]
 }