Connector/J commit: r6752 - branches/branch_5_1/src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_1/src/com/mysql/jdbc/ConnectionPropertiesImpl.java
   branches/branch_5_1/src/com/mysql/jdbc/LocalizedErrorMessages.properties
   branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java
Log:
I18N updates/fixes.

Modified: branches/branch_5_1/src/com/mysql/jdbc/ConnectionPropertiesImpl.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ConnectionPropertiesImpl.java	2008-02-28
05:34:19 UTC (rev 6751)
+++ branches/branch_5_1/src/com/mysql/jdbc/ConnectionPropertiesImpl.java	2008-02-28
18:26:22 UTC (rev 6752)
@@ -294,7 +294,7 @@
 					errorMessageBuf.append(", "); //$NON-NLS-1$
 					errorMessageBuf.append("'"); //$NON-NLS-1$
 					errorMessageBuf.append(validateAgainst[i]);
-					errorMessageBuf.append(Messages.getString("'")); //$NON-NLS-1$
+					errorMessageBuf.append("'"); //$NON-NLS-1$
 				}
 
 				errorMessageBuf.append(" or '"); //$NON-NLS-1$
@@ -2701,8 +2701,9 @@
 				String testString = "abc"; //$NON-NLS-1$
 				testString.getBytes(testEncoding);
 			} catch (UnsupportedEncodingException UE) {
-				throw
SQLError.createSQLException(Messages.getString("ConnectionProperties.unsupportedCharacterEncoding")
+ Messages.getString("ConnectionProperties.unsupportedCharacterEncoding.1") //$NON-NLS-1$
//$NON-NLS-2$
-						+ testEncoding +
Messages.getString("ConnectionProperties.unsupportedCharacterEncoding.2"), "0S100");
//$NON-NLS-1$ //$NON-NLS-2$
+				throw SQLError.createSQLException(Messages.getString(
+						"ConnectionProperties.unsupportedCharacterEncoding", 
+						new Object[] {testEncoding}), "0S100"); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 		}
 

Modified: branches/branch_5_1/src/com/mysql/jdbc/LocalizedErrorMessages.properties
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/LocalizedErrorMessages.properties	2008-02-28
05:34:19 UTC (rev 6751)
+++ branches/branch_5_1/src/com/mysql/jdbc/LocalizedErrorMessages.properties	2008-02-28
18:26:22 UTC (rev 6752)
@@ -225,9 +225,13 @@
 ChannelBuffer.1='
 Field.12=Unsupported character encoding '
 Field.13='
+
 Blob.0=indexToWriteAt must be >= 1
 Blob.1=IO Error while writing bytes to blob
 Blob.2=Position 'pos' can not be < 1
+Blob.invalidStreamLength=Requested stream length of {2} is out of range, given blob
length of {0} and starting position of {1}.
+Blob.invalidStreamPos=Position 'pos' can not be < 1 or > blob length.
+
 StringUtils.0=Unsupported character encoding '
 StringUtils.1='.
 StringUtils.5=Unsupported character encoding '
@@ -422,7 +426,8 @@
 JDBC4Connection.ClientInfoNotImplemented=Configured clientInfoProvider class '{0}' does
not implement com.mysql.jdbc.JDBC4ClientInfoProvider.
 
 InvalidLoadBalanceStrategy=Invalid load balancing strategy '{0}'.
-Connection.Connection.BadValueInServerVariables=Invalid value '{1}' for server variable
named '{0}', falling back to sane default of '{2}'.
+Connection.BadValueInServerVariables=Invalid value '{1}' for server variable named '{0}',
falling back to sane default of '{2}'.
+LoadBalancingConnectionProxy.badValueForRetriesAllDown=Bad value '{0}' for property
"retriesAllDown".
 
 Connection.UnableToConnect=Could not create connection to database server.
 Connection.UnableToConnectWithRetries=Could not create connection to database server. \
@@ -613,12 +618,14 @@
 #
 
 ConnectionProperties.unableToInitDriverProperties=Unable to initialize driver properties
