Changeset 2753

Timestamp:

06/06/2008 03:52:41 PM (6 months ago)

Author:

Shadowhand

Message:

Changes to i18n:

• Removed HTML tags from all exceptions
  
• Removed "ftp" i18n file (not needed, there is no FTP library)
  
• Changed core.cannot_write_log to core.log_dir_unwritable
  

Location:

trunk/system

Files:

• core/Log.php (modified) (1 diff)
• i18n/en_US/cache.php (modified) (1 diff)
• i18n/en_US/captcha.php (modified) (1 diff)
• i18n/en_US/core.php (modified) (1 diff)
• i18n/en_US/encrypt.php (modified) (1 diff)
• i18n/en_US/event.php (modified) (1 diff)
• i18n/en_US/ftp.php (deleted)
• i18n/en_US/image.php (modified) (1 diff)

trunk/system/core/Log.php

@@ -44 +44 @@
                 {
                         // Log directory is invalid
-                        throw new Kohana_Exception('core.cannot_write_log', $log_dir);
+                        throw new Kohana_Exception('core.log_dir_unwritable', $log_dir);
                 }
         }

trunk/system/i18n/en_US/cache.php

@@ -5 +5 @@
         'undefined_group'      => 'The %s group is not defined in your configuration.',
         'extension_not_loaded' => 'The %s PHP extension must be loaded to use this driver.',
-        'unwritable'           => 'The configured storage location, <tt>%s</tt>, is not writable.',
+        'unwritable'           => 'The configured storage location, %s, is not writable.',
         'resources'            => 'Caching of resources is impossible, because resources cannot be serialized.',
         'driver_error'         => '%s',

trunk/system/i18n/en_US/captcha.php

@@ -3 +3 @@
 $lang = array
 (
-        'file_not_found' => 'The specified file, %s, was not found. Please verify that files exist by using <tt>file_exists</tt> before using them.',
+        'file_not_found' => 'The specified file, %s, was not found. Please verify that files exist by using file_exists() before using them.',
         'requires_GD2'   => 'The Captcha library requires GD2 with FreeType support. Please see http://php.net/gd_info for more information.',
 );

trunk/system/i18n/en_US/core.php

@@ -5 +5 @@
         'there_can_be_only_one' => 'There can be only one instance of Kohana per page request',
         'uncaught_exception'    => 'Uncaught %s: %s in file %s on line %s',
-        'invalid_method'        => 'Invalid method <tt>%s</tt> called in <tt>%s</tt>',
-        'cannot_write_log'      => 'Your log.directory config setting does not point to a writable directory',
-        'resource_not_found'    => 'The requested %s, <tt>%s</tt>, could not be found',
-        'invalid_filetype'      => 'The requested filetype, <tt>.%s</tt>, is not allowed in your view configuration file',
+        'invalid_method'        => 'Invalid method %s called in %s',
+        'log_dir_unwritable'    => 'The log directory is not writable: %s',
+        'resource_not_found'    => 'The requested %s, %s, could not be found',
+        'invalid_filetype'      => 'The requested filetype, .%s, is not allowed in your view configuration file',
         'view_set_filename'     => 'You must set the the view filename before calling render',
-        'no_default_route'      => 'Please set a default route in <tt>config/routes.php</tt>',
+        'no_default_route'      => 'Please set a default route in config/routes.php',
         'no_controller'         => 'Kohana was not able to determine a controller to process this request: %s',
-        'page_not_found'        => 'The page you requested, <tt>%s</tt>, could not be found.',
+        'page_not_found'        => 'The page you requested, %s, could not be found.',
         'stats_footer'          => 'Loaded in {execution_time} seconds, using {memory_usage} of memory. Generated by Kohana v{kohana_version}.',
         'error_file_line'       => '<tt>%s <strong>[%s]:</strong></tt>',

trunk/system/i18n/en_US/encrypt.php

@@ -3 +3 @@
 $lang = array
 (
-        'requires_mcrypt'   => 'To use the Encrypt library, mcrypt must be enabled.',
-        'no_encryption_key' => 'To use the Encrypt library, you need to set an encryption key in your config file.'
+        'requires_mcrypt'   => 'To use the Encrypt library, mcrypt must be enabled in your PHP installation',
+        'no_encryption_key' => 'To use the Encrypt library, you must set an encryption key in your config file'
 );

trunk/system/i18n/en_US/event.php

@@ -3 +3 @@
 $lang = array
 (
-        'invalid_subject'  => 'Attempt to attach invalid subject <tt>%s</tt> to <tt>%s</tt> failed. Subjects must extend the <tt>Event_Subject</tt> class.',
-        'invalid_observer' => 'Attempt to attach invalid observer <tt>%s</tt> to <tt>%s</tt> failed. Observers must extend the <tt>Event_Observer</tt> class.',
+        'invalid_subject'  => 'Attempt to attach invalid subject %s to %s failed: Subjects must extend the Event_Subject class',
+        'invalid_observer' => 'Attempt to attach invalid observer %s to %s failed: Observers must extend the Event_Observer class',
 );

trunk/system/i18n/en_US/image.php

@@ -3 +3 @@
 $lang = array
 (
-        'getimagesize_missing'    => 'The Image library requires the <tt>getimagesize</tt> PHP function, which is not available in your installation.',
+        'getimagesize_missing'    => 'The Image library requires the getimagesize() PHP function, which is not available in your installation.',
         'unsupported_method'      => 'Your configured driver does not support the %s image transformation.',
-        'file_not_found'          => 'The specified image, %s, was not found. Please verify that images exist by using <tt>file_exists</tt> before manipulating them.',
+        'file_not_found'          => 'The specified image, %s, was not found. Please verify that images exist by using file_exists() before manipulating them.',
         'type_not_allowed'        => 'The specified image, %s, is not an allowed image type.',
         'invalid_width'           => 'The width you specified, %s, is not valid.',