Skip to content

Commit

Permalink
feature #874 Replaced the "transchoice" filter by "trans" (javieregui…
Browse files Browse the repository at this point in the history
…luz)

This PR was squashed before being merged into the master branch (closes #874).

Discussion
----------

Replaced the "transchoice" filter by "trans"

Fixes #872.

Commits
-------

6cba825 Replaced the \"transchoice\" filter by \"trans\"
  • Loading branch information
javiereguiluz committed Oct 17, 2018
2 parents 985cdb9 + 6cba825 commit 61bae05
Show file tree
Hide file tree
Showing 22 changed files with 151 additions and 148 deletions.
255 changes: 129 additions & 126 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion templates/blog/post_show.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</div>

<h3>
<i class="fa fa-comments" aria-hidden="true"></i> {{ 'post.num_comments'|transchoice(post.comments|length) }}
<i class="fa fa-comments" aria-hidden="true"></i> {{ 'post.num_comments'|trans({ 'count': post.comments|length }) }}
</h3>

{% for comment in post.comments %}
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.bg.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% коментар|%count% коментари</target>
<target>{count, plural, one {# коментар} other {# коментари}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.ca.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% comentari|%count% comentaris</target>
<target>{count, plural, one {# comentari} other {# comentaris}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% komentář|%count% komentáře|%count% komentářů</target>
<target>{count, plural, one {# komentář} few {# komentáře} other {# komentářů}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
4 changes: 2 additions & 2 deletions translations/messages.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% Kommentar|%count% Kommentare</target>
<target>{count, plural, one {# Kommentar} other {# Kommentare}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down Expand Up @@ -239,7 +239,7 @@
<source>post.search_for</source>
<target>Suchen nach...</target>
</trans-unit>

<trans-unit id="help.app_description">
<source>help.app_description</source>
<target><![CDATA[Das ist eine <strong>Demo Applikation</strong>, die mit dem Symfony Framework gebaut wurde um eine Empfehlung für die Entwicklung auszusprechen.]]></target>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.en.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% comment|%count% comments</target>
<target>{count, plural, one {# comment} other {# comments}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% comentario|%count% comentarios</target>
<target>{count, plural, one {# comentario} other {# comentarios}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% commentaire|%count% commentaires</target>
<target>{count, plural, one {# commentaire} other {# commentaires}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.hr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% komentar|%count% komentara|%count% komentara|%count% komentara</target>
<target>{count, plural, one {# komentar} few {# komentara} other {# komentara}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.id.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% komentar</target>
<target>{count} komentar</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% commento|%count% commenti</target>
<target>{count, plural, one {# commento} other {# commenti}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% コメント</target>
<target>{count} コメント</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.nl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% reactie|%count% reacties</target>
<target>{count, plural, one {# reactie} other {# reacties}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% komentarz|%count% komentarze|%count% komentarzy</target>
<target>{count, plural, one {# komentarz} many {# komentarze} other {# komentarzy}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.pt_BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% comentário|%count% comentários</target>
<target>{count, plural, one {# comentário} other {# comentários}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.ro.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% comentariu|%count% comentarii</target>
<target>{count, plural, one {# comentariu} other {# comentarii}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% комментарий|%count% комментария|%count% комментариев</target>
<target>{count, plural, one {# комментарий} few {# комментария} many {# комментариев}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.sl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% komentar|%count% komentarja|%count% komentarji|%count% komentarjev</target>
<target>{count, plural, one {# komentar} two {# komentarja} few {# komentarji} other {# komentarjev}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% yorum</target>
<target>{count} yorum</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.uk.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% коментар|%count% коментаря|%count% коментарів</target>
<target>{count, plural, one {# коментар} many {# коментаря} other {# коментарів}}</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down
2 changes: 1 addition & 1 deletion translations/messages.zh_CN.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
</trans-unit>
<trans-unit id="post.num_comments">
<source>post.num_comments</source>
<target>%count% 评论|%count% 评论</target>
<target>{count} 评论</target>
</trans-unit>
<trans-unit id="post.commented_on">
<source>post.commented_on</source>
Expand Down

0 comments on commit 61bae05

Please sign in to comment.