due to 
-ConnectionProperties.unsupportedCharacterEncoding=Unsupported character encoding '${0}'.
+ConnectionProperties.unsupportedCharacterEncoding=Unsupported character encoding ''{0}''.
 ConnectionProperties.errorNotExpected=Huh?
 ConnectionProperties.InternalPropertiesFailure=Internal properties failure
 
-TimeUtil.TooGenericTimezoneId=The server timezone value ''${0}'' represents more than one
timezone. You must \
+TimeUtil.TooGenericTimezoneId=The server timezone value ''{0}'' represents more than one
timezone. You must \
 configure either the server or JDBC driver (via the 'serverTimezone' configuration
property) to use a \
-more specifc timezone value if you want to utilize timezone support. The timezones that
''${0}'' maps to are: ${1}.
+more specifc timezone value if you want to utilize timezone support. The timezones that
''{0}'' maps to are: {1}.
 
-Connection.exceededConnectionLifetime=Ping or validation failed because configured
connection lifetime exceeded.
\ No newline at end of file
+Connection.exceededConnectionLifetime=Ping or validation failed because configured
connection lifetime exceeded.
+Connection.badLifecycleInterceptor=Unable to load connection lifecycle interceptor
''{0}''.
+MysqlIo.BadStatementInterceptor=Unable to load statement interceptor ''{0}''.
\ No newline at end of file

Modified: branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java	2008-02-28 05:34:19 UTC (rev
6751)
+++ branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java	2008-02-28 18:26:22 UTC (rev
6752)
@@ -1303,14 +1303,8 @@
 						} catch (ArithmeticException arEx) {
 							throw SQLError.createSQLException(
 									Messages
-											.getString("ResultSet.Bad_format_for_BigDecimal____124") //$NON-NLS-1$
-											+ stringVal
-											+ Messages
-													.getString("ResultSet.___in_column__125")
-											+ columnIndex
-											+ "(" //$NON-NLS-1$
-											+ this.fields[columnIndex - 1]
-											+ ").",
+											.getString("ResultSet.Bad_format_for_BigDecimal", //$NON-NLS-1$
+											 new Object[] {stringVal, new Integer(columnIndex)}),
 									SQLError.SQL_STATE_ILLEGAL_ARGUMENT);
 						}
 					}
@@ -4816,13 +4810,9 @@
 				} catch (NumberFormatException ex) {
 					throw SQLError.createSQLException(
 							Messages
-									.getString("ResultSet.Bad_format_for_BigDecimal____86") //$NON-NLS-1$
-									+ stringVal
-									+ Messages
-											.getString("ResultSet.___in_column__87")
-									+ columnIndex + "(" //$NON-NLS-1$
-									+ this.fields[columnIndex - 1] + ").",
-							SQLError.SQL_STATE_ILLEGAL_ARGUMENT);
+							.getString("ResultSet.Bad_format_for_BigDecimal", //$NON-NLS-1$
+							 new Object[] {stringVal, new Integer(columnIndex)}),
+					SQLError.SQL_STATE_ILLEGAL_ARGUMENT);
 				}
 
 				return val;
@@ -5048,13 +5038,9 @@
 				} catch (NumberFormatException ex) {
 					throw SQLError.createSQLException(
 							Messages
-									.getString("ResultSet.Bad_format_for_BigDecimal____86") //$NON-NLS-1$
-									+ stringVal
-									+ Messages
-											.getString("ResultSet.___in_column__87")
-									+ columnIndex + "(" //$NON-NLS-1$
-									+ this.fields[columnIndex - 1] + ").",
-							SQLError.SQL_STATE_ILLEGAL_ARGUMENT);
+							.getString("ResultSet.Bad_format_for_BigDecimal", //$NON-NLS-1$
+							 new Object[] {stringVal, new Integer(columnIndex)}),
+					SQLError.SQL_STATE_ILLEGAL_ARGUMENT);
 				}
 
 				return val;