fix search text 'zero' (#2150)

diff --git a/app/assets/javascripts/components/features/compose/components/search_results.jsx b/app/assets/javascripts/components/features/compose/components/search_results.jsx
index fd05e7f7e49e00c67be96a84c291df75b5a421e3..d0064f1b9dd0f353ec25d69e05e49277d32e30e6 100644 (file)
--- a/app/assets/javascripts/components/features/compose/components/search_results.jsx
+++ b/app/assets/javascripts/components/features/compose/components/search_results.jsx
@@ -53,7 +53,7 @@ const SearchResults = React.createClass({
     return (
       <div className='search-results'>
         <div className='search-results__header'>
-          <FormattedMessage id='search_results.total' defaultMessage='{count} {count, plural, one {result} other {results}}' values={{ count }} />
+          <FormattedMessage id='search_results.total' defaultMessage='{count, number} {count, plural, one {result} other {results}}' values={{ count }} />
         </div>
 
         {accounts}

diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx
index 96781166e8789d1e6763117674c14bbb70da4897..4446bb5f77f535ce714c69ae172eb04246dc5cad 100644 (file)
--- a/app/assets/javascripts/components/locales/en.jsx
+++ b/app/assets/javascripts/components/locales/en.jsx
@@ -100,7 +100,7 @@ const en = {
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
-  "search_results.total": "{count} {count, plural, one {result} other {results}}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "search.placeholder": "Search",
   "search.status_by": "Status by {name}",
   "status.delete": "Delete",

diff --git a/app/assets/javascripts/components/locales/fr.jsx b/app/assets/javascripts/components/locales/fr.jsx
index 73a34ee4f01210ddba45608300ad15e02c5ec120..3a7335964adbbc41719c1ddffef4311a49d886e2 100644 (file)
--- a/app/assets/javascripts/components/locales/fr.jsx
+++ b/app/assets/javascripts/components/locales/fr.jsx
@@ -81,7 +81,7 @@ const fr = {
   "search.placeholder": "Rechercher",
   "search.account": "Compte",
   "search.hashtag": "Mot-clé",
-  "search_results.total": "{count} {count, plural, one {résultat} other {résultats}}",
+  "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
   "search.status_by": "Statuts de {name}",
   "upload_button.label": "Joindre un média",
   "upload_form.undo": "Annuler",

diff --git a/app/assets/javascripts/components/locales/hr.jsx b/app/assets/javascripts/components/locales/hr.jsx
index c26e2cc293fc0200efd43e07903d9b202468de78..a7ee2eabdad45751a66a60f1403d750aa7cf86fa 100644 (file)
--- a/app/assets/javascripts/components/locales/hr.jsx
+++ b/app/assets/javascripts/components/locales/hr.jsx
@@ -90,7 +90,7 @@ const hr = {
   "report.placeholder": "Dodatni komentari",
   "report.submit": "Pošalji",
   "report.target": "Prijavljivanje",
-  "search_results.total": "{count} {count, plural, one {result} other {results}}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "search.placeholder": "Traži",
   "search.status_by": "Status od {name}",
   "status.delete": "Obriši",

diff --git a/app/assets/javascripts/components/locales/ja.jsx b/app/assets/javascripts/components/locales/ja.jsx
index 154f62f5a1a54ec9a65f31acacc1d3f5a2c6fab9..845d2eaafbfc6f638e242e8c8d0cc69f9a7d9a0b 100644 (file)
--- a/app/assets/javascripts/components/locales/ja.jsx
+++ b/app/assets/javascripts/components/locales/ja.jsx
@@ -110,7 +110,7 @@ const ja = {
   "report.target": "問題のユーザー",
   "search.placeholder": "検索",
   "search.status_by": "{name}からの投稿",
-  "search_results.total": "{count} 件",
+  "search_results.total": "{count, number} 件",
   "status.delete": "削除",
   "status.favourite": "お気に入り",
   "status.load_more": "もっと見る",

diff --git a/app/assets/javascripts/components/locales/nl.jsx b/app/assets/javascripts/components/locales/nl.jsx
index 533bc2aa589081863f08773acc958c3759076a88..310cfafb14bb0541208b2e3fac353de38e783d1c 100644 (file)
--- a/app/assets/javascripts/components/locales/nl.jsx
+++ b/app/assets/javascripts/components/locales/nl.jsx
@@ -59,7 +59,7 @@ const nl = {
   "search.placeholder": "Zoeken",
   "search.account": "Account",
   "search.hashtag": "Hashtag",
-  "search_results.total": "{count} {count, plural, one {resultaat} other {resultaten}}",
+  "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
   "upload_button.label": "Media toevoegen",
   "upload_form.undo": "Ongedaan maken",
   "notification.follow": "{name} volgt jou nu",

diff --git a/app/assets/javascripts/components/locales/no.jsx b/app/assets/javascripts/components/locales/no.jsx
index c89c5ede646d6009b13d8048a822b625b782f0a9..7839c3cc0bf803e5f8e3f42481e8284a33a34095 100644 (file)
--- a/app/assets/javascripts/components/locales/no.jsx
+++ b/app/assets/javascripts/components/locales/no.jsx
@@ -87,7 +87,7 @@ const no = {
   "report.placeholder": "Tilleggskommentarer",
   "report.submit": "Send inn",
   "report.target": "Rapporterer",
-  "search_results.total": "{count} {count, plural, one {resultat} other {resultater}}",
+  "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
   "search.placeholder": "Søk",
   "search.status_by": "Status fra {name}",
   "status.delete": "Slett",

diff --git a/app/assets/javascripts/components/locales/oc.jsx b/app/assets/javascripts/components/locales/oc.jsx
index ca21a8c4391936ea89cd648f911775657b0b10ca..bd18b760f98ab46d28566c834975e1eb313736c9 100644 (file)
--- a/app/assets/javascripts/components/locales/oc.jsx
+++ b/app/assets/javascripts/components/locales/oc.jsx
@@ -80,7 +80,7 @@ const oc = {
   "search.placeholder": "Recercar",
   "search.account": "Compte",
   "search.hashtag": "Mot-clau",
-  "search_results.total": "{count} {count, plural, one {resultat} other {resultats}}",
+  "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
   "search.status_by": "Estatuts de {name}",
   "upload_button.label": "Apondre un mèdia",
   "upload_form.undo": "Anullar",

diff --git a/app/assets/javascripts/components/locales/pt-br.jsx b/app/assets/javascripts/components/locales/pt-br.jsx
index 724c5f1ce60f41d428098ba7f51589053165aa94..91c74bb195c7b916cff58dae5e1e37bd6c82148a 100644 (file)
--- a/app/assets/javascripts/components/locales/pt-br.jsx
+++ b/app/assets/javascripts/components/locales/pt-br.jsx
@@ -90,7 +90,7 @@ const pt_br = {
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
-  "search_results.total": "{count} {count, plural, one {resultado} other {resultados}}",
+  "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "search.placeholder": "Pesquisar",
   "search.status_by": "Post de {name}",
   "status.delete": "Eliminar",

diff --git a/app/assets/javascripts/components/locales/pt.jsx b/app/assets/javascripts/components/locales/pt.jsx
index 88729c94c555e0ddee29a63beec2e51430ac0fb8..03095d20dc3a9f9cbd1f203828d36d8a7fc29129 100644 (file)
--- a/app/assets/javascripts/components/locales/pt.jsx
+++ b/app/assets/javascripts/components/locales/pt.jsx
@@ -90,7 +90,7 @@ const pt = {
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
-  "search_results.total": "{count} {count, plural, one {resultado} other {resultados}}",
+  "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "search.placeholder": "Pesquisar",
   "search.status_by": "Post de {name}",
   "status.delete": "Eliminar",

diff --git a/app/assets/javascripts/components/locales/ru.jsx b/app/assets/javascripts/components/locales/ru.jsx
index 11456b08e8de0ca71f53d66a20b6002d94b22721..afc8c105863dcc69884d98aaf2266b06ca8eefa5 100644 (file)
--- a/app/assets/javascripts/components/locales/ru.jsx
+++ b/app/assets/javascripts/components/locales/ru.jsx
@@ -92,7 +92,7 @@ const ru = {
   "report.target": "Жалуемся на",
   "search.placeholder": "Поиск",
   "search.status_by": "Статус от {name}",
-  "search_results.total": "{count} {count, plural, one {result} other {results}}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "status.delete": "Удалить",
   "status.favourite": "Нравится",
   "status.load_more": "Показать еще",

diff --git a/app/assets/javascripts/components/locales/zh-cn.jsx b/app/assets/javascripts/components/locales/zh-cn.jsx
index 843000aa2bc7376f9d35bba321849676dda6538c..bce1b8fc35cd2da999be221123a3ed8c0b5cae5e 100644 (file)
--- a/app/assets/javascripts/components/locales/zh-cn.jsx
+++ b/app/assets/javascripts/components/locales/zh-cn.jsx
@@ -119,7 +119,7 @@ const zh_cn = {
   "report.placeholder": "额外消息",
   "report.submit": "提交",
   "report.target": "Reporting",
-  "search_results.total": "{count} 项结果",
+  "search_results.total": "{count, number} 项结果",
   "search.account": "用户",
   "search.hashtag": "标签",
   "search.placeholder": "搜索",

diff --git a/app/assets/javascripts/components/locales/zh-hk.jsx b/app/assets/javascripts/components/locales/zh-hk.jsx
index 676be3dbc31c28efa6994e35089df4c57b0a549d..3130879fa0028db0d2fb563cb4210282cd374ca2 100644 (file)
--- a/app/assets/javascripts/components/locales/zh-hk.jsx
+++ b/app/assets/javascripts/components/locales/zh-hk.jsx
@@ -112,7 +112,7 @@ const zh_hk = {
   "report.placeholder": "額外訊息",
   "report.submit": "提交",
   "report.target": "Reporting",
-  "search_results.total": "{count} 項結果",
+  "search_results.total": "{count, number} 項結果",
   "search.account": "用戶",
   "search.hashtag": "標籤",
   "search.placeholder": "搜尋",