=== modified file 'shipping/uc_flatrate/uc_flatrate.admin.inc'
--- shipping/uc_flatrate/uc_flatrate.admin.inc	2009-02-06 21:02:20 +0000
+++ shipping/uc_flatrate/uc_flatrate.admin.inc	2009-04-11 07:15:38 +0000
@@ -13,16 +13,23 @@
 function uc_flatrate_admin_methods() {
   $output = '';
 
+  $context = array(
+    'revision' => 'formatted',
+    'location' => 'shipping-flatrate-method-admin',
+  );
+  
   $rows = array();
   $enabled = variable_get('uc_quote_enabled', array());
   $weight = variable_get('uc_quote_method_weight', array());
   $result = db_query("SELECT mid, title, label, base_rate, product_rate FROM {uc_flatrate_methods}");
   while ($method = db_fetch_object($result)) {
+    $context['subject']['flatrate_method'] = $method;
+    
     $row = array();
     $row[] = check_plain($method->title);
     $row[] = check_plain($method->label);
-    $row[] = uc_currency_format($method->base_rate);
-    $row[] = uc_currency_format($method->product_rate);
+    $row[] = uc_price($method->base_rate, $context);
+    $row[] = uc_price($method->product_rate, $context);
     $row[] = l(t('edit'), 'admin/store/settings/quotes/methods/flatrate/'. $method->mid);
     $row[] = l(t('conditions'), CA_UI_PATH .'/uc_flatrate_get_quote_'. $method->mid .'/edit/conditions');
     $rows[] = $row;

=== modified file 'shipping/uc_flatrate/uc_flatrate.module'
--- shipping/uc_flatrate/uc_flatrate.module	2009-02-12 15:33:59 +0000
+++ shipping/uc_flatrate/uc_flatrate.module	2009-04-11 07:20:59 +0000
@@ -55,7 +55,12 @@ function uc_flatrate_form_alter(&$form, 
     $enabled = variable_get('uc_quote_enabled', array());
     $weight = variable_get('uc_quote_method_weight', array());
     $result = db_query("SELECT mid, title, product_rate FROM {uc_flatrate_methods}");
+    $context = array(
+      'revision' => 'formatted',
+      'location' => 'shipping-flatrate-method-node-form',
+    );
     while ($method = db_fetch_object($result)) {
+      $context['subject']['flatrate_method'] = $method;
       if (!isset($form['shipping']['flatrate'])) {
         $form['shipping']['flatrate'] = array(
           '#type' => 'fieldset',
@@ -71,7 +76,7 @@ function uc_flatrate_form_alter(&$form, 
         '#type' => 'textfield',
         '#title' => $method->title,
         '#default_value' => $form['#node']->flatrate[$method->mid],
-        '#description' => t('Default rate: %price', array('%price' => uc_currency_format($method->product_rate))),
+        '#description' => t('Default rate: %price', array('%price' => uc_price($method->product_rate, $context))),
         '#size' => 16,
         '#field_prefix' => $sign_flag ? '' : $currency_sign,
         '#field_suffix' => $sign_flag ? $currency_sign : '',
@@ -201,7 +206,13 @@ function uc_flatrate_shipping_method() {
 function uc_flatrate_quote($products, $details, $method) {
   $method = explode('_', $method['id']);
   $mid = $method[1];
+  $context = array(
+    'revision' => 'formatted',
+    'location' => 'shipping-flatrate-method-json',
+  );
+  
   if ($method = db_fetch_object(db_query("SELECT * FROM {uc_flatrate_methods} WHERE mid = %d", $mid))) {
+    $context['subject']['flatrate_method'] = $method;
     // Start at the base rate.
     $rate = $method->base_rate;
 
@@ -216,7 +227,7 @@ function uc_flatrate_quote($products, $d
       }
     }
 
-    $quotes[] = array('rate' => $rate, 'format' => uc_currency_format($rate), 'option_label' => check_plain($method->label));
+    $quotes[] = array('rate' => $rate, 'format' => uc_price($rate, $context), 'option_label' => check_plain($method->label));
   }
 
   return $quotes;

=== modified file 'shipping/uc_quote/uc_quote.module'
--- shipping/uc_quote/uc_quote.module	2009-03-31 14:14:58 +0000
+++ shipping/uc_quote/uc_quote.module	2009-04-11 07:23:18 +0000
@@ -866,9 +866,14 @@ function uc_checkout_pane_quotes($op, &$
     return TRUE;
 
     case 'review':
+      $context = array(
+        'revision' => 'formatted',
+        'location' => 'shipping-quote-checkout-pane-review',
+      );
       $result = db_query("SELECT * FROM {uc_order_line_items} WHERE order_id = %d AND type = '%s'", $arg1->order_id, 'shipping');
       if ($line_item = db_fetch_object($result)) {
-        $review[] = array('title' => $line_item->title, 'data' => uc_currency_format($line_item->amount));
+        $context['subject']['line_item'] = $line_item;
+        $review[] = array('title' => $line_item->title, 'data' => uc_price($line_item->amount, $context));
       }
       return $review;
   }

=== modified file 'shipping/uc_shipping/uc_shipping.admin.inc'
--- shipping/uc_shipping/uc_shipping.admin.inc	2009-04-01 13:40:52 +0000
+++ shipping/uc_shipping/uc_shipping.admin.inc	2009-04-11 07:26:25 +0000
@@ -587,7 +587,12 @@ function uc_shipping_shipment_view($orde
   else {
     $rows[] = array(t('Services:'), $shipment->accessorials);
   }
-  $rows[] = array(t('Cost:'), uc_currency_format($shipment->cost));
+  $context = array(
+    'revision' => 'formatted',
+    'location' => 'shipping-order-view',
+    'subject' => array('shipment' => $shipment),
+  );
+  $rows[] = array(t('Cost:'), uc_price($shipment->cost, $context));
   $output .= theme('table', array(), $rows, array('style' => 'width:auto'));
   $output .= '</div>';
   foreach ($shipment->packages as $package) {

=== modified file 'shipping/uc_shipping/uc_shipping.module'
--- shipping/uc_shipping/uc_shipping.module	2009-02-04 22:14:23 +0000
+++ shipping/uc_shipping/uc_shipping.module	2009-04-11 07:27:41 +0000
@@ -236,7 +236,12 @@ function uc_shipping_package_view($packa
   if ($package->length && $package->width && $package->height) {
     $rows[] = array(t('Dimensions:'), t('!l x !w x !h', array('!l' => uc_length_format($package->length), '!w' => uc_length_format($package->width), '!h' => uc_length_format($package->height))));
   }
-  $rows[] = array(t('Insured value:'), uc_currency_format($package->value));
+  $context = array(
+    'revision' => 'formatted',
+    'location' => 'shipping-package-view',
+    'subject' => array('package' => $package),
+  );
+  $rows[] = array(t('Insured value:'), uc_price($package->value, $context));
   if ($package->tracking_number) {
     $rows[] = array(t('Tracking number:'), check_plain($package->tracking_number));
   }

=== modified file 'shipping/uc_ups/uc_ups.admin.inc'
--- shipping/uc_ups/uc_ups.admin.inc	2009-04-04 05:08:59 +0000
+++ shipping/uc_ups/uc_ups.admin.inc	2009-04-11 07:29:28 +0000
@@ -206,7 +206,12 @@ function theme_uc_ups_confirm_shipment($
   $output .= '<div class="shipment-data">';
   $method = uc_ups_shipping_method();
   $output .= '<b>'. $method['ups']['quote']['accessorials'][$_SESSION['ups']['service']] .'</b><br />';
-  $output .= '<i>'. check_plain($_SESSION['ups']['rate']['type']) .'</i>: '. uc_currency_format($_SESSION['ups']['rate']['amount']) .' ('. check_plain($_SESSION['ups']['rate']['currency']) .')<br />';
+  $context = array(
+    'revision' => 'formatted',
+    'location' => 'shipping-ups-confirm',
+    'subject' => array('ups_info' => $_SESSION['ups']),
+  );
+  $output .= '<i>'. check_plain($_SESSION['ups']['rate']['type']) .'</i>: '. uc_price($_SESSION['ups']['rate']['amount'], $context) .' ('. check_plain($_SESSION['ups']['rate']['currency']) .')<br />';
   $ship_date = $_SESSION['ups']['ship_date'];
   $output .= 'Ship date: '. format_date(gmmktime(12, 0, 0, $ship_date['month'], $ship_date['day'], $ship_date['year']), 'custom', variable_get('uc_date_format_default', 'm/d/Y'));
   $exp_delivery = $_SESSION['ups']['expected_delivery'];

=== modified file 'shipping/uc_ups/uc_ups.module'
--- shipping/uc_ups/uc_ups.module	2009-04-04 05:08:59 +0000
+++ shipping/uc_ups/uc_ups.module	2009-04-11 07:31:37 +0000
@@ -834,9 +834,14 @@ function uc_ups_quote($products, $detail
     }
   }
   uasort($quotes, 'uc_quote_price_sort');
+  $context = array(
+    'revision' => 'formatted',
+    'location' => 'shipping-quote',
+  );
   foreach ($quotes as $key => $quote) {
     if (isset($quote['rate'])) {
-      $quotes[$key]['format'] = uc_currency_format($quote['rate']);
+      $context['subject']['quote'] = $quote;
+      $quotes[$key]['format'] = uc_price($quote['rate'], $context);
       $quotes[$key]['option_label'] = theme('uc_ups_option_label', $method['ups']['quote']['accessorials'][$key]);
     }
   }

=== modified file 'shipping/uc_usps/uc_usps.module'
--- shipping/uc_usps/uc_usps.module	2009-02-12 15:33:59 +0000
+++ shipping/uc_usps/uc_usps.module	2009-04-11 07:32:31 +0000
@@ -399,9 +399,14 @@ function uc_usps_quote($products, $detai
       unset($services[$service]);
     }
   }
+  $context = array(
+    'revision' => 'formatted',
+    'location' => 'shipping-usps-quote',
+  );
   foreach ($services as $key => $quote) {
     if (isset($quote['rate'])) {
-      $services[$key]['format'] = uc_currency_format($quote['rate']);
+      $context['subject']['quote'] = $quote;
+      $services[$key]['format'] = uc_price($quote['rate'], $context);
       $services[$key]['option_label'] = $quote['label'];
     }
   }

=== modified file 'shipping/uc_weightquote/uc_weightquote.module'
--- shipping/uc_weightquote/uc_weightquote.module	2009-02-12 15:33:59 +0000
+++ shipping/uc_weightquote/uc_weightquote.module	2009-04-11 07:34:49 +0000
@@ -182,7 +182,14 @@ function uc_weightquote_quote($products,
 
   $method = uc_weightquote_shipping_method();
 
-  $quotes[] = array('rate' => $rate, 'format' => uc_currency_format($rate), 'option_label' => $method['weightquote']['quote']['accessorials'][0]);
+  $context = array(
+    'revision' => 'formatted',
+    'location' => 'shipping-weightquote-quote',
+    'subject' => array(
+      'method' => $method,
+    ),
+  );
+  $quotes[] = array('rate' => $rate, 'format' => uc_price($rate, $context), 'option_label' => $method['weightquote']['quote']['accessorials'][0]);
 
   return $quotes;
 }