From: Ævar Arnfjörð Bjarmason Date: Fri, 2 Oct 2009 10:41:47 +0000 (+0000) Subject: use {{count}} instead of {{sent_count}} so rails plural forms will kick in X-Git-Tag: live~7137 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2dab83d57b469effd2265c567d925304c81218b0?hp=817aee0536494e023ca51cb78ee8c6c48d79284a use {{count}} instead of {{sent_count}} so rails plural forms will kick in --- diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb index f1f9ddea7..afd1d2fc5 100644 --- a/app/views/message/outbox.html.erb +++ b/app/views/message/outbox.html.erb @@ -1,6 +1,6 @@

<%= t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), url_for(:controller => "user", :action => "inbox", :id => @user.display_name)) %>/<%= t'message.outbox.outbox' %>

-

<%= t'message.outbox.you_have_sent_messages', :sent_count => @user.sent_messages.size %> +

<%= t'message.outbox.you_have_sent_messages', :count => @user.sent_messages.size %> <% if @user.sent_messages.size > 0 %>

diff --git a/config/locales/af.yml b/config/locales/af.yml index a99f7870b..24ee9ef03 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -335,7 +335,7 @@ af: outbox: Posvak UIT subject: Onderwerp to: Aan - you_have_sent_messages: U het {{sent_count}} gestuurde boodskappe + you_have_sent_messages: U het {{count}} gestuurde boodskappe read: date: Datum from: Van diff --git a/config/locales/be.yml b/config/locales/be.yml index 3fa534932..2183534d8 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -367,7 +367,7 @@ be: subject: Тэма title: Зыходныя to: Каму - you_have_sent_messages: У вас {{sent_count}} дасланых паведамленняў + you_have_sent_messages: У вас {{count}} дасланых паведамленняў read: back_to_inbox: Вярнуцца да ўваходных back_to_outbox: Вярнуцца да зыходных diff --git a/config/locales/br.yml b/config/locales/br.yml index 9eeb1c447..82d09626a 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -471,7 +471,7 @@ br: subject: Danvez title: Boest kas to: Da - you_have_sent_messages: Kaset hoc'h eus {{sent_count}} kemennadenn + you_have_sent_messages: Kaset hoc'h eus {{count}} kemennadenn read: back_to_inbox: Distreiñ d'ar voest resev back_to_outbox: Distreiñ d'ar voest kas diff --git a/config/locales/de.yml b/config/locales/de.yml index 51c5841ea..6a1f53057 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -439,7 +439,7 @@ de: subject: Betreff title: Gesendet to: An - you_have_sent_messages: Du hast {{sent_count}} Nachrichten versendet + you_have_sent_messages: Du hast {{count}} Nachrichten versendet read: back_to_inbox: Zurück zum Posteingang back_to_outbox: Zurück zu Gesendete Nachrichten diff --git a/config/locales/en.yml b/config/locales/en.yml index 4b8ace863..d3cde84fb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -581,7 +581,7 @@ en: my_inbox: "My {{inbox_link}}" inbox: "inbox" outbox: "outbox" - you_have_sent_messages: "You have {{sent_count}} sent messages" + you_have_sent_messages: "You have {{count}} sent messages" to: "To" subject: "Subject" date: "Date" diff --git a/config/locales/es.yml b/config/locales/es.yml index 5389dde3b..49ccd827d 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -464,7 +464,7 @@ es: subject: Asunto title: Salida to: A - you_have_sent_messages: Tienes {{sent_count}} mensajes enviados + you_have_sent_messages: Tienes {{count}} mensajes enviados read: back_to_inbox: Regresar a la bandeja de entrada back_to_outbox: Regresar a la bandeja de salida diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 072003c8b..a9ddf6bc2 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -383,7 +383,7 @@ fi: subject: Otsikko title: Lähetetyt to: Vastaanottaja - you_have_sent_messages: Sinulla on {{sent_count}} lähetettyä viestiä + you_have_sent_messages: Sinulla on {{count}} lähetettyä viestiä read: back_to_inbox: Takaisin saapuneisiin back_to_outbox: Takaisin lähetettyihin diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 6afbd5745..5a4d81375 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -444,7 +444,7 @@ fr: subject: Objet title: Boîte d'envoi to: À - you_have_sent_messages: Vous avez envoyé {{sent_count}} messages + you_have_sent_messages: Vous avez envoyé {{count}} messages read: back_to_inbox: Revenir à la boîte de réception back_to_outbox: Revenir à la boîte d'envoi diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index bd7706a6d..600488b27 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -468,7 +468,7 @@ hsb: subject: Temowe nadpismo title: Pósłany to: Komu - you_have_sent_messages: Sy {{sent_count}} pósłanych powěsćow + you_have_sent_messages: Sy {{count}} pósłanych powěsćow read: back_to_inbox: Wróćo k póstowemu kašćikej back_to_outbox: Wróćo k pósłanym powěsćam diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 316d7e712..1538133d1 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -474,7 +474,7 @@ hu: subject: Tárgy title: Elküldött üzenetek to: Címzett - you_have_sent_messages: "{{sent_count}} elküldött üzeneted van" + you_have_sent_messages: "{{count}} elküldött üzeneted van" read: back_to_inbox: Vissza a beérkezett üzenetekhez back_to_outbox: Vissza az elküldött üzenetekhez diff --git a/config/locales/is.yml b/config/locales/is.yml index a0503fbcb..095496c00 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -475,7 +475,7 @@ is: subject: Titill title: Úthólf to: Til - you_have_sent_messages: Þú hefur sent {{sent_count}} skeyti + you_have_sent_messages: Þú hefur sent {{count}} skeyti read: back_to_inbox: Aftur í innhólf back_to_outbox: Aftur í úthólf diff --git a/config/locales/it.yml b/config/locales/it.yml index c4da29183..cf1907b00 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -330,7 +330,7 @@ it: subject: Oggetto title: In uscita to: A - you_have_sent_messages: Hai {{sent_count}} messaggi inviati + you_have_sent_messages: Hai {{count}} messaggi inviati read: back_to_inbox: Ritorna ai messaggi in arrivo back_to_outbox: Ritorna ai messaggi in uscita diff --git a/config/locales/ja.yml b/config/locales/ja.yml index c71985884..d564db724 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -411,7 +411,7 @@ ja: subject: タイトル title: 送信箱 to: 宛先 - you_have_sent_messages: "{{sent_count}}この送信済みメッセージがあります" + you_have_sent_messages: "{{count}}この送信済みメッセージがあります" read: back_to_inbox: 受信箱に戻る back_to_outbox: 送信箱に戻る diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 5284a7c6d..c6c3a7619 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -309,7 +309,7 @@ ko: people_mapping_nearby: 근처를 지도 입력한 사람들 subject: 제목 title: 보낸 쪽지함 - you_have_sent_messages: "{{sent_count}} 개의 쪽지를 보냈습니다." + you_have_sent_messages: "{{count}} 개의 쪽지를 보냈습니다." notifier: diary_comment_notification: banner1: "* 이 email에 답장하지 마세요. *" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index c4d917b04..4d9a1904b 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -454,7 +454,7 @@ nl: subject: Onderwerp title: Postvak UIT to: Aan - you_have_sent_messages: U hebt {{sent_count}} verzonden berichten + you_have_sent_messages: U hebt {{count}} verzonden berichten read: back_to_inbox: Terug naar Postvak IN back_to_outbox: Terug naar Postvak UIT diff --git a/config/locales/no.yml b/config/locales/no.yml index 4922301fd..db3f19c62 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -433,7 +433,7 @@ subject: Emne title: Utboks to: Til - you_have_sent_messages: Du har sendt {{sent_count}} meldinger + you_have_sent_messages: Du har sendt {{count}} meldinger read: back_to_inbox: Tilbake til innboks back_to_outbox: Tilbake til utboks diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 1bc5fde0b..586f83702 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -337,7 +337,7 @@ pl: subject: Temat title: Wiadomości wysłane to: Do - you_have_sent_messages: Wysłaleś/aś {{sent_count}} wiadomości + you_have_sent_messages: Wysłaleś/aś {{count}} wiadomości read: back_to_inbox: Powrót do wysłanych date: Nadano diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index caa7288b1..f405b0bd4 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -458,7 +458,7 @@ pt-BR: subject: Assunto title: Caixa de Saída to: Para - you_have_sent_messages: Você tem {{sent_count}} mensagens enviadas + you_have_sent_messages: Você tem {{count}} mensagens enviadas read: back_to_inbox: Voltar para a caixa de entrada back_to_outbox: Voltar para a caixa de saída diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 970fbcf74..99d0d49ad 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -471,7 +471,7 @@ ru: subject: Тема title: Исходящие to: Кому - you_have_sent_messages: Вы отправили {{sent_count}} сообщений + you_have_sent_messages: Вы отправили {{count}} сообщений read: back_to_inbox: Назад ко входящим back_to_outbox: Назад к исходящим diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 55d91567c..fd2b85700 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -452,7 +452,7 @@ sl: subject: Zadeva title: Poslana pošta to: Za - you_have_sent_messages: Poslali ste {{sent_count}} sporočil + you_have_sent_messages: Poslali ste {{count}} sporočil read: back_to_inbox: Nazaj na prejeto pošto back_to_outbox: Nazaj na poslano pošto diff --git a/config/locales/vi.yml b/config/locales/vi.yml index fe75853a5..c98f662b2 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -474,7 +474,7 @@ vi: subject: Tiêu đề title: Hộp thư đã gửi to: Tới - you_have_sent_messages: Bạn đã gửi {{sent_count}} thư + you_have_sent_messages: Bạn đã gửi {{count}} thư read: back_to_inbox: Trở về hộp thư đến back_to_outbox: Trở về hộp thư đã gửi diff --git a/config/locales/yo.yml b/config/locales/yo.yml index acde3d2ed..d8acd5cac 100644 --- a/config/locales/yo.yml +++ b/config/locales/yo.yml @@ -65,7 +65,7 @@ yo: welcome_user: Kabo, {{user_link}} message: outbox: - you_have_sent_messages: O ni {{sent_count}} sent messages + you_have_sent_messages: O ni {{count}} sent messages read: back_to_inbox: Pada si inbox back_to_outbox: Pad si outbox diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index d8ef42f59..8caf4b632 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -332,7 +332,7 @@ zh-CN: people_mapping_nearby: 在您附近的人 subject: 主体 to: 给 - you_have_sent_messages: 您有{{sent_count}} 已发送邮件 + you_have_sent_messages: 您有{{count}} 已发送邮件 read: back_to_inbox: 返回收件箱 back_to_outbox: 返回发件箱 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index f7b24fdd6..7103e1eeb 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -459,7 +459,7 @@ zh-TW: subject: 主旨 title: 寄件匣 to: 收件者 - you_have_sent_messages: 您有 {{sent_count}} 個寄送的訊息 + you_have_sent_messages: 您有 {{count}} 個寄送的訊息 read: back_to_inbox: 回到收件匣 back_to_outbox: 回到寄件匣