Skip to content

Commit 279f8a0

Browse files
javiereguiluzjaviereguiluz
committed
bug #908 Fix translations files with ICU message formater (ker0x)
This PR was merged into the master branch. Discussion ---------- Fix translations files with ICU message formater As pointed by @stof in #890, translations files does no longer take in account variables because of the `+intl-icu` suffix in translation files. This PR fix that! Commits ------- c29e1dd Fix translations files with ICU message formater
2 parents 75dc354 + c29e1dd commit 279f8a0

20 files changed

+105
-105
lines changed

‎translations/messages+intl-icu.bg.xlf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
</trans-unit>
2121
<trans-unit id="http_error.name">
2222
<source>http_error.name</source>
23-
<target>Грешка %status_code%</target>
23+
<target>Грешка {status_code, number}</target>
2424
</trans-unit>
2525
<trans-unit id="http_error.description">
2626
<source>http_error.description</source>
27-
<target>Има неизвестна грешка (HTTP %status_code%) , която спира изпълнението на заявката.</target>
27+
<target>Има неизвестна грешка (HTTP {status_code, number}) , която спира изпълнението на заявката.</target>
2828
</trans-unit>
2929
<trans-unit id="http_error.suggestion">
3030
<source>http_error.suggestion</source>
31-
<target><![CDATA[Опитайте да заредите тази страница няколко минути по-късно или <a href="%url%">се върни в началната страница</a>.]]></target>
31+
<target><![CDATA[Опитайте да заредите тази страница няколко минути по-късно или <a href="{url}">се върни в началната страница</a>.]]></target>
3232
</trans-unit>
3333
<trans-unit id="http_error_403.description">
3434
<source>http_error_403.description</source>
@@ -44,15 +44,15 @@
4444
</trans-unit>
4545
<trans-unit id="http_error_404.suggestion">
4646
<source>http_error_404.suggestion</source>
47-
<target><![CDATA[Проверете за правописни грешки в URL адреса или <a href="%url%">се върнете в началната страница</a>.]]></target>
47+
<target><![CDATA[Проверете за правописни грешки в URL адреса или <a href="{url}">се върнете в началната страница</a>.]]></target>
4848
</trans-unit>
4949
<trans-unit id="http_error_500.description">
5050
<source>http_error_500.description</source>
5151
<target>Възникна вътрешно сървърна грешка.</target>
5252
</trans-unit>
5353
<trans-unit id="http_error_500.suggestion">
5454
<source>http_error_500.suggestion</source>
55-
<target><![CDATA[Опитайте да заредите тази страница отново след няколко минути или <a href="%url%">се върнете в началната страница</a>.]]></target>
55+
<target><![CDATA[Опитайте да заредите тази страница отново след няколко минути или <a href="{url}">се върнете в началната страница</a>.]]></target>
5656
</trans-unit>
5757
<trans-unit id="title.homepage">
5858
<source>title.homepage</source>
@@ -80,7 +80,7 @@
8080
</trans-unit>
8181
<trans-unit id="title.edit_post">
8282
<source>title.edit_post</source>
83-
<target>Редактиране на публикация #%id%</target>
83+
<target>Редактиране на публикация #{id, number}</target>
8484
</trans-unit>
8585
<trans-unit id="title.add_comment">
8686
<source>title.add_comment</source>
@@ -300,7 +300,7 @@
300300
</trans-unit>
301301
<trans-unit id="notification.comment_created.description">
302302
<source>notification.comment_created.description</source>
303-
<target><![CDATA[Вашата публикация "%title%" получи нов коментар. Можете да прочетете коментара, като последвате <a href="%link%">този линк</a>]]></target>
303+
<target><![CDATA[Вашата публикация "{title}" получи нов коментар. Можете да прочетете коментара, като последвате <a href="{link}">този линк</a>]]></target>
304304
</trans-unit>
305305
<trans-unit id="help.app_description">
306306
<source>help.app_description</source>

‎translations/messages+intl-icu.ca.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</trans-unit>
4646
<trans-unit id="title.edit_post">
4747
<source>title.edit_post</source>
48-
<target>Editar article #%id%</target>
48+
<target>Editar article #{id, number}</target>
4949
</trans-unit>
5050
<trans-unit id="title.add_comment">
5151
<source>title.add_comment</source>

‎translations/messages+intl-icu.cs.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</trans-unit>
4646
<trans-unit id="title.edit_post">
4747
<source>title.edit_post</source>
48-
<target>Upravit příspěvek #%id%</target>
48+
<target>Upravit příspěvek #{id, number}</target>
4949
</trans-unit>
5050
<trans-unit id="title.add_comment">
5151
<source>title.add_comment</source>

