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 rh...@apache.org on 2012/07/25 19:40:35 UTC
svn commit: r1365672 - in /db/derby/code/trunk/java:
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/functionTests/tests/tools/
tools/org/apache/derby/loc/
Author: rhillegas
Date: Wed Jul 25 17:40:35 2012
New Revision: 1365672
URL: http://svn.apache.org/viewvc?rev=1365672&view=rev
Log:
DERBY-5879: Help translators by adding comments to multi-line tools messages and by changing a couple of ALL CAPS words to ordinary casing.
Modified:
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/tests/tools/derbyrunjartest.java
db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
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=1365672&r1=1365671&r2=1365672&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 Wed Jul 25 17:40:35 2012
@@ -5946,14 +5946,14 @@ CREATE SEQUENCE "APP"."SEQUENCE_1"
NO CYCLE
-- ----------------------------------------------
-- DDL Statements for jars
--- **** NOTE **** In order for jar files to be loaded correctly,
+-- **** Note **** In order for jar files to be loaded correctly,
-- you must either 1) ensure that the DBJARS directory (created
-- automatically by dblook) exists where it was created (i.e. at
-- the path shown in the statements below), or else 2) change the
-- path in the statements below to reflect the current location of
-- DBJARS. If the DBJARS directory does not exist, or if it
-- has been moved and the path is not correct, the following DDL
--- statements will throw errors, and the jar files will NOT be
+-- statements will throw errors, and the jar files will not be
-- loaded.
-- ----------------------------------------------
CALL SQLJ.INSTALL_JAR(<maskedOutJarDesc>)
@@ -6058,7 +6058,7 @@ File dblook.log was empty.
Msg Test 3
************
USAGE:
- java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]
+ java org.apache.derby.tools.dblook -d <sourceDBUrl> [options]
where the source URL is the full URL, including the connection protocol
and any connection attributes that might apply. For example, use
'jdbc:derby:myDB', or 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=usr;'.
@@ -6103,14 +6103,14 @@ CREATE SEQUENCE "APP"."SEQUENCE_1"
#
-- ----------------------------------------------
-- DDL Statements for jars
--- **** NOTE **** In order for jar files to be loaded correctly,
+-- **** Note **** In order for jar files to be loaded correctly,
-- you must either 1) ensure that the DBJARS directory (created
-- automatically by dblook) exists where it was created (i.e. at
-- the path shown in the statements below), or else 2) change the
-- path in the statements below to reflect the current location of
-- DBJARS. If the DBJARS directory does not exist, or if it
-- has been moved and the path is not correct, the following DDL
--- statements will throw errors, and the jar files will NOT be
+-- statements will throw errors, and the jar files will not be
-- loaded.
-- ----------------------------------------------
CALL SQLJ.INSTALL_JAR(<maskedOutJarDesc>)
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=1365672&r1=1365671&r2=1365672&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 Wed Jul 25 17:40:35 2012
@@ -5946,14 +5946,14 @@ CREATE SEQUENCE "APP"."SEQUENCE_1"
NO CYCLE
-- ----------------------------------------------
-- DDL Statements for jars
--- **** NOTE **** In order for jar files to be loaded correctly,
+-- **** Note **** In order for jar files to be loaded correctly,
-- you must either 1) ensure that the DBJARS directory (created
-- automatically by dblook) exists where it was created (i.e. at
-- the path shown in the statements below), or else 2) change the
-- path in the statements below to reflect the current location of
-- DBJARS. If the DBJARS directory does not exist, or if it
-- has been moved and the path is not correct, the following DDL
--- statements will throw errors, and the jar files will NOT be
+-- statements will throw errors, and the jar files will not be
-- loaded.
-- ----------------------------------------------
CALL SQLJ.INSTALL_JAR(<maskedOutJarDesc>)
@@ -6058,7 +6058,7 @@ File dblook.log was empty.
Msg Test 3
************
USAGE:
- java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]
+ java org.apache.derby.tools.dblook -d <sourceDBUrl> [options]
where the source URL is the full URL, including the connection protocol
and any connection attributes that might apply. For example, use
'jdbc:derby:myDB', or 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=usr;'.
@@ -6103,14 +6103,14 @@ CREATE SEQUENCE "APP"."SEQUENCE_1"
#
-- ----------------------------------------------
-- DDL Statements for jars
--- **** NOTE **** In order for jar files to be loaded correctly,
+-- **** Note **** In order for jar files to be loaded correctly,
-- you must either 1) ensure that the DBJARS directory (created
-- automatically by dblook) exists where it was created (i.e. at
-- the path shown in the statements below), or else 2) change the
-- path in the statements below to reflect the current location of
-- DBJARS. If the DBJARS directory does not exist, or if it
-- has been moved and the path is not correct, the following DDL
--- statements will throw errors, and the jar files will NOT be
+-- statements will throw errors, and the jar files will not be
-- loaded.
-- ----------------------------------------------
CALL SQLJ.INSTALL_JAR(<maskedOutJarDesc>)
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java?rev=1365672&r1=1365671&r2=1365672&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java Wed Jul 25 17:40:35 2012
@@ -114,7 +114,7 @@ public class derbyrunjartest extends Bas
String[] cmd = { "dblook" };
String[] output = {
" USAGE:",
- " java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]",
+ " java org.apache.derby.tools.dblook -d <sourceDBUrl> [options]",
" where the source URL is the full URL, including the connection protocol",
" and any connection attributes that might apply. For example, use",
" options include:",
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=1365672&r1=1365671&r2=1365672&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 Wed Jul 25 17:40:35 2012
@@ -48,6 +48,24 @@ IJ_CurreConne=* = current connection
IJ_NoCurreConne=No current connection
IJ_TestsRun0Pass12Fail34=Tests run: {0} pass: {1} ({2}%) fail: {3} ({4}%)
IJ_UnexpResulUnx01=***** UNEXPECTED RESULTS, unx: {0} ({1}%) *****
+
+#
+# This long, multi-line message is the help text for the ij command.
+# Everything in ALL CAPS is either part of the syntax of an ij command
+# or is a term which should not be translated. All other words should be translated.
+#
+# The backslashes at the ends of lines are continuation markers
+# which tell the program that all of this text is part of one, big message.
+# These backslashes should appear in translations also.
+#
+# The backslashes at the beginnings of lines tell the program
+# to preserve the white space which starts the lines. The white space
+# is needed to improve readability. These backslashes should also appear
+# in the translations.
+#
+# The double hyphens improve the readability of the text by indicating
+# which comments apply to which commands.
+#
IJ_HelpText=\
\ \n\
\ Supported commands include:\n\
@@ -202,9 +220,24 @@ TL_urlLabel1=URL Attribute {0}{1}{2}
# Directory org/apache/derby/tools
# From dblook.java
DBLOOK_MissingLocale=Resources not found for current locale; switching to {0}.
+
+#
+# This long, multi-line message is the usage text for the dblook command.
+# The option switches (e.g., -z, -noview, etc.) should not be translated.
+# The connection urls (e.g. ''jdbc:derby:myDB'') should not be translated either.
+#
+# The backslashes at the ends of lines are continuation markers
+# which tell the program that all of this text is part of one, big message.
+# These backslashes should appear in translations also.
+#
+# The backslashes at the beginnings of lines tell the program
+# to preserve the white space which starts the lines. The white space
+# is needed to improve readability. These backslashes should also appear
+# in the translations.
+#
DBLOOK_Usage=\
\ \n\
-\ USAGE:\n\ java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]\n\n\
+\ USAGE:\n\ java org.apache.derby.tools.dblook -d <sourceDBUrl> [options]\n\n\
\ \twhere the source URL is the full URL, including the connection protocol\n\
\ \tand any connection attributes that might apply. For example, use\n\
\ \t''jdbc:derby:myDB'', or ''jdbc:derby://localhost:1527/myDB;user=usr;''. \n\n\
@@ -225,6 +258,7 @@ DBLOOK_Usage=\
\ \t will be written.\n\
\ \t\tIf not specified, default is the console.\
\ \n
+
DBLOOK_FileCreation=This file was created using Derby''s dblook utility.
DBLOOK_OutputLocation=Output will be sent to file {0}\n
DBLOOK_Timestamp=Timestamp: {0}
@@ -255,16 +289,30 @@ DBLOOK_SequencePrivHeader=GRANT statemen
DBLOOK_UDTPrivHeader=GRANT statements for user defined types
DBLOOK_Role_definitions_header=CREATE statements for roles
DBLOOK_Role_grants_header=GRANT statements for roles
+
+#
+# This long, multi-line message is a header comment
+# for a block of SQL commands which are printed to a script file.
+#
+# The backslashes at the ends of lines are continuation markers
+# which tell the program that all of this text is part of one, big message.
+# These backslashes should appear in translations also.
+#
+# The double hyphens at the start of lines are comment markers.
+# They are needed so that the ij tool will ignore these
+# comments when it processes the script file.
+#
DBLOOK_Jar_Note=\
-**** NOTE **** In order for jar files to be loaded correctly,\n\
+**** Note **** In order for jar files to be loaded correctly,\n\
-- you must either 1) ensure that the DBJARS directory (created\n\
-- automatically by dblook) exists where it was created (i.e. at\n\
-- the path shown in the statements below), or else 2) change the\n\
-- path in the statements below to reflect the current location of\n\
-- DBJARS. If the DBJARS directory does not exist, or if it\n\
-- has been moved and the path is not correct, the following DDL\n\
--- statements will throw errors, and the jar files will NOT be\n\
+-- statements will throw errors, and the jar files will not be\n\
-- loaded.
+
DBLOOK_FailedToLoadJar=Failed to load jar file {0}
DBLOOK_DefaultSchema=Reverting back to default schema ''APP''
DBLOOK_AtLeastOneDebug=\
@@ -272,7 +320,18 @@ DBLOOK_AtLeastOneDebug=\
-- encountered during DDL generation. See dblook.log\n\
-- to review the message(s).\n\
\n
+
# Directory org/apache/derby/tools/iapi
+
+#
+# This long, multi-line message is the usage text for the derbyrun
+# program. The option flags (e.g., -p, -cp) are literal and should not
+# be translated.
+#
+# The backslashes at the ends of lines are continuation markers
+# which tell the program that all of this text is part of one, big message.
+# These backslashes should appear in translations also.
+#
RUN_Usage=Usage:\n\
java -jar derbyrun.jar ij [-p propertiesfile] [sql script]\n\
java -jar derbyrun.jar sysinfo [-cp ...] [-cp help] \n\
@@ -282,13 +341,23 @@ java -jar derbyrun.jar server [args] (or
#
# Messages for SignatureChecker.java
#
+
+#
+# This long, multi-line message is the usage text for the SignatureChecker
+# program.
+#
+# The backslashes at the ends of lines are continuation markers
+# which tell the program that all of this text is part of one, big message.
+# These backslashes should appear in translations also.
+#
SC_USAGE=Usage if running on J2SE:\n\
\ \n\
-\ \tjava org.apache.derby.tools.SignatureChecker CONNECTION_URL_TO_DATABASE\n\
+\ \tjava org.apache.derby.tools.SignatureChecker connectionUrlToDatabase\n\
\ \n\
Usage if running on J2ME:\n\
\ \n\
-\ \tjava org.apache.derby.tools.SignatureChecker DATABASE_NAME
+\ \tjava org.apache.derby.tools.SignatureChecker databaseName
+
SC_NO_CONN=Could not get a connection.
SC_FOUND_MATCH=Found a matching method for: {0}
SC_UNRESOLVABLE=Unresolvable routine: {0}. Detailed reason: {1}