Skip to content

Commit 61bae05

Browse files
committed
feature #874 Replaced the "transchoice" filter by "trans" (javiereguiluz)
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\"
2 parents 985cdb9 + 6cba825 commit 61bae05

22 files changed

+151
-148
lines changed

composer.lock

+129-126
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/blog/post_show.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</div>
3535

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

4040
{% for comment in post.comments %}

translations/messages.bg.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
</trans-unit>
261261
<trans-unit id="post.num_comments">
262262
<source>post.num_comments</source>
263-
<target>%count% коментар|%count% коментари</target>
263+
<target>{count, plural, one {# коментар} other {# коментари}}</target>
264264
</trans-unit>
265265
<trans-unit id="post.commented_on">
266266
<source>post.commented_on</source>

translations/messages.ca.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
</trans-unit>
202202
<trans-unit id="post.num_comments">
203203
<source>post.num_comments</source>
204-
<target>%count% comentari|%count% comentaris</target>
204+
<target>{count, plural, one {# comentari} other {# comentaris}}</target>
205205
</trans-unit>
206206
<trans-unit id="post.commented_on">
207207
<source>post.commented_on</source>

translations/messages.cs.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
</trans-unit>
190190
<trans-unit id="post.num_comments">
191191
<source>post.num_comments</source>
192-
<target>%count% komentář|%count% komentáře|%count% komentářů</target>
192+
<target>{count, plural, one {# komentář} few {# komentáře} other {# komentářů}}</target>
193193
</trans-unit>
194194
<trans-unit id="post.commented_on">
195195
<source>post.commented_on</source>

translations/messages.de.xlf

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
</trans-unit>
210210
<trans-unit id="post.num_comments">
211211
<source>post.num_comments</source>
212-
<target>%count% Kommentar|%count% Kommentare</target>
212+
<target>{count, plural, one {# Kommentar} other {# Kommentare}}</target>
213213
</trans-unit>
214214
<trans-unit id="post.commented_on">
215215
<source>post.commented_on</source>
@@ -239,7 +239,7 @@
239239
<source>post.search_for</source>
240240
<target>Suchen nach...</target>
241241
</trans-unit>
242-
242+
243243
<trans-unit id="help.app_description">
244244
<source>help.app_description</source>
245245
<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>

translations/messages.en.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@
306306
</trans-unit>
307307
<trans-unit id="post.num_comments">
308308
<source>post.num_comments</source>
309-
<target>%count% comment|%count% comments</target>
309+
<target>{count, plural, one {# comment} other {# comments}}</target>
310310
</trans-unit>
311311
<trans-unit id="post.commented_on">
312312
<source>post.commented_on</source>

translations/messages.es.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
</trans-unit>
255255
<trans-unit id="post.num_comments">
256256
<source>post.num_comments</source>
257-
<target>%count% comentario|%count% comentarios</target>
257+
<target>{count, plural, one {# comentario} other {# comentarios}}</target>
258258
</trans-unit>
259259
<trans-unit id="post.commented_on">
260260
<source>post.commented_on</source>

translations/messages.fr.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@
306306
</trans-unit>
307307
<trans-unit id="post.num_comments">
308308
<source>post.num_comments</source>
309-
<target>%count% commentaire|%count% commentaires</target>
309+
<target>{count, plural, one {# commentaire} other {# commentaires}}</target>
310310
</trans-unit>
311311
<trans-unit id="post.commented_on">
312312
<source>post.commented_on</source>

translations/messages.hr.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
</trans-unit>
255255
<trans-unit id="post.num_comments">
256256
<source>post.num_comments</source>
257-
<target>%count% komentar|%count% komentara|%count% komentara|%count% komentara</target>
257+
<target>{count, plural, one {# komentar} few {# komentara} other {# komentara}}</target>
258258
</trans-unit>
259259
<trans-unit id="post.commented_on">
260260
<source>post.commented_on</source>

translations/messages.id.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
</trans-unit>
186186
<trans-unit id="post.num_comments">
187187
<source>post.num_comments</source>
188-
<target>%count% komentar</target>
188+
<target>{count} komentar</target>
189189
</trans-unit>
190190
<trans-unit id="post.commented_on">
191191
<source>post.commented_on</source>

translations/messages.it.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
</trans-unit>
267267
<trans-unit id="post.num_comments">
268268
<source>post.num_comments</source>
269-
<target>%count% commento|%count% commenti</target>
269+
<target>{count, plural, one {# commento} other {# commenti}}</target>
270270
</trans-unit>
271271
<trans-unit id="post.commented_on">
272272
<source>post.commented_on</source>

translations/messages.ja.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
</trans-unit>
194194
<trans-unit id="post.num_comments">
195195
<source>post.num_comments</source>
196-
<target>%count% コメント</target>
196+
<target>{count} コメント</target>
197197
</trans-unit>
198198
<trans-unit id="post.commented_on">
199199
<source>post.commented_on</source>

translations/messages.nl.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
</trans-unit>
267267
<trans-unit id="post.num_comments">
268268
<source>post.num_comments</source>
269-
<target>%count% reactie|%count% reacties</target>
269+
<target>{count, plural, one {# reactie} other {# reacties}}</target>
270270
</trans-unit>
271271
<trans-unit id="post.commented_on">
272272
<source>post.commented_on</source>

translations/messages.pl.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
</trans-unit>
210210
<trans-unit id="post.num_comments">
211211
<source>post.num_comments</source>
212-
<target>%count% komentarz|%count% komentarze|%count% komentarzy</target>
212+
<target>{count, plural, one {# komentarz} many {# komentarze} other {# komentarzy}}</target>
213213
</trans-unit>
214214
<trans-unit id="post.commented_on">
215215
<source>post.commented_on</source>

translations/messages.pt_BR.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
</trans-unit>
263263
<trans-unit id="post.num_comments">
264264
<source>post.num_comments</source>
265-
<target>%count% comentário|%count% comentários</target>
265+
<target>{count, plural, one {# comentário} other {# comentários}}</target>
266266
</trans-unit>
267267
<trans-unit id="post.commented_on">
268268
<source>post.commented_on</source>

translations/messages.ro.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
</trans-unit>
206206
<trans-unit id="post.num_comments">
207207
<source>post.num_comments</source>
208-
<target>%count% comentariu|%count% comentarii</target>
208+
<target>{count, plural, one {# comentariu} other {# comentarii}}</target>
209209
</trans-unit>
210210
<trans-unit id="post.commented_on">
211211
<source>post.commented_on</source>

translations/messages.ru.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
</trans-unit>
267267
<trans-unit id="post.num_comments">
268268
<source>post.num_comments</source>
269-
<target>%count% комментарий|%count% комментария|%count% комментариев</target>
269+
<target>{count, plural, one {# комментарий} few {# комментария} many {# комментариев}}</target>
270270
</trans-unit>
271271
<trans-unit id="post.commented_on">
272272
<source>post.commented_on</source>

translations/messages.sl.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
</trans-unit>
267267
<trans-unit id="post.num_comments">
268268
<source>post.num_comments</source>
269-
<target>%count% komentar|%count% komentarja|%count% komentarji|%count% komentarjev</target>
269+
<target>{count, plural, one {# komentar} two {# komentarja} few {# komentarji} other {# komentarjev}}</target>
270270
</trans-unit>
271271
<trans-unit id="post.commented_on">
272272
<source>post.commented_on</source>

translations/messages.tr.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
</trans-unit>
267267
<trans-unit id="post.num_comments">
268268
<source>post.num_comments</source>
269-
<target>%count% yorum</target>
269+
<target>{count} yorum</target>
270270
</trans-unit>
271271
<trans-unit id="post.commented_on">
272272
<source>post.commented_on</source>

translations/messages.uk.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
</trans-unit>
267267
<trans-unit id="post.num_comments">
268268
<source>post.num_comments</source>
269-
<target>%count% коментар|%count% коментаря|%count% коментарів</target>
269+
<target>{count, plural, one {# коментар} many {# коментаря} other {# коментарів}}</target>
270270
</trans-unit>
271271
<trans-unit id="post.commented_on">
272272
<source>post.commented_on</source>

translations/messages.zh_CN.xlf

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
</trans-unit>
263263
<trans-unit id="post.num_comments">
264264
<source>post.num_comments</source>
265-
<target>%count% 评论|%count% 评论</target>
265+
<target>{count} 评论</target>
266266
</trans-unit>
267267
<trans-unit id="post.commented_on">
268268
<source>post.commented_on</source>

0 commit comments

Comments
 (0)