You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2008/10/09 23:06:09 UTC
svn commit: r703259 - in /db/derby/code/trunk/java:
engine/org/apache/derby/loc/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/functionTests/tests/i18n/
Author: myrnavl
Date: Thu Oct 9 14:06:08 2008
New Revision: 703259
URL: http://svn.apache.org/viewvc?rev=703259&view=rev
Log:
DERBY-3902; correct messages.xml and translated files for SQLState 2003.S.4
(was accidentally listed as 2004.S.4 - see also comment in DERBY-1567).
Also fix up MessageBundleTest to ignore two sqlstates that are not exposed to
the user so don't need text.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/MessageBundleTest.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Thu Oct 9 14:06:08 2008
@@ -577,7 +577,7 @@
</msg>
<msg>
- <name>22004.S.4</name>
+ <name>22003.S.4</name>
<text>The length ({0}) exceeds the maximum length for the data type ({1}).</text>
<arg>number</arg>
<arg>datatypeName</arg>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties Thu Oct 9 14:06:08 2008
@@ -431,7 +431,7 @@
22003.S.1=Rok ({0}) p\u0159ekra\u010duje maximum ''{1}''.
22003.S.2=Des\u00edtkov\u00e9 \u010d\u00edslo m\u016f\u017ee m\u00edt maxim\u00e1ln\u011b 31 \u010d\u00edslic.
22003.S.3=Vyskytlo se p\u0159ete\u010den\u00ed b\u011bhem konverze \u010d\u00edseln\u00e9ho datov\u00e9ho typu ''{0}'' na {1}.
-22004.S.4=D\u00e9lka ({0}) p\u0159ekra\u010duje maxim\u00e1ln\u00ed d\u00e9lku pro datov\u00fd typ ({1}).
+22003.S.4=D\u00e9lka ({0}) p\u0159ekra\u010duje maxim\u00e1ln\u00ed d\u00e9lku pro datov\u00fd typ ({1}).
22005=Byl u\u010din\u011bn pokus o z\u00edsk\u00e1n\u00ed hodnoty dat typu ''{0}'' z hodnoty dat typu ''{1}''.
22005.S.1=Nelze konvertovat hodnotu typu ''{0}'' na typ ''{1}'' : zak\u00f3dov\u00e1n\u00ed nen\u00ed podporov\u00e1no.
22005.S.2=Po\u017eadovan\u00fd konvertor znak\u016f nen\u00ed k dispozici.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties Thu Oct 9 14:06:08 2008
@@ -96,7 +96,7 @@
22003.S.2=Eine Dezimalzahl darf nicht mehr als 31 Stellen haben.
22003.S.3=Bei der Konvertierung eines numerischen Datentyps von ''{0}'' in {1} ist es zu einem \u00DCberlauf gekommen.
22003=Der resultierende Wert liegt au\u00DFerhalb des Bereichs f\u00FCr den Datentyp {0}.
-22004.S.4=Die L\u00E4nge ({0}) \u00FCberschreitet das Maximum f\u00FCr den Datentyp ({1}).
+22003.S.4=Die L\u00E4nge ({0}) \u00FCberschreitet das Maximum f\u00FCr den Datentyp ({1}).
22005.S.1=Ein Wert des Typs ''{0}'' kann nicht in den Typ ''{1}'' konvertiert werden. Die Codierung wird nicht unterst\u00FCtzt.
22005.S.2=Der erforderliche Zeichenumsetzer ist nicht verf\u00FCgbar.
22005.S.3=Eine Unicode-Zeichenfolge kann nicht in eine EBCDIC-Zeichenfolge konvertiert werden.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties Thu Oct 9 14:06:08 2008
@@ -96,7 +96,7 @@
22003.S.2=El decimal s\u00F3lo puede tener un m\u00E1ximo de 31 d\u00EDgitos.
22003.S.3=Se ha producido un desbordamiento durante la conversi\u00F3n del tipo de datos num\u00E9rico de ''{0}'' a {1}.
22003=El valor resultante queda fuera del rango para el tipo de datos {0}.
-22004.S.4=La longitud de ({0}) excede la longitud m\u00E1xima para el tipo de datos ({1}).
+22003.S.4=La longitud de ({0}) excede la longitud m\u00E1xima para el tipo de datos ({1}).
22005.S.1=No se ha podido convertir un valor del tipo ''{0}'' al tipo ''{1}'' \: la codificaci\u00F3n no est\u00E1 soportada.
22005.S.2=El convertidor de caracteres necesario no est\u00E1 disponible.
22005.S.3=La serie Unicode no se puede convertir a la serie Ebcdic
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties Thu Oct 9 14:06:08 2008
@@ -96,7 +96,7 @@
22003.S.2=Les nombres d\u00E9cimaux ne peuvent comporter que 31 d\u00E9cimales maximum.
22003.S.3=Un d\u00E9passement de capacit\u00E9 s''est produit au cours de la conversion du type de donn\u00E9e num\u00E9rique de''{0}'' en {1}.
22003=La valeur r\u00E9sultante se situe hors de la fourchette admise pour le type de donn\u00E9es {0}.
-22004.S.4=La longueur ({0}) d\u00E9passe la longueur maximale ({1}) autoris\u00E9e pour le type de donn\u00E9es.
+22003.S.4=La longueur ({0}) d\u00E9passe la longueur maximale ({1}) autoris\u00E9e pour le type de donn\u00E9es.
22005.S.1=Conversion d''une valeur de type ''{0}'' en type ''{1}'' impossible \: le codage n''est pas pris en charge.
22005.S.2=Le convertisseur de caract\u00E8res requis n''est pas disponible.
22005.S.3=Une cha\u00EEne unicode ne peut \u00EAtre convertie en cha\u00EEne Ebcdic
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties Thu Oct 9 14:06:08 2008
@@ -431,7 +431,7 @@
22003.S.1=A(z) {0} \u00e9v meghaladja a maxim\u00e1lis ''{1}'' \u00e9rt\u00e9ket.
22003.S.2=A decim\u00e1lis \u00e9rt\u00e9k legfeljebb 31 sz\u00e1mjegy\u0171 lehet.
22003.S.3=T\u00falcsordul\u00e1s t\u00f6rt\u00e9nt a(z) ''{0}'' numerikus adatt\u00edpus \u00e1talak\u00edt\u00e1sa sor\u00e1n a k\u00f6vetkez\u0151re: {1}.
-22004.S.4=A(z) {0} hossz meghaladja a(z) {1} adatt\u00edpus maxim\u00e1lis hossz\u00e1t.
+22003.S.4=A(z) {0} hossz meghaladja a(z) {1} adatt\u00edpus maxim\u00e1lis hossz\u00e1t.
22005=K\u00eds\u00e9rlet t\u00f6rt\u00e9nt ''{0}'' t\u00edpus\u00fa adat\u00e9rt\u00e9k lek\u00e9r\u00e9s\u00e9re egy ''{1}'' t\u00edpus\u00fa adat\u00e9rt\u00e9kb\u0151l.
22005.S.1=Nem alak\u00edthat\u00f3 \u00e1t a(z) ''{0}'' t\u00edpus\u00fa \u00e9rt\u00e9k ''{1}'' t\u00edpus\u00fav\u00e1: a k\u00f3dol\u00e1s nem t\u00e1mogatott.
22005.S.2=A sz\u00fcks\u00e9ges karakter\u00e1talak\u00edt\u00f3 nem \u00e9rhet\u0151 el.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties Thu Oct 9 14:06:08 2008
@@ -96,7 +96,7 @@
22003.S.2=Il numero decimale pu\u00F2 contenere 31 cifre.
22003.S.3=Si \u00E8 verificato un overflow durante la conversione del tipo di dati numerici di ''{0}'' in {1}.
22003=Il valore risultante non \u00E8 compreso nell''intervallo per il tipo di dati {0}.
-22004.S.4=La lunghezza {0}) supera la lunghezza massima per il tipo di dati ({1}).
+22003.S.4=La lunghezza {0}) supera la lunghezza massima per il tipo di dati ({1}).
22005.S.1=Impossibile convertire un valore di tipo ''{0}'' nel tipo ''{1}'' \: la codifica non \u00E8 supportata.
22005.S.2=Il convertitore del carattere richiesto non \u00E8 disponibile.
22005.S.3=Impossibile convertire la stringa Unicode nella stringa Ebcdic
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties Thu Oct 9 14:06:08 2008
@@ -96,7 +96,7 @@
22003.S.2=\u4F7F\u7528\u53EF\u80FD\u306A 10 \u9032\u6570\u306F\u300131 \u6841\u307E\u3067\u3067\u3059\u3002
22003.S.3=''{0}'' \u304B\u3089 {1} \u3078\u306E\u6570\u5024\u30C7\u30FC\u30BF\u578B\u5909\u63DB\u4E2D\u306B\u30AA\u30FC\u30D0\u30FC\u30D5\u30ED\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
22003=\u7D50\u679C\u5024\u306F\u3001\u30C7\u30FC\u30BF\u578B {0} \u306E\u7BC4\u56F2\u5916\u3067\u3059\u3002
-22004.S.4=\u9577\u3055 ({0}) \u304C\u3001\u3053\u306E\u30C7\u30FC\u30BF\u578B\u306E\u6700\u5927\u9577 ({1}) \u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
+22003.S.4=\u9577\u3055 ({0}) \u304C\u3001\u3053\u306E\u30C7\u30FC\u30BF\u578B\u306E\u6700\u5927\u9577 ({1}) \u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
22005.S.1=\u578B ''{0}'' \u306E\u5024\u3092\u578B ''{1}'' \u306B\u5909\u63DB\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u306E\u30A8\u30F3\u30B3\u30FC\u30C9\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
22005.S.2=\u5FC5\u8981\u306A\u6587\u5B57\u30B3\u30F3\u30D0\u30FC\u30BF\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
22005.S.3=Unicode \u30B9\u30C8\u30EA\u30F3\u30B0\u3092 EBCDIC \u30B9\u30C8\u30EA\u30F3\u30B0\u306B\u5909\u63DB\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties Thu Oct 9 14:06:08 2008
@@ -96,7 +96,7 @@
22003.S.2=10\uC9C4\uC218\uC758 \uCD5C\uB300 \uC790\uB9AC\uC218\uB294 31\uC790\uB9AC\uC785\uB2C8\uB2E4.
22003.S.3=\uC22B\uC790 \uB370\uC774\uD130 \uC720\uD615\uC744 ''{0}''\uC5D0\uC11C {1}(\uC73C)\uB85C \uBCC0\uD658\uD558\uB294 \uC911\uC5D0 \uC624\uBC84\uD50C\uB85C\uC6B0\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
22003=\uACB0\uACFC \uAC12\uC774 {0} \uB370\uC774\uD130 \uC720\uD615\uC758 \uBC94\uC704\uB97C \uBC97\uC5B4\uB0AC\uC2B5\uB2C8\uB2E4.
-22004.S.4=\uAE38\uC774({0})\uAC00 \uB370\uC774\uD130 \uC720\uD615\uC758 \uCD5C\uB300 \uAE38\uC774({1})\uB97C \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
+22003.S.4=\uAE38\uC774({0})\uAC00 \uB370\uC774\uD130 \uC720\uD615\uC758 \uCD5C\uB300 \uAE38\uC774({1})\uB97C \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4.
22005.S.1=\uC720\uD615 ''{0}''\uC758 \uAC12\uC744 \uC720\uD615 ''{1}''(\uC73C)\uB85C \uBCC0\uD658\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC778\uCF54\uB529\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
22005.S.2=\uD544\uC218 \uBB38\uC790 \uBCC0\uD658\uAE30\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
22005.S.3=\uC720\uB2C8\uCF54\uB4DC \uBB38\uC790\uC5F4\uC740 Ebcdic \uBB38\uC790\uC5F4\uB85C \uBCC0\uD658\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties Thu Oct 9 14:06:08 2008
@@ -431,7 +431,7 @@
22003.S.1=Rok ({0}) przekracza maksymaln\u0105 warto\u015b\u0107 ''{1}''.
22003.S.2=Liczba dziesi\u0119tna mo\u017ce mie\u0107 maksymalnie 31 cyfr.
22003.S.3=Podczas konwersji danych liczbowych ''{0}'' na {1} wyst\u0105pi\u0142o przepe\u0142nienie.
-22004.S.4=D\u0142ugo\u015b\u0107 ({0}) przekracza maksymaln\u0105 d\u0142ugo\u015b\u0107 dla typu danych ({1}).
+22003.S.4=D\u0142ugo\u015b\u0107 ({0}) przekracza maksymaln\u0105 d\u0142ugo\u015b\u0107 dla typu danych ({1}).
22005=Wyst\u0105pi\u0142a pr\u00f3ba pobrania warto\u015bci danych typu ''{0}'' z warto\u015bci danych typu ''{1}''.
22005.S.1=Nie mo\u017cna dokona\u0107 konwersji warto\u015bci typu ''{0}'' na typ ''{1}'': kodowanie nie jest obs\u0142ugiwane.
22005.S.2=Wymagany konwerter znak\u00f3w nie jest dost\u0119pny.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties Thu Oct 9 14:06:08 2008
@@ -431,7 +431,7 @@
22003.S.1=\u0413\u043e\u0434 ({0}) \u043f\u0440\u0435\u0432\u044b\u0448\u0430\u0435\u0442 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 ''{1}''.
22003.S.2=\u0414\u0435\u0441\u044f\u0442\u0438\u0447\u043d\u043e\u0435 \u0447\u0438\u0441\u043b\u043e \u043c\u043e\u0436\u0435\u0442 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u0434\u043e 31 \u0440\u0430\u0437\u0440\u044f\u0434\u0430.
22003.S.3=\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u043e \u043f\u0435\u0440\u0435\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0447\u0438\u0441\u043b\u043e\u0432\u043e\u0433\u043e \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0442\u0438\u043f\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u0437 ''{0}'' \u0432 {1}.
-22004.S.4=\u0414\u043b\u0438\u043d\u0430 ({0}) \u043f\u0440\u0435\u0432\u044b\u0448\u0430\u0435\u0442 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u0434\u043b\u0438\u043d\u0443 \u0434\u043b\u044f \u0442\u0438\u043f\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 ({1}).
+22003.S.4=\u0414\u043b\u0438\u043d\u0430 ({0}) \u043f\u0440\u0435\u0432\u044b\u0448\u0430\u0435\u0442 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u0434\u043b\u0438\u043d\u0443 \u0434\u043b\u044f \u0442\u0438\u043f\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 ({1}).
22005=\u041f\u0440\u0435\u0434\u043f\u0440\u0438\u043d\u044f\u0442\u0430 \u043f\u043e\u043f\u044b\u0442\u043a\u0435 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0430 ''{0}'' \u0438\u0437 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445 \u0442\u0438\u043f\u0430 ''{1}''.
22005.S.1=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u0442\u044c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0442\u0438\u043f\u0430 ''{0}'' \u0432 \u0442\u0438\u043f ''{1}'': \u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.
22005.S.2=\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0430\u044f \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties Thu Oct 9 14:06:08 2008
@@ -96,7 +96,7 @@
22003.S.2=\u5341\u8FDB\u5236\u6700\u591A\u53EA\u80FD\u6709 31 \u4F4D\u3002
22003.S.3=\u5C06\u6570\u5B57\u6570\u636E\u7C7B\u578B\u4ECE\u201C{0}\u201D\u8F6C\u6362\u4E3A {1} \u671F\u95F4\u53D1\u751F\u6EA2\u51FA\u3002
22003=\u4EA7\u751F\u7684\u503C\u8D85\u51FA\u4E86\u6570\u636E\u7C7B\u578B {0} \u7684\u8303\u56F4\u3002
-22004.S.4=\u957F\u5EA6 {0} \u8D85\u51FA\u4E86\u6570\u636E\u7C7B\u578B {1} \u7684\u6700\u5927\u957F\u5EA6\u3002
+22003.S.4=\u957F\u5EA6 {0} \u8D85\u51FA\u4E86\u6570\u636E\u7C7B\u578B {1} \u7684\u6700\u5927\u957F\u5EA6\u3002
22005.S.1=\u65E0\u6CD5\u5C06\u7C7B\u578B\u4E3A\u201C{0}\u201D\u7684\u503C\u8F6C\u6362\u4E3A\u7C7B\u578B\u201C{1}\u201D\uFF1A\u7F16\u7801\u4E0D\u53D7\u652F\u6301\u3002
22005.S.2=\u5FC5\u9700\u7684\u5B57\u7B26\u8F6C\u6362\u5668\u4E0D\u53EF\u7528\u3002
22005.S.3=Unicode \u5B57\u7B26\u4E32\u4E0D\u80FD\u8F6C\u6362\u4E3A Ebcdic \u5B57\u7B26\u4E32
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties Thu Oct 9 14:06:08 2008
@@ -96,7 +96,7 @@
22003.S.2=\u5C0F\u6578\u53EA\u80FD\u6700\u591A 31 \u4F4D\u6578\u3002
22003.S.3=\u5C07 ''{0}'' \u4EE5\u6578\u503C\u8CC7\u6599\u985E\u578B\u8F49\u63DB\u6210 {1} \u6642\u767C\u751F\u6EA2\u4F4D\u3002
22003=\u7522\u751F\u7684\u503C\u8D85\u51FA\u8CC7\u6599\u985E\u578B {0} \u7684\u7BC4\u570D\u3002
-22004.S.4=\u9577\u5EA6 ({0}) \u8D85\u51FA\u8CC7\u6599\u985E\u578B ({1}) \u7684\u9577\u5EA6\u4E0A\u9650\u3002
+22003.S.4=\u9577\u5EA6 ({0}) \u8D85\u51FA\u8CC7\u6599\u985E\u578B ({1}) \u7684\u9577\u5EA6\u4E0A\u9650\u3002
22005.S.1=\u7121\u6CD5\u5C07\u985E\u578B ''{0}'' \u7684\u503C\u8F49\u63DB\u6210\u985E\u578B ''{1}''\uFF1A\u4E0D\u652F\u63F4\u7DE8\u78BC\u3002
22005.S.2=\u7121\u6CD5\u4F7F\u7528\u5FC5\u8981\u7684\u5B57\u5143\u8F49\u63DB\u5668\u3002
22005.S.3=Unicode \u5B57\u4E32\u7121\u6CD5\u8F49\u63DB\u6210 Ebcdic \u5B57\u4E32
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/MessageBundleTest.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/MessageBundleTest.out?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/MessageBundleTest.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/MessageBundleTest.out Thu Oct 9 14:06:08 2008
@@ -1,20 +1,12 @@
-.
-testSQLStateOrphanedIds ERROR: Message id 22003.S.4 in SQLState.java was not found in messages_en.properties
-ERROR: Message id XCL32.S in SQLState.java was not found in messages_en.properties
-ERROR: Message id X0RQ3.C in SQLState.java was not found in messages_en.properties
-ERROR: Message id XSAX1 in SQLState.java was not found in messages_en.properties
-used 188 ms .
-testMessageIdOrphanedIds used 0 ms .
-testMessageBundleOrphanedMessages WARNING: Message id 22004.S.4 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
-WARNING: Message id J106 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
+...WARNING: Message id J106 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
WARNING: Message id J107 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
-WARNING: Message id J108 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
-WARNING: Message id J109 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
-WARNING: Message id 08000.S.1 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
WARNING: Message id XCL17.S in messages_en.properties is not referenced in either SQLState.java or MessageId.java
+WARNING: Message id 08000.S.1 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
+WARNING: Message id J108 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
WARNING: Message id XJ102.S in messages_en.properties is not referenced in either SQLState.java or MessageId.java
-used 0 ms
-Time: 0.203
+WARNING: Message id J109 in messages_en.properties is not referenced in either SQLState.java or MessageId.java
+
+Time: 0.094
OK (3 tests)
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java?rev=703259&r1=703258&r2=703259&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/MessageBundleTest.java Thu Oct 9 14:06:08 2008
@@ -138,11 +138,18 @@
String sqlStateId = (String)it.next();
if ( ! messageBundleIds.contains(sqlStateId) ) {
+ // there are some error messages that do not need to be in
+ // messages.xml:
+ // XCL32: will never be exposed to users (see DERBY-1414)
+ // XSAX1: shared SQLState explains; not exposed to users.
+ //
+ if (!(sqlStateId.equalsIgnoreCase("XCL32.S") ||
+ sqlStateId.equalsIgnoreCase("XSAX1")))
// Don't fail out on the first one, we want to catch
// all of them. Just note there was a failure and continue
- System.err.println("ERROR: Message id " + sqlStateId +
- " in SQLState.java was not found in" +
- " messages_en.properties");
+ System.err.println("ERROR: Message id " + sqlStateId +
+ " in SQLState.java was not found in" +
+ " messages_en.properties");
}
}
}