logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 30183c0a7468278b51384945ba0a885d8eb0bbfd
parent: 15a4fc5dcc8e7a6b51ba5c33e921f0e9b70a0c6e
Author: matsurai25 <souta.m825@gmail.com>
Date:   Wed, 19 Apr 2017 23:40:24 +0900

fix search text 'zero' (#2150)


Diffstat:

Mapp/assets/javascripts/components/features/compose/components/search_results.jsx2+-
Mapp/assets/javascripts/components/locales/en.jsx2+-
Mapp/assets/javascripts/components/locales/fr.jsx2+-
Mapp/assets/javascripts/components/locales/hr.jsx2+-
Mapp/assets/javascripts/components/locales/ja.jsx2+-
Mapp/assets/javascripts/components/locales/nl.jsx2+-
Mapp/assets/javascripts/components/locales/no.jsx2+-
Mapp/assets/javascripts/components/locales/oc.jsx2+-
Mapp/assets/javascripts/components/locales/pt-br.jsx2+-
Mapp/assets/javascripts/components/locales/pt.jsx2+-
Mapp/assets/javascripts/components/locales/ru.jsx2+-
Mapp/assets/javascripts/components/locales/zh-cn.jsx2+-
Mapp/assets/javascripts/components/locales/zh-hk.jsx2+-
13 files changed, 13 insertions(+), 13 deletions(-)

diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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": "搜尋",