### Eclipse Workspace Patch 1.0 #P drupal-contrib-cvs Index: modules/project/project.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/project.module,v retrieving revision 1.274 diff -u -r1.274 project.module --- modules/project/project.module 20 Jun 2007 21:54:46 -0000 1.274 +++ modules/project/project.module 1 Jul 2007 20:00:48 -0000 @@ -22,11 +22,7 @@ } } if (count($categories)) { - $help = t('

Properly categorizing your project will help ensure that users can find it easily. Please follow these steps:

- ', array('%types' => implode (', ', $types), '%type' => $types[0], '%categories' => implode (', ', $categories))); + $help = t('

Properly categorizing your project will help ensure that users can find it easily. Please follow these steps:

', array('%types' => implode (', ', $types), '%type' => $types[0], '%categories' => implode (', ', $categories))); } } $help .= variable_get('project_help_node_add', ''); @@ -35,10 +31,7 @@ if (project_use_taxonomy()) { $vid = _project_get_vid(); $vocabulary = taxonomy_get_vocabulary($vid); - return t('

The project module makes special use of the taxonomy (category) system. A special vocabulary, %vocabulary_name, has been created automatically.

-

To take full advantage of project categorization, add at least two levels of terms to this vocabulary. The first level will be the basic project types, e.g., "modules", "themes", "translations".

-

Subterms of each of these types will be the categories that users can select to classify the projects. For example, "modules" might have sub-terms including "mail" and "XML".

-

Use the vocabulary admin page to view and add terms.

', array('!taxonomy-admin' => url('admin/content/taxonomy/' . $vid), '%vocabulary_name' => $vocabulary->name)); + return t('

The project module makes special use of the taxonomy (category) system. A special vocabulary, %vocabulary_name, has been created automatically.

To take full advantage of project categorization, add at least two levels of terms to this vocabulary. The first level will be the basic project types, e.g., "modules", "themes", "translations".

Subterms of each of these types will be the categories that users can select to classify the projects. For example, "modules" might have sub-terms including "mail" and "XML".

Use the vocabulary admin page to view and add terms.

