'. t("%item_count %item_suffix in %your_cart", array("%item_count" => $item_count, "%item_suffix" => $item_suffix, "%your_cart" => l(t("your cart"), "cart/view"))). "
\n";
+ $output .= ''. t("%item_suffix in %your_cart", array("%item_suffix" => $item_suffix, "%your_cart" => l(t("your cart"), "cart/view"))). "
\n";
if (!empty($item)) {
$output .= "";
@@ -438,7 +438,7 @@
$node = node_load(array('nid' => $product->nid));
$subtotal += $product->qty * product_adjust_price($product);
- $row[] = array(t('%order of
%title at %price each', array('%order' => format_plural($product->qty, t('1 order'), t('%count orders')), '%title' => $node->title, '%price' => payment_format(product_adjust_price($product)))), l(t('Update or delete?'), 'cart/view'));
+ $row[] = array(t('%order of
%title at %price each', array('%order' => format_plural($product->qty, '%count order', '%count orders'), '%title' => $node->title, '%price' => payment_format(product_adjust_price($product)))), l(t('Update or delete?'), 'cart/view'));
}
$formatted_totals = '
| Subtotal: | '. payment_format($subtotal) .' |
';
Index: store/store.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/store/store.module,v
retrieving revision 1.44.2.8
diff -u -r1.44.2.8 store.module
--- store/store.module 26 Jul 2005 21:08:42 -0000 1.44.2.8
+++ store/store.module 26 Sep 2005 17:32:55 -0000
@@ -348,7 +348,7 @@
switch ($op) {
case 'search':
- case 'Search':
+ case t('Search'):
if ($_GET['txnid'] == '>0') menu_set_location(array(array('path' => 'admin/store/transaction')));
$output = store_query();
break;
@@ -389,11 +389,11 @@
}
break;
- case 'Delete':
+ case t('Delete'):
$output = store_transaction_confirm_delete(arg(4));
break;
- case 'Confirm delete':
+ case t('Confirm delete'):
$output = store_transaction_delete($edit['txnid']);
if ($edit['destination']) {
unset($_REQUEST['destination']);
@@ -419,11 +419,11 @@
function store_transaction_confirm_delete($txnid) {
- $form = t("Are you sure you want to delete transaction #$txnid?
");
+ $form = t("Are you sure you want to delete transaction #%txnid?
",array('%txnid' => $txnid));
$form .= form_hidden('txnid', $txnid);
$edit['destination'] = ($edit['destination']) ? $edit['destination'] : $_GET['destination'];
$form .= form_hidden('destination', $edit['destination']);
- $form .= form_submit('Confirm delete') . form_submit('Cancel');
+ $form .= form_submit(t('Confirm delete')) . form_submit(t('Cancel'));
return form($form);
}
@@ -740,7 +740,7 @@
if ($edit['txnid']) {
$form .= form_hidden('txnid', $edit['txnid']);
- $form .= form_submit('Update transaction') . form_submit(t('Delete'));
+ $form .= form_submit(t('Update transaction')) . form_submit(t('Delete'));
}
else {
$form .= form_submit(t('Create new transaction'));
@@ -893,7 +893,7 @@
$header = array(array("data" => "Monthly figures", "colspan" => 2));
$row[] = array(array("data" => l(t("monthly orders"), "admin/store/search&date=>". date('m/d/Y', $beg_month)), "align" => "right"), $num_orders);
- $row[] = array(array("data" => "monthly sales", "align" => "right"), $mon_sales);
+ $row[] = array(array("data" => t("monthly sales"), "align" => "right"), $mon_sales);
$output .= theme("table", $header, $row, $style) . '
';
$row = null;
@@ -913,7 +913,7 @@
$header = array(array("data" => "General statistics", "colspan" => 2));
$row[] = array(array("data" => l(t("customers"), "admin/user"), "align" => "right"), $num_customers);
$row[] = array(array("data" => l(t('products'), 'product'), "align" => "right"), $num_products);
- $row[] = array(array("data" => "yearly sales", "align" => "right"), $year_sales);
+ $row[] = array(array("data" => t("yearly sales"), "align" => "right"), $year_sales);
/* Started to work on some queries to generate top selling product reports.
$result = db_query("SELECT nid, title, COUNT(*) as count FROM {ec_transaction_product} GROUP BY nid ORDER BY count DESC");
@@ -1238,8 +1238,8 @@
while ($i = db_fetch_object($resultset)) {
$num_items += $i->qty;
}
- $item_str = ($num_items == 1) ? t('item') : t('items');
- $r[] = l("$num_items $item_str", "admin/store/transaction/product/view/$data->txnid", array('onclick' => "window.open(this.href, 'items_ordered', 'width=480,height=480,scrollbars=yes,status=yes'); return false"));
+ $item_str = format_plural($num_items, 'item', 'items');
+ $r[] = l("$item_str", "admin/store/transaction/product/view/$data->txnid", array('onclick' => "window.open(this.href, 'items_ordered', 'width=480,height=480,scrollbars=yes,status=yes'); return false"));
$r[] = l(t('edit'), $edit_uri) .
'
'. l(t('addresses'), "admin/store/transaction/edit/$data->txnid§ion=addresses&destination=$destination") .
@@ -1255,8 +1255,8 @@
$output .= "". l(t("#"), "admin/store/search$uri", array('title' => 'Permanent link to this search query.')) ."
";
- $r = ($numset == 1) ? t('result') : t('results');
- $output .= "$numset $r found
";
+ $r = format_plural($numset, '%count result found', '%count results found');
+ $output .= ''.$r.'
';
if ($numset) {
$output .= theme('table', $header, $row);
Index: product/product.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/product/product.module,v
retrieving revision 1.58.2.3
diff -u -r1.58.2.3 product.module
--- product/product.module 26 Sep 2005 15:30:00 -0000 1.58.2.3
+++ product/product.module 26 Sep 2005 17:32:56 -0000
@@ -852,13 +852,13 @@
function product_unit_nice_name($unit, $interval) {
switch (strtoupper($unit)) {
case 'D':
- return format_plural($interval, t('day'), t('days'));
+ return format_plural($interval, 'day', 'days');
case 'W':
- return format_plural($interval, t('week'), t('weeks'));
+ return format_plural($interval, 'week', 'weeks');
case 'M':
- return format_plural($interval, t('month'), t('months'));
+ return format_plural($interval, 'month', 'months');
case 'Y':
- return format_plural($interval, t('year'), t('years'));
+ return format_plural($interval, 'year', 'years');
}
}