--- make_file_module_pass-1533236-57.patch 2014-09-15 21:14:36.187571205 +0530 +++ make_file_module_pass-1533236-59.patch 2014-09-15 23:03:12.159995538 +0530 @@ -97,61 +97,6 @@ $description = $variables['description']; $upload_validators = $variables['upload_validators']; $cardinality = $variables['cardinality']; -diff --git a/core/modules/file/file.install b/core/modules/file/file.install -index 8d13c03..dc64477 100644 ---- a/core/modules/file/file.install -+++ b/core/modules/file/file.install -@@ -64,6 +64,7 @@ function file_schema() { - */ - function file_requirements($phase) { - $requirements = array(); -+ $t = get_t(); - - // Check the server's ability to indicate upload progress. - if ($phase == 'runtime') { -@@ -73,30 +74,30 @@ function file_requirements($phase) { - $fastcgi = strpos($server_software, 'mod_fastcgi') !== FALSE || strpos($server_software, 'mod_fcgi') !== FALSE; - $description = NULL; - if (!$apache) { -- $value = t('Not enabled'); -- $description = t('Your server is not capable of displaying file upload progress. File upload progress requires an Apache server running PHP with mod_php.'); -+ $value = $t('Not enabled'); -+ $description = $t('Your server is not capable of displaying file upload progress. File upload progress requires an Apache server running PHP with mod_php.'); - } - elseif ($fastcgi) { -- $value = t('Not enabled'); -- $description = t('Your server is not capable of displaying file upload progress. File upload progress requires PHP be run with mod_php and not as FastCGI.'); -+ $value = $t('Not enabled'); -+ $description = $t('Your server is not capable of displaying file upload progress. File upload progress requires PHP be run with mod_php and not as FastCGI.'); - } - elseif (!$implementation && extension_loaded('apc')) { -- $value = t('Not enabled'); -- $description = t('Your server is capable of displaying file upload progress through APC, but it is not enabled. Add apc.rfc1867 = 1 to your php.ini configuration. Alternatively, it is recommended to use PECL uploadprogress, which supports more than one simultaneous upload.', array('@url' => 'http://pecl.php.net/package/uploadprogress')); -+ $value = $t('Not enabled'); -+ $description = $t('Your server is capable of displaying file upload progress through APC, but it is not enabled. Add apc.rfc1867 = 1 to your php.ini configuration. Alternatively, it is recommended to use PECL uploadprogress, which supports more than one simultaneous upload.', array('@url' => 'http://pecl.php.net/package/uploadprogress')); - } - elseif (!$implementation) { -- $value = t('Not enabled'); -- $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.', array('@uploadprogress_url' => 'http://pecl.php.net/package/uploadprogress', '@apc_url' => 'http://php.net/apc')); -+ $value = $t('Not enabled'); -+ $description = $t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.', array('@uploadprogress_url' => 'http://pecl.php.net/package/uploadprogress', '@apc_url' => 'http://php.net/apc')); - } - elseif ($implementation == 'apc') { -- $value = t('Enabled (APC RFC1867)', array('@url' => 'http://php.net/manual/apc.configuration.php#ini.apc.rfc1867')); -- $description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the PECL uploadprogress library if possible.', array('@url' => 'http://pecl.php.net/package/uploadprogress')); -+ $value = $t('Enabled (APC RFC1867)', array('@url' => 'http://php.net/manual/apc.configuration.php#ini.apc.rfc1867')); -+ $description = $t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the PECL uploadprogress library if possible.', array('@url' => 'http://pecl.php.net/package/uploadprogress')); - } - elseif ($implementation == 'uploadprogress') { -- $value = t('Enabled (PECL uploadprogress)', array('@url' => 'http://pecl.php.net/package/uploadprogress')); -+ $value = $t('Enabled (PECL uploadprogress)', array('@url' => 'http://pecl.php.net/package/uploadprogress')); - } - $requirements['file_progress'] = array( -- 'title' => t('Upload progress'), -+ 'title' => $t('Upload progress'), - 'value' => $value, - 'description' => $description, - ); diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 03e10bf..9f83779 100644 --- a/core/modules/file/file.module