From 558ce49793ac1187e560c07e4441d9371fefa6a0 Mon Sep 17 00:00:00 2001
From: Stuart Colville <scolville@mozilla.com>
Date: Fri, 20 May 2016 15:45:36 +0100
Subject: [PATCH] Support ngettext and friends

---
 locale/templates/LC_MESSAGES/search.pot     | 8 +++++++-
 src/search/components/SearchResult/index.js | 3 ++-
 webpack.l10n.config.babel.js                | 7 +++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/locale/templates/LC_MESSAGES/search.pot b/locale/templates/LC_MESSAGES/search.pot
index c3c3239801..acb630edea 100644
--- a/locale/templates/LC_MESSAGES/search.pot
+++ b/locale/templates/LC_MESSAGES/search.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: search\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-05-20 11:27+0000\n"
+"POT-Creation-Date: 2016-05-20 14:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,6 +51,12 @@ msgstr ""
 msgid "Add-on Search"
 msgstr ""
 
+#: src/search/components/SearchResult/index.js:18
+msgid "%(count)s file"
+msgid_plural "%(count)s files"
+msgstr[0] ""
+msgstr[1] ""
+
 #: src/search/components/SearchResults.js:32
 msgid "Your search for \"%(query)s\" returned %(count)s results."
 msgstr ""
diff --git a/src/search/components/SearchResult/index.js b/src/search/components/SearchResult/index.js
index cc606815b5..f4586bdae2 100644
--- a/src/search/components/SearchResult/index.js
+++ b/src/search/components/SearchResult/index.js
@@ -1,5 +1,6 @@
 import React, { PropTypes } from 'react';
 import { Link } from 'react-router';
+import { sprintf } from 'sprintf-js';
 
 import { ngettext } from 'core/utils';
 
@@ -14,7 +15,7 @@ function fileCount(version) {
 
 function fileCountText(version) {
   const count = fileCount(version);
-  return ngettext('{count} file', '{count} files', count).replace('{count}', count);
+  return sprintf(ngettext('%(count)s file', '%(count)s files', count), {count});
 }
 
 export default class SearchResult extends React.Component {
diff --git a/webpack.l10n.config.babel.js b/webpack.l10n.config.babel.js
index 9bb0a05ad9..d0a1c39fb2 100644
--- a/webpack.l10n.config.babel.js
+++ b/webpack.l10n.config.babel.js
@@ -44,6 +44,13 @@ const babelL10nPlugins = [
     },
     functionNames: {
       _: ['msgid'],
+      dgettext: ['domain', 'msgid'],
+      ngettext: ['msgid', 'msgid_plural', 'count'],
+      dngettext: ['domain', 'msgid', 'msgid_plural', 'count'],
+      pgettext: ['msgctxt', 'msgid'],
+      dpgettext: ['domain', 'msgctxt', 'msgid'],
+      npgettext: ['msgctxt', 'msgid', 'msgid_plural', 'count'],
+      dnpgettext: ['domain', 'msgctxt', 'msgid', 'msgid_plural', 'count'],
     },
     fileName: `locale/templates/LC_MESSAGES/${appName}.pot`,
     baseDirectory: process.cwd(),