Changeset 2470

Timestamp:

06/30/2008 12:04:42 PM (3 months ago)

Author:

mikl

Message:

Implemented MessageSource?_Database

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• UPGRADE (modified) (1 diff)
• framework/Exceptions/messages/messages.txt (modified) (1 diff)
• framework/I18N/TGlobalization.php (modified) (1 diff)
• framework/I18N/core/MessageSource.php (modified) (3 diffs)
• framework/I18N/core/MessageSource_Database.php (added)

trunk/HISTORY

@@ -11 +11 @@
 BUG: Ticket#872 - use PATH_SEPARATOR in phpunit.php (fragmaster b)
 ENH: Added Prado.Validation.validateControl(id) on client side to validate a specific control (Michael)
+ENH: Added MessageSource_Database to I18N (uses TDbConnection) (Michael)
 
 Version 3.1.2 April 21, 2008

trunk/UPGRADE

@@ -12 +12 @@
 Upgrading from v3.1.2
 ---------------------
+- The Translation configuration now also accepts type 'Database' to
+  ease the setup of DB base translation. A valid ConnectionID has to 
+  be supplied in the source parameter:
+  <translation type="Database" source="db1" autosave="true" cache="false" />
+  Type 'MySQL' can still be used but is deprecated and might be removed
+  in a later release.
 
 

trunk/framework/Exceptions/messages/messages.txt

@@ -350 +350 @@
 globalization_cache_path_failed                 = Unable to create translation message cache path '{0}'. Make sure the parent directory exists and is writable by the Web process.
 globalization_source_path_failed                = Unable to create translation message path '{0}'. Make sure the parent directory exists and is writable by the Web process.
+messagesource_connectionid_invalid      = MessageSource_Database.source '{0}' does not point to a valid TDataSourceConfig module.
+messagesource_connectionid_required     = ConnectionID in MessageSource_Database.source is required.
+
 callback_not_support_no_priority_state_update   = Callback request does not support unprioritized pagestate update.
 callback_invalid_callback_options               = '{1}' is not a valid TCallbackOptions control for Callback control '{0}'.

trunk/framework/I18N/TGlobalization.php

@@ -156 +156 @@
          * Sets the translation configuration. Example configuration:
          * <code>
-         * $config['type'] = 'XLIFF'; //XLIFF, gettext, mysql or sqlite
-         * $config['source'] = 'Path.to.directory'; //or database connection string
+         * $config['type'] = 'XLIFF'; //XLIFF, gettext, Database or MySQL (deprecated)
+         * $config['source'] = 'Path.to.directory'; // for types XLIFF and gettext
+         * $config['source'] = 'connectionId'; // for type Database
+         * $config['source'] = 'mysql://user:pw@host/db'; // for type MySQL (deprecated)
          * $config['catalogue'] = 'messages'; //default catalog
          * $config['autosave'] = 'true'; //save untranslated message

trunk/framework/I18N/core/MessageSource.php

@@ -109 +109 @@
         /**
          * Factory method to instantiate a new MessageSource depending on the
-         * source type. The allowed source types are 'XLIFF', 'SQLite', 
-         * 'MySQL', and 'gettext'. The source parameter is dependent on the 
-         * source type. For 'gettext' and 'XLIFF', it should point to the directory
-         * where the messages are stored. For database types, e.g. 'SQLite' and 
-         * 'MySQL', it should be a PEAR DB style DSN string. 
+         * source type. The allowed source types are 'XLIFF', 'gettext' and
+     * 'Database'. The source parameter depends on the source type. 
+     * For 'gettext' and 'XLIFF', 'source' should point to the directory 
+     * where the messages are stored. 
+     * For 'Database', 'source' should be a valid connection id.
+     * If (deprecated) 'MySQL' is used, 'source' must contain a valid 
+     * DSN.
          *
          * Custom message source are possible by supplying the a filename parameter
@@ -119 +121 @@
          * 
          * @param string the message source type.
-         * @param string the location of the resource.
+         * @param string the location of the resource or the ConnectionID.
          * @param string the filename of the custom message source.
          * @return MessageSource a new message source of the specified type. 
@@ -126 +128 @@
         static function &factory($type, $source='.', $filename='')
         {
-                $types = array('XLIFF', 'SQLite', 'MySQL', 'gettext');
-                
-                if(empty($filename) && in_array($type, $types) == false)
+                $types = array('XLIFF', 'MySQL', 'Database', 'gettext');
+                
+                if(empty($filename) && !in_array($type, $types))
                         throw new Exception('Invalid type "'.$type.'", valid types are '.
                                 implode(', ', $types));