From dfb77ae6fda79d7a237346fc10feb877203a7d37 Mon Sep 17 00:00:00 2001
From: Marco Villegas <marvil07@gmail.com>
Date: Sun, 22 Aug 2010 18:56:29 +0200
Subject: [PATCH] change nomeclature to use {,s} instead of {,s}

---
 versioncontrol.admin.inc |    4 ++--
 versioncontrol.pages.inc |   18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git versioncontrol.admin.inc versioncontrol.admin.inc
index 4222c39..b40f3f2 100644
--- versioncontrol.admin.inc
+++ versioncontrol.admin.inc
@@ -194,12 +194,12 @@ function versioncontrol_admin_account_list_form(&$form_state) {
         ),
       ));
     }
-    $vcs_usernames = empty($repo_usernames)
+    $usernames = empty($repo_usernames)
       ? t('VCS backend is currently disabled')
       : theme('item_list', $repo_usernames);
 
     $rows_by_uid[$uid] = array(
-      theme('username', $user), $vcs_usernames,
+      theme('username', $user), $usernames,
       isset($total_operations[$uid]) ? $total_operations[$uid] : 0,
       isset($first_operation_dates[$uid]) ? $first_operation_dates[$uid] : t('n/a'),
       isset($last_operation_dates[$uid]) ? $last_operation_dates[$uid] : t('n/a'),
diff --git versioncontrol.pages.inc versioncontrol.pages.inc
index b55345a..f061cf1 100644
--- versioncontrol.pages.inc
+++ versioncontrol.pages.inc
@@ -331,13 +331,13 @@ function versioncontrol_account_list_form(&$form_state, $accounts) {
  *   The uid of the Drupal user whose account is being edited or registered.
  * @param $repository
  *   The repository of the added/edited account.
- * @param $vcs_username
+ * @param $username
  *   The user's VCS-specific username for the repository,
  *   or VERSIONCONTROL_FORM_CREATE if a new VCS account should be registered.
  */
-function versioncontrol_account_edit_form(&$form_state, $uid, $repository, $vcs_username) {
+function versioncontrol_account_edit_form(&$form_state, $uid, $repository, $username) {
   $form = array();
-  $create_account = ($vcs_username === VERSIONCONTROL_FORM_CREATE);
+  $create_account = ($username === VERSIONCONTROL_FORM_CREATE);
   $vcs_name = $repository->backend->name;
 
   $user = ($uid === VERSIONCONTROL_REGISTER_DEMO) ? FALSE : user_load($uid);
@@ -364,7 +364,7 @@ function versioncontrol_account_edit_form(&$form_state, $uid, $repository, $vcs_
   $form['#vcs'] = $repository['vcs'];
   $form['#vcs_name'] = $vcs_name;
   $form['#uid'] = $uid;
-  $form['#original_username'] = $vcs_username;
+  $form['#original_username'] = $username;
 
   $form['#validate'] = array('versioncontrol_account_edit_form_validate');
   $form['#submit'] = array('versioncontrol_account_edit_form_submit');
@@ -397,9 +397,9 @@ function versioncontrol_account_edit_form(&$form_state, $uid, $repository, $vcs_
 
   if ($create_account || $admin_access) {
     if ($create_account) {
-      $vcs_account = new $repository->backend->classes['account']($vcs_username, $uid, $repository);
+      $vcs_account = new $repository->backend->classes['account']($username, $uid, $repository);
       // Have a nice default value for the new VCS username.
-      $vcs_username = $vcs_account->usernameSuggestion($user);
+      $username = $vcs_account->usernameSuggestion($user);
     }
 
     if ($admin_access) { // the admin version
@@ -413,7 +413,7 @@ function versioncontrol_account_edit_form(&$form_state, $uid, $repository, $vcs_
       '#type' => 'textfield',
       '#title' => t('@vcs username', array('@vcs' => $vcs_name)),
       '#description' => $description,
-      '#default_value' => $vcs_username,
+      '#default_value' => $username,
       '#weight' => 0,
       '#size' => 30,
       '#maxlength' => 64,
@@ -422,13 +422,13 @@ function versioncontrol_account_edit_form(&$form_state, $uid, $repository, $vcs_
   else {
     $form['account_name'] = array(
       '#type' => 'value',
-      '#value' => $vcs_username,
+      '#value' => $username,
     );
     $form['account']['account_name_display'] = array(
       '#type' => 'item',
       '#title' => t('@vcs username', array('@vcs' => $vcs_name)),
       '#description' => t('Your @vcs username. This field can only be edited by administrators and is used to link your @vcs messages to your user account.', array('@vcs' => $vcs_name)),
-      '#value' => $vcs_username,
+      '#value' => $username,
       '#weight' => 0,
     );
   }
-- 
1.7.1