‎translations/messages+intl-icu.de.xlf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</trans-unit>
4646
<trans-unit id="title.edit_post">
4747
<source>title.edit_post</source>
48-
<target>Bearbeite Beitrag #%id%</target>
48+
<target>Bearbeite Beitrag #{id, number}</target>
4949
</trans-unit>
5050
<trans-unit id="title.add_comment">
5151
<source>title.add_comment</source>
@@ -310,15 +310,15 @@
310310
</trans-unit>
311311
<trans-unit id="http_error.name">
312312
<source>http_error.name</source>
313-
<target>Fehler %status_code%</target>
313+
<target>Fehler {status_code, number}</target>
314314
</trans-unit>
315315
<trans-unit id="http_error.description">
316316
<source>http_error.description</source>
317-
<target>Ein unbekannter Fehler (HTTP %status_code%) ist aufgetreten. Deine Anfrage konnte deswegen nicht ausgeführt werden.</target>
317+
<target>Ein unbekannter Fehler (HTTP {status_code, number}) ist aufgetreten. Deine Anfrage konnte deswegen nicht ausgeführt werden.</target>
318318
</trans-unit>
319319
<trans-unit id="http_error.suggestion">
320320
<source>http_error.suggestion</source>
321-
<target><![CDATA[Versuche diese Seite in einigen Minuten erneut zu laden oder <a href="%url%">gehe zurück zur Homepage</a>.]]></target>
321+
<target><![CDATA[Versuche diese Seite in einigen Minuten erneut zu laden oder <a href="{url}">gehe zurück zur Homepage</a>.]]></target>
322322
</trans-unit>
323323
<trans-unit id="http_error_403.description">
324324
<source>http_error_403.description</source>
@@ -334,23 +334,23 @@
334334
</trans-unit>
335335
<trans-unit id="http_error_404.suggestion">
336336
<source>http_error_404.suggestion</source>
337-
<target><![CDATA[Überprüfe Rechtschreibfehler in der URL oder <a href="%url%">gehe zurück zur Homepage</a>.]]></target>
337+
<target><![CDATA[Überprüfe Rechtschreibfehler in der URL oder <a href="{url}">gehe zurück zur Homepage</a>.]]></target>
338338
</trans-unit>
339339
<trans-unit id="http_error_500.description">
340340
<source>http_error_500.description</source>
341341
<target>Es gab einen internen Serverfehler.</target>
342342
</trans-unit>
343343
<trans-unit id="http_error_500.suggestion">
344344
<source>http_error_500.suggestion</source>
345-
<target><![CDATA[Versuche diese Seite in einigen Minuten erneut zu laden oder <a href="%url%">gehe zurück zur Homepage</a>.]]></target>
345+
<target><![CDATA[Versuche diese Seite in einigen Minuten erneut zu laden oder <a href="{url}">gehe zurück zur Homepage</a>.]]></target>
346346
</trans-unit>
347347
<trans-unit id="notification.comment_created">
348348
<source>notification.comment_created</source>
349349
<target>Dein Beitrag hat einen Kommentar erhalten!</target>
350350
</trans-unit>
351351
<trans-unit id="notification.comment_created.description">
352352
<source>notification.comment_created.description</source>
353-
<target><![CDATA[Dein Beitrag "%title%" hat einen Kommentar erhalten. Du kannst den Kommentar lesen, wenn du <a href="%link%">diesem Link</a> folgst.]]></target>
353+
<target><![CDATA[Dein Beitrag "{title}" hat einen Kommentar erhalten. Du kannst den Kommentar lesen, wenn du <a href="{link}">diesem Link</a> folgst.]]></target>
354354
</trans-unit>
355355
</body>
356356
</file>

‎translations/messages+intl-icu.en.xlf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121

2222
<trans-unit id="http_error.name">
2323
<source>http_error.name</source>
24-
<target>Error %status_code%</target>
24+
<target>Error {status_code, number}</target>
2525
</trans-unit>
2626
<trans-unit id="http_error.description">
2727
<source>http_error.description</source>
28-
<target>There was an unknown error (HTTP %status_code%) that prevented to complete your request.</target>
28+
<target>There was an unknown error (HTTP {status_code, number}) that prevented to complete your request.</target>
2929
</trans-unit>
3030
<trans-unit id="http_error.suggestion">
3131
<source>http_error.suggestion</source>
32-
<target><![CDATA[Try loading this page again in some minutes or <a href="%url%">go back to the homepage</a>.]]></target>
32+
<target><![CDATA[Try loading this page again in some minutes or <a href="{url}">go back to the homepage</a>.]]></target>
3333
</trans-unit>
3434
<trans-unit id="http_error_403.description">
3535
<source>http_error_403.description</source>
@@ -45,15 +45,15 @@
4545
</trans-unit>
4646
<trans-unit id="http_error_404.suggestion">
4747
<source>http_error_404.suggestion</source>
48-
<target><![CDATA[Check out any misspelling in the URL or <a href="%url%">go back to the homepage</a>.]]></target>
48+
<target><![CDATA[Check out any misspelling in the URL or <a href="{url}">go back to the homepage</a>.]]></target>
4949
</trans-unit>
5050
<trans-unit id="http_error_500.description">
5151
<source>http_error_500.description</source>
5252
<target>There was an internal server error.</target>
5353
</trans-unit>
5454
<trans-unit id="http_error_500.suggestion">
5555
<source>http_error_500.suggestion</source>
56-
<target><![CDATA[Try loading this page again in some minutes or <a href="%url%">go back to the homepage</a>.]]></target>
56+
<target><![CDATA[Try loading this page again in some minutes or <a href="{url}">go back to the homepage</a>.]]></target>
5757
</trans-unit>
5858

5959
<trans-unit id="title.homepage">
@@ -82,7 +82,7 @@
8282
</trans-unit>
8383
<trans-unit id="title.edit_post">
8484
<source>title.edit_post</source>
85-
<target>Edit post #%id%</target>
85+
<target>Edit post #{id, number}</target>
8686
</trans-unit>
8787
<trans-unit id="title.add_comment">
8888
<source>title.add_comment</source>
@@ -352,7 +352,7 @@
352352
</trans-unit>
353353
<trans-unit id="notification.comment_created.description">
354354
<source>notification.comment_created.description</source>
355-
<target><![CDATA[Your post "%title%" has received a new comment. You can read the comment by following <a href="%link%">this link</a>]]></target>
355+
<target><![CDATA[Your post "{title}" has received a new comment. You can read the comment by following <a href="{link}">this link</a>]]></target>
356356
</trans-unit>
357357

358358
<trans-unit id="help.app_description">

‎translations/messages+intl-icu.es.xlf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121

2222
<trans-unit id="http_error.name">
2323
<source>http_error.name</source>
24-
<target>Error %status_code%</target>
24+
<target>Error {status_code, number}</target>
2525
</trans-unit>
2626
<trans-unit id="http_error.description">
2727
<source>http_error.description</source>
28-
<target>Se ha producido un error desconocido (HTTP %status_code%) que ha impedido completar tu petición.</target>
28+
<target>Se ha producido un error desconocido (HTTP {status_code, number}) que ha impedido completar tu petición.</target>
2929
</trans-unit>
3030
<trans-unit id="http_error.suggestion">
3131
<source>http_error.suggestion</source>
32-
<target><![CDATA[Intentar recargar esta página dentro de unos minutos o <a href="%url%">vuelve a la portada del sitio</a>.]]></target>
32+
<target><![CDATA[Intentar recargar esta página dentro de unos minutos o <a href="{url}">vuelve a la portada del sitio</a>.]]></target>
3333
</trans-unit>
3434
<trans-unit id="http_error_403.description">
3535
<source>http_error_403.description</source>
@@ -45,15 +45,15 @@
4545
</trans-unit>
4646
<trans-unit id="http_error_404.suggestion">
4747
<source>http_error_404.suggestion</source>
48-
<target><![CDATA[Comprueba que la dirección de la página está bien escrita o <a href="%url%">vuelve a la portada del sitio</a>.]]></target>
48+
<target><![CDATA[Comprueba que la dirección de la página está bien escrita o <a href="{url}">vuelve a la portada del sitio</a>.]]></target>
4949
</trans-unit>
5050
<trans-unit id="http_error_500.description">
5151
<source>http_error_500.description</source>
5252
<target>Se ha producido un error grave en el servidor.</target>
5353
</trans-unit>
5454
<trans-unit id="http_error_500.suggestion">
5555
<source>http_error_500.suggestion</source>
56-
<target><![CDATA[Intentar recargar esta página dentro de unos minutos o <a href="%url%">vuelve a la portada del sitio</a>.]]></target>
56+
<target><![CDATA[Intentar recargar esta página dentro de unos minutos o <a href="{url}">vuelve a la portada del sitio</a>.]]></target>
5757
</trans-unit>
5858

5959
<trans-unit id="title.homepage">
@@ -82,7 +82,7 @@
8282
</trans-unit>
8383
<trans-unit id="title.edit_post">
8484
<source>title.edit_post</source>
85-
<target>Editar artículo #%id%</target>
85+
<target>Editar artículo #{id, number}</target>
8686
</trans-unit>
8787
<trans-unit id="title.add_comment">
8888
<source>title.add_comment</source>
@@ -347,7 +347,7 @@
347347
</trans-unit>
348348
<trans-unit id="notification.comment_created.description">
349349
<source>notification.comment_created.description</source>
350-
<target><![CDATA[Su artículo "%title%" recibió un comentario nuevo. Puede leer el comentario siguiendo <a href="%link%">este enlace</a>]]></target>
350+
<target><![CDATA[Su artículo "{title}" recibió un comentario nuevo. Puede leer el comentario siguiendo <a href="{link}">este enlace</a>]]></target>
351351
</trans-unit>
352352
<trans-unit id="rss.title">
353353
<source>rss.title</source>

‎translations/messages+intl-icu.fr.xlf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121

2222
<trans-unit id="http_error.name">
2323
<source>http_error.name</source>
24-
<target>Erreur %status_code%</target>
24+
<target>Erreur {status_code, number}</target>
2525
</trans-unit>
2626
<trans-unit id="http_error.description">
2727
<source>http_error.description</source>
28-
<target>Il y a eu une erreur inconnue (HTTP %status_code%) qui a empêché l'aboutissement de votre requête.</target>
28+
<target>Il y a eu une erreur inconnue (HTTP {status_code, number}) qui a empêché l'aboutissement de votre requête.</target>
2929
</trans-unit>
3030
<trans-unit id="http_error.suggestion">
3131
<source>http_error.suggestion</source>
32-
<target><![CDATA[Essayez de recharger cette page dans quelques minutes ou <a href="%url%">retournez sur la page principale</a>.]]></target>
32+
<target><![CDATA[Essayez de recharger cette page dans quelques minutes ou <a href="{url}">retournez sur la page principale</a>.]]></target>
3333
</trans-unit>
3434
<trans-unit id="http_error_403.description">
3535
<source>http_error_403.description</source>
@@ -45,15 +45,15 @@
4545
</trans-unit>
4646
<trans-unit id="http_error_404.suggestion">
4747
<source>http_error_404.suggestion</source>
48-
<target><![CDATA[Vérifiez si l'URL ne comporte pas d'erreurs ou <a href="%url%">retournez sur la page principale</a>.]]></target>
48+
<target><![CDATA[Vérifiez si l'URL ne comporte pas d'erreurs ou <a href="{url}">retournez sur la page principale</a>.]]></target>
4949
</trans-unit>
5050
<trans-unit id="http_error_500.description">
5151
<source>http_error_500.description</source>
5252
<target>Il y a eu une erreur interne du serveur.</target>
5353
</trans-unit>
5454
<trans-unit id="http_error_500.suggestion">
5555
<source>http_error_500.suggestion</source>
56-
<target><![CDATA[Essayez de recharger cette page dans quelques minutes ou <a href="%url%">retournez sur la page principale</a>.]]></target>
56+
<target><![CDATA[Essayez de recharger cette page dans quelques minutes ou <a href="{url}">retournez sur la page principale</a>.]]></target>
5757
</trans-unit>
5858

5959
<trans-unit id="title.homepage">
@@ -82,7 +82,7 @@
8282
</trans-unit>
8383
<trans-unit id="title.edit_post">
8484
<source>title.edit_post</source>
85-
<target>Modifier l'article #%id%</target>
85+
<target>Modifier l'article #{id, number}</target>
8686
</trans-unit>
8787
<trans-unit id="title.add_comment">
8888
<source>title.add_comment</source>
@@ -352,7 +352,7 @@
352352
</trans-unit>
353353
<trans-unit id="notification.comment_created.description">
354354
<source>notification.comment_created.description</source>
355-
<target><![CDATA[Votre article "%title%" a reçu un nouveau commentaire. Vous pouvez lire le commentaire en suivant <a href="%link%">ce lien</a>]]></target>
355+
<target><![CDATA[Votre article "{title}" a reçu un nouveau commentaire. Vous pouvez lire le commentaire en suivant <a href="{link}">ce lien</a>]]></target>
356356
</trans-unit>
357357

358358
<trans-unit id="help.app_description">

0 commit comments

Comments
 (0)