Index: emfield.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/Attic/emfield.admin.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 emfield.admin.inc --- emfield.admin.inc 5 Aug 2008 11:41:40 -0000 1.1.2.4 +++ emfield.admin.inc 6 Oct 2008 20:29:02 -0000 @@ -11,7 +11,7 @@ */ function emfield_settings() { if (!module_exists('emvideo') && !module_exists('emimage') && !module_exists('emaudio')) { - drupal_set_message(t('The Embedded Media Field module does nothing on its own. You should also install the Embedded Video Field, Embedded Image Field, and/or Embedded Audio Field modules from the !modules. (If you do not see them listed there, under the CCK section, you may need to !download from its project page. They are all in the same package.)', array('!download' => l(t('download the module'), 'http://drupal.org/project/emfield'), '!modules' => l(t('modules administration page'), 'admin/build/modules'))), 'error'); + drupal_set_message(t('The Embedded Media Field module does nothing on its own. You should also install the Embedded Video Field, Embedded Image Field, and/or Embedded Audio Field modules from the modules administration page. (If you do not see them listed there, under the CCK section, you may need to download the module from its project page. They are all in the same package.)', array('@download' => 'http://drupal.org/project/emfield', '@modules' => url('admin/build/modules'))), 'error'); } $form = array(); $form['general'] = array( @@ -23,10 +23,10 @@ function emfield_settings() { ); if (module_exists('swfobject_api')) { - $swfobject_desc = t('As you have the !swfobject_api module installed, Embedded Media Field will use those settings, assuming you\'ve configured them properly. Visit its !settings for more information.', array('!swfobject_api' => l(t('SWFObject API'), 'http://drupal.org/project/swfobject_api', array('target' => '_blank')), l(t('settings page'), 'admin/settings/swfobject_api'))); + $swfobject_desc = t('As you have the SWFObject API module installed, Embedded Media Field will use those settings, assuming you have configured them properly. Visit its settings page for more information.', array('@swfobject_api' => 'http://drupal.org/project/swfobject_api', '@settings' => url('admin/settings/swfobject_api'))); } else { - $swfobject_desc = t('If you have the swfobject.js file installed on your system, you can make it available to Embedded Media Field and its related modules by entering the information here. You can download and find out more about !here. You may also choose to install the !swfobject_api module, which will integrate automatically with this module..', array('!here' => l(t('SWFObject here'), 'http://code.google.com/p/swfobject/', array('target' => '_blank')), '!swfobject_api' => l(t('SWFObject API'), 'http://drupal.org/project/swfobject_api', array('target' => '_blank')))); + $swfobject_desc = t('If you have the swfobject.js file installed on your system, you can make it available to Embedded Media Field and its related modules by entering the information here. You can download and find out more about SWFObject here. You may also choose to install the SWFObject API module, which will integrate automatically with this module..', array('@here' => 'http://code.google.com/p/swfobject/', '@swfobject_api' => 'http://drupal.org/project/swfobject_api')); } $form['general']['swfobject'] = array( '#type' => 'fieldset', Index: emfield.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/emfield.module,v retrieving revision 1.12.4.19 diff -u -p -r1.12.4.19 emfield.module --- emfield.module 11 Aug 2008 15:27:51 -0000 1.12.4.19 +++ emfield.module 6 Oct 2008 20:29:03 -0000 @@ -87,7 +87,7 @@ function emfield_implement_types($cached if (!isset($types) || !$cached) { // If it's a cachable request, try to load a cached value. if ($cached && $cache = cache_get('emfield_implement_types', 'cache')) { - $types = unserialize($cache->data); + $types = $cache->data; } else { $system_types = _content_type_info(); @@ -117,7 +117,7 @@ function emfield_implement_types($cached } } - cache_set('emfield_implement_types', serialize($types), 'cache', CACHE_PERMANENT); + cache_set('emfield_implement_types', $types, 'cache', CACHE_PERMANENT); return $types; } @@ -308,7 +308,7 @@ function emfield_request_xml($provider, // if it's a cachable request, try to load a cached value if ($cached && $cache = cache_get($arghash, 'cache')) { - return unserialize($cache->data); + return $cache->data; } // connect and fetch a value @@ -377,7 +377,7 @@ function emfield_request_xml($provider, } } - cache_set($arghash, serialize($response), 'cache', time() + variable_get('emfield_cache_duration', 3600)); + cache_set($arghash, $response, 'cache', time() + variable_get('emfield_cache_duration', 3600)); return $response; } @@ -398,7 +398,7 @@ function emfield_request_xml($provider, function emfield_request_header($provider, $url, $cached = TRUE, $return_errors = TRUE) { // if it's cacheable, try to load a cached value if ($cached && $cache = cache_get($url, 'cache')) { - return unserialize($cache->data); + return $cache->data; } $result = _emfield_http_request_header($url); @@ -414,7 +414,7 @@ function emfield_request_header($provide } // @todo does this not want to be changing 'cache' to 'cache_emfield' or similar - cache_set($url, serialize($result), 'cache', time() + variable_get('emfield_cache_duration', 3600)); + cache_set($url, $result, 'cache', time() + variable_get('emfield_cache_duration', 3600)); return $result; } @@ -452,7 +452,7 @@ function _emfield_http_request_header($u } function emfield_set_error($error) { - watchdog('emfield', $error, WATCHDOG_WARNING); + watchdog('emfield', '!error', array('!error' => $error), WATCHDOG_WARNING); } /** Index: contrib/emaudio/emaudio.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emaudio/emaudio.module,v retrieving revision 1.1.4.16 diff -u -p -r1.1.4.16 emaudio.module --- contrib/emaudio/emaudio.module 14 Sep 2008 20:27:48 -0000 1.1.4.16 +++ contrib/emaudio/emaudio.module 6 Oct 2008 20:29:03 -0000 @@ -243,7 +243,7 @@ function emaudio_widget_settings($op, $w $form['tn'] = array( '#type' => 'fieldset', '#title' => t('Thumbnail'), - '#description' => t('When displayed as a thumbnail, these settings control the image returned. Note that not all 3rd party audio content providers offer thumbnails, and others may require an API key or other requirements. More information from the !settings. The default size for thumbnails is @widthx@height.', array('!settings' => l(t('settings page'), 'admin/content/emfield'), '@width' => $width, '@height' => $height)), + '#description' => t('When displayed as a thumbnail, these settings control the image returned. Note that not all 3rd party audio content providers offer thumbnails, and others may require an API key or other requirements. More information from the settings page. The default size for thumbnails is @widthx@height.', array('@settings' => url('admin/content/emfield'), '@width' => $width, '@height' => $height)), '#collapsible' => true, '#collapsed' => false, ); @@ -262,14 +262,14 @@ function emaudio_widget_settings($op, $w '#description' => t('The height of the thumbnail. It defaults to @height.', array('@height' => $height)), ); if (!module_exists('emthumb')) { - $tn_desc = t(' You may be interested in activating the Embedded Media Thumbnails module as well, which will allow you to specify custom thumbnails on a per-node basis.'); + $tn_desc = ' '. t('You may be interested in activating the Embedded Media Thumbnails module as well, which will allow you to specify custom thumbnails on a per-node basis.'); } $default_path = variable_get('emaudio_default_thumbnail_path', EMAUDIO_DEFAULT_THUMBNAIL_PATH); $form['tn']['thumbnail_default_path'] = array( '#type' => 'textfield', '#title' => t('Default thumbnail path'), '#default_value' => empty($widget['thumbnail_default_path']) ? $default_path : $widget['thumbnail_default_path'], - '#description' => t('Path to a local default thumbnail image for cases when a thumbnail can\'t be found. For example, you might have a default thumbnail at %files.', array('%files' => 'files/thumbnail.png')) . $tn_desc, + '#description' => t("Path to a local default thumbnail image for cases when a thumbnail can't be found. For example, you might have a default thumbnail at %files.", array('%files' => 'files/thumbnail.png')) . $tn_desc, ); } Index: contrib/emaudio/providers/odeo.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emaudio/providers/odeo.inc,v retrieving revision 1.1.4.4 diff -u -p -r1.1.4.4 odeo.inc --- contrib/emaudio/providers/odeo.inc 25 Jul 2008 11:45:50 -0000 1.1.4.4 +++ contrib/emaudio/providers/odeo.inc 6 Oct 2008 20:29:03 -0000 @@ -21,7 +21,6 @@ define('EMAUDIO_ODEO_MAIN_URL', 'http:// * These will be rendered in a table, with the columns being 'Feature', 'Supported', 'Notes'. */ function emaudio_odeo_info() { - $name = t('odeo'); $features = array( array(t('Autoplay'), t('No'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -29,9 +28,9 @@ function emaudio_odeo_info() { ); return array( 'provider' => 'odeo', - 'name' => $name, + 'name' => t('odeo'), 'url' => EMAUDIO_ODEO_MAIN_URL, - 'settings_description' => t('These settings specifically affect audio podcasts displayed from !odeo.', array('!odeo' => l($name, EMAUDIO_ODEO_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect audio podcasts displayed from odeo.', array('@odeo' => EMAUDIO_ODEO_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emaudio/providers/podcastalley.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emaudio/providers/podcastalley.inc,v retrieving revision 1.1.4.4 diff -u -p -r1.1.4.4 podcastalley.inc --- contrib/emaudio/providers/podcastalley.inc 25 Jul 2008 11:45:50 -0000 1.1.4.4 +++ contrib/emaudio/providers/podcastalley.inc 6 Oct 2008 20:29:04 -0000 @@ -21,7 +21,6 @@ define('EMAUDIO_PODCASTALLEY_MAIN_URL', * These will be rendered in a table, with the columns being 'Feature', 'Supported', 'Notes'. */ function emaudio_podcastalley_info() { - $name = t('Podcast Alley'); $features = array( array(t('Autoplay'), t('No'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -30,9 +29,9 @@ function emaudio_podcastalley_info() { return array( 'provider' => 'Podcast Alley', - 'name' => $name, + 'name' => t('Podcast Alley'), 'url' => EMAUDIO_PODCASTALLEY_MAIN_URL, - 'settings_description' => t('These settings specifically affect audio podcasts displayed from !podcastalley.', array('!podcastalley' => l($name, EMAUDIO_PODCASTALLEY_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect audio podcasts displayed from Podcast Alley.', array('@podcastalley' => EMAUDIO_PODCASTALLEY_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emaudio/providers/podomatic.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emaudio/providers/podomatic.inc,v retrieving revision 1.1.4.5 diff -u -p -r1.1.4.5 podomatic.inc --- contrib/emaudio/providers/podomatic.inc 25 Jul 2008 11:45:50 -0000 1.1.4.5 +++ contrib/emaudio/providers/podomatic.inc 6 Oct 2008 20:29:04 -0000 @@ -20,7 +20,6 @@ define('EMAUDIO_PODOMATIC_MAIN_URL', 'ht * These will be rendered in a table, with the columns being 'Feature', 'Supported', 'Notes'. */ function emaudio_podomatic_info() { - $name = t('podOmatic'); $features = array( array(t('Autoplay'), t('No'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -28,9 +27,9 @@ function emaudio_podomatic_info() { ); return array( 'provider' => 'podomatic', - 'name' => $name, + 'name' => t('podOmatic'), 'url' => EMAUDIO_PODOMATIC_MAIN_URL, - 'settings_description' => t('These settings specifically affect audio podcasts displayed from !podomatic.', array('!podomatic' => l($name, EMAUDIO_PODOMATIC_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect audio podcasts displayed from podOmatic.', array('@podomatic' => EMAUDIO_PODOMATIC_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emimage/emimage.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emimage/Attic/emimage.module,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 emimage.module --- contrib/emimage/emimage.module 14 Sep 2008 20:07:59 -0000 1.1.2.5 +++ contrib/emimage/emimage.module 6 Oct 2008 20:29:04 -0000 @@ -163,7 +163,7 @@ function emimage_widget_settings($op, $w $form['full']['full_link'] = array( '#type' => 'select', '#title' => t('Full size link'), - '#description' => t('Where the image will link when displayed in its full size. \'Content\' links to the content page, \'provider\' links to the provider\'s image page, and \'none\' displays the image with no link.'), + '#description' => t("Where the image will link when displayed in its full size. 'Content' links to the content page, 'provider' links to the provider's image page, and 'none' displays the image with no link."), '#options' => $link_options, '#default_value' => empty($widget['full_link']) ? $full_link : $widget['full_link'], ); @@ -195,7 +195,7 @@ function emimage_widget_settings($op, $w $form['preview']['preview_link'] = array( '#type' => 'select', '#title' => t('Preview size link'), - '#description' => t('Where the image will link when displayed in its preview size. \'Content\' links to the content page, \'provider\' links to the provider\'s image page, and \'none\' displays the image with no link.'), + '#description' => t("Where the image will link when displayed in its preview size. 'Content' links to the content page, 'provider' links to the provider's image page, and 'none' displays the image with no link."), '#options' => $link_options, '#default_value' => empty($widget['full_link']) ? $full_link : $widget['full_link'], ); @@ -226,7 +226,7 @@ function emimage_widget_settings($op, $w $form['tn']['thumbnail_link'] = array( '#type' => 'select', '#title' => t('Image thumbnail link'), - '#description' => t('Where the image will link when displayed as a thumbnail. \'Content\' links to the content page, \'provider\' links to the provider\'s image page, and \'none\' displays the image with no link.'), + '#description' => t("Where the image will link when displayed as a thumbnail. 'Content' links to the content page, 'provider' links to the provider's image page, and 'none' displays the image with no link."), '#options' => $link_options, '#default_value' => empty($widget['thumbnail_link']) ? $thumb_link : $widget['thumbnail_link'], ); Index: contrib/emimage/providers/flickr.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emimage/providers/Attic/flickr.inc,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 flickr.inc --- contrib/emimage/providers/flickr.inc 25 Jul 2008 11:45:51 -0000 1.1.2.3 +++ contrib/emimage/providers/flickr.inc 6 Oct 2008 20:29:04 -0000 @@ -24,15 +24,14 @@ define('EMIMAGE_FLICKR_REST_ENDPOINT', ' */ function emimage_flickr_info() { - $name = t('Flickr'); $features = array( array(t('Import photosets'), t('Yes'), t('If you have the Embedded Media Import module activated, you may allow @name photosets to be imported into content.', array('@name' => $name))), ); return array( 'provider' => 'flickr', - 'name' => $name, + 'name' => t('Flickr'), 'url' => EMIMAGE_FLICKR_MAIN_URL, - 'settings_description' => t('These settings specifically affect images displayed from !flickr.', array('!flickr' => l($name, EMIMAGE_FLICKR_MAIN_URL, array('target' => '_blank')), '!api' => l(t('API'), EMIMAGE_FLICKR_API_INFO, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect images displayed from Flickr.', array('@flickr' => EMIMAGE_FLICKR_MAIN_URL)), 'supported_features' => $features, 'import_sets_word' => t('photosets'), ); @@ -91,7 +90,7 @@ function emimage_flickr_settings() { $form['flickr']['api'] = array( '#type' => 'fieldset', '#title' => t('Flickr API'), - '#description' => t('You will first need to apply for an API Developer Key from the !flickr.', array('!flickr' => l(t('Flickr Developer Profile page'), EMIMAGE_FLICKR_API_APPLICATION_URL, array('target' => '_blank')))), + '#description' => t('You will first need to apply for an API Developer Key from the Flickr Developer Profile page.', array('@flickr' => EMIMAGE_FLICKR_API_APPLICATION_URL)), '#collapsible' => TRUE, '#collapsed' => (variable_get('emimage_flickr_api_key', '') != ''), ); @@ -155,11 +154,11 @@ function emimage_flickr_error_check() { static $checked; if (!$checked && (variable_get('emimage_flickr_api_key', '') == '')) { global $user; - $error = t('You do not yet have a Flickr API key set. You will need to !apply and enter your key at the !settings before Flickr images may be displayed.', array('!apply' => l(t('apply for a Flickr API key'), EMIMAGE_FLICKR_API_APPLICATION_URL, array('target' => '_blank')), '!settings' => l(t('settings administration page'), 'admin/content/emfield'))); + $error = t('You do not yet have a Flickr API key set. You will need to apply for a Flickr API key and enter your key at the settings administration page before Flickr images may be displayed.', array('@apply' => EMIMAGE_FLICKR_API_APPLICATION_URL, '@settings' => url('admin/content/emfield'))); if (user_access('administer site configuration')) { drupal_set_message($error, 'error'); } - watchdog('Embedded Media Field', $error); + watchdog('Embedded Media Field', '!error', array('!error' => $error)); } $checked = TRUE; } Index: contrib/emimage/providers/imageshack.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emimage/providers/Attic/imageshack.inc,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 imageshack.inc --- contrib/emimage/providers/imageshack.inc 25 Jul 2008 11:45:51 -0000 1.1.2.3 +++ contrib/emimage/providers/imageshack.inc 6 Oct 2008 20:29:05 -0000 @@ -21,13 +21,12 @@ define('EMIMAGE_IMAGESHACK_MAIN_URL', 'h */ function emimage_imageshack_info() { - $name = t('ImageShack'); $features = array(); return array( 'provider' => 'imageshack', - 'name' => $name, + 'name' => t('ImageShack'), 'url' => EMIMAGE_IMAGESHACK_MAIN_URL, - 'settings_description' => t('These settings specifically affect images displayed from !imageshack.', array('!imageshack' => l($name, EMIMAGE_IMAGESHACK_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect images displayed from ImageShack.', array('@imageshack' => EMIMAGE_IMAGESHACK_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emimage/providers/photobucket.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emimage/providers/Attic/photobucket.inc,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 photobucket.inc --- contrib/emimage/providers/photobucket.inc 25 Jul 2008 11:45:51 -0000 1.1.2.3 +++ contrib/emimage/providers/photobucket.inc 6 Oct 2008 20:29:05 -0000 @@ -21,13 +21,12 @@ define('EMIMAGE_PHOTOBUCKET_MAIN_URL', ' */ function emimage_photobucket_info() { - $name = t('Photobucket'); $features = array(); return array( 'provider' => 'photobucket', - 'name' => $name, + 'name' => t('Photobucket'), 'url' => EMIMAGE_PHOTOBUCKET_MAIN_URL, - 'settings_description' => t('These settings specifically affect images displayed from !photobucket.', array('!photobucket' => l($name, EMIMAGE_PHOTOBUCKET_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect images displayed from Photobucket.', array('@photobucket' => EMIMAGE_PHOTOBUCKET_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emimage/providers/picasa.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emimage/providers/Attic/picasa.inc,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 picasa.inc --- contrib/emimage/providers/picasa.inc 25 Jul 2008 11:45:51 -0000 1.1.2.3 +++ contrib/emimage/providers/picasa.inc 6 Oct 2008 20:29:05 -0000 @@ -23,15 +23,14 @@ define('EMIMAGE_PICASA_REST_ENDPOINT', ' */ function emimage_picasa_info() { - $name = t('Picasa'); $features = array( array(t('Import photosets'), t('No'), ''), ); return array( 'provider' => 'picasa', - 'name' => $name, + 'name' => t('Picasa'), 'url' => EMIMAGE_PICASA_MAIN_URL, - 'settings_description' => t('These settings specifically affect images displayed from !picasa.', array('!picasa' => l($name, EMIMAGE_PICASA_MAIN_URL, array('target' => '_blank')), '!api' => l(t('API'), EMIMAGE_PICASA_API_INFO, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect images displayed from Picasa.', array('@picasa' => EMIMAGE_PICASA_MAIN_URL)), 'supported_features' => $features, 'import_sets_word' => t('photosets'), ); Index: contrib/emimport/emimport.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emimport/emimport.module,v retrieving revision 1.2.4.3 diff -u -p -r1.2.4.3 emimport.module --- contrib/emimport/emimport.module 27 May 2008 02:37:00 -0000 1.2.4.3 +++ contrib/emimport/emimport.module 6 Oct 2008 20:29:06 -0000 @@ -35,7 +35,8 @@ function emimport_menu() { $create_type_access = 'create '. $type->type .' content'; $path = 'emimport/'. $type_url_str; $items[$path] = array( - 'title' => 'Import $type->name set', + 'title' => 'Import !name set', + 'title arguments' => array('!name' => $type->name), 'page callback' => 'drupal_get_form', 'page arguments' => array('emimport_import', $type->type), 'access' => array('import media sets',$create_type_access), @@ -183,7 +184,7 @@ function emimport_settings() { $form['emimport'][$module]['providers'] = array( '#type' => 'fieldset', '#title' => t('Provider settings'), - '#description' => t('If a provider allowed on the !media also allows importing content from sets, such as photosets or playlists, then it will be listed below. You may change specific settings for those providers here. If you don\'t see an expected provider here, first make sure that it is enabled on the !media page, and also make sure there that the provider allows that feature.', array('!media' => l(t('media settings page'), 'admin/content/emfield/media'))), + '#description' => t('If a provider allowed on the media settings page also allows importing content from sets, such as photosets or playlists, then it will be listed below. You may change specific settings for those providers here. If you do not see an expected provider here, first make sure that it is enabled on the media settings page, and also make sure there that the provider allows that feature.', array('@media' => url('admin/content/emfield/media'))), '#collapsible' => TRUE, '#collapsed' => FALSE, ); @@ -242,7 +243,7 @@ function emimport_types_allowing_import( if (!isset($emfield_types) || !$cached) { // if it's a cachable request, try to load a cached value if ($cached && $cache = cache_get('emimport_types_allowing_import', 'cache')) { - $emfield_types = unserialize($cache->data); + $emfield_types = $cache->data; } else { $system_types = _content_type_info(); @@ -279,7 +280,7 @@ function emimport_types_allowing_import( } // save our types to cache - cache_set('emimport_types_allowing_import', serialize($emfield_types), 'cache', CACHE_PERMANENT); + cache_set('emimport_types_allowing_import', $emfield_types, 'cache', CACHE_PERMANENT); if ($rebuild_menu) { // make sure to register any new import types in the menu @@ -556,7 +557,7 @@ function emimport_import_validate($form, } } if (!$flag) { - form_set_error($field['field_name'], t('The @field set doesn\'t evaluate to a valid set.', array('@field' => $field['widget']['label']))); + form_set_error($field['field_name'], t("The @field set doesn't evaluate to a valid set.", array('@field' => $field['widget']['label']))); } } } Index: contrib/emthumb/emthumb.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emthumb/emthumb.module,v retrieving revision 1.7.2.5 diff -u -p -r1.7.2.5 emthumb.module --- contrib/emthumb/emthumb.module 16 Aug 2008 16:14:39 -0000 1.7.2.5 +++ contrib/emthumb/emthumb.module 6 Oct 2008 20:29:06 -0000 @@ -309,7 +309,7 @@ function _emthumb_widget_form($node, $fi // $form = array(); $form = array( '#type' => 'fieldset', - '#title' => t($field['widget']['emthumb_label'] ? $field['widget']['emthumb_label'] : t('@field custom thumbnail', array('@field' => $field['widget']['label']))), + '#title' => $field['widget']['emthumb_label'] ? $field['widget']['emthumb_label'] : t('@field custom thumbnail', array('@field' => $field['widget']['label'])), '#weight' => $field['widget']['emthumb_weight'], '#collapsible' => TRUE, '#collapsed' => FALSE, @@ -359,7 +359,7 @@ function _emthumb_widget_form($node, $fi //drupal_set_message('imagefield['. $fieldname .'] '. $op .' node field: 
'. print_r($items, true) .'
'); $form['emthumb']['description'] = array( '#type' => 'markup', - '#value' => ''. t('Filename: ') .''. $file['filename'], + '#value' => ''. t('Filename:') .' '. $file['filename'], ); $form['emthumb']['emthumb_alt'] = array( Index: contrib/emvideo/emvideo.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/Attic/emvideo.module,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 emvideo.module --- contrib/emvideo/emvideo.module 14 Sep 2008 20:24:26 -0000 1.1.2.6 +++ contrib/emvideo/emvideo.module 6 Oct 2008 20:29:07 -0000 @@ -291,7 +291,7 @@ function emvideo_widget_settings($op, $w $form['tn'] = array( '#type' => 'fieldset', '#title' => t('Thumbnail'), - '#description' => t('When displayed as a thumbnail, these settings control the image returned. Note that not all 3rd party video content providers offer thumbnails, and others may require an API key or other requirements. More information from the !settings. The default size for thumbnails is @widthx@height.', array('!settings' => l(t('settings page'), 'admin/content/emfield'), '@width' => $width, '@height' => $height)), + '#description' => t('When displayed as a thumbnail, these settings control the image returned. Note that not all 3rd party video content providers offer thumbnails, and others may require an API key or other requirements. More information from the settings page. The default size for thumbnails is @widthx@height.', array('@settings' => url('admin/content/emfield'), '@width' => $width, '@height' => $height)), '#collapsible' => true, '#collapsed' => false, ); @@ -310,14 +310,14 @@ function emvideo_widget_settings($op, $w '#description' => t('The height of the thumbnail. It defaults to @height.', array('@height' => $height)), ); if (!module_exists('emthumb')) { - $tn_desc = t(' You may be interested in activating the Embedded Media Thumbnails module as well, which will allow you to specify custom thumbnails on a per-node basis.'); + $tn_desc = ' '. t('You may be interested in activating the Embedded Media Thumbnails module as well, which will allow you to specify custom thumbnails on a per-node basis.'); } $default_path = variable_get('emvideo_default_thumbnail_path', ''); $form['tn']['thumbnail_default_path'] = array( '#type' => 'textfield', '#title' => t('Default thumbnail path'), '#default_value' => empty($widget['thumbnail_default_path']) ? $default_path : $widget['thumbnail_default_path'], - '#description' => t('Path to a local default thumbnail image for cases when a thumbnail can\'t be found. For example, you might have a default thumbnail at %files.', array('%files' => 'files/thumbnail.png')) . $tn_desc, + '#description' => t("Path to a local default thumbnail image for cases when a thumbnail can't be found. For example, you might have a default thumbnail at %files.", array('%files' => 'files/thumbnail.png')) . $tn_desc, ); } return $form; Index: contrib/emvideo/providers/bliptv.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/bliptv.inc,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 bliptv.inc --- contrib/emvideo/providers/bliptv.inc 16 Aug 2008 16:14:39 -0000 1.1.2.6 +++ contrib/emvideo/providers/bliptv.inc 6 Oct 2008 20:29:07 -0000 @@ -10,7 +10,6 @@ define('EMVIDEO_BLIPTV_MAIN_URL', 'http: define('EMVIDEO_BLIPTV_DEFAULT_RSS_TYPE', 'flv'); function emvideo_bliptv_info() { - $name = t('Blip.tv'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS attachment'), t('Yes'), t('When displaying in an RSS feed, these videos will be attached to the feed. (The feed reader or aggregator must support enclosure tags.)')), @@ -18,9 +17,9 @@ function emvideo_bliptv_info() { ); return array( 'provider' => 'bliptv', - 'name' => $name, + 'name' => t('Blip.tv'), 'url' => EMVIDEO_BLIPTV_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !provider.', array('!provider' => l($name, EMVIDEO_BLIPTV_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Blip.tv.', array('@provider' => EMVIDEO_BLIPTV_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/brightcove.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/brightcove.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 brightcove.inc --- contrib/emvideo/providers/brightcove.inc 16 Aug 2008 16:14:39 -0000 1.1.2.5 +++ contrib/emvideo/providers/brightcove.inc 6 Oct 2008 20:29:07 -0000 @@ -18,7 +18,6 @@ define('EMVIDEO_BRIGHTCOVE_MAIN_URL', 'h * 'settings_description' => a description of the provider that will be posted in the admin settings form */ function emvideo_brightcove_info() { - $name = t('Brightcove'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -26,9 +25,9 @@ function emvideo_brightcove_info() { ); return array( 'provider' => 'brightcove', - 'name' => $name, + 'name' => t('Brightcove'), 'url' => EMVIDEO_BRIGHTCOVE_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !brightcove.', array('!brightcove' => l($name, EMVIDEO_BRIGHTCOVE_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Brightcove.', array('@brightcove' => EMVIDEO_BRIGHTCOVE_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/dailymotion.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/dailymotion.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 dailymotion.inc --- contrib/emvideo/providers/dailymotion.inc 16 Aug 2008 16:14:39 -0000 1.1.2.5 +++ contrib/emvideo/providers/dailymotion.inc 6 Oct 2008 20:29:07 -0000 @@ -20,7 +20,6 @@ define('EMVIDEO_DAILYMOTION_MAIN_URL', ' * These will be rendered in a table, with the columns being 'Feature', 'Supported', 'Notes'. */ function emvideo_dailymotion_info() { - $name = t('Dailymotion'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -28,9 +27,9 @@ function emvideo_dailymotion_info() { ); return array( 'provider' => 'dailymotion', - 'name' => $name, + 'name' => t('Dailymotion'), 'url' => EMVIDEO_DAILYMOTION_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !dailymotion. You can learn more about its !api here.', array('!dailymotion' => l($name, EMVIDEO_DAILYMOTION_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Dailymotion.', array('@dailymotion' => EMVIDEO_DAILYMOTION_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/google.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/google.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 google.inc --- contrib/emvideo/providers/google.inc 16 Aug 2008 16:14:39 -0000 1.1.2.5 +++ contrib/emvideo/providers/google.inc 6 Oct 2008 20:29:08 -0000 @@ -11,7 +11,6 @@ define('EMVIDEO_GOOGLE_XML', 'http://vid define('EMVIDEO_GOOGLE_DOMAIN_DEFAULT', 'com'); function emvideo_google_info() { - $name = t('Google'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS Attachment'), t('Yes'), ''), @@ -19,9 +18,9 @@ function emvideo_google_info() { ); return array( 'provider' => 'google', - 'name' => $name, + 'name' => t('Google'), 'url' => EMVIDEO_GOOGLE_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !google.', array('!google' => l($name, EMVIDEO_GOOGLE_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Google.', array('@google' => EMVIDEO_GOOGLE_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/guba.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/guba.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 guba.inc --- contrib/emvideo/providers/guba.inc 16 Aug 2008 16:14:39 -0000 1.1.2.2 +++ contrib/emvideo/providers/guba.inc 6 Oct 2008 20:29:08 -0000 @@ -6,7 +6,6 @@ define('EMVIDEO_GUBA_API_INFO', 'http:// define('EMVIDEO_GUBA_API_APPLICATION_URL', 'http://www.guba.com/developers.html'); function emvideo_guba_info() { - $name = t('GUBA'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -15,9 +14,9 @@ function emvideo_guba_info() { ); return array( 'provider' => 'guba', - 'name' => $name, + 'name' => t('GUBA'), 'url' => EMVIDEO_GUBA_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !guba. You can learn more about its !api here.', array('!guba' => l($name, EMVIDEO_GUBA_MAIN_URL, array('target' => '_blank')), '!api' => l(t('API'), EMVIDEO_GUBA_API_INFO, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from GUBA. You can learn more about its API here.', array('@guba' => EMVIDEO_GUBA_MAIN_URL, '@api' => EMVIDEO_GUBA_API_INFO)), 'supported_features' => $features, ); } @@ -26,7 +25,7 @@ function emvideo_guba_settings() { $form['guba']['api'] = array( '#type' => 'fieldset', '#title' => t('GUBA API'), - '#description' => t('If you wish to be able to display GUBA thumbnails automatically, you will first need to apply for an API Developer Key from the !guba. Note that you do not need this key to display GUBA videos themselves.', array('!guba' => l('GUBA Developer Profile page', EMVIDEO_GUBA_API_APPLICATION_URL, array('target' => '_blank')))), + '#description' => t('If you wish to be able to display GUBA thumbnails automatically, you will first need to apply for an API Developer Key from the GUBA Developer Profile page. Note that you do not need this key to display GUBA videos themselves.', array('@guba' => EMVIDEO_GUBA_API_APPLICATION_URL)), '#collapsible' => true, '#collapsed' => true, ); Index: contrib/emvideo/providers/imeem.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/imeem.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 imeem.inc --- contrib/emvideo/providers/imeem.inc 16 Aug 2008 16:14:39 -0000 1.1.2.2 +++ contrib/emvideo/providers/imeem.inc 6 Oct 2008 20:29:08 -0000 @@ -7,7 +7,6 @@ define('EMVIDEO_IMEEM_API_APPLICATION_UR define('EMVIDEO_IMEEM_XML', 'http://www.imeem.com/api/xml/mediaGetInfo?&mediaIds='); function emvideo_imeem_info() { - $name = t('IMEEM'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -16,9 +15,9 @@ function emvideo_imeem_info() { ); return array( 'provider' => 'imeem', - 'name' => $name, + 'name' => t('IMEEM'), 'url' => EMVIDEO_IMEEM_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !imeem. You can learn more about its !api here.', array('!imeem' => l($name, EMVIDEO_IMEEM_MAIN_URL, array('target' => '_blank')), '!api' => l(t('API'), EMVIDEO_IMEEM_API_INFO, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from IMEEM. You can learn more about its API here.', array('@imeem' => EMVIDEO_IMEEM_MAIN_URL, '@api' => EMVIDEO_IMEEM_API_INFO)), 'supported_features' => $features, ); } @@ -27,7 +26,7 @@ function emvideo_imeem_settings() { $form['imeem']['api'] = array( '#type' => 'fieldset', '#title' => t('IMEEM API'), - '#description' => t('If you wish to be able to display IMEEM thumbnails automatically, you will first need to apply for an API Developer Key from the !imeem. Note that you do not need this key to display IMEEM videos themselves.', array('!imeem' => l('IMEEM Developer Profile page', EMVIDEO_IMEEM_API_APPLICATION_URL, array('target' => '_blank')))), + '#description' => t('If you wish to be able to display IMEEM thumbnails automatically, you will first need to apply for an API Developer Key from the IMEEM Developer Profile page. Note that you do not need this key to display IMEEM videos themselves.', array('@imeem' => EMVIDEO_IMEEM_API_APPLICATION_URL)), '#collapsible' => true, '#collapsed' => true, ); Index: contrib/emvideo/providers/jumpcut.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/jumpcut.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 jumpcut.inc --- contrib/emvideo/providers/jumpcut.inc 16 Aug 2008 16:14:39 -0000 1.1.2.5 +++ contrib/emvideo/providers/jumpcut.inc 6 Oct 2008 20:29:08 -0000 @@ -9,7 +9,6 @@ define('EMVIDEO_JUMPCUT_MAIN_URL', 'http://jumpcut.com/'); function emvideo_jumpcut_info() { - $name = t('JumpCut'); $features = array( array(t('Autoplay'), t('No'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -17,9 +16,9 @@ function emvideo_jumpcut_info() { ); return array( 'provider' => 'jumpcut', - 'name' => $name, + 'name' => t('JumpCut'), 'url' => EMVIDEO_JUMPCUT_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !provider.', array('!provider' => l($name, EMVIDEO_JUMPCUT_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from JumpCut.', array('@provider' => EMVIDEO_JUMPCUT_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/lastfm.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/lastfm.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 lastfm.inc --- contrib/emvideo/providers/lastfm.inc 16 Aug 2008 16:14:39 -0000 1.1.2.2 +++ contrib/emvideo/providers/lastfm.inc 6 Oct 2008 20:29:08 -0000 @@ -15,7 +15,6 @@ define('EMVIDEO_LASTFM_MAIN_URL', 'http: * These will be rendered in a table, with the columns being 'Feature', 'Supported', 'Notes'. */ function emvideo_lastfm_info() { - $name = t('Last.fm'); $features = array( array(t('Autoplay'), t('No'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -23,9 +22,9 @@ function emvideo_lastfm_info() { ); return array( 'provider' => 'lastfm', - 'name' => $name, + 'name' => t('Last.fm'), 'url' => EMVIDEO_LASTFM_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !lastfm.', array('!lastfm' => l($name, EMVIDEO_LASTFM_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Last.fm.', array('@lastfm' => EMVIDEO_LASTFM_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/livevideo.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/livevideo.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 livevideo.inc --- contrib/emvideo/providers/livevideo.inc 16 Aug 2008 16:14:39 -0000 1.1.2.5 +++ contrib/emvideo/providers/livevideo.inc 6 Oct 2008 20:29:08 -0000 @@ -23,7 +23,6 @@ define('EMVIDEO_LIVEVIDEO_REST_ENDPOINT' * These will be rendered in a table, with the columns being 'Feature', 'Supported', 'Notes'. */ function emvideo_livevideo_info() { - $name = t('Live Video'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -32,9 +31,9 @@ function emvideo_livevideo_info() { return array( 'provider' => 'livevideo', - 'name' => $name, + 'name' => t('Live Video'), 'url' => EMVIDEO_LIVEVIDEO_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !livevideo. You can learn more about its !api here.', array('!livevideo' => l($name, EMVIDEO_LIVEVIDEO_MAIN_URL, array('target' => '_blank')), '!api' => l(t('API'), EMVIDEO_LIVEVIDEO_API_INFO, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Live Video. You can learn more about its API here.', array('@livevideo' => EMVIDEO_LIVEVIDEO_MAIN_URL, '@api' => EMVIDEO_LIVEVIDEO_API_INFO)), 'supported_features' => $features, ); } @@ -49,7 +48,7 @@ function emvideo_livevideo_settings() { $form['livevideo']['api'] = array( '#type' => 'fieldset', '#title' => t('Live Video API'), - '#description' => t('If you wish to be able to display Live Video thumbnails automatically, you will first need to apply for an API Developer Key from the !livevideo. Note that you do not need this key to display Live Video videos themselves.', array('!livevideo' => l('Live Video Developer Profile page', EMVIDEO_LIVEVIDEO_API_APPLICATION_URL, array('target' => '_blank')))), + '#description' => t('If you wish to be able to display Live Video thumbnails automatically, you will first need to apply for an API Developer Key from the Live Video Developer Profile page. Note that you do not need this key to display Live Video videos themselves.', array('@livevideo' => EMVIDEO_LIVEVIDEO_API_APPLICATION_URL)), '#collapsible' => TRUE, '#collapsed' => TRUE, ); Index: contrib/emvideo/providers/metacafe.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/metacafe.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 metacafe.inc --- contrib/emvideo/providers/metacafe.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/metacafe.inc 6 Oct 2008 20:29:09 -0000 @@ -9,7 +9,6 @@ define('EMVIDEO_METACAFE_MAIN_URL', 'http://www.metacafe.com/'); function emvideo_metacafe_info() { - $name = t('MetaCafe'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -17,9 +16,9 @@ function emvideo_metacafe_info() { ); return array( 'provider' => 'metacafe', - 'name' => $name, + 'name' => t('MetaCafe'), 'url' => EMVIDEO_METACAFE_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !provider.', array('!provider' => l($name, EMVIDEO_METACAFE_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from MetaCafe.', array('@provider' => EMVIDEO_METACAFE_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/myspace.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/myspace.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 myspace.inc --- contrib/emvideo/providers/myspace.inc 16 Aug 2008 16:14:39 -0000 1.1.2.5 +++ contrib/emvideo/providers/myspace.inc 6 Oct 2008 20:29:09 -0000 @@ -9,7 +9,6 @@ define('EMVIDEO_MYSPACE_MAIN_URL', 'http://vids.myspace.com/index.cfm?fuseaction=vids.videos'); function emvideo_myspace_info() { - $name = t('MySpace'); $features = array( array(t('Autoplay'), t('No'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -17,9 +16,9 @@ function emvideo_myspace_info() { ); return array( 'provider' => 'myspace', - 'name' => $name, + 'name' => t('MySpace'), 'url' => EMVIDEO_MYSPACE_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !provider.', array('!provider' => l($name, EMVIDEO_MYSPACE_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from MySpace.', array('@provider' => EMVIDEO_MYSPACE_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/revver.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/revver.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 revver.inc --- contrib/emvideo/providers/revver.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/revver.inc 6 Oct 2008 20:29:09 -0000 @@ -10,7 +10,6 @@ define('EMVIDEO_REVVER_MAIN_URL', 'http: define('EMVIDEO_REVVER_AFFILIATE_PROGRAM_URL', 'http://one.revver.com/revver/go/faq#makingmoney1'); function emvideo_revver_info() { - $name = t('Revver'); $features = array( array(t('Affliate program'), t('Yes'), t('Not currently supported by other providers. Set affiliate ID above.')), array(t('Autoplay'), t('Yes'), ''), @@ -19,9 +18,9 @@ function emvideo_revver_info() { ); return array( 'provider' => 'revver', - 'name' => $name, + 'name' => t('Revver'), 'url' => EMVIDEO_REVVER_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !provider.', array('!provider' => l($name, EMVIDEO_REVVER_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Revver.', array('@provider' => EMVIDEO_REVVER_MAIN_URL)), 'supported_features' => $features, ); } @@ -31,7 +30,7 @@ function emvideo_revver_settings() { $form['revver']['api'] = array( '#type' => 'fieldset', '#title' => t('Revver affiliate program'), - '#description' => t('You may share ad revenue if you publish Revver videos through their !program.', array('!program' => l('Affiliate Program', EMVIDEO_REVVER_AFFILIATE_PROGRAM_URL, array('target' => '_blank')))), + '#description' => t('You may share ad revenue if you publish Revver videos through their Affiliate Program.', array('@program' => EMVIDEO_REVVER_AFFILIATE_PROGRAM_URL)), '#collapsible' => TRUE, '#collapsed' => TRUE, ); Index: contrib/emvideo/providers/sevenload.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/sevenload.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 sevenload.inc --- contrib/emvideo/providers/sevenload.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/sevenload.inc 6 Oct 2008 20:29:09 -0000 @@ -18,7 +18,6 @@ define('EMVIDEO_SEVENLOAD_MAIN_URL', 'ht * 'settings_description' => a description of the provider that will be posted in the admin settings form */ function emvideo_sevenload_info() { - $name = t('Sevenload'); $features = array( array(t('Autoplay'), t('No'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -26,9 +25,9 @@ function emvideo_sevenload_info() { ); return array( 'provider' => 'sevenload', - 'name' => $name, + 'name' => t('Sevenload'), 'url' => EMVIDEO_SEVENLOAD_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !provider.', array('!provider' => l($name, EMVIDEO_SEVENLOAD_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Sevenload.', array('@provider' => EMVIDEO_SEVENLOAD_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/spike.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/spike.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 spike.inc --- contrib/emvideo/providers/spike.inc 5 Aug 2008 00:26:34 -0000 1.1.2.4 +++ contrib/emvideo/providers/spike.inc 6 Oct 2008 20:29:09 -0000 @@ -9,7 +9,6 @@ define('EMVIDEO_SPIKE_MAIN_URL', 'http://www.spike.com/'); function emvideo_spike_info() { - $name = t('Spike TV'); $features = array( array(t('Autoplay'), t('No'), t('In the works...')), array(t('RSS Attachment'), t('No'), ''), @@ -17,9 +16,9 @@ function emvideo_spike_info() { ); return array( 'provider' => 'spike tv', - 'name' => $name, + 'name' => t('Spike TV'), 'url' => EMVIDEO_SPIKE_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !spike.', array('!spike' => l($name, EMVIDEO_SPIKE_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Spike TV.', array('@spike' => EMVIDEO_SPIKE_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/tudou.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/tudou.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 tudou.inc --- contrib/emvideo/providers/tudou.inc 10 Aug 2008 22:22:12 -0000 1.1.2.1 +++ contrib/emvideo/providers/tudou.inc 6 Oct 2008 20:29:09 -0000 @@ -15,7 +15,6 @@ define('EMVIDEO_TUDOU_MAIN_URL', 'http:/ * These will be rendered in a table, with the columns being 'Feature', 'Supported', 'Notes'. */ function emvideo_tudou_info() { - $name = t('Tudou'); $features = array( array(t('Autoplay'), t('No'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -23,9 +22,9 @@ function emvideo_tudou_info() { ); return array( 'provider' => 'tudou', - 'name' => $name, + 'name' => t('Tudou'), 'url' => EMVIDEO_TUDOU_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !tudou.', array('!tudou' => l($name, EMVIDEO_TUDOU_MAIN_URL, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Tudou.', array('@tudou' => EMVIDEO_TUDOU_MAIN_URL)), 'supported_features' => $features, ); } Index: contrib/emvideo/providers/veoh.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/veoh.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 veoh.inc --- contrib/emvideo/providers/veoh.inc 16 Aug 2008 16:14:39 -0000 1.1.2.2 +++ contrib/emvideo/providers/veoh.inc 6 Oct 2008 20:29:09 -0000 @@ -7,7 +7,6 @@ define('EMVIDEO_VEOH_API_APPLICATION_URL define('EMVIDEO_VEOH_XML', 'http://www.veoh.com/rest/video/'); function emvideo_veoh_info() { - $name = t('Veoh'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS Attachment'), t('No'), ''), @@ -16,9 +15,9 @@ function emvideo_veoh_info() { ); return array( 'provider' => 'veoh', - 'name' => $name, + 'name' => t('Veoh'), 'url' => EMVIDEO_VEOH_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !veoh. You can learn more about its !api here.', array('!veoh' => l($name, EMVIDEO_VEOH_MAIN_URL, array('target' => '_blank')), '!api' => l(t('API'), EMVIDEO_VEOH_API_INFO, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Veoh. You can learn more about its API here.', array('@veoh' => EMVIDEO_VEOH_MAIN_URL, '@api' => EMVIDEO_VEOH_API_INFO)), 'supported_features' => $features, ); } @@ -27,7 +26,7 @@ function emvideo_veoh_settings() { $form['veoh']['api'] = array( '#type' => 'fieldset', '#title' => t('Veoh API'), - '#description' => t('If you wish to be able to display Veoh thumbnails automatically, you will first need to apply for an API Developer Key from the !veoh. Note that you do not need this key to display Veoh videos themselves.', array('!veoh' => l('Veoh Developer Profile page', EMVIDEO_VEOH_API_APPLICATION_URL, array('target' => '_blank')))), + '#description' => t('If you wish to be able to display Veoh thumbnails automatically, you will first need to apply for an API Developer Key from the Veoh Developer Profile page. Note that you do not need this key to display Veoh videos themselves.', array('@veoh' => EMVIDEO_VEOH_API_APPLICATION_URL)), '#collapsible' => true, '#collapsed' => true, ); Index: contrib/emvideo/providers/vimeo.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/vimeo.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 vimeo.inc --- contrib/emvideo/providers/vimeo.inc 10 Aug 2008 22:22:12 -0000 1.1.2.1 +++ contrib/emvideo/providers/vimeo.inc 6 Oct 2008 20:29:10 -0000 @@ -17,17 +17,16 @@ define('EMVIDEO_VIMEO_COLOR_DEFAULT', '# * These will be rendered in a table, with the columns being 'Feature', 'Supported', 'Notes'. */ function emvideo_vimeo_info() { - $name = t('Vimeo'); $features = array( - array(t('Custom player color'), t('Yes'), t('You may customize the player\'s skin by choosing your own color.')), + array(t('Custom player color'), t('Yes'), t("You may customize the player's skin by choosing your own color.")), array(t('Thumbnails'), t('Yes'), t('You may select the size of thumbnail to request from Vimeo.')), array(t('Full screen mode'), t('Yes'), t('You may customize the player to enable or disable full screen playback. Full screen mode is enabled by default.')), ); return array( 'provider' => 'vimeo', - 'name' => $name, + 'name' => t('Vimeo'), 'url' => EMVIDEO_VIMEO_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !provider. You can learn more about its !api here.', array('!provider' => l($name, EMVIDEO_VIMEO_MAIN_URL, array('target' => '_blank')), '!api' => l(t('API'), EMVIDEO_VIMEO_API_INFO, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from Vimeo. You can learn more about its API here.', array('@provider' => EMVIDEO_VIMEO_MAIN_URL, '@api' => EMVIDEO_VIMEO_API_INFO)), 'supported_features' => $features, ); } @@ -67,7 +66,7 @@ function emvideo_vimeo_settings() { '#title' => t('On-screen info'), '#default_value' => variable_get('emvideo_vimeo_on_screen_info', array('portrait', 'title', 'byline')), '#options' => array( - 'portrait' => t('Show video author\'s portrait'), + 'portrait' => t("Show video author's portrait"), 'title' => t('Show video title'), 'byline' => t('Show byline'), ), Index: contrib/emvideo/providers/youtube.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/youtube.inc,v retrieving revision 1.1.2.10 diff -u -p -r1.1.2.10 youtube.inc --- contrib/emvideo/providers/youtube.inc 16 Aug 2008 16:14:39 -0000 1.1.2.10 +++ contrib/emvideo/providers/youtube.inc 6 Oct 2008 20:29:10 -0000 @@ -25,19 +25,18 @@ define('EMVIDEO_YOUTUBE_COLOR2_DEFAULT', * These will be rendered in a table, with the columns being 'Feature', 'Supported', 'Notes'. */ function emvideo_youtube_info() { - $name = t('YouTube'); $features = array( array(t('Autoplay'), t('Yes'), ''), array(t('RSS Attachment'), t('Yes'), ''), array(t('Show related videos'), t('Yes'), t('This is embedded in the video itself when enabled; currently not available with other providers. Set the feature above.')), array(t('Thumbnails'), t('Yes'), t('')), - array(t('Custom player colors'), t('Yes'), t('You may customize the player\'s skin by choosing your own colors, and/or border in that setting field set.')), + array(t('Custom player colors'), t('Yes'), t("You may customize the player's skin by choosing your own colors, and/or border in that setting field set.")), ); return array( 'provider' => 'youtube', - 'name' => $name, + 'name' => t('YouTube'), 'url' => EMVIDEO_YOUTUBE_MAIN_URL, - 'settings_description' => t('These settings specifically affect videos displayed from !youtube. You can learn more about its !api here.', array('!youtube' => l($name, EMVIDEO_YOUTUBE_MAIN_URL, array('target' => '_blank')), '!api' => l(t('API'), EMVIDEO_YOUTUBE_API_INFO, array('target' => '_blank')))), + 'settings_description' => t('These settings specifically affect videos displayed from YouTube. You can learn more about its API here.', array('@youtube' => EMVIDEO_YOUTUBE_MAIN_URL, '@api' => EMVIDEO_YOUTUBE_API_INFO)), 'supported_features' => $features, ); } @@ -58,7 +57,7 @@ function emvideo_youtube_settings() { $form['youtube']['api'] = array( '#type' => 'fieldset', '#title' => t('YouTube API'), - '#description' => t('The API is no longer required. However, there may be future features requiring it (such as the ability to display otherwise private videos). You will first need to apply for an API Developer Key from the !youtube. Note that you do not need this key to display YouTube videos or their thumbnails.', array('!youtube' => l('YouTube Developer Profile page', EMVIDEO_YOUTUBE_API_APPLICATION_URL, array('target' => '_blank')))), + '#description' => t('The API is no longer required. However, there may be future features requiring it (such as the ability to display otherwise private videos). You will first need to apply for an API Developer Key from the YouTube Developer Profile page. Note that you do not need this key to display YouTube videos or their thumbnails.', array('@youtube' => EMVIDEO_YOUTUBE_API_APPLICATION_URL)), '#collapsible' => TRUE, '#collapsed' => TRUE, ); @@ -118,7 +117,7 @@ function emvideo_youtube_settings() { ); } else { - $form['youtube']['colors']['#description'] .= t(' The !colorpicker, if active, gives an easy way to select these colors.', array('!colorpicker' => l(t('Colorpicker module'), 'http://drupal.org/project/colorpicker'))); + $form['youtube']['colors']['#description'] .= ' '. t('The Colorpicker module, if active, gives an easy way to select these colors.', array('@colorpicker' => 'http://drupal.org/project/colorpicker')); } return $form; } Index: contrib/emvideo/providers/zzz_custom_url.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/emfield/contrib/emvideo/providers/Attic/zzz_custom_url.inc,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 zzz_custom_url.inc --- contrib/emvideo/providers/zzz_custom_url.inc 27 Aug 2008 07:47:31 -0000 1.1.2.6 +++ contrib/emvideo/providers/zzz_custom_url.inc 6 Oct 2008 20:29:10 -0000 @@ -21,7 +21,7 @@ function emvideo_zzz_custom_url_info() { 'provider' => 'zzz_custom_url', 'name' => $name, 'url' => '', - 'settings_description' => t('These settings specifically affect videos displayed from custom URL\'s. When a field uses a URL it determines to be a link directly to a video file, it will embed that file into the content.'), + 'settings_description' => t('These settings specifically affect videos displayed from custom URLs. When a field uses a URL it determines to be a link directly to a video file, it will embed that file into the content.'), 'supported_features' => $features, 'weight' => 9, );