db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1514387 - in /db/derby/code/trunk/java: engine/org/apache/derby/loc/messages.xml testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
Date Thu, 15 Aug 2013 17:19:57 GMT
Author: rhillegas
Date: Thu Aug 15 17:19:57 2013
New Revision: 1514387

URL: http://svn.apache.org/r1514387
Log:
DERBY-4628: Replace the Derby jargon term territory with the more familiar term locale in
some Derby messages; commits derby-4628-01-ab-useLocaleInMessagesRatherThanTerritory.diff.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.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=1514387&r1=1514386&r2=1514387&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 Aug 15 17:19:57
2013
@@ -4015,9 +4015,9 @@ Guide.
 
             <msg>
                 <name>XBM0X.D</name>
-                <text>Supplied territory description '{0}' is invalid, expecting ln[_CO[_variant]]
+                <text>Supplied locale description '{0}' is invalid, expecting ln[_CO[_variant]]
 ln=lower-case two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country
codes, see java.util.Locale.</text>
-                <arg>territoryID</arg>
+                <arg>localeID</arg>
             </msg>
 
             <msg>
@@ -4329,7 +4329,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XCXE0.S</name>
-                <text>You are trying to do an operation that uses the territory of
the database, but the database does not have a territory.</text>
+                <text>You are trying to do an operation that uses the locale of the
database, but the database does not have a locale.</text>
             </msg>
 
         </family>
@@ -8021,7 +8021,7 @@ Shutting down instance {0} on database d
 
             <msg>
                 <name>J021</name>
-                <text>Territory for the database</text>
+                <text>Locale for the database</text>
             </msg>
 
             <msg>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java?rev=1514387&r1=1514386&r2=1514387&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
Thu Aug 15 17:19:57 2013
@@ -187,7 +187,7 @@ public final class ErrorCodeTest extends
         		{"XBM0R","Unable to remove File {0}.  ","45000"},
         		{"XBM0S","Unable to rename file '{0}' to '{1}'","45000"},
         		{"XBM0T","Ambiguous sub-protocol for database name {0}.   ","45000"},
-        		{"XBM0X","Supplied territory description '{0}' is invalid, expecting ln[_CO[_variant]]\nln=lower-case
two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.","45000"},
+        		{"XBM0X","Supplied locale description '{0}' is invalid, expecting ln[_CO[_variant]]\nln=lower-case
two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.","45000"},
         		{"XBM0Y","Backup database directory {0} not found. Please make sure that the specified
backup path is right.","45000"},
         		{"XBM0Z","Unable to copy file '{0}' to '{1}'. Please make sure that there is enough
space and permissions are correct. ","45000"},
         		{"XCW00","Unsupported upgrade from '{0}' to '{1}'.","45000"},



Mime
View raw message