From 8f5c67b8365c5040f2d66cf7aaa2d62bb18e7e30 Mon Sep 17 00:00:00 2001 From: Andrei Selkin Date: Thu, 3 Sep 2015 01:55:11 +0300 Subject: [PATCH] Issue #1900: Extended violation message for right curly brace policy 'same'. --- .../tools/checkstyle/checks/blocks/messages.properties | 2 +- .../tools/checkstyle/checks/blocks/messages_de.properties | 2 +- .../tools/checkstyle/checks/blocks/messages_es.properties | 2 +- .../tools/checkstyle/checks/blocks/messages_fi.properties | 2 +- .../tools/checkstyle/checks/blocks/messages_fr.properties | 2 +- .../tools/checkstyle/checks/blocks/messages_ja.properties | 2 +- .../tools/checkstyle/checks/blocks/messages_pt.properties | 2 +- .../tools/checkstyle/checks/blocks/messages_tr.properties | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages.properties index 59c6919a5..384b3cb44 100644 --- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages.properties +++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages.properties @@ -7,7 +7,7 @@ catch.block.empty=Empty catch block. line.alone=''{0}'' at column {1} should be alone on a line. line.new=''{0}'' at column {1} should be on a new line. line.previous=''{0}'' at column {1} should be on the previous line. -line.same=''{0}'' at column {1} should be on the same line. +line.same=''{0}'' at column {1} should be on the same line as the next part of a multi-block statement. needBraces=''{0}'' construct must use '''{}'''s. diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_de.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_de.properties index bcea1c6ff..6dfb8910b 100644 --- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_de.properties +++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_de.properties @@ -7,7 +7,7 @@ catch.block.empty=Leerer catch block. line.alone=''{0}'' in Spalten {1} sollte allein in der Zeile stehen. line.new=''{0}'' in Spalten {1} sollte in einer neuen Zeile stehen. line.previous=''{0}'' in Spalten {1} sollte in der vorhergehenden Zeile stehen. -line.same=''{0}'' in Spalten sollte in derselben Zeile stehen. +line.same=''{0}'' in Spalte {1} sollte auf der gleichen Linie wie der nächste Teil einer Multi-Block-Anweisung sein. needBraces=Das ''{0}''-Konstrukt muss '''{}''' benutzen. diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_es.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_es.properties index f7228e509..3bea42234 100644 --- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_es.properties +++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_es.properties @@ -7,7 +7,7 @@ catch.block.empty=Bloque catch vacío. line.alone=''{0}'' en la columna {1} debería estar solo en una línea. line.new=''{0}'' en la columna {1} debería estar en una nueva línea. line.previous=''{0}'' en la columna {1} debería estar en la línea anterior. -line.same=''{0}'' en la columna {1} debería estar en la misma línea. +line.same=''{0}'' en la columna {1} debe estar en la misma línea que la siguiente parte de una declaración de varios bloques. needBraces=La construcción ''{0}'' debe usar '''{}'' (llaves). diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_fi.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_fi.properties index c3a9c3e78..cee85eb21 100644 --- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_fi.properties +++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_fi.properties @@ -7,7 +7,7 @@ catch.block.empty=Tyhjä catch-rakenne. line.alone=''{0}'' sarakkeen {1} pitää olla yksinään rivillä. line.new=''{0}'' sarakkeen {1} pitää olla uudella rivillä. line.previous=''{0}'' sarakkeen {1} pitää olla edellisellä rivillä. -line.same=''{0}'' sarakkeen {1} pitää olla samalla rivillä. +line.same=''{0}'' sarakkeen {1} pitäisi olla samalla rivillä kuin seuraava osa monen lohkon selvitys. needBraces=''{0}''-rakenteen pitää käyttää '''{}'':a. diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_fr.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_fr.properties index 4a9a9adf8..0932e0eaa 100644 --- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_fr.properties +++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_fr.properties @@ -7,7 +7,7 @@ catch.block.empty=Bloc catch vide. line.alone=''{0}'' à la colonne {1} devrait être seul sur sa ligne. line.new=''{0}'' à la colonne {1} devrait être sur une nouvelle ligne. line.previous=''{0}'' à la colonne {1} devrait être sur la ligne précédente. -line.same=''{0}'' à la colonne {1} devrait être sur la même ligne. +line.same=''{0}'' à la colonne {1} devrait être sur la même ligne que la prochaine partie d'une instruction multi-bloc. needBraces=L''instruction ''{0}'' devrait utiliser des accolades ('''{''' et '''}'''). diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_ja.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_ja.properties index 35edfbda4..7b2b47589 100644 --- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_ja.properties +++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_ja.properties @@ -7,7 +7,7 @@ catch.block.empty=空の catch ブロック。 line.alone=''{0}'' 列 {1} には、行の一人であるべきです。 line.new=''{0}'' 列に {1} 新しい行にする必要があります。 line.previous=''{0}'' 列に {1} 前の行にする必要があります。 -line.same=''{0}'' 列に {1} 同じ行にある必要があります。 +line.same=''{0}'' 欄で {1} マルチブロック文の次の部分と同じ行にある必要があります。 needBraces=''{0}'' 文では '''{}''' を使用しなければなりません。 diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_pt.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_pt.properties index 00e6ae98d..01bc21ad4 100644 --- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_pt.properties +++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_pt.properties @@ -7,7 +7,7 @@ catch.block.empty=Bloco catch vazio. line.alone=''{0}'' na coluna {1} deve estar sozinho numa linha. line.new=''{0}'' na coluna {1} deve estar numa nova linha. line.previous=''{0}'' na coluna {1} deve estar na linha anterior. -line.same=''{0}'' na coluna {1} deve estar na mesma linha. +line.same=''{0}'' na coluna {1} deve estar na mesma linha que a próxima parte de uma instrução multi-bloco. needBraces=A estrutura sintáctica ''{0}'' deve utilizar '''{}'''s. diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_tr.properties b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_tr.properties index b39fde0dd..292089841 100644 --- a/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_tr.properties +++ b/src/main/resources/com/puppycrawl/tools/checkstyle/checks/blocks/messages_tr.properties @@ -9,7 +9,7 @@ catch.block.empty=Boş catch bloğu. line.alone = ''{0}'' sütun {1} bir çizgi üzerinde yalnız olmalıdır. line.new = ''{0}'' sütun {1} yeni bir satırda olmalıdır. line.previous = ''{0}'' sütun {1} önceki satırda olmalıdır. -line.same = ''{0}'' sütun {1} aynı satırda olmalıdır. +line.same = ''{0}'' sütun {1} multi-blok deyiminin sonraki parçası olarak aynı satırda olmalıdır. needBraces = ''{0}'' yapısı süslü parantezler ('''{}''') kullanmalı.