', array('!taxonomy-admin' => url('admin/content/taxonomy/' . $vid), '%vocabulary_name' => $vocabulary->name)); } break; } @@ -62,7 +55,7 @@ function project_node_info() { return array( 'project_project' => array( - 'name' => t('project'), + 'name' => t('Project'), 'module' => 'project_project', 'description' => t('A project is something a group is working on. It can optionally have issue tracking, integration with revision control systems, releases, and so on.' ), ), @@ -358,7 +351,7 @@ } else { unset($form['path']['path']); - $form['path']['value'] = array('#value' => t('Automatically generated path alias: %url', array('%url' => $url_alias))); + $form['path']['value'] = array('#value' => '
'.t('Automatically generated path alias: %url', array('%url' => $url_alias)).'
'); } } } @@ -879,7 +872,7 @@ ); $form['submit'] = array( '#type' => 'submit', - '#value' => t('Go') + '#value' => t('Filter') ); return $form; } Index: modules/project/project.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/project.inc,v retrieving revision 1.106 diff -u -r1.106 project.inc --- modules/project/project.inc 19 Jun 2007 23:21:52 -0000 1.106 +++ modules/project/project.inc 1 Jul 2007 20:00:46 -0000 @@ -234,7 +234,7 @@ // Make sure all URL fields actually contain URLs. foreach (array('homepage', 'changelog', 'cvs', 'demo') as $uri) { if ($node->$uri && !preg_match('/^(http|https|ftp):\/\//i', $node->$uri)) { - form_set_error($uri, t('!field is not a valid URL.', array('!field' => t(ucfirst($uri))))); + form_set_error($uri, t('!field is not a valid URL.', array('!field' => ucfirst($uri)))); } } Index: modules/project/release/project_release_update.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/release/project_release_update.php,v retrieving revision 1.4 diff -u -r1.4 project_release_update.php --- modules/project/release/project_release_update.php 22 Dec 2006 23:53:20 -0000 1.4 +++ modules/project/release/project_release_update.php 1 Jul 2007 20:00:55 -0000 @@ -41,7 +41,7 @@ $num_prp = db_result(db_query("SELECT count(nid) FROM {project_release_projects}")); $num_projects = db_result(db_query("SELECT count(nid) FROM {project_projects}")); if ($num_prp == $num_projects) { - print("The {project_release_projects} table is already full
"); + print("The {project_release_projects} table is already full
"); return; } // First, insert a record with the right nid for all projects @@ -82,7 +82,7 @@ list($usec, $sec) = explode(' ', microtime()); $stop = (float)$usec + (float)$sec; $diff = round(($stop - $start) * 1000, 2); - print t('Added %num records to the {project_release_projects} table in %ms ms
', array('%num' => $num_prp, '%ms' => $diff)); + print t('Added %num records to the {project_release_projects} table in %ms ms
', array('%num' => $num_prp, '%ms' => $diff)); } /** @@ -119,7 +119,7 @@ $num_considered++; } - print t('Considered %num_considered releases, converted %num_converted into nodes in %interval
', array('%num_considered' => $num_considered, '%num_converted' => $num_converted, '%interval' => format_interval(time() - $start_time))); + print t('Considered %num_considered releases, converted %num_converted into nodes in %interval
', array('%num_considered' => $num_considered, '%num_converted' => $num_converted, '%interval' => format_interval(time() - $start_time))); } /** @@ -191,7 +191,7 @@ $target_api = "$matches[1].$matches[2].x"; } else { - print("ERROR: release $old_release->rid of $old_release->project_title has malformed version ($old_release->version)
"); + print t('ERROR: release %old_release_rid of %old_release_project_title has malformed version (%old_release_version)
', array('%old_release_rid' => $old_release->rid, '%old_release_project_title' => $old_release->project_title, '%old_release_version' => $old_release->version)); return false; } } @@ -205,7 +205,7 @@ // Nightly tarball from a specific branch. preg_match('/^(\d+)\.(\d+)\.(\d+)$/', $old_release->version, $matches); if ($matches[3] != 0) { - print("warning: release $old_release->rid of $old_release->project_title has unexpected patch-level version ($matches[3])
"); + print t('WARNING: release %old_release_rid of %old_release_project_title has unexpected patch-level version (%matches)
', array('%old_release_rid' => $old_release->rid, '%old_release_project_title' => $old_release->project_title, '%matches' => $matches[3])); } $target_api = "$matches[1].$matches[2].x"; $node->version_major = 1; @@ -324,9 +324,9 @@ db_query("UPDATE {project_comments} SET data = '%s' WHERE cid = %d", serialize($data), $comment->cid); $num++; } - print t('Converted %num issue followups in %interval', array('%num' => $num, '%interval' => format_interval(time() - $start_time))) . '
'; + print t('Converted %num issue followups in %interval', array('%num' => $num, '%interval' => format_interval(time() - $start_time))) . '
'; if ($errors) { - print '' . t('ERROR: problem during conversion of %num issue followups', array('%num' => $errors)) . '
'; + print '' . t('ERROR: problem during conversion of %num issue followups', array('%num' => $errors)) . '
'; } } Index: modules/project/release/project-release-history.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/release/project-release-history.php,v retrieving revision 1.2 diff -u -r1.2 project-release-history.php --- modules/project/release/project-release-history.php 16 Jun 2007 18:38:32 -0000 1.2 +++ modules/project/release/project-release-history.php 1 Jul 2007 20:00:50 -0000 @@ -260,7 +260,7 @@ // Now we can atomically rename the .new into place in the "live" spot. if (!rename($tmp_filename, $filename)) { - wd_err(t("ERROR: rename(@old, $new) failed, can't write history for %project.", array('@old' => $tmp_filename, '@new' => $filename, '%project' => $project->title))); + wd_err(t("ERROR: rename(@old, @new) failed, can't write history for %project.", array('@old' => $tmp_filename, '@new' => $filename, '%project' => $project->title))); return FALSE; } return TRUE; Index: modules/project/release/package-release-nodes.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/release/package-release-nodes.php,v retrieving revision 1.17 diff -u -r1.17 package-release-nodes.php --- modules/project/release/package-release-nodes.php 30 Jun 2007 05:55:25 -0000 1.17 +++ modules/project/release/package-release-nodes.php 1 Jul 2007 20:00:50 -0000 @@ -1,4 +1,3 @@ -#!/usr/bin/php $num_built, '!num_considered' => $num_considered))); + wd_msg(t("Done packaging releases for %uri from %plural: !num_built built, !num_considered considered.", array('%uri' => $uri, '%plural' => $plural,'!num_built' => $num_built, '!num_considered' => $num_considered))); } else { - wd_msg(t("Done packaging releases from $plural: !num_built built, !num_considered considered.", array('!num_built' => $num_built, '!num_considered' => $num_considered))); + wd_msg(t("Done packaging releases from %plural: !num_built built, !num_considered considered.", array('%plural' => $plural, '!num_built' => $num_built, '!num_considered' => $num_considered))); } } } @@ -471,10 +470,10 @@ } if (!$valid_date && !$valid_hash) { - wd_check(t('All file meta data for %file is incorrect: saved date: !db_date (!db_date_raw) real date: !real_date (!real_date_raw); saved md5hash: @db_hash, real md5hash: @real_hash', $variables), $view_link); + wd_check(t('All file meta data for %file is incorrect: saved date: !db_date (!db_date_raw), real date: !real_date (!real_date_raw); saved md5hash: @db_hash, real md5hash: @real_hash', $variables), $view_link); } else if (!$valid_date) { - wd_check(t('File date for %file is incorrect: saved date: !db_date (!db_date_raw) real date: !real_date (!real_date_raw)', $variables), $view_link); + wd_check(t('File date for %file is incorrect: saved date: !db_date (!db_date_raw), real date: !real_date (!real_date_raw)', $variables), $view_link); } else { // !$valid_hash wd_check(t('File md5hash for %file is incorrect: saved: @db_hash, real: @real_hash', $variables), $view_link); Index: modules/project/release/project_release.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/release/project_release.module,v retrieving revision 1.25 diff -u -r1.25 project_release.module --- modules/project/release/project_release.module 28 Jun 2007 10:41:36 -0000 1.25 +++ modules/project/release/project_release.module 1 Jul 2007 20:00:54 -0000 @@ -309,7 +309,7 @@ '#type' => 'radios', '#title' => t('Unmoderate projects with releases'), '#default_value' => variable_get('project_release_unmoderate', 0), - '#options' => array('Disabled', 'Enabled'), + '#options' => array( 0 => t('Disabled'), 1 => t('Enabled')), ); if ($tree = project_release_get_api_taxonomy()) { @@ -674,7 +674,7 @@ } $val = $edit->version_patch; if (isset($val) && $val !== '' && !is_numeric($val) && $val != 'x') { - form_set_error('version_patch', t("Patch-level version number must be numeric or the letter 'x'.")); + form_set_error('version_patch', t("Patch-level version number must be numeric or the char 'x'.")); } } @@ -1079,7 +1079,7 @@ ); $form['submit'] = array( '#type' => 'submit', - '#value' => t('Go') + '#value' => t('Filter') ); } else {