db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1369889 - in /db/derby/code/trunk/java: drda/org/apache/derby/loc/drda/ engine/org/apache/derby/iapi/types/ engine/org/apache/derby/impl/sql/execute/rts/ engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/ testing...
Date Mon, 06 Aug 2012 17:27:43 GMT
Author: rhillegas
Date: Mon Aug  6 17:27:42 2012
New Revision: 1369889

URL: http://svn.apache.org/viewvc?rev=1369889&view=rev
Log:
DERBY-5879: Various changes to messages to give translators more context.

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_en.properties
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setOpPlan.out
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_en.properties?rev=1369889&r1=1369888&r2=1369889&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_en.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_en.properties Mon Aug
 6 17:27:42 2012
@@ -25,8 +25,13 @@ SRV_LogOffButton=Press the button to tur
 SRV_TraceOnButton=Press the button to turn tracing on for all sessions when the server is
started.
 SRV_TraceOffButton=Press the button to turn tracing off for all sessions when the server
is started.
 SRV_StartButton=Press the button to start the server.
+
+# Translators: this is a verb which appears on an html form
 SRV_Start=Start
+
+# Translators: this is a verb which appears on an html form
 SRV_Stop=Stop
+
 SRV_LogOn=Logging on
 SRV_LogOff=Logging off
 SRV_TraceOn=Tracing on

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java?rev=1369889&r1=1369888&r2=1369889&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java Mon Aug  6 17:27:42
2012
@@ -221,8 +221,7 @@ public abstract class DataType
 	 */
 	public InputStream	getStream() throws StandardException
 	{
-		throw dataTypeConversion( 
-			MessageService.getTextMessage(SQLState.LANG_STREAM));
+		throw dataTypeConversion( "InputStream" );
 	}
 
     /**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java?rev=1369889&r1=1369888&r2=1369889&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java
Mon Aug  6 17:27:42 2012
@@ -127,7 +127,7 @@ public class RealSetOpResultSetStatistic
         initFormatInfo(depth);
 
         String rs = (opType == IntersectOrExceptNode.INTERSECT_OP) 
-                ? (SQLState.RTS_INTERSECT_RS) : (SQLState.RTS_EXCEPT_RS);
+                ? "INTERSECT ResultSet" : "EXCEPT ResultSet";
          
         return
             indent + MessageService.getTextMessage(rs) + 
@@ -207,7 +207,7 @@ public class RealSetOpResultSetStatistic
     public String getNodeName() {
         String nodeName = 
             (opType == IntersectOrExceptNode.INTERSECT_OP) 
-                ? (SQLState.RTS_INTERSECT) : (SQLState.RTS_EXCEPT);
+                ? "INTERSECT" : "EXCEPT";
 		
         return MessageService.getTextMessage(nodeName);
     }

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=1369889&r1=1369888&r2=1369889&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 Mon Aug  6 17:27:42
2012
@@ -2818,7 +2818,8 @@ Guide.
 
             <msg>
                 <name>42Z91</name>
-                <text>subquery</text>
+                <text>SELECT</text>
+                <comment>This is a kind of query fragment, which may or may not appear
in certain query contexts.</comment>
             </msg>
 
             <msg>
@@ -6242,11 +6243,6 @@ MessageId.java.
             </msg>
 
             <msg>
-                <name>42Z11.U</name>
-                <text>stream</text>
-            </msg>
-
-            <msg>
                 <name>42Z12.U</name>
                 <text>Internal error: Invalid attempt to access a {0} as a stream</text>
                 <arg>dataType</arg>
@@ -6298,6 +6294,7 @@ MessageId.java.
                 <name>42Z37.U</name>
                 <text>None</text>
                 <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
+                <comment>This is a start or stop position for a scan.</comment>
             </msg>
 
             <msg>
@@ -6415,6 +6412,7 @@ MessageId.java.
                 <text>exclusive</text>
                 <comment>A lock mode.</comment>
                 <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
+                <comment>This is shorthand for "exclusive lock".</comment>
             </msg>
 
             <msg>
@@ -6564,6 +6562,7 @@ MessageId.java.
                 <name>43X16.U</name>
                 <text>deferred</text>
                 <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
+                <comment>This is shorthand for "deferred update".</comment>
             </msg>
 
             <msg>
@@ -6833,6 +6832,7 @@ MessageId.java.
                 <name>43X59.U</name>
                 <text>all</text>
                 <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
+                <comment>Shorthand for "all columns".</comment>
             </msg>
 
             <msg>
@@ -7389,30 +7389,6 @@ MessageId.java.
             </msg>
 
             <msg>
-                <name>43Y58.U</name>
-                <text>Intersect ResultSet</text>
-                <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
-            </msg>
-
-            <msg>
-                <name>43Y59.U</name>
-                <text>Intersect</text>
-                <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
-            </msg>
-
-            <msg>
-                <name>43Y60.U</name>
-                <text>Except ResultSet</text>
-                <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
-            </msg>
-
-            <msg>
-                <name>43Y61.U</name>
-                <text>Except</text>
-                <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
-            </msg>
-
-            <msg>
                 <name>44X00.U</name>
                 <text>SQL Type Name</text>
             </msg>
@@ -7612,11 +7588,13 @@ MessageId.java.
             <msg>
                 <name>XSAJF.U</name>
                 <text>btree</text>
+                <comment>This is a type of conglomerate.</comment>
             </msg>
 
             <msg>
                 <name>XSAJG.U</name>
                 <text>heap</text>
+                <comment>This is a type of conglomerate.</comment>
             </msg>
 
             <msg>
@@ -7627,11 +7605,13 @@ MessageId.java.
             <msg>
                 <name>XSAJI.U</name>
                 <text>external</text>
+                <comment>This is a type of sort.</comment>
             </msg>
 
             <msg>
                 <name>XSAJJ.U</name>
                 <text>internal</text>
+                <comment>This is a type of sort.</comment>
             </msg>
 
         </family>

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=1369889&r1=1369888&r2=1369889&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
(original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
Mon Aug  6 17:27:42 2012
@@ -1026,7 +1026,6 @@ public interface SQLState {
 
 	// MORE GENERIC LANGUAGE STUFF
 	String LANG_UDT_BUILTIN_CONFLICT										   = "42Z10";
-	String LANG_STREAM												   = "42Z11.U";
     String LANG_STREAM_INVALID_ACCESS                                  = "42Z12.U";
 
 	// String LANG_UPDATABLE_VTI_BAD_GETMETADATA						   = "42Z14";
@@ -1291,10 +1290,6 @@ public interface SQLState {
 	String RTS_END_DEPENDENT_NUMBER									   = "43Y55.U";	
 	String RTS_USER_SUPPLIED_OPTIMIZER_OVERRIDES_FOR_TABLE			   = "43Y56.U";	
 	String RTS_USER_SUPPLIED_OPTIMIZER_OVERRIDES_FOR_JOIN			   = "43Y57.U";
-	String RTS_INTERSECT_RS                                            = "43Y58.U";
-	String RTS_INTERSECT                                               = "43Y59.U";
-	String RTS_EXCEPT_RS                                               = "43Y60.U";
-	String RTS_EXCEPT                                                  = "43Y61.U";
 
 	// org.apache.derby.catalog.types
 	String TI_SQL_TYPE_NAME			= "44X00.U";

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out?rev=1369889&r1=1369888&r2=1369889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
Mon Aug  6 17:27:42 2012
@@ -5984,9 +5984,9 @@ CREATE SYNONYM "APP"."SYN1" FOR "BAR"."T
 -- ----------------------------------------------
 -- DDL Statements for keys
 -- ----------------------------------------------
--- primary/unique
+-- PRIMARY/UNIQUE
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" PRIMARY KEY ("C")
--- foreign
+-- FOREIGN
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" FOREIGN KEY ("FKCHAR") REFERENCES
"BAR"."T1" ("C") ON DELETE NO ACTION ON UPDATE NO ACTION
 -- ----------------------------------------------
 -- DDL Statements for checks
@@ -6044,9 +6044,9 @@ CREATE INDEX "BAR"."IX1" ON "BAR"."T1" (
 -- ----------------------------------------------
 -- DDL Statements for keys
 -- ----------------------------------------------
--- primary/unique
+-- PRIMARY/UNIQUE
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" PRIMARY KEY ("C");
--- foreign
+-- FOREIGN
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" FOREIGN KEY ("FKCHAR") REFERENCES
"BAR"."T1" ("C") ON DELETE NO ACTION ON UPDATE NO ACTION;
 -- ----------------------------------------------
 -- DDL Statements for checks
@@ -6141,9 +6141,9 @@ CREATE SYNONYM "APP"."SYN1" FOR "BAR"."T
 -- ----------------------------------------------
 -- DDL Statements for keys
 -- ----------------------------------------------
--- primary/unique
+-- PRIMARY/UNIQUE
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" PRIMARY KEY ("C") #
--- foreign
+-- FOREIGN
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" FOREIGN KEY ("FKCHAR") REFERENCES
"BAR"."T1" ("C") ON DELETE NO ACTION ON UPDATE NO ACTION #
 -- ----------------------------------------------
 -- DDL Statements for checks

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out?rev=1369889&r1=1369888&r2=1369889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
Mon Aug  6 17:27:42 2012
@@ -5984,9 +5984,9 @@ CREATE SYNONYM "APP"."SYN1" FOR "BAR"."T
 -- ----------------------------------------------
 -- DDL Statements for keys
 -- ----------------------------------------------
--- primary/unique
+-- PRIMARY/UNIQUE
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" PRIMARY KEY ("C")
--- foreign
+-- FOREIGN
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" FOREIGN KEY ("FKCHAR") REFERENCES
"BAR"."T1" ("C") ON DELETE NO ACTION ON UPDATE NO ACTION
 -- ----------------------------------------------
 -- DDL Statements for checks
@@ -6044,9 +6044,9 @@ CREATE INDEX "BAR"."IX1" ON "BAR"."T1" (
 -- ----------------------------------------------
 -- DDL Statements for keys
 -- ----------------------------------------------
--- primary/unique
+-- PRIMARY/UNIQUE
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" PRIMARY KEY ("C");
--- foreign
+-- FOREIGN
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" FOREIGN KEY ("FKCHAR") REFERENCES
"BAR"."T1" ("C") ON DELETE NO ACTION ON UPDATE NO ACTION;
 -- ----------------------------------------------
 -- DDL Statements for checks
@@ -6141,9 +6141,9 @@ CREATE SYNONYM "APP"."SYN1" FOR "BAR"."T
 -- ----------------------------------------------
 -- DDL Statements for keys
 -- ----------------------------------------------
--- primary/unique
+-- PRIMARY/UNIQUE
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" PRIMARY KEY ("C") #
--- foreign
+-- FOREIGN
 ALTER TABLE "BAR"."T1" ADD CONSTRAINT "xxxxGENERATED-IDxxxx" FOREIGN KEY ("FKCHAR") REFERENCES
"BAR"."T1" ("C") ON DELETE NO ACTION ON UPDATE NO ACTION #
 -- ----------------------------------------------
 -- DDL Statements for checks

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out?rev=1369889&r1=1369888&r2=1369889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out Mon
Aug  6 17:27:42 2012
@@ -82,8 +82,7 @@ help;
                                -- lists tables, views, procedures, functions or synonyms
   SHOW INDEXES { IN schema | FROM table };
                                -- lists indexes in a schema, or for a table
-  SHOW ROLES;                  -- lists all defined roles in the database,
-                               -- sorted
+  SHOW ROLES;                  -- lists all defined roles in the database, sorted
   SHOW ENABLED_ROLES;          -- lists the enabled roles for the current
                                -- connection (to see current role use
                                -- VALUES CURRENT_ROLE), sorted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setOpPlan.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setOpPlan.out?rev=1369889&r1=1369888&r2=1369889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setOpPlan.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setOpPlan.out
Mon Aug  6 17:27:42 2012
@@ -104,7 +104,7 @@ Source result set:
 			qualifiers:
 				None
 	Right result set:
-		Intersect ResultSet:
+		INTERSECT ResultSet:
 		Number of opens = 1
 		Rows seen from the left = 4
 		Rows seen from the right = 4
@@ -210,7 +210,7 @@ End Compilation Timestamp : null
 Begin Execution Timestamp : null
 End Execution Timestamp : null
 Statement Execution Plan Text: 
-Except ResultSet:
+EXCEPT ResultSet:
 Number of opens = 1
 Rows seen from the left = 4
 Rows seen from the right = 4
@@ -350,7 +350,7 @@ End Compilation Timestamp : null
 Begin Execution Timestamp : null
 End Execution Timestamp : null
 Statement Execution Plan Text: 
-Except ResultSet:
+EXCEPT ResultSet:
 Number of opens = 1
 Rows seen from the left = 3
 Rows seen from the right = 3
@@ -360,7 +360,7 @@ Rows returned = 0
 	next time (milliseconds) = 0
 	close time (milliseconds) = 0
 Left result set:
-	Intersect ResultSet:
+	INTERSECT ResultSet:
 	Number of opens = 1
 	Rows seen from the left = 3
 	Rows seen from the right = 3

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties?rev=1369889&r1=1369888&r2=1369889&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Mon Aug 
6 17:27:42 2012
@@ -99,8 +99,7 @@ IJ_HelpText=\
 \                               -- lists tables, views, procedures, functions or synonyms\n\
 \  SHOW INDEXES '{' IN schema | FROM table '}';\n\
 \                               -- lists indexes in a schema, or for a table\n\
-\  SHOW ROLES;                  -- lists all defined roles in the database,\n\
-\                               -- sorted\n\
+\  SHOW ROLES;                  -- lists all defined roles in the database, sorted\n\
 \  SHOW ENABLED_ROLES;          -- lists the enabled roles for the current\n\
 \                               -- connection (to see current role use\n\
 \                               -- VALUES CURRENT_ROLE), sorted\n\
@@ -306,8 +305,8 @@ DBLOOK_ChecksHeader=DDL Statements for c
 DBLOOK_IndexesHeader=DDL Statements for indexes
 DBLOOK_JarsHeader=DDL Statements for jars
 DBLOOK_KeysHeader=DDL Statements for keys
-DBLOOK_PrimUniqueHeader=primary/unique
-DBLOOK_ForeignHeader=foreign
+DBLOOK_PrimUniqueHeader=PRIMARY/UNIQUE
+DBLOOK_ForeignHeader=FOREIGN
 DBLOOK_FunctionHeader=DDL Statements for functions
 DBLOOK_SchemasHeader=DDL Statements for schemas
 DBLOOK_SequenceHeader=DDL Statements for sequences



Mime
View raw message