+ {t a=$layout.lmsv}Generated by LMS $a{/t}
© 2001-2011 LMS Developers - http://www.lms.org.pl
- {t}Customer Account:{/t} ({t 0=$limit}last $0 transactions{/t})
+ {t}Customer Account:{/t} ({t a=$limit}last $a transactions{/t})
|
- {if $customerinfo.balance < 0}{t 0=$customerinfo.balance*-1|money_format 1=$customerinfo.id}We are please for punctual payment in value: $0 with comment: $1{/t}{elseif $customerinfo.balance > 0}{t 0=$customerinfo.balance|money_format}You have overpayments on value: $0, they will be moved as payments for future subscriptions or services.{/t}{else}{t}You have no outstandings towards as.{/t}{/if} + {if $customerinfo.balance < 0}{t a=($customerinfo.balance*-1)|money_format b=$customerinfo.id}We are please for punctual payment in value: $a with comment: $b{/t}{elseif $customerinfo.balance > 0}{t 0=$customerinfo.balance|money_format}You have overpayments on value: $a, they will be moved as payments for future subscriptions or services.{/t}{else}{t}You have no outstandings towards as.{/t}{/if} |
|
LMS {$layout.lmsv} @ {$layout.hostname} {$smarty.now|date_format:"%A, %x"} - {t 0=$layout.logname}Prepared by: $0{/t} + {t a=$layout.logname}Prepared by: $a{/t} |
'.trans('Specified ID is not proper or does not exist!').'
'; } else if ($_GET['is_sure'] != 1) { - $body = ''.trans('Do you want to remove package "$0"?', $name).'
'; + $body = ''.trans('Do you want to remove package "$a"?', $name).'
'; $body .= ''.trans('All cash operations from that package will be lost.').'
'; $body .= ''.trans('Yes, I know what I do.').' '; $body .= ''.trans('No, I\'ve changed my mind.').'
'; diff --git a/modules/cashregdel.php b/modules/cashregdel.php index b33f84e1e7..f288ef6367 100644 --- a/modules/cashregdel.php +++ b/modules/cashregdel.php @@ -25,7 +25,7 @@ */ $name = $DB->GetOne('SELECT name FROM cashregs WHERE id=?', array($_GET['id'])); -$layout['pagetitle'] = trans('Removing registry "$0"', $name); +$layout['pagetitle'] = trans('Removing registry "$a"', $name); if (!$name) { @@ -34,7 +34,7 @@ if($_GET['is_sure']!=1) { - $body = ''.trans('Do you want to remove registry "$0"?', $name).'
'; + $body = ''.trans('Do you want to remove registry "$a"?', $name).'
'; $body .= ''.trans('All receipts in that registry will be lost.').'
'; $body .= ''.trans('Yes, I know what I do.').' '; $body .= ''.trans('No, I\'ve changed my mind.').'
'; diff --git a/modules/cashregedit.php b/modules/cashregedit.php index 43e5adf424..825614553d 100644 --- a/modules/cashregedit.php +++ b/modules/cashregedit.php @@ -84,7 +84,7 @@ } } -$layout['pagetitle'] = trans('Edit Cash Registry: $0', $registry['name']); +$layout['pagetitle'] = trans('Edit Cash Registry: $a', $registry['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/cashreginfo.php b/modules/cashreginfo.php index eeca7a6545..d019c02879 100644 --- a/modules/cashreginfo.php +++ b/modules/cashreginfo.php @@ -46,7 +46,7 @@ $registry['rights'][] = $user; } -$layout['pagetitle'] = trans('Cash Registry Info: $0', $registry['name']); +$layout['pagetitle'] = trans('Cash Registry Info: $a', $registry['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/cashsourceedit.php b/modules/cashsourceedit.php index 664faf1450..d51abe41ff 100644 --- a/modules/cashsourceedit.php +++ b/modules/cashsourceedit.php @@ -31,7 +31,7 @@ $SESSION->redirect('?m=cashsourcelist'); } -$layout['pagetitle'] = trans('Cash Import Source Edit: $0', $source['name']); +$layout['pagetitle'] = trans('Cash Import Source Edit: $a', $source['name']); if(isset($_POST['sourceedit'])) { diff --git a/modules/configedit.php b/modules/configedit.php index 3017cb1451..bc28abc954 100644 --- a/modules/configedit.php +++ b/modules/configedit.php @@ -92,7 +92,7 @@ function ConfigOptionExists($id) $config = $cfg; } -$layout['pagetitle'] = trans('Option Edit: $0',$option); +$layout['pagetitle'] = trans('Option Edit: $a',$option); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/core/actions/init.php b/modules/core/actions/init.php index 63a0cc6c7c..7854d71c51 100644 --- a/modules/core/actions/init.php +++ b/modules/core/actions/init.php @@ -43,10 +43,10 @@ $LMS->ui_lang = $_ui_language; $LMS->lang = $_language; -$SMARTY->assign_by_ref('_LANG', $_LANG); -$SMARTY->assign_by_ref('LANGDEFS', $LANGDEFS); -$SMARTY->assign_by_ref('_ui_language', $LMS->ui_lang); -$SMARTY->assign_by_ref('_language', $LMS->lang); +$SMARTY->assignByRef('_LANG', $_LANG); +$SMARTY->assignByRef('LANGDEFS', $LANGDEFS); +$SMARTY->assignByRef('_ui_language', $LMS->ui_lang); +$SMARTY->assignByRef('_language', $LMS->lang); $SMARTY->assign('_dochref', is_dir('doc/html/'.$LMS->ui_lang) ? 'doc/html/'.$LMS->ui_lang.'/' : 'doc/html/en/'); $SMARTY->assign('_config',$CONFIG); @@ -59,7 +59,7 @@ $layout['dberrors'] =& $DB->errors; $layout['popup'] = isset($_GET['popup']) ? true : false; -$SMARTY->assign_by_ref('layout', $layout); +$SMARTY->assignByRef('layout', $layout); $SMARTY->assign('_module', $ExecStack->module); $SMARTY->assign('_action', $ExecStack->action); diff --git a/modules/core/templates/calendar_js.html b/modules/core/templates/calendar_js.html index 42a3c0bde1..dc7dcb6296 100644 --- a/modules/core/templates/calendar_js.html +++ b/modules/core/templates/calendar_js.html @@ -103,18 +103,18 @@ var arr_date = str_date.split('/'); - if (arr_date.length != 3) return cal_error ("{/literal}{t 0="'\" + str_date + \"'"}Invalid date format: $0.\nFormat accepted is 'YYYY/MM/DD hh:mm'.{/t}{literal}"); - if (!arr_date[0]) return cal_error ("{/literal}{t 0="'\" + str_date + \"'"}Invalid date format: $0.\nNo year value can be found.{/t}{literal}"); - if (!RE_NUM.exec(arr_date[0])) return cal_error ("{/literal}{t 0="'\" + arr_date[0] + \"'"}Invalid year value: $0.\nAllowed values are unsigned integers.{/t}{literal}"); - if (!arr_date[1]) return cal_error ("{/literal}{t 0="'\" + str_date + \"'"}Invalid date format: $0.\nNo month value can be found.{/t}{literal}"); - if (!RE_NUM.exec(arr_date[1])) return cal_error ("{/literal}{t 0="'\" + arr_date[1] + \"'"}Invalid month value: $0.\nAllowed values are unsigned integers.{/t}{literal}"); - if (!arr_date[2]) return cal_error ("{/literal}{t 0="'\" + str_date + \"'"}Invalid date format: $0.\nNo day of month value can be found.{/t}{literal}."); - if (!RE_NUM.exec(arr_date[2])) return cal_error ("{/literal}{t 0="'\" + arr_date[2] + \"'"}Invalid day of month value: $0.\nAllowed values are unsigned integers.{/t}{literal}"); + if (arr_date.length != 3) return cal_error ("{/literal}{t a="'\" + str_date + \"'"}Invalid date format: $a.\nFormat accepted is 'YYYY/MM/DD hh:mm'.{/t}{literal}"); + if (!arr_date[0]) return cal_error ("{/literal}{t a="'\" + str_date + \"'"}Invalid date format: $a.\nNo year value can be found.{/t}{literal}"); + if (!RE_NUM.exec(arr_date[0])) return cal_error ("{/literal}{t a="'\" + arr_date[0] + \"'"}Invalid year value: $a.\nAllowed values are unsigned integers.{/t}{literal}"); + if (!arr_date[1]) return cal_error ("{/literal}{t a="'\" + str_date + \"'"}Invalid date format: $a.\nNo month value can be found.{/t}{literal}"); + if (!RE_NUM.exec(arr_date[1])) return cal_error ("{/literal}{t a="'\" + arr_date[1] + \"'"}Invalid month value: $a.\nAllowed values are unsigned integers.{/t}{literal}"); + if (!arr_date[2]) return cal_error ("{/literal}{t a="'\" + str_date + \"'"}Invalid date format: $a.\nNo day of month value can be found.{/t}{literal}."); + if (!RE_NUM.exec(arr_date[2])) return cal_error ("{/literal}{t a="'\" + arr_date[2] + \"'"}Invalid day of month value: $a.\nAllowed values are unsigned integers.{/t}{literal}"); var dt_date = new Date(); dt_date.setDate(1); - if (arr_date[1] < 1 || arr_date[1] > 12) return cal_error ("{/literal}{t 0="'\" + arr_date[1] + \"'"}Invalid month value: $0.\nAllowed range is 01-12.{/t}{literal}"); + if (arr_date[1] < 1 || arr_date[1] > 12) return cal_error ("{/literal}{t a="'\" + arr_date[1] + \"'"}Invalid month value: $a.\nAllowed range is 01-12.{/t}{literal}"); dt_date.setMonth(arr_date[1]-1); if (arr_date[0] < 100) arr_date[0] = Number(arr_date[0]) + (arr_date[0] < NUM_CENTYEAR ? 2000 : 1900); @@ -122,7 +122,7 @@ var dt_numdays = new Date(arr_date[0], arr_date[1], 0); dt_date.setDate(arr_date[2]); - if (dt_date.getMonth() != (arr_date[1]-1)) return cal_error ("{/literal}{t 0="'\" + arr_date[2] + \"'" 1="\"+dt_numdays.getDate()+\""}Invalid day of month value: $0.\nAllowed range is 01-$1.{/t}{literal}"); + if (dt_date.getMonth() != (arr_date[1]-1)) return cal_error ("{/literal}{t a="'\" + arr_date[2] + \"'" 1="\"+dt_numdays.getDate()+\""}Invalid day of month value: $a.\nAllowed range is 01-$b.{/t}{literal}"); return (dt_date) } @@ -136,14 +136,14 @@ if (!arr_time[0]) dt_date.setHours(0); else if (RE_NUM.exec(arr_time[0])) if (arr_time[0] < 24) dt_date.setHours(arr_time[0]); - else return cal_error ("{/literal}{t 0="'\" + arr_time[0] + \"'"}Invalid hour value: $0.\nAllowed range is 00-23.{/t}{literal}"); - else return cal_error ("{/literal}{t 0="'\" + arr_time[0] + \"'"}Invalid hour value: $0.\nAllowed values are unsigned integers.{/t}{literal}"); + else return cal_error ("{/literal}{t a="'\" + arr_time[0] + \"'"}Invalid hour value: $a.\nAllowed range is 00-23.{/t}{literal}"); + else return cal_error ("{/literal}{t a="'\" + arr_time[0] + \"'"}Invalid hour value: $a.\nAllowed values are unsigned integers.{/t}{literal}"); if (!arr_time[1]) dt_date.setMinutes(0); else if (RE_NUM.exec(arr_time[1])) if (arr_time[1] < 60) dt_date.setMinutes(arr_time[1]); - else return cal_error ("{/literal}{t 0="'\" + arr_time[1] + \"'"}Invalid minutes value: $0.\nAllowed range is 00-59.{/t}{literal}"); - else return cal_error ("{/literal}{t 0="'\" + arr_time[1] + \"'"}Invalid minutes value: $0.\nAllowed values are unsigned integers.{/t}{literal}"); + else return cal_error ("{/literal}{t a="'\" + arr_time[1] + \"'"}Invalid minutes value: $a.\nAllowed range is 00-59.{/t}{literal}"); + else return cal_error ("{/literal}{t a="'\" + arr_time[1] + \"'"}Invalid minutes value: $a.\nAllowed values are unsigned integers.{/t}{literal}"); dt_date.setMilliseconds(0); return dt_date; diff --git a/modules/core/templates/err_actionnotfound.html b/modules/core/templates/err_actionnotfound.html index 72b0e49a48..60265b366f 100644 --- a/modules/core/templates/err_actionnotfound.html +++ b/modules/core/templates/err_actionnotfound.html @@ -5,7 +5,7 @@{t 0=$_action 1=$_module}Action '$0' of module '$1' not found!{/t}
+{t a=$_action b=$_module}Action '$a' of module '$b' not found!{/t}
{t 0=$_action 1=$_module}Action '$0' of module '$1' is not public and can't be called directly!{/t}
+{t a=$_action b=$_module}Action '$a' of module '$b' is not public and can't be called directly!{/t}
{t 0=$_module}Module '$0' not found!{/t}
+{t a=$_module}Module '$a' not found!{/t}
{t 0=$_module}Module '$0' is not public and can't be called directly!{/t}
+{t a=$_module}Module '$a' is not public and can't be called directly!{/t}
'.trans('Do you want to remove $0 customer?',$LMS->GetCustomerName($_GET['id'])).'
'; + $body = ''.trans('Do you want to remove $a customer?',$LMS->GetCustomerName($_GET['id'])).'
'; $body .= ''.trans('All customer data and computers bound to this customer will be lost!').'
'; $body .= ''; }else{ header("Location: ?".$SESSION->get('backto')); - $body = ''.trans('Customer $0 has been removed.',$LMS->GetCustomerName($_GET['id'])).'
'; + $body = ''.trans('Customer $a has been removed.',$LMS->GetCustomerName($_GET['id'])).'
'; $LMS->DeleteCustomer($_GET['id']); } } diff --git a/modules/customeredit.php b/modules/customeredit.php index fdd2c364e2..05adc69eb2 100644 --- a/modules/customeredit.php +++ b/modules/customeredit.php @@ -202,7 +202,7 @@ $customerinfo['contacts'][] = array(); } -$layout['pagetitle'] = trans('Customer Edit: $0',$customerinfo['customername']); +$layout['pagetitle'] = trans('Customer Edit: $a',$customerinfo['customername']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/customergroupadd.php b/modules/customergroupadd.php index e1dd2518c7..e2c4ed2508 100644 --- a/modules/customergroupadd.php +++ b/modules/customergroupadd.php @@ -43,7 +43,7 @@ elseif(!preg_match('/^[._a-z0-9-]+$/i', $customergroupadd['name'])) $error['name'] = trans('Invalid chars in group name!'); elseif($LMS->CustomergroupGetId($customergroupadd['name'])) - $error['name'] = trans('Group with name $0 already exists!',$customergroupadd['name']); + $error['name'] = trans('Group with name $a already exists!',$customergroupadd['name']); if(!$error) { diff --git a/modules/customergroupedit.php b/modules/customergroupedit.php index dbeb390b20..a322df9833 100644 --- a/modules/customergroupedit.php +++ b/modules/customergroupedit.php @@ -49,7 +49,7 @@ $customergroup = $LMS->CustomergroupGet($_GET['id'], $membersnetid); $customers = $LMS->GetCustomerWithoutGroupNames($_GET['id'], $othersnetid); -$layout['pagetitle'] = trans('Group Edit: $0', $customergroup['name']); +$layout['pagetitle'] = trans('Group Edit: $a', $customergroup['name']); if(isset($_POST['customergroup'])) { @@ -67,7 +67,7 @@ elseif(!preg_match('/^[._a-z0-9-]+$/i', $customergroupedit['name'])) $error['name'] = trans('Invalid chars in group name!'); elseif(($id = $LMS->CustomergroupGetId($customergroupedit['name'])) && $id != $customergroupedit['id']) - $error['name'] = trans('Group with name $0 already exists!',$customergroupedit['name']); + $error['name'] = trans('Group with name $a already exists!',$customergroupedit['name']); if(!$error) { diff --git a/modules/customergroupinfo.php b/modules/customergroupinfo.php index 44de073481..845e9dd639 100644 --- a/modules/customergroupinfo.php +++ b/modules/customergroupinfo.php @@ -51,7 +51,7 @@ $customers = $LMS->GetCustomerWithoutGroupNames($id, isset($othersnetid) ? $othersnetid : 0); $customerscount = sizeof($customers); -$layout['pagetitle'] = trans('Group Info: $0',$customergroup['name']); +$layout['pagetitle'] = trans('Group Info: $a',$customergroup['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/customerinfo.php b/modules/customerinfo.php index 04ab190290..4372c1043b 100644 --- a/modules/customerinfo.php +++ b/modules/customerinfo.php @@ -33,7 +33,7 @@ $SESSION->save('backto', $_SERVER['QUERY_STRING']); -$layout['pagetitle'] = trans('Customer Info: $0',$customerinfo['customername']); +$layout['pagetitle'] = trans('Customer Info: $a',$customerinfo['customername']); $SMARTY->display('customerinfo.html'); diff --git a/modules/customerprint.php b/modules/customerprint.php index 9cbf95838f..7646d54f12 100644 --- a/modules/customerprint.php +++ b/modules/customerprint.php @@ -68,7 +68,7 @@ switch($_POST['filter']) { case 0: - $layout['pagetitle'] = trans('Customers List $0$1',($_POST['network'] ? trans(' (Net: $0)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $0)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); + $layout['pagetitle'] = trans('Customers List $a$b',($_POST['network'] ? trans(' (Net: $a)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $a)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); $SMARTY->assign('customerlist', $LMS->GetCustomerList($_POST['order'].','.$_POST['direction'], $_POST['filter'], $_POST['network'], $_POST['customergroup'], $search, $date, 'AND', $_POST['nodegroup'])); break; case 1: @@ -80,20 +80,20 @@ $SMARTY->assign('customerlist', $LMS->GetCustomerList($_POST['order'].','.$_POST['direction'], $_POST['filter'], NULL, NULL, $search, $date)); break; case 3: - $layout['pagetitle'] = trans('List of Connected Customers $0$1',($_POST['network'] ? trans(' (Net: $0)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $0)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); + $layout['pagetitle'] = trans('List of Connected Customers $a$b',($_POST['network'] ? trans(' (Net: $a)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $a)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); $SMARTY->assign('customerlist', $LMS->GetCustomerList($_POST['order'].','.$_POST['direction'], $_POST['filter'], $_POST['network'], $_POST['customergroup'], $search, $date, 'AND', $_POST['nodegroup'])); break; case 5: - $layout['pagetitle'] = trans('List of Disconnected Customers $0$1',($_POST['network'] ? trans(' (Net: $0)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $0)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); + $layout['pagetitle'] = trans('List of Disconnected Customers $a$b',($_POST['network'] ? trans(' (Net: $a)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $a)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); $SMARTY->assign('customerlist', $LMS->GetCustomerList($_POST['order'].','.$_POST['direction'], $_POST['filter'], $_POST['network'], $_POST['customergroup'], $search, $date, 'AND', $_POST['nodegroup'])); break; case 6: case 11: - $layout['pagetitle'] = trans('Indebted Customers List $0$1',($_POST['network'] ? trans(' (Net: $0)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $0)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); + $layout['pagetitle'] = trans('Indebted Customers List $a$b',($_POST['network'] ? trans(' (Net: $a)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $a)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); $SMARTY->assign('customerlist', $LMS->GetCustomerList($_POST['order'].','.$_POST['direction'], $_POST['filter'], $_POST['network'], $_POST['customergroup'], $search, $date, 'AND', $_POST['nodegroup'])); break; case -1: - $layout['pagetitle'] = trans('Customers Without Nodes List $0$1',($_POST['network'] ? trans(' (Net: $0)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $0)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); + $layout['pagetitle'] = trans('Customers Without Nodes List $a$b',($_POST['network'] ? trans(' (Net: $a)',$LMS->GetNetworkName($_POST['network'])) : ''),($_POST['customergroup'] ? trans('(Group: $a)',$LMS->CustomergroupGetName($_POST['customergroup'])) : '')); if($customerlist = $LMS->GetCustomerList($_POST['order'].','.$_POST['direction'], NULL, NULL, $_POST['customergroup'], $search, $date)) { unset($customerlist['total']); @@ -134,7 +134,7 @@ $date['to'] = mktime(23,59,59); //koniec dnia dzisiejszego } - $layout['pagetitle'] = trans('Customer $0 Balance Sheet ($1 to $2)', + $layout['pagetitle'] = trans('Customer $a Balance Sheet ($b to $c)', $LMS->GetCustomerName($_POST['customer']), ($from ? $from : ''), $to); $id = $_POST['customer']; diff --git a/modules/daemonconfigadd.php b/modules/daemonconfigadd.php index 136533a931..1dcd6b4b1f 100644 --- a/modules/daemonconfigadd.php +++ b/modules/daemonconfigadd.php @@ -66,7 +66,7 @@ $instance = $DB->GetRow('SELECT daemoninstances.name AS name, hosts.name AS hostname FROM daemoninstances, hosts WHERE hosts.id=hostid AND daemoninstances.id=?', array($_GET['id'])); -$layout['pagetitle'] = trans('New Option for Instance: $0/$1', $instance['name'], $instance['hostname']); +$layout['pagetitle'] = trans('New Option for Instance: $a/$b', $instance['name'], $instance['hostname']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/daemonconfigedit.php b/modules/daemonconfigedit.php index fff979561c..59b0dff5f7 100644 --- a/modules/daemonconfigedit.php +++ b/modules/daemonconfigedit.php @@ -68,7 +68,7 @@ $instance = $DB->GetRow('SELECT daemoninstances.name AS name, hosts.name AS hostname FROM daemoninstances, hosts WHERE hosts.id=hostid AND daemoninstances.id=?', array($config['instanceid'])); -$layout['pagetitle'] = trans('Option Edit: $0/$1/$2', $config['var'], $instance['name'], $instance['hostname']); +$layout['pagetitle'] = trans('Option Edit: $a/$b/$c', $config['var'], $instance['name'], $instance['hostname']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/daemoninstanceedit.php b/modules/daemoninstanceedit.php index 45f683502b..b8fcd7e689 100644 --- a/modules/daemoninstanceedit.php +++ b/modules/daemoninstanceedit.php @@ -26,7 +26,7 @@ $instance = $DB->GetRow('SELECT id, name, hostid, description, module, crontab, priority, disabled FROM daemoninstances WHERE id=?', array($_GET['id'])); -$layout['pagetitle'] = trans('Instance Edit: $0', $instance['name']); +$layout['pagetitle'] = trans('Instance Edit: $a', $instance['name']); if(isset($_POST['instance'])) { diff --git a/modules/daemoninstanceview.php b/modules/daemoninstanceview.php index 2f83266b55..d750b0c281 100644 --- a/modules/daemoninstanceview.php +++ b/modules/daemoninstanceview.php @@ -39,7 +39,7 @@ function GetOptionList($instanceid) WHERE hosts.id = i.hostid AND i.id = ?', array($_GET['id'])); -$layout['pagetitle'] = trans('Configuration of Instance: $0/$1', $instance['name'], +$layout['pagetitle'] = trans('Configuration of Instance: $a/$b', $instance['name'], ''.$instance['hostname'].''); $optionlist = GetOptionList($instance['id']); diff --git a/modules/dbdel.php b/modules/dbdel.php index fad9825520..82261f2120 100644 --- a/modules/dbdel.php +++ b/modules/dbdel.php @@ -44,7 +44,7 @@ $layout['pagetitle'] = trans('Backup Delete'); $SMARTY->display('header.html'); echo ''.trans('Are you sure, you want to delete database backup created at $0 ?',date('Y/m/d H:i.s',$_GET['db'])).'
'; + echo ''.trans('Are you sure, you want to delete database backup created at $a ?',date('Y/m/d H:i.s',$_GET['db'])).'
'; echo ''.trans('Yes, I am sure.').''; $SMARTY->display('footer.html'); } diff --git a/modules/dbrecover.php b/modules/dbrecover.php index ce6f7b8bc5..8d8b00da03 100644 --- a/modules/dbrecover.php +++ b/modules/dbrecover.php @@ -106,7 +106,7 @@ function DBLoad($filename=NULL) $layout['pagetitle'] = trans('Database Backup Recovery'); $SMARTY->display('header.html'); echo ''.trans('Are you sure, you want to recover database created at $0?', date('Y/m/d H:i.s',$_GET['db'])).'
'; + echo ''.trans('Are you sure, you want to recover database created at $a?', date('Y/m/d H:i.s',$_GET['db'])).'
'; echo ''.trans('Yes, I am sure.').''; $SMARTY->display('footer.html'); } diff --git a/modules/divisionedit.php b/modules/divisionedit.php index 1500314457..6f3e9ee020 100644 --- a/modules/divisionedit.php +++ b/modules/divisionedit.php @@ -116,7 +116,7 @@ } } -$layout['pagetitle'] = trans('Edit Division: $0', $olddiv['shortname']); +$layout['pagetitle'] = trans('Edit Division: $a', $olddiv['shortname']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/documentadd.php b/modules/documentadd.php index edf099b9b5..463b30a8a4 100644 --- a/modules/documentadd.php +++ b/modules/documentadd.php @@ -152,7 +152,7 @@ function plugin($template, $customer) // read template information include(DOC_DIR.'/templates/'.$document['templ'].'/info.php'); // set some variables (needed in e.g. plugin) - $SMARTY->assign_by_ref('document', $document); + $SMARTY->assignByRef('document', $document); // call plugin if(!empty($engine['plugin']) && file_exists(DOC_DIR.'/templates/'.$engine['name'].'/'.$engine['plugin'].'.php')) include(DOC_DIR.'/templates/'.$engine['name'].'/'.$engine['plugin'].'.php'); @@ -201,7 +201,7 @@ function plugin($template, $customer) @unlink($newfile); } if(!@rename($file, $newfile)) - $error['file'] = trans('Can\'t save file in "$0" directory!', $path); + $error['file'] = trans('Can\'t save file in "$a" directory!', $path); } } diff --git a/modules/documentedit.php b/modules/documentedit.php index 88a01d148a..7cadacbe31 100644 --- a/modules/documentedit.php +++ b/modules/documentedit.php @@ -164,7 +164,7 @@ if(!file_exists($newfile)) { if(!@rename($file, $newfile)) - $error['file'] = trans('Can\'t save file in "$0" directory!', $path); + $error['file'] = trans('Can\'t save file in "$a" directory!', $path); } else $error['file'] = trans('Specified file exists in database!'); @@ -260,7 +260,7 @@ if($docengines) ksort($docengines); */ -$layout['pagetitle'] = trans('Edit Document: $0', docnumber($document['number'], $document['template'], $document['cdate'])); +$layout['pagetitle'] = trans('Edit Document: $a', docnumber($document['number'], $document['template'], $document['cdate'])); //$SMARTY->assign('docengines', $docengines); $SMARTY->assign('numberplans', $numberplans); diff --git a/modules/documentgen.php b/modules/documentgen.php index b0bf89ec96..74e2accb63 100644 --- a/modules/documentgen.php +++ b/modules/documentgen.php @@ -188,7 +188,7 @@ function plugin($template, $customer) if(!file_exists($newfile)) { if(!@rename($file, $newfile)) - $error = trans('Can\'t save file in "$0" directory!', $path); + $error = trans('Can\'t save file in "$a" directory!', $path); } } else diff --git a/modules/documenttypeedit.php b/modules/documenttypeedit.php index 81cdac5192..24b64cb772 100644 --- a/modules/documenttypeedit.php +++ b/modules/documenttypeedit.php @@ -84,7 +84,7 @@ 'id' => $id ); -$layout['pagetitle'] = trans('Document Type Edit: $0', $type['name']); +$layout['pagetitle'] = trans('Document Type Edit: $a', $type['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/domainadd.php b/modules/domainadd.php index 0e6c050001..452bbaa877 100644 --- a/modules/domainadd.php +++ b/modules/domainadd.php @@ -72,7 +72,7 @@ function GetDomainIdByName($name) array($domainadd['ownerid'])); if($limits['domain_limit'] == 0 || $limits['domain_limit'] <= $cnt) - $error['ownerid'] = trans('Exceeded domains limit of selected customer ($0)!', $limits['domain_limit']); + $error['ownerid'] = trans('Exceeded domains limit of selected customer ($a)!', $limits['domain_limit']); } } diff --git a/modules/domainedit.php b/modules/domainedit.php index e801259e4d..ee1ab4841e 100644 --- a/modules/domainedit.php +++ b/modules/domainedit.php @@ -46,7 +46,7 @@ function DomainExists($id) $domain = $DB->GetRow('SELECT id, name, ownerid, description, master, last_check, type, notified_serial, account FROM domains WHERE id = ?', array($id)); -$layout['pagetitle'] = trans('Domain Edit: $0', $domain['name']); +$layout['pagetitle'] = trans('Domain Edit: $a', $domain['name']); if(isset($_POST['domain'])) { @@ -89,7 +89,7 @@ function DomainExists($id) array($domainadd['ownerid'])); if($limits['domain_limit'] == 0 || $limits['domain_limit'] <= $cnt) - $error['ownerid'] = trans('Exceeded domains limit of selected customer ($0)!', $limits['domain_limit']); + $error['ownerid'] = trans('Exceeded domains limit of selected customer ($a)!', $limits['domain_limit']); } } diff --git a/modules/domaininfo.php b/modules/domaininfo.php index 6149c3cecf..46da351d94 100644 --- a/modules/domaininfo.php +++ b/modules/domaininfo.php @@ -40,7 +40,7 @@ $SESSION->redirect('?'.$SESSION->get('backto')); } -$layout['pagetitle'] = trans('Domain Info: $0', $domain['name']); +$layout['pagetitle'] = trans('Domain Info: $a', $domain['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/ewxchdel.php b/modules/ewxchdel.php index 03e034a581..226b5e65f6 100644 --- a/modules/ewxchdel.php +++ b/modules/ewxchdel.php @@ -31,7 +31,7 @@ } else if ($channel = $DB->GetRow('SELECT id, name FROM ewx_channels WHERE id = ?', array(intval($_GET['id'])))) { - $layout['pagetitle'] = trans('Removing channel $0', strtoupper($channel['name'])); + $layout['pagetitle'] = trans('Removing channel $a', strtoupper($channel['name'])); $SMARTY->display('header.html'); echo ''.trans('Are you sure, you want to delete this channel?').'
'; diff --git a/modules/ewxchedit.php b/modules/ewxchedit.php index 104fadeae1..e2f361628f 100644 --- a/modules/ewxchedit.php +++ b/modules/ewxchedit.php @@ -41,7 +41,7 @@ $SESSION->redirect('?m=ewxchlist'); } -$layout['pagetitle'] = trans('Channel Edit: $0', $channel['name']); +$layout['pagetitle'] = trans('Channel Edit: $a', $channel['name']); if(isset($_POST['channel'])) { diff --git a/modules/ewxchinfo.php b/modules/ewxchinfo.php index 78638549f5..b4489b1741 100644 --- a/modules/ewxchinfo.php +++ b/modules/ewxchinfo.php @@ -42,7 +42,7 @@ $SESSION->redirect('?m=ewxchlist'); } -$layout['pagetitle'] = trans('Info Channel: $0', $channel['name']); +$layout['pagetitle'] = trans('Info Channel: $a', $channel['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/hostedit.php b/modules/hostedit.php index f2634f612f..42fc237c93 100644 --- a/modules/hostedit.php +++ b/modules/hostedit.php @@ -32,7 +32,7 @@ function GetHostIdByName($name) $host = $DB->GetRow('SELECT id, name, description FROM hosts WHERE id=?', array($_GET['id'])); -$layout['pagetitle'] = trans('Host Edit: $0', $host['name']); +$layout['pagetitle'] = trans('Host Edit: $a', $host['name']); if(isset($_POST['hostedit'])) { diff --git a/modules/invoice.php b/modules/invoice.php index 93ede9c20a..f998eefe4f 100644 --- a/modules/invoice.php +++ b/modules/invoice.php @@ -152,9 +152,9 @@ { $number = docnumber($invoice['number'], $invoice['template'], $invoice['cdate']); if(!isset($invoice['invoice'])) - $layout['pagetitle'] = trans('Invoice No. $0', $number); + $layout['pagetitle'] = trans('Invoice No. $a', $number); else - $layout['pagetitle'] = trans('Credit Note No. $0', $number); + $layout['pagetitle'] = trans('Credit Note No. $a', $number); $which = array(); diff --git a/modules/invoice_pdf.inc.php b/modules/invoice_pdf.inc.php index 257d4890fa..a22cecd78c 100644 --- a/modules/invoice_pdf.inc.php +++ b/modules/invoice_pdf.inc.php @@ -60,7 +60,7 @@ function invoice_simple_form_fill($x,$y,$scale) text_autosize(15*$scale+$x,322*$scale+$y,30*$scale, iconv("UTF-8","ISO-8859-2//TRANSLIT",$invoice['zip'].' '.$invoice['city']),350*$scale); $tmp = docnumber($invoice['number'], $invoice['template'], $invoice['cdate']); - text_autosize(15*$scale+$x,215*$scale+$y,30*$scale,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Payment for invoice No. $0', $tmp)),350*$scale); + text_autosize(15*$scale+$x,215*$scale+$y,30*$scale,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Payment for invoice No. $a', $tmp)),350*$scale); } function invoice_main_form_fill($x,$y,$scale) @@ -86,11 +86,11 @@ function invoice_main_form_fill($x,$y,$scale) text_autosize(15*$scale+$x,555*$scale+$y,30*$scale,$account,950*$scale); $pdf->addtext(330*$scale+$x,495*$scale+$y,30*$scale,'X'); text_autosize(550*$scale+$x,495*$scale+$y,30*$scale,"*".number_format($invoice['total'],2,',','')."*",400*$scale); - text_autosize(15*$scale+$x,434*$scale+$y,30*$scale,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('$0 dollars $1 cents',to_words(floor($invoice['total'])),to_words(round(($invoice['total']-floor($invoice['total']))*100)))),950*$scale); + text_autosize(15*$scale+$x,434*$scale+$y,30*$scale,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('$a dollars $b cents',to_words(floor($invoice['total'])),to_words(round(($invoice['total']-floor($invoice['total']))*100)))),950*$scale); text_autosize(15*$scale+$x,372*$scale+$y,30*$scale, iconv("UTF-8","ISO-8859-2//TRANSLIT",$invoice['name']),950*$scale); text_autosize(15*$scale+$x,312*$scale+$y,30*$scale, iconv("UTF-8","ISO-8859-2//TRANSLIT",$invoice['address']." ".$invoice['zip']." ".$invoice['city']),950*$scale); $tmp = docnumber($invoice['number'], $invoice['template'], $invoice['cdate']); - text_autosize(15*$scale+$x,250*$scale+$y,30*$scale,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Payment for invoice No. $0',$tmp)),950*$scale); + text_autosize(15*$scale+$x,250*$scale+$y,30*$scale,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Payment for invoice No. $a',$tmp)),950*$scale); } function invoice_dates($x,$y) @@ -122,7 +122,7 @@ function invoice_buyer($x,$y) $y=$y-text_align_left($x,$y,$font_size,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('TEN')).' '.$invoice['ten']); else if ($invoice['ssn']) $y=$y-text_align_left($x,$y,$font_size,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('SSN')).' '.$invoice['ssn']); - $y=$y-text_align_left($x,$y,$font_size,''.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Customer No.: $0',sprintf('%04d',$invoice['customerid']))).''); + $y=$y-text_align_left($x,$y,$font_size,''.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Customer No.: $a',sprintf('%04d',$invoice['customerid']))).''); return $y; } @@ -144,15 +144,15 @@ function invoice_title($x,$y) $font_size = 16; $tmp = docnumber($invoice['number'], $invoice['template'], $invoice['cdate']); if(isset($invoice['invoice'])) - $y=$y-text_align_left($x,$y,$font_size,''.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Credit Note No. $0',$tmp)).''); + $y=$y-text_align_left($x,$y,$font_size,''.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Credit Note No. $a',$tmp)).''); else - $y=$y-text_align_left($x,$y,$font_size,''.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Invoice No. $0',$tmp)).''); + $y=$y-text_align_left($x,$y,$font_size,''.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('Invoice No. $a',$tmp)).''); if(isset($invoice['invoice'])) { $font_size = 12; $y += 8; $tmp = docnumber($invoice['invoice']['number'], $invoice['invoice']['template'], $invoice['invoice']['cdate']); - $y=$y-text_align_left($x,$y,$font_size,''.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('for Invoice No. $0',$tmp)).''); + $y=$y-text_align_left($x,$y,$font_size,''.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('for Invoice No. $a',$tmp)).''); $y -= 5; } @@ -177,7 +177,7 @@ function invoice_address_box($x,$y) /* $invoice_name = $invoice['name']; if (strlen($invoice_name)>25) - $invoice_name = preg_replace('/(.{25})/',"$1>\n",$invoice_name); + $invoice_name = preg_replace('/(.{25})/',"$b>\n",$invoice_name); $tmp = preg_split('/\r?\n/', iconv("UTF-8","ISO-8859-2",$invoice_name)); foreach ($tmp as $line) $y=$y-text_align_left($x,$y,$font_size,"".$line.""); */ @@ -754,7 +754,7 @@ function invoice_to_pay($x,$y) $y = $y - text_align_left($x,$y,14,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('To repay:')).' '.iconv("UTF-8","ISO-8859-2//TRANSLIT",moneyf($invoice['value']))); else $y = $y - text_align_left($x,$y,14,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('To pay:')).' '.iconv("UTF-8","ISO-8859-2//TRANSLIT",moneyf($invoice['value']))); - $y = $y - text_align_left($x,$y,10,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('In words:')).' '.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('$0 dollars $1 cents',to_words(floor($invoice['value'])),to_words(round(($invoice['value']-floor($invoice['value']))*100))))); + $y = $y - text_align_left($x,$y,10,iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('In words:')).' '.iconv("UTF-8","ISO-8859-2//TRANSLIT",trans('$a dollars $b cents',to_words(floor($invoice['value'])),to_words(round(($invoice['value']-floor($invoice['value']))*100))))); return $y; } @@ -787,7 +787,7 @@ function invoice_footnote($x, $y, $width, $font_size) function invoice_body_standard() { global $pdf; - $page = $pdf->ezStartPageNumbers($pdf->ez['pageWidth']-50,20,8,'right',trans('Page $0 of $1', '{PAGENUM}','{TOTALPAGENUM}'),1); + $page = $pdf->ezStartPageNumbers($pdf->ez['pageWidth']-50,20,8,'right',trans('Page $a of $b', '{PAGENUM}','{TOTALPAGENUM}'),1); $top=800; invoice_dates(500,800); invoice_address_box(400,700); @@ -810,7 +810,7 @@ function invoice_body_ft0100() { global $pdf; - $page = $pdf->ezStartPageNumbers($pdf->ez['pageWidth']/2+10,$pdf->ez['pageHeight']-30,8,'',trans('Page $0 of $1', '{PAGENUM}','{TOTALPAGENUM}'),1); + $page = $pdf->ezStartPageNumbers($pdf->ez['pageWidth']/2+10,$pdf->ez['pageHeight']-30,8,'',trans('Page $a of $b', '{PAGENUM}','{TOTALPAGENUM}'),1); $top=$pdf->ez['pageHeight']-50; invoice_dates(500,$top); invoice_address_box(400,700); diff --git a/modules/invoiceedit.php b/modules/invoiceedit.php index c83d87eca3..5c2c0f9e92 100644 --- a/modules/invoiceedit.php +++ b/modules/invoiceedit.php @@ -68,7 +68,7 @@ $itemdata = r_trim($_POST); $ntempl = docnumber($invoice['number'], $invoice['template'], $invoice['cdate']); -$layout['pagetitle'] = trans('Invoice Edit: $0', $ntempl); +$layout['pagetitle'] = trans('Invoice Edit: $a', $ntempl); if(isset($_GET['customerid']) && $_GET['customerid'] != '' && $LMS->CustomerExists($_GET['customerid'])) $action = 'setcustomer'; diff --git a/modules/invoicenew.php b/modules/invoicenew.php index 3d86b20d1d..21ff9ee77e 100644 --- a/modules/invoicenew.php +++ b/modules/invoicenew.php @@ -206,7 +206,7 @@ function GetCustomerCovenants($customerid) if($invoice['cdate'] < $maxdate) { - $error['cdate'] = trans('Last date of invoice settlement is $0. If sure, you want to write invoice with date of $1, then click "Submit" again.', + $error['cdate'] = trans('Last date of invoice settlement is $a. If sure, you want to write invoice with date of $b, then click "Submit" again.', date('Y/m/d H:i', $maxdate), date('Y/m/d H:i', $invoice['cdate'])); $invoice['cdatewarning'] = 1; } @@ -219,7 +219,7 @@ function GetCustomerCovenants($customerid) if(!preg_match('/^[0-9]+$/', $invoice['number'])) $error['number'] = trans('Invoice number must be integer!'); elseif($LMS->DocumentExists($invoice['number'], DOC_INVOICE, $invoice['numberplanid'], $invoice['cdate'])) - $error['number'] = trans('Invoice number $0 already exists!', $invoice['number']); + $error['number'] = trans('Invoice number $a already exists!', $invoice['number']); } if(empty($invoice['paytime_default']) && !preg_match('/^[0-9]+$/', $invoice['paytime'])) @@ -289,7 +289,7 @@ function GetCustomerCovenants($customerid) if(!preg_match('/^[0-9]+$/', $invoice['number'])) $error['number'] = trans('Invoice number must be integer!'); elseif($LMS->DocumentExists($invoice['number'], DOC_INVOICE, $invoice['numberplanid'], $invoice['cdate'])) - $error['number'] = trans('Invoice number $0 already exists!', $invoice['number']); + $error['number'] = trans('Invoice number $a already exists!', $invoice['number']); if($error) { $invoice['number'] = $LMS->GetNewDocumentNumber(DOC_INVOICE, $invoice['numberplanid'], $invoice['cdate']); diff --git a/modules/invoicenote.php b/modules/invoicenote.php index ed799d6906..32d1df9265 100644 --- a/modules/invoicenote.php +++ b/modules/invoicenote.php @@ -80,7 +80,7 @@ $SESSION->restore('cnoteerror', $error); $ntempl = docnumber($invoice['number'], $invoice['template'], $invoice['cdate']); -$layout['pagetitle'] = trans('Credit Note for Invoice: $0', $ntempl); +$layout['pagetitle'] = trans('Credit Note for Invoice: $a', $ntempl); switch($action) { @@ -157,7 +157,7 @@ if(!preg_match('/^[0-9]+$/', $cnote['number'])) $error['number'] = trans('Credit note number must be integer!'); elseif($LMS->DocumentExists($cnote['number'], DOC_CNOTE, $cnote['numberplanid'], $cnote['cdate'])) - $error['number'] = trans('Credit note number $0 already exists!', $cnote['number']); + $error['number'] = trans('Credit note number $a already exists!', $cnote['number']); } // finally check if selected customer can use selected numberplan @@ -224,7 +224,7 @@ if(!preg_match('/^[0-9]+$/', $cnote['number'])) $error['number'] = trans('Credit note number must be integer!'); elseif($LMS->DocumentExists($cnote['number'], DOC_CNOTE, $cnote['numberplanid'], $cnote['cdate'])) - $error['number'] = trans('Credit note number $0 already exists!', $cnote['number']); + $error['number'] = trans('Credit note number $a already exists!', $cnote['number']); if($error) $cnote['number'] = $LMS->GetNewDocumentNumber(DOC_CNOTE, $cnote['numberplanid'], $cnote['cdate']); diff --git a/modules/invoicereport.php b/modules/invoicereport.php index 02b6d3a069..439204331f 100644 --- a/modules/invoicereport.php +++ b/modules/invoicereport.php @@ -52,7 +52,7 @@ function set_taxes($taxid) $unixto = mktime(23,59,59); //today } -$layout['pagetitle'] = trans('Sale Registry for period $0 - $1', $from, $to); +$layout['pagetitle'] = trans('Sale Registry for period $a - $b', $from, $to); $listdata = array('tax' => 0, 'brutto' => 0); $invoicelist = array(); @@ -81,9 +81,9 @@ function set_taxes($taxid) $groupnames .= ($idx ? ', ' : '') . $row['name']; if(isset($_POST['groupexclude'])) - $layout['group'] = trans('Group: all excluding $0', $groupnames); + $layout['group'] = trans('Group: all excluding $a', $groupnames); else - $layout['group'] = trans('Group: $0', $groupnames); + $layout['group'] = trans('Group: $a', $groupnames); } if(!empty($_POST['division'])) diff --git a/modules/mailing/actions/mailing.php b/modules/mailing/actions/mailing.php index b646e96bac..0850fff4b6 100644 --- a/modules/mailing/actions/mailing.php +++ b/modules/mailing/actions/mailing.php @@ -147,7 +147,7 @@ function GetEmails($group, $network=NULL, $customergroup=NULL) } if(!empty($CONFIG['mail']['debug_email'])) - echo ''.trans('Warning! Debug mode (using address $0).',$CONFIG['mail']['debug_email']).'
'.trans('$0 of $1 ($2): $3 <$4>', ($key+1), sizeof($emails), sprintf('%02.1f%%',round((100/sizeof($emails))*($key+1),1)), $row['customername'], $row['email']);
+ echo ' '.trans('$a of $b ($c): $d <$4>', ($key+1), sizeof($emails), sprintf('%02.1f%%',round((100/sizeof($emails))*($key+1),1)), $row['customername'], $row['email']);
echo ' '.$LMS->SendMail($row['email'], $headers, $body, $files)."
';
}
- echo trans('$0 of $1 ($2) $3:', ($key+1), sizeof($recipients),
+ echo trans('$a of $b ($c) $d:', ($key+1), sizeof($recipients),
sprintf('%02.1f%%',round((100/sizeof($recipients))*($key+1),1)),
$row['customername'].' <'.$row['destination'].'>');
flush();
diff --git a/modules/messageinfo.php b/modules/messageinfo.php
index a3872dba36..3cdb615319 100644
--- a/modules/messageinfo.php
+++ b/modules/messageinfo.php
@@ -166,7 +166,7 @@ function GetItemList($id, $order='id,desc', $search=NULL, $cat=NULL, $status=NUL
$pagelimit = (empty($CONFIG['phpui']['messagelist_pagelimit']) ? $listdata['total'] : $CONFIG['phpui']['messagelist_pagelimit']);
$SESSION->save('milp', $page);
-$layout['pagetitle'] = trans('Message Info: $0', $subject);
+$layout['pagetitle'] = trans('Message Info: $a', $subject);
$SESSION->save('backto', $_SERVER['QUERY_STRING']);
diff --git a/modules/netadd.php b/modules/netadd.php
index e94794256d..6ff542e2c4 100644
--- a/modules/netadd.php
+++ b/modules/netadd.php
@@ -61,7 +61,7 @@
{
if(getnetaddr($netadd['address'], prefix2mask($netadd['prefix'])) != $netadd['address'])
{
- $error['address'] = trans('Specified address is not a network address, setting $0',getnetaddr($netadd['address'], prefix2mask($netadd['prefix'])));
+ $error['address'] = trans('Specified address is not a network address, setting $a',getnetaddr($netadd['address'], prefix2mask($netadd['prefix'])));
$netadd['address'] = getnetaddr($netadd['address'], prefix2mask($netadd['prefix']));
}
else
diff --git a/modules/netcmp.php b/modules/netcmp.php
index 5c1af3be18..d15edbfb6e 100644
--- a/modules/netcmp.php
+++ b/modules/netcmp.php
@@ -36,9 +36,9 @@
$LMS->NetworkCompress($_GET['id']);
$SESSION->redirect('?m='.$SESSION->get('lastmodule').'&id='.$_GET['id']);
}else{
- $layout['pagetitle'] = trans('Readdressing Network $0', strtoupper($network['name']));
+ $layout['pagetitle'] = trans('Readdressing Network $a', strtoupper($network['name']));
$SMARTY->display('header.html');
- echo ''.trans('Are you sure, you want to reorder that network?').'
'; echo ''.trans('Yes, I am sure.').''; $SMARTY->display('footer.html'); diff --git a/modules/netdel.php b/modules/netdel.php index 774cab341c..c0612eade4 100644 --- a/modules/netdel.php +++ b/modules/netdel.php @@ -43,7 +43,7 @@ } else { - $layout['pagetitle'] = trans('Removing network $0', strtoupper($network['name'])); + $layout['pagetitle'] = trans('Removing network $a', strtoupper($network['name'])); $SMARTY->display('header.html'); echo ''.trans('Are you sure, you want to delete that network?').'
'; @@ -53,7 +53,7 @@ } else { - $layout['pagetitle'] = trans('Info Network: $0', $network['name']); + $layout['pagetitle'] = trans('Info Network: $a', $network['name']); $SMARTY->assign('network',$network); $SMARTY->assign('networks', $LMS->GetNetworks()); $SMARTY->assign('error',$error); diff --git a/modules/netdevdel.php b/modules/netdevdel.php index e7dba985df..a38e2d46b6 100644 --- a/modules/netdevdel.php +++ b/modules/netdevdel.php @@ -29,7 +29,7 @@ $SESSION->redirect('?m=netdevlist'); } -$layout['pagetitle'] = trans('Deletion of Device with ID: $0',sprintf('%04d',$_GET['id'])); +$layout['pagetitle'] = trans('Deletion of Device with ID: $a',sprintf('%04d',$_GET['id'])); $SMARTY->assign('netdevid',$_GET['id']); if($LMS->CountNetDevLinks($_GET['id'])>0) diff --git a/modules/netdevedit.php b/modules/netdevedit.php index a3d671b66d..6cfb03a24f 100644 --- a/modules/netdevedit.php +++ b/modules/netdevedit.php @@ -337,7 +337,7 @@ if($nodeipdata['name']=='') $error['ipname'] = trans('Address field is required!'); elseif(strlen($nodeipdata['name']) > 32) - $error['ipname'] = trans('Specified name is too long (max.$0 characters)!','32'); + $error['ipname'] = trans('Specified name is too long (max.$a characters)!','32'); elseif($LMS->GetNodeIDByName($nodeipdata['name'])) $error['ipname'] = trans('Specified name is in use!'); elseif(!preg_match('/^[_a-z0-9-]+$/i', $nodeipdata['name'])) @@ -427,7 +427,7 @@ if($nodeipdata['name']=='') $error['ipname'] = trans('Address field is required!'); elseif(strlen($nodeipdata['name']) > 32) - $error['ipname'] = trans('Specified name is too long (max.$0 characters)!','32'); + $error['ipname'] = trans('Specified name is too long (max.$a characters)!','32'); elseif( $LMS->GetNodeIDByName($nodeipdata['name']) && $LMS->GetNodeName($_GET['ip'])!=$nodeipdata['name'] @@ -520,7 +520,7 @@ if($netdevdata['name'] == '') $error['name'] = trans('Device name is required!'); elseif(strlen($netdevdata['name']) > 32) - $error['name'] = trans('Specified name is too long (max.$0 characters)!','32'); + $error['name'] = trans('Specified name is too long (max.$a characters)!','32'); $netdevdata['ports'] = intval($netdevdata['ports']); @@ -614,7 +614,7 @@ unset($replacelist['total']); unset($replacelist['direction']); -$layout['pagetitle'] = trans('Device Edit: $0 ($1)', $netdevdata['name'], $netdevdata['producer']); +$layout['pagetitle'] = trans('Device Edit: $a ($b)', $netdevdata['name'], $netdevdata['producer']); if($subtitle) $layout['pagetitle'] .= ' - '.$subtitle; diff --git a/modules/netdevinfo.php b/modules/netdevinfo.php index e29d5d4184..59ab2129f3 100644 --- a/modules/netdevinfo.php +++ b/modules/netdevinfo.php @@ -45,7 +45,7 @@ $SESSION->save('backto', $_SERVER['QUERY_STRING']); -$layout['pagetitle'] = trans('Device Info: $0 $1 $2', $netdevinfo['name'], $netdevinfo['producer'], $netdevinfo['model']); +$layout['pagetitle'] = trans('Device Info: $a $b $c', $netdevinfo['name'], $netdevinfo['producer'], $netdevinfo['model']); $netdevinfo['id'] = $_GET['id']; diff --git a/modules/netedit.php b/modules/netedit.php index 7043ed178f..2c3dfc52fd 100644 --- a/modules/netedit.php +++ b/modules/netedit.php @@ -62,7 +62,7 @@ { if(getnetaddr($networkdata['address'],prefix2mask($networkdata['prefix']))!=$networkdata['address']) { - $error['address'] = trans('Specified address is not a network address, setting $0',getnetaddr($networkdata['address'],prefix2mask($networkdata['prefix']))); + $error['address'] = trans('Specified address is not a network address, setting $a',getnetaddr($networkdata['address'],prefix2mask($networkdata['prefix']))); $networkdata['address'] = getnetaddr($networkdata['address'],prefix2mask($networkdata['prefix'])); } else @@ -178,7 +178,7 @@ $networks = $LMS->GetNetworks(); -$layout['pagetitle'] = trans('Network Edit: $0',$network['name']); +$layout['pagetitle'] = trans('Network Edit: $a',$network['name']); $SMARTY->assign('unlockedit',TRUE); $SMARTY->assign('network',$network); diff --git a/modules/netinfo.php b/modules/netinfo.php index d9f35d4855..f25b0d7998 100644 --- a/modules/netinfo.php +++ b/modules/netinfo.php @@ -38,7 +38,7 @@ $network = $LMS->GetNetworkRecord($_GET['id'], $page, $CONFIG['phpui']['networkhosts_pagelimit']); -$layout['pagetitle'] = trans('Info Network: $0', $network['name']); +$layout['pagetitle'] = trans('Info Network: $a', $network['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/netremap.php b/modules/netremap.php index 6af7a1f590..50a8d0342b 100644 --- a/modules/netremap.php +++ b/modules/netremap.php @@ -43,10 +43,10 @@ $SESSION->redirect('?m=netinfo&id='.$network['dest']['id']); }else{ - $layout['pagetitle'] = trans('Readdressing Network $0',strtoupper($network['source']['name'])); + $layout['pagetitle'] = trans('Readdressing Network $a',strtoupper($network['source']['name'])); $SMARTY->display('header.html'); echo ''.trans('Are you sure, you want to readdress network $0 to network $1 ?',strtoupper($network['source']['name']).' ('.$network['source']['address'].'/'.$network['source']['prefix'].')', strtoupper($network['dest']['name']).' ('.$network['dest']['address'].'/'.$network['dest']['prefix'].')').'
'; + echo ''.trans('Are you sure, you want to readdress network $a to network $b ?',strtoupper($network['source']['name']).' ('.$network['source']['address'].'/'.$network['source']['prefix'].')', strtoupper($network['dest']['name']).' ('.$network['dest']['address'].'/'.$network['dest']['prefix'].')').'
'; echo ''.trans('Yes, I am sure.').''; $SMARTY->display('footer.html'); } diff --git a/modules/nodedel.php b/modules/nodedel.php index ed5db91412..1dc968ebb5 100644 --- a/modules/nodedel.php +++ b/modules/nodedel.php @@ -34,9 +34,9 @@ { $nodename = $LMS->GetNodeName($nodeid); - $layout['pagetitle'] = trans('Delete Node $0', $nodename); + $layout['pagetitle'] = trans('Delete Node $a', $nodename); - $body = ''.trans('Are you sure, you want to delete node $0?', $nodename).'
'; + $body = ''.trans('Are you sure, you want to delete node $a?', $nodename).'
'; $body .= ''; $SMARTY->assign('body',$body); diff --git a/modules/nodeedit.php b/modules/nodeedit.php index a3cdad089d..9d44891b34 100644 --- a/modules/nodeedit.php +++ b/modules/nodeedit.php @@ -74,7 +74,7 @@ else $SESSION->save('backto', $_SERVER['QUERY_STRING']); -$layout['pagetitle'] = trans('Node Edit: $0', $nodeinfo['name']); +$layout['pagetitle'] = trans('Node Edit: $a', $nodeinfo['name']); if(isset($_POST['nodeedit']) && !isset($_GET['newmac'])) { diff --git a/modules/nodegroupadd.php b/modules/nodegroupadd.php index 4c53bc93aa..824f136475 100644 --- a/modules/nodegroupadd.php +++ b/modules/nodegroupadd.php @@ -43,7 +43,7 @@ elseif(!preg_match('/^[._a-z0-9-]+$/i', $nodegroupadd['name'])) $error['name'] = trans('Invalid chars in group name!'); elseif($DB->GetOne('SELECT 1 FROM nodegroups WHERE name = ?', array($nodegroupadd['name']))) - $error['name'] = trans('Group with name $0 already exists!',$nodegroupadd['name']); + $error['name'] = trans('Group with name $a already exists!',$nodegroupadd['name']); if(!$error) { diff --git a/modules/nodegroupedit.php b/modules/nodegroupedit.php index 806aebc95c..43f8c0d627 100644 --- a/modules/nodegroupedit.php +++ b/modules/nodegroupedit.php @@ -35,7 +35,7 @@ $nodegroup = $LMS->GetNodeGroup($id, $membersnetid); $nodes = $LMS->GetNodesWithoutGroup($id, $othersnetid); -$layout['pagetitle'] = trans('Group Edit: $0', $nodegroup['name']); +$layout['pagetitle'] = trans('Group Edit: $a', $nodegroup['name']); if(isset($_POST['nodegroup'])) { @@ -53,7 +53,7 @@ elseif(!preg_match('/^[._a-z0-9-]+$/i', $nodegroupedit['name'])) $error['name'] = trans('Invalid chars in group name!'); elseif( $id != $nodegroupedit['id']) - $error['name'] = trans('Group with name $0 already exists!',$nodegroupedit['name']); + $error['name'] = trans('Group with name $a already exists!',$nodegroupedit['name']); if(!$error) { diff --git a/modules/nodegroupinfo.php b/modules/nodegroupinfo.php index 9f477167a1..fc895ce43f 100644 --- a/modules/nodegroupinfo.php +++ b/modules/nodegroupinfo.php @@ -49,7 +49,7 @@ $nodes = $LMS->GetNodesWithoutGroup($id, isset($othersnetid) ? $othersnetid : 0); $nodescount = sizeof($nodes); -$layout['pagetitle'] = trans('Group Info: $0',$nodegroup['name']); +$layout['pagetitle'] = trans('Group Info: $a',$nodegroup['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/nodeinfo.php b/modules/nodeinfo.php index f2ef68f9f6..ab913f3476 100644 --- a/modules/nodeinfo.php +++ b/modules/nodeinfo.php @@ -94,7 +94,7 @@ function NodeStats($id, $dt) else $netdevices = $LMS->GetNetDev($nodeinfo['netdev']); -$layout['pagetitle'] = trans('Node Info: $0',$nodeinfo['name']); +$layout['pagetitle'] = trans('Node Info: $a',$nodeinfo['name']); $nodeinfo = $LMS->ExecHook('node_info_init', $nodeinfo); diff --git a/modules/note.php b/modules/note.php index 915867c9aa..888961a885 100644 --- a/modules/note.php +++ b/modules/note.php @@ -127,7 +127,7 @@ elseif($note = $LMS->GetNoteContent($_GET['id'])) { $number = docnumber($note['number'], $note['template'], $note['cdate']); - $layout['pagetitle'] = trans('Debit Note No. $0', $number); + $layout['pagetitle'] = trans('Debit Note No. $a', $number); $SMARTY->display('noteheader.html'); diff --git a/modules/noteadd.php b/modules/noteadd.php index 992c86b6b9..0fa905cab0 100644 --- a/modules/noteadd.php +++ b/modules/noteadd.php @@ -116,7 +116,7 @@ if($note['cdate'] < $maxdate) { - $error['cdate'] = trans('Last date of debit note settlement is $0. If sure, you want to write note with date of $1, then click "Submit" again.', date('Y/m/d H:i', $maxdate), date('Y/m/d H:i', $note['cdate'])); + $error['cdate'] = trans('Last date of debit note settlement is $a. If sure, you want to write note with date of $b, then click "Submit" again.', date('Y/m/d H:i', $maxdate), date('Y/m/d H:i', $note['cdate'])); $note['cdatewarning'] = 1; } } @@ -128,7 +128,7 @@ if(!preg_match('/^[0-9]+$/', $note['number'])) $error['number'] = trans('Debit note number must be integer!'); elseif($LMS->DocumentExists($note['number'], DOC_DNOTE, $note['numberplanid'], $note['cdate'])) - $error['number'] = trans('Debit note number $0 already exists!', $note['number']); + $error['number'] = trans('Debit note number $a already exists!', $note['number']); } if(empty($note['paytime_default']) && !preg_match('/^[0-9]+$/', $note['paytime'])) @@ -167,7 +167,7 @@ if(!preg_match('/^[0-9]+$/', $note['number'])) $error['number'] = trans('Debit note number must be integer!'); elseif($LMS->DocumentExists($note['number'], DOC_DNOTE, $note['numberplanid'], $note['cdate'])) - $error['number'] = trans('Debit note number $0 already exists!', $note['number']); + $error['number'] = trans('Debit note number $a already exists!', $note['number']); if($error) $note['number'] = $LMS->GetNewDocumentNumber(DOC_DNOTE, $note['numberplanid'], $note['cdate']); diff --git a/modules/noteedit.php b/modules/noteedit.php index 2fe45a5765..d807c14be1 100644 --- a/modules/noteedit.php +++ b/modules/noteedit.php @@ -57,7 +57,7 @@ $SESSION->restore('noteediterror', $error); $ntempl = docnumber($note['number'], $note['template'], $note['cdate']); -$layout['pagetitle'] = trans('Debit Note Edit: $0', $ntempl); +$layout['pagetitle'] = trans('Debit Note Edit: $a', $ntempl); if(!empty($_GET['customerid']) && $LMS->CustomerExists($_GET['customerid'])) $action = 'setcustomer'; diff --git a/modules/number.php b/modules/number.php index 07aa3c6954..0aaca337f0 100644 --- a/modules/number.php +++ b/modules/number.php @@ -34,16 +34,16 @@ switch($doc['type']) { case DOC_INVOICE: - $ntempl = trans('Invoice No. $0',$ntempl); + $ntempl = trans('Invoice No. $a',$ntempl); break; case DOC_RECEIPT: - $ntempl = trans('Cash Receipt No. $0',$ntempl); + $ntempl = trans('Cash Receipt No. $a',$ntempl); break; case DOC_CNOTE: - $ntempl = trans('Credit Note No. $0',$ntempl); + $ntempl = trans('Credit Note No. $a',$ntempl); break; case DOC_DNOTE: - $ntempl = trans('Debit Note No. $0',$ntempl); + $ntempl = trans('Debit Note No. $a',$ntempl); break; } diff --git a/modules/numberplanedit.php b/modules/numberplanedit.php index 9e86dfb97e..6f7940b6a9 100644 --- a/modules/numberplanedit.php +++ b/modules/numberplanedit.php @@ -108,7 +108,7 @@ WHERE d.id = divisionid AND planid = ?', 'id', array($numberplan['id'])); } -$layout['pagetitle'] = trans('Numbering Plan Edit: $0', $template); +$layout['pagetitle'] = trans('Numbering Plan Edit: $a', $template); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/paymentedit.php b/modules/paymentedit.php index 7ee9d623eb..883237ae21 100644 --- a/modules/paymentedit.php +++ b/modules/paymentedit.php @@ -143,7 +143,7 @@ $payment['at'] = sprintf('%02d/%02d', $payment['at']%100, $payment['at']/100+1); } -$layout['pagetitle'] = trans('Payment Edit: $0',$payment['name']); +$layout['pagetitle'] = trans('Payment Edit: $a',$payment['name']); $SMARTY->assign('payment', $payment); $SMARTY->assign('error', $error); diff --git a/modules/paymentinfo.php b/modules/paymentinfo.php index bea628eebc..b4e0f41f0d 100644 --- a/modules/paymentinfo.php +++ b/modules/paymentinfo.php @@ -31,7 +31,7 @@ $payment = $LMS->GetPayment($_GET['id']); -$layout['pagetitle'] = trans('Payment Info: $0',$payment['name']); +$layout['pagetitle'] = trans('Payment Info: $a',$payment['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/print.php b/modules/print.php index dfc4693b1f..47d62cc5c8 100644 --- a/modules/print.php +++ b/modules/print.php @@ -53,7 +53,7 @@ $id = intval($_POST['customer']); - $layout['pagetitle'] = trans('Customer $0 Balance Sheet ($1 to $2)',$LMS->GetCustomerName($id), ($from ? $from : ''), $to); + $layout['pagetitle'] = trans('Customer $a Balance Sheet ($b to $c)',$LMS->GetCustomerName($id), ($from ? $from : ''), $to); $list['balance'] = 0; $list['income'] = 0; @@ -151,9 +151,9 @@ $net = $LMS->GetNetworkParams($net); if($user = $_POST['user']) - $layout['pagetitle'] = trans('Balance Sheet of User: $0 ($1 to $2)', $LMS->GetUserName($user), ($from ? $from : ''), $to); + $layout['pagetitle'] = trans('Balance Sheet of User: $a ($b to $c)', $LMS->GetUserName($user), ($from ? $from : ''), $to); else - $layout['pagetitle'] = trans('Balance Sheet ($0 to $1)', ($from ? $from : ''), $to); + $layout['pagetitle'] = trans('Balance Sheet ($a to $b)', ($from ? $from : ''), $to); if($types) { @@ -301,7 +301,7 @@ $date['to'] = mktime(23,59,59); // end of today } - $layout['pagetitle'] = trans('Total Invoiceless Income ($0 to $1)',($from ? $from : ''), $to); + $layout['pagetitle'] = trans('Total Invoiceless Income ($a to $b)',($from ? $from : ''), $to); $incomelist = $DB->GetAll('SELECT floor(time/86400)*86400 AS date, SUM(value) AS value FROM cash c @@ -339,7 +339,7 @@ $date['to'] = mktime(23,59,59); // end of today } - $layout['pagetitle'] = trans('Cash Import History ($0 to $1)', $from, $to); + $layout['pagetitle'] = trans('Cash Import History ($a to $b)', $from, $to); $importlist = $DB->GetAll('SELECT c.time, c.value, c.customerid, ' .$DB->Concat('upper(v.lastname)',"' '",'v.name').' AS customername @@ -448,7 +448,7 @@ $today = mktime(0,0,0); } - $layout['pagetitle'] = trans('Liability Report on $0',date('Y/m/d', $reportday)); + $layout['pagetitle'] = trans('Liability Report on $a',date('Y/m/d', $reportday)); $order = $_POST['order']; $direction = $_POST['direction']; @@ -738,17 +738,17 @@ $layout['pagetitle'] = trans('Cash Report').' '.$period; if($registry) - $layout['registry'] = trans('Registry: $0', ($registry ? $DB->GetOne('SELECT name FROM cashregs WHERE id=?', array($registry)) : trans('all'))); + $layout['registry'] = trans('Registry: $a', ($registry ? $DB->GetOne('SELECT name FROM cashregs WHERE id=?', array($registry)) : trans('all'))); if($user) - $layout['username'] = trans('Cashier: $0', $DB->GetOne('SELECT name FROM users WHERE id=?', array($user))); + $layout['username'] = trans('Cashier: $a', $DB->GetOne('SELECT name FROM users WHERE id=?', array($user))); if($group) { $groupname = $DB->GetOne('SELECT name FROM customergroups WHERE id=?', array($group)); if(isset($_POST['groupexclude'])) - $layout['group'] = trans('Group: all excluding $0', $groupname); + $layout['group'] = trans('Group: all excluding $a', $groupname); else - $layout['group'] = trans('Group: $0', $groupname); + $layout['group'] = trans('Group: $a', $groupname); } $SMARTY->assign('receiptlist', $list); $SMARTY->assign('listdata', $listdata); diff --git a/modules/promotionedit.php b/modules/promotionedit.php index 8600027fae..89ff530ddf 100644 --- a/modules/promotionedit.php +++ b/modules/promotionedit.php @@ -74,7 +74,7 @@ array(intval($_GET['id']))); } -$layout['pagetitle'] = trans('Promotion Edit: $0', $promotion['name']); +$layout['pagetitle'] = trans('Promotion Edit: $a', $promotion['name']); $SMARTY->assign('error', $error); $SMARTY->assign('promotion', $promotion); diff --git a/modules/promotioninfo.php b/modules/promotioninfo.php index e3bad41c39..c678a330f2 100644 --- a/modules/promotioninfo.php +++ b/modules/promotioninfo.php @@ -52,7 +52,7 @@ array($promotion['id'])); } -$layout['pagetitle'] = trans('Promotion Info: $0', $promotion['name']); +$layout['pagetitle'] = trans('Promotion Info: $a', $promotion['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/promotionschemaedit.php b/modules/promotionschemaedit.php index fd07808e42..7d24167860 100644 --- a/modules/promotionschemaedit.php +++ b/modules/promotionschemaedit.php @@ -210,7 +210,7 @@ $schema['selection'] = array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,30,36,42,48,60); -$layout['pagetitle'] = trans('Schema Edit: $0', $oldschema['name']); +$layout['pagetitle'] = trans('Schema Edit: $a', $oldschema['name']); $SMARTY->assign('error', $error); $SMARTY->assign('schema', $schema); diff --git a/modules/promotionschemainfo.php b/modules/promotionschemainfo.php index 5306146429..dadf3d007a 100644 --- a/modules/promotionschemainfo.php +++ b/modules/promotionschemainfo.php @@ -49,11 +49,11 @@ break; } else if ($data == 1) { - $period = trans('Month $0', $data); + $period = trans('Month $a', $data); $mon++; } else { - $period = trans('Months $0-$1', $mon, $mon + $data-1); + $period = trans('Months $a-$b', $mon, $mon + $data-1); $mon += $data; } $schema['periods'][] = $period; @@ -86,7 +86,7 @@ WHERE promotionschemaid = ?) ORDER BY t.name, t.value DESC', array($schema['id'])); -$layout['pagetitle'] = trans('Schema Info: $0', $schema['name']); +$layout['pagetitle'] = trans('Schema Info: $a', $schema['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/receipt.php b/modules/receipt.php index 2a71787495..5e160bfccb 100644 --- a/modules/receipt.php +++ b/modules/receipt.php @@ -131,7 +131,7 @@ function GetReceipt($id) die; } - $layout['pagetitle'] = trans('Cash Receipt No. $0', $receipt['number']); + $layout['pagetitle'] = trans('Cash Receipt No. $a', $receipt['number']); $receipt['last'] = TRUE; $receipt['first'] = TRUE; diff --git a/modules/receipt_pdf.php b/modules/receipt_pdf.php index 63d93e0a1a..6fe278b6dd 100644 --- a/modules/receipt_pdf.php +++ b/modules/receipt_pdf.php @@ -44,7 +44,7 @@ function receipt_header($x, $y) text_align_center($xmax - 70, $y - 10, $font_size + 4, ''.iconv("UTF-8", "ISO-8859-2", trans('CR-out')).''); else text_align_center($xmax - 70, $y - 10, $font_size + 4, ''.iconv("UTF-8", "ISO-8859-2", trans('CR-in')).''); - text_align_center($xmax - 70, $y - 30, $font_size, ''.iconv("UTF-8", "ISO-8859-2", trans('No. $0',$receipt['number'])).''); + text_align_center($xmax - 70, $y - 30, $font_size, ''.iconv("UTF-8", "ISO-8859-2", trans('No. $a',$receipt['number'])).''); if($receipt['type'] == 'out') $y -= text_align_center($x + 210, $y, $font_size, ''.iconv("UTF-8", "ISO-8859-2", trans('Proof of Pay-out')).''); @@ -203,7 +203,7 @@ function receipt_data($x,$y) $y -= 16; text_align_left($x+2,$y,8,iconv("UTF-8","ISO-8859-2",trans('In words:'))); - $y = text_wrap($x+40,$y,300,$font_size-2,iconv("UTF-8","ISO-8859-2",trans('$0 dollars $1 cents',to_words(floor($receipt['total'])),to_words($receipt['totalg']))),''); + $y = text_wrap($x+40,$y,300,$font_size-2,iconv("UTF-8","ISO-8859-2",trans('$a dollars $b cents',to_words(floor($receipt['total'])),to_words($receipt['totalg']))),''); $y -= 8; $y += $font_size/2; diff --git a/modules/receiptadd.php b/modules/receiptadd.php index aa323e0d91..1bf424db0f 100644 --- a/modules/receiptadd.php +++ b/modules/receiptadd.php @@ -213,7 +213,7 @@ function additem(&$content, $item) if(!empty($CONFIG['receipts']['nodegroups_warning'])) $customer['nodegroupswarning'] = $CONFIG['receipts']['nodegroups_warning']; else - $customer['nodegroupswarning'] = trans('Customer has got nodes in groups: $0!', + $customer['nodegroupswarning'] = trans('Customer has got nodes in groups: $a!', $CONFIG['receipts']['show_nodegroups_warning']); } } @@ -277,7 +277,7 @@ function additem(&$content, $item) $sum += $itemdata['value']; if( $cash < $sum ) - $error['nocash'] = trans('There is no cash in selected registry! You can expense only $0.', moneyf($cash)); + $error['nocash'] = trans('There is no cash in selected registry! You can expense only $a.', moneyf($cash)); } if(!$error && $itemdata['value'] && $itemdata['description']) @@ -307,9 +307,9 @@ function additem(&$content, $item) $itemdata['posuid'] = (string) (getmicrotime()+$id); if($row['type']==DOC_INVOICE) - $itemdata['description'] = trans('Invoice No. $0', docnumber($row['number'], $row['template'], $row['cdate'])); + $itemdata['description'] = trans('Invoice No. $a', docnumber($row['number'], $row['template'], $row['cdate'])); else - $itemdata['description'] = trans('Credit Note No. $0', docnumber($row['number'], $row['template'], $row['cdate'])); + $itemdata['description'] = trans('Credit Note No. $a', docnumber($row['number'], $row['template'], $row['cdate'])); if($row['reference'] && $receipt['type']=='in') { @@ -346,7 +346,7 @@ function additem(&$content, $item) if( $cash < $sum ) { - $error['nocash'] = trans('There is no cash in selected registry! You can expense only $0.', moneyf($cash)); + $error['nocash'] = trans('There is no cash in selected registry! You can expense only $a.', moneyf($cash)); break; } } @@ -411,7 +411,7 @@ function additem(&$content, $item) if($receipt['cdate'] < $maxdate) { - $error['cdate'] = trans('Last date of receipt settlement is $0. If sure, you want to write receipt with date of $1, then click "Submit" again.',date('Y/m/d H:i', $maxdate), date('Y/m/d H:i', $receipt['cdate'])); + $error['cdate'] = trans('Last date of receipt settlement is $a. If sure, you want to write receipt with date of $b, then click "Submit" again.',date('Y/m/d H:i', $maxdate), date('Y/m/d H:i', $receipt['cdate'])); $receipt['cdatewarning'] = 1; } } @@ -421,7 +421,7 @@ function additem(&$content, $item) if(!preg_match('/^[0-9]+$/', $receipt['number'])) $error['number'] = trans('Receipt number must be integer!'); elseif($LMS->DocumentExists($receipt['number'], DOC_RECEIPT, $receipt['numberplanid'], $receipt['cdate'])) - $error['number'] = trans('Receipt number $0 already exists!', $receipt['number']); + $error['number'] = trans('Receipt number $a already exists!', $receipt['number']); } if($receipt['numberplanid'] && !isset($receipt['extnumber'])) @@ -480,7 +480,7 @@ function additem(&$content, $item) { $balance = $LMS->GetCustomerBalance($cid); if( $balance<0 ) - $error['customerid'] = trans('Selected customer is in debt for $0!', moneyf($balance*-1)); + $error['customerid'] = trans('Selected customer is in debt for $a!', moneyf($balance*-1)); } if(!isset($error)) @@ -527,7 +527,7 @@ function additem(&$content, $item) if(!empty($CONFIG['receipts']['nodegroups_warning'])) $customer['nodegroupswarning'] = $CONFIG['receipts']['nodegroups_warning']; else - $customer['nodegroupswarning'] = trans('Customer has got nodes in group(s): $0!', $CONFIG['receipts']['show_nodegroups_warning']); + $customer['nodegroupswarning'] = trans('Customer has got nodes in group(s): $a!', $CONFIG['receipts']['show_nodegroups_warning']); } } @@ -555,7 +555,7 @@ function additem(&$content, $item) if(!preg_match('/^[0-9]+$/', $receipt['number'])) $error['number'] = trans('Receipt number must be integer!'); elseif($LMS->DocumentExists($receipt['number'], DOC_RECEIPT, $receipt['numberplanid'], $receipt['cdate'])) - $error['number'] = trans('Receipt number $0 already exists!', $receipt['number']); + $error['number'] = trans('Receipt number $a already exists!', $receipt['number']); if($error) $receipt['number'] = $LMS->GetNewDocumentNumber(DOC_RECEIPT, $receipt['numberplanid'], $receipt['cdate']); @@ -632,7 +632,7 @@ function additem(&$content, $item) if(!preg_match('/^[0-9]+$/', $receipt['number'])) $error['number'] = trans('Receipt number must be integer!'); elseif($LMS->DocumentExists($receipt['number'], DOC_RECEIPT, $receipt['numberplanid'], $receipt['cdate'])) - $error['number'] = trans('Receipt number $0 already exists!', $receipt['number']); + $error['number'] = trans('Receipt number $a already exists!', $receipt['number']); if($error) $receipt['number'] = $LMS->GetNewDocumentNumber(DOC_RECEIPT, $receipt['numberplanid'], $receipt['cdate']); @@ -714,7 +714,7 @@ function additem(&$content, $item) if( $cash < $value ) { - $error['nocash'] = trans('There is no cash in selected registry! You can expense only $0.', moneyf($cash)); + $error['nocash'] = trans('There is no cash in selected registry! You can expense only $a.', moneyf($cash)); break; } @@ -727,14 +727,14 @@ function additem(&$content, $item) if(!preg_match('/^[0-9]+$/', $receipt['number'])) $error['number'] = trans('Receipt number must be integer!'); elseif($LMS->DocumentExists($receipt['number'], DOC_RECEIPT, $receipt['numberplanid'], $receipt['cdate'])) - $error['number'] = trans('Receipt number $0 already exists!', $receipt['number']); + $error['number'] = trans('Receipt number $a already exists!', $receipt['number']); if($error) $receipt['number'] = $LMS->GetNewDocumentNumber(DOC_RECEIPT, $receipt['numberplanid'], $receipt['cdate']); } // cash-out - $description = trans('Moving assets to registry $0',$DB->GetOne('SELECT name FROM cashregs WHERE id=?', array($dest))); + $description = trans('Moving assets to registry $a',$DB->GetOne('SELECT name FROM cashregs WHERE id=?', array($dest))); $DB->Execute('INSERT INTO documents (type, number, extnumber, numberplanid, cdate, userid, name, closed) VALUES(?, ?, ?, ?, ?, ?, \'\', 1)', @@ -762,7 +762,7 @@ function additem(&$content, $item) $r_number = docnumber($receipt['number'], $template, $receipt['cdate']); // cash-in - $description = trans('Moving assets from registry $0 ($1)',$DB->GetOne('SELECT name FROM cashregs WHERE id=?', array($receipt['regid'])), $r_number); + $description = trans('Moving assets from registry $a ($b)',$DB->GetOne('SELECT name FROM cashregs WHERE id=?', array($receipt['regid'])), $r_number); $numberplan = $DB->GetOne('SELECT in_numberplanid FROM cashregs WHERE id=?', array($dest)); $number = $LMS->GetNewDocumentNumber(DOC_RECEIPT, $numberplan, $receipt['cdate']); diff --git a/modules/receiptadv.php b/modules/receiptadv.php index ba3c60cceb..318c7b497c 100644 --- a/modules/receiptadv.php +++ b/modules/receiptadv.php @@ -60,7 +60,7 @@ } $titlenumber = docnumber($record['number'], $record['template'], $record['cdate'], $record['extnumber']); -$layout['pagetitle'] = trans('Advance settlement: $0', $titlenumber); +$layout['pagetitle'] = trans('Advance settlement: $a', $titlenumber); if(isset($_POST['receipt'])) { @@ -114,7 +114,7 @@ { $sum = $DB->GetOne('SELECT SUM(value) FROM receiptcontents WHERE regid = ?', array($regid)); if($sum < $diff) - $error['value'] = trans('There is only $0 in registry!', money_format($sum)); + $error['value'] = trans('There is only $a in registry!', money_format($sum)); } } @@ -123,7 +123,7 @@ if(!preg_match('/^[0-9]+$/', $receipt['in_number'])) $error['in_number'] = trans('Receipt number must be integer!'); elseif($LMS->DocumentExists($receipt['in_number'], DOC_RECEIPT, $in_plan, $receipt['cdate'])) - $error['in_number'] = trans('Receipt number $0 already exists!', $receipt['in_number']); + $error['in_number'] = trans('Receipt number $a already exists!', $receipt['in_number']); } if($receipt['out_number']) @@ -131,7 +131,7 @@ if(!preg_match('/^[0-9]+$/', $receipt['out_number'])) $error['out_number'] = trans('Receipt number must be integer!'); elseif($LMS->DocumentExists($receipt['out_number'], DOC_RECEIPT, $record['numberplanid'], $receipt['cdate'])) - $error['out_number'] = trans('Receipt number $0 already exists!', $receipt['out_number']); + $error['out_number'] = trans('Receipt number $a already exists!', $receipt['out_number']); } } else @@ -141,7 +141,7 @@ if(!preg_match('/^[0-9]+$/', $receipt['number'])) $error['number'] = trans('Receipt number must be integer!'); elseif($LMS->DocumentExists($receipt['number'], DOC_RECEIPT, $in_plan, $receipt['cdate'])) - $error['number'] = trans('Receipt number $0 already exists!', $receipt['number']); + $error['number'] = trans('Receipt number $a already exists!', $receipt['number']); } } diff --git a/modules/receiptedit.php b/modules/receiptedit.php index cb3bbf4508..d3bcdf9ef2 100644 --- a/modules/receiptedit.php +++ b/modules/receiptedit.php @@ -115,7 +115,7 @@ if(!empty($CONFIG['receipts']['nodegroups_warning'])) $customer['nodegroupswarning'] = $CONFIG['receipts']['nodegroups_warning']; else - $customer['nodegroupswarning'] = trans('Customer has got nodes in groups: $0!', + $customer['nodegroupswarning'] = trans('Customer has got nodes in groups: $a!', $CONFIG['receipts']['show_nodegroups_warning']); } } @@ -157,9 +157,9 @@ function additem(&$content, $item) isset($receipt['extnumber']) ? $receipt['extnumber'] : ''); if($receipt['type']=='in') - $layout['pagetitle'] = trans('Cash-in Receipt Edit: $0', $receipt['titlenumber']); + $layout['pagetitle'] = trans('Cash-in Receipt Edit: $a', $receipt['titlenumber']); else - $layout['pagetitle'] = trans('Cash-out Receipt Edit: $0', $receipt['titlenumber']); + $layout['pagetitle'] = trans('Cash-out Receipt Edit: $a', $receipt['titlenumber']); $action = isset($_GET['action']) ? $_GET['action'] : ''; @@ -240,7 +240,7 @@ function additem(&$content, $item) $maxdate = $DB->GetOne('SELECT MAX(cdate) FROM documents WHERE type = ? AND numberplanid = ?', array(DOC_RECEIPT, $receipt['numberplanid'])); if($receipt['cdate'] < $maxdate) { - $error['cdate'] = trans('Last date of receipt settlement is $0. If sure, you want to write receipt with date of $1, then click "Submit" again.',date('Y/m/d H:i', $maxdate), date('Y/m/d H:i', $receipt['cdate'])); + $error['cdate'] = trans('Last date of receipt settlement is $a. If sure, you want to write receipt with date of $b, then click "Submit" again.',date('Y/m/d H:i', $maxdate), date('Y/m/d H:i', $receipt['cdate'])); $receipt['cdatewarning'] = 1; } } @@ -256,7 +256,7 @@ function additem(&$content, $item) $error['number'] = trans('Receipt number must be integer!'); elseif($receipt['number']!=$oldnumber) if($LMS->DocumentExists($receipt['number'], DOC_RECEIPT, $receipt['numberplanid'], $receipt['cdate'])) - $error['number'] = trans('Receipt number $0 already exists!', $receipt['number']); + $error['number'] = trans('Receipt number $a already exists!', $receipt['number']); } if($receipt['numberplanid'] && !$receipt['extnumber']) @@ -337,7 +337,7 @@ function additem(&$content, $item) if(!empty($CONFIG['receipts']['nodegroups_warning'])) $customer['nodegroupswarning'] = $CONFIG['receipts']['nodegroups_warning']; else - $customer['nodegroupswarning'] = trans('Customer has got nodes in groups: $0!', + $customer['nodegroupswarning'] = trans('Customer has got nodes in groups: $a!', $CONFIG['receipts']['show_nodegroups_warning']); } } diff --git a/modules/receiptlist.php b/modules/receiptlist.php index 76122987e5..cdf2d10080 100644 --- a/modules/receiptlist.php +++ b/modules/receiptlist.php @@ -242,7 +242,7 @@ function GetReceiptList($registry, $order='', $search=NULL, $cat=NULL, $from=0, $logentry = $DB->GetRow('SELECT * FROM cashreglog WHERE regid = ? ORDER BY time DESC LIMIT 1', array($regid, $regid)); -$layout['pagetitle'] = trans('Cash Registry: $0', $DB->GetOne('SELECT name FROM cashregs WHERE id=?', array($regid))); +$layout['pagetitle'] = trans('Cash Registry: $a', $DB->GetOne('SELECT name FROM cashregs WHERE id=?', array($regid))); $SESSION->save('backto', 'm=receiptlist®id='.$regid); diff --git a/modules/reload.php b/modules/reload.php index 9a4ffeb9e9..0ae32ac24b 100644 --- a/modules/reload.php +++ b/modules/reload.php @@ -135,7 +135,7 @@ break; default: - echo ''.trans('Error: Unknown reload type: "$0"!', $_RELOAD_TYPE).'
'; + echo ''.trans('Error: Unknown reload type: "$a"!', $_RELOAD_TYPE).'
'; break; } diff --git a/modules/rtcategorydel.php b/modules/rtcategorydel.php index 86153af76c..8af20f5aba 100644 --- a/modules/rtcategorydel.php +++ b/modules/rtcategorydel.php @@ -24,7 +24,7 @@ * $Id$ */ -$layout['pagetitle'] = trans('Remove category ID: $0',sprintf("%04d",$_GET['id'])); +$layout['pagetitle'] = trans('Remove category ID: $a',sprintf("%04d",$_GET['id'])); if(!$LMS->CategoryExists($_GET['id'])) { @@ -34,7 +34,7 @@ { if($_GET['is_sure'] != 1) { - $body = ''.trans('Do you want to remove category called $0?',$LMS->GetQueueName($_GET['id'])).'
'; + $body = ''.trans('Do you want to remove category called $a?',$LMS->GetQueueName($_GET['id'])).'
'; $body .= ''.trans('Yes, I know what I do.').' '; $body .= ''.trans('No, I\'ve changed my mind.').'
'; } diff --git a/modules/rtcategoryedit.php b/modules/rtcategoryedit.php index 57a953f3dc..48e00920c4 100644 --- a/modules/rtcategoryedit.php +++ b/modules/rtcategoryedit.php @@ -71,7 +71,7 @@ else $category = $LMS->GetCategory($_GET['id']); -$layout['pagetitle'] = trans('Category Edit: $0', $category['name']); +$layout['pagetitle'] = trans('Category Edit: $a', $category['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/rtcategoryinfo.php b/modules/rtcategoryinfo.php index 39be864960..fea1e84baf 100644 --- a/modules/rtcategoryinfo.php +++ b/modules/rtcategoryinfo.php @@ -31,7 +31,7 @@ $category = $LMS->GetCategory($_GET['id']); -$layout['pagetitle'] = trans('Category Info: $0',$category['name']); +$layout['pagetitle'] = trans('Category Info: $a',$category['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/rtqueuedel.php b/modules/rtqueuedel.php index c2b440e116..a001dae029 100644 --- a/modules/rtqueuedel.php +++ b/modules/rtqueuedel.php @@ -24,7 +24,7 @@ * $Id$ */ -$layout['pagetitle'] = trans('Remove queue ID: $0',sprintf("%04d",$_GET['id'])); +$layout['pagetitle'] = trans('Remove queue ID: $a',sprintf("%04d",$_GET['id'])); if(!$LMS->QueueExists($_GET['id'])) { @@ -34,7 +34,7 @@ { if($_GET['is_sure']!=1) { - $body = ''.trans('Do you want to remove queue called $0?',$LMS->GetQueueName($_GET['id'])).'
'; + $body = ''.trans('Do you want to remove queue called $a?',$LMS->GetQueueName($_GET['id'])).'
'; $body .= ''.trans('All tickets and messages in queue will be lost.').'
'; $body .= ''.trans('Yes, I know what I do.').' '; $body .= ''.trans('No, I\'ve changed my mind.').'
'; diff --git a/modules/rtqueueedit.php b/modules/rtqueueedit.php index f38388c5cb..239c7af2ec 100644 --- a/modules/rtqueueedit.php +++ b/modules/rtqueueedit.php @@ -67,7 +67,7 @@ else $queue = $LMS->GetQueue($_GET['id']); -$layout['pagetitle'] = trans('Queue Edit: $0', $queue['name']); +$layout['pagetitle'] = trans('Queue Edit: $a', $queue['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/rtqueueinfo.php b/modules/rtqueueinfo.php index f60651dd4e..0af60460d3 100644 --- a/modules/rtqueueinfo.php +++ b/modules/rtqueueinfo.php @@ -31,7 +31,7 @@ $queue = $LMS->GetQueue($_GET['id']); -$layout['pagetitle'] = trans('Queue Info: $0',$queue['name']); +$layout['pagetitle'] = trans('Queue Info: $a',$queue['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/rtticketedit.php b/modules/rtticketedit.php index f5c54a1713..c169a9515c 100644 --- a/modules/rtticketedit.php +++ b/modules/rtticketedit.php @@ -234,7 +234,7 @@ } $categories = $ncategories; -$layout['pagetitle'] = trans('Ticket Edit: $0',sprintf("%06d",$ticket['ticketid'])); +$layout['pagetitle'] = trans('Ticket Edit: $a',sprintf("%06d",$ticket['ticketid'])); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/rtticketprint.php b/modules/rtticketprint.php index d2bc0e5e57..34048c99fe 100644 --- a/modules/rtticketprint.php +++ b/modules/rtticketprint.php @@ -54,7 +54,7 @@ $SMARTY->assign('customernodes', $LMS->GetCustomerNodes($ticket['customerid'])); } -$layout['pagetitle'] = trans('Ticket No. $0',sprintf("%06d",$ticket['ticketid'])); +$layout['pagetitle'] = trans('Ticket No. $a',sprintf("%06d",$ticket['ticketid'])); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/rtticketview.php b/modules/rtticketview.php index 992851f53f..10709edb08 100644 --- a/modules/rtticketview.php +++ b/modules/rtticketview.php @@ -90,7 +90,7 @@ } $categories = $ncategories; -$layout['pagetitle'] = trans('Ticket Review: $0',sprintf("%06d", $ticket['ticketid'])); +$layout['pagetitle'] = trans('Ticket Review: $a',sprintf("%06d", $ticket['ticketid'])); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/stateedit.php b/modules/stateedit.php index e52e9c8fb0..0e11ce6bc6 100644 --- a/modules/stateedit.php +++ b/modules/stateedit.php @@ -54,7 +54,7 @@ $state = $stateedit; } -$layout['pagetitle'] = trans('State Edit: $0', $name); +$layout['pagetitle'] = trans('State Edit: $a', $name); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/tariffedit.php b/modules/tariffedit.php index db98d8ac96..14bb21dc02 100644 --- a/modules/tariffedit.php +++ b/modules/tariffedit.php @@ -119,7 +119,7 @@ else $tariff = $LMS->GetTariff($_GET['id']); -$layout['pagetitle'] = trans('Subscription Edit: $0',$tariff['name']); +$layout['pagetitle'] = trans('Subscription Edit: $a',$tariff['name']); $SMARTY->assign('tariff',$tariff); $SMARTY->assign('taxeslist',$LMS->GetTaxes()); diff --git a/modules/tariffinfo.php b/modules/tariffinfo.php index b32d1cb8fe..856697f56d 100644 --- a/modules/tariffinfo.php +++ b/modules/tariffinfo.php @@ -40,7 +40,7 @@ WHERE a.tariffid = ? OR s.ctariffid = ? ORDER BY p.name', array($tariff['id'], $tariff['id'])); -$layout['pagetitle'] = trans('Subscription Info: $0',$tariff['name']); +$layout['pagetitle'] = trans('Subscription Info: $a',$tariff['name']); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/taxrateedit.php b/modules/taxrateedit.php index b2dc424ad5..802f57e1b7 100644 --- a/modules/taxrateedit.php +++ b/modules/taxrateedit.php @@ -114,7 +114,7 @@ $taxrate = $taxrateedit; } -$layout['pagetitle'] = trans('Tax Rate Edit: $0', $label); +$layout['pagetitle'] = trans('Tax Rate Edit: $a', $label); $SESSION->save('backto', $_SERVER['QUERY_STRING']); diff --git a/modules/traffic/actions/compacting.php b/modules/traffic/actions/compacting.php index 51e2535514..1c36054817 100644 --- a/modules/traffic/actions/compacting.php +++ b/modules/traffic/actions/compacting.php @@ -28,12 +28,12 @@ $layout['nomenu'] = TRUE; echo ''; ?> diff --git a/modules/traffic/actions/printtraffic.php b/modules/traffic/actions/printtraffic.php index d464ffb340..3af560f67a 100644 --- a/modules/traffic/actions/printtraffic.php +++ b/modules/traffic/actions/printtraffic.php @@ -28,7 +28,7 @@ $year = $_POST['year'] ? $_POST['year'] : date('Y'); $customer = $_POST['customer'] ? $_POST['customer'] : $_GET['customer']; -$layout['pagetitle'] = trans('Stats of Customer $0 in month $1', $LMS->GetCustomerName($customer), strftime('%B %Y', mktime(0,0,0,$month,1,$year))); +$layout['pagetitle'] = trans('Stats of Customer $a in month $b', $LMS->GetCustomerName($customer), strftime('%B %Y', mktime(0,0,0,$month,1,$year))); $from = mktime(0,0,0,$month,1,$year); $to = mktime(0,0,0,$month+1,1,$year); diff --git a/modules/traffic/templates/printtraffic.html b/modules/traffic/templates/printtraffic.html index 4555ec036f..ef0670e60e 100644 --- a/modules/traffic/templates/printtraffic.html +++ b/modules/traffic/templates/printtraffic.html @@ -8,7 +8,7 @@'.trans('Compacting Database').'
'; -echo trans('$0 records before compacting.
',$DB->GetOne('SELECT COUNT(*) FROM stats')); +echo trans('$a records before compacting.
',$DB->GetOne('SELECT COUNT(*) FROM stats')); if(isset($_POST['delete'])) { $yeardeleted = $DB->Execute('DELETE FROM stats where dt < ?NOW? - 365*24*60*60'); - echo trans('$0 at least one year old records have been removed.
',$yeardeleted); + echo trans('$a at least one year old records have been removed.
',$yeardeleted); } if(isset($_POST['removedeleted'])) @@ -45,7 +45,7 @@ { if(!in_array($node,$nodes)) if($DB->Execute('DELETE FROM stats WHERE nodeid = '.$node)) - echo trans('Statistics for computer $0 has been removed
',$node); + echo trans('Statistics for computer $a has been removed
',$node); } } } @@ -80,12 +80,12 @@ $maxtime -= $step; } $DB->CommitTrans(); - echo trans('$0 - removed, $1 - inserted
', $deleted, $inserted); + echo trans('$a - removed, $b - inserted
', $deleted, $inserted); } } } -echo trans('$0 records after compacting.
',$DB->GetOne("SELECT COUNT(*) FROM stats")); +echo trans('$a records after compacting.
',$DB->GetOne("SELECT COUNT(*) FROM stats")); echo '
';
-echo trans('$0 records before compacting.
',$DB->GetOne('SELECT COUNT(*) FROM stats'));
+echo trans('$a records before compacting.
',$DB->GetOne('SELECT COUNT(*) FROM stats'));
flush();
if(isset($_GET['removeold']))
{
if($deleted = $DB->Execute('DELETE FROM stats where dt < ?NOW? - 365*24*60*60'))
{
- echo trans('$0 at least one year old records have been removed.
', $deleted);
+ echo trans('$a at least one year old records have been removed.
', $deleted);
flush();
}
}
@@ -54,7 +54,7 @@
{
if($deleted = $DB->Execute('DELETE FROM stats WHERE nodeid NOT IN (SELECT id FROM nodes)'))
{
- echo trans('$0 records for deleted nodes has been removed.
', $deleted);
+ echo trans('$a records for deleted nodes has been removed.
', $deleted);
flush();
}
}
@@ -107,7 +107,7 @@
// all records for this node has been already compacted
if (empty($data)) {
- echo $node['name'].': '.trans('$0 - removed, $1 - inserted
', 0, 0);
+ echo $node['name'].': '.trans('$a - removed, $b - inserted
', 0, 0);
flush();
continue;
}
@@ -146,14 +146,14 @@
$DB->CommitTrans();
- echo $node['name'].': '.trans('$0 - removed, $1 - inserted
', $deleted, $inserted);
+ echo $node['name'].': '.trans('$a - removed, $b - inserted
', $deleted, $inserted);
flush();
}
}
}
}
-echo trans('$0 records after compacting.',$DB->GetOne('SELECT COUNT(*) FROM stats'));
+echo trans('$a records after compacting.',$DB->GetOne('SELECT COUNT(*) FROM stats'));
echo '';
flush();
diff --git a/modules/trafficprint.php b/modules/trafficprint.php
index 19b172bf9b..cffdfa2fc7 100644
--- a/modules/trafficprint.php
+++ b/modules/trafficprint.php
@@ -34,7 +34,7 @@
$year = isset($_POST['year']) ? $_POST['year'] : date('Y');
$customer = isset($_POST['customer']) ? intval($_POST['customer']) : intval($_GET['customer']);
- $layout['pagetitle'] = trans('Stats of Customer $0 in month $1', $LMS->GetCustomerName($customer), strftime('%B %Y', mktime(0,0,0,$month,1,$year)));
+ $layout['pagetitle'] = trans('Stats of Customer $a in month $b', $LMS->GetCustomerName($customer), strftime('%B %Y', mktime(0,0,0,$month,1,$year)));
$from = mktime(0,0,0,$month,1,$year);
$to = mktime(0,0,0,$month+1,1,$year);
diff --git a/modules/transferforms.php b/modules/transferforms.php
index b99c0da3e9..c014f699ed 100644
--- a/modules/transferforms.php
+++ b/modules/transferforms.php
@@ -44,7 +44,7 @@ function main_fill($x,$y,$scale)
$pdf->addtext(550*$scale+$x,497*$scale+$y,30*$scale,number_format($invoice['total'],2,',',''));
$pdf->addtext(15*$scale+$x,375*$scale+$y,30*$scale, iconv('UTF-8', 'ISO-8859-2',$invoice['name']));
$pdf->addtext(15*$scale+$x,315*$scale+$y,30*$scale, iconv('UTF-8', 'ISO-8859-2',$invoice['address']."; ".$invoice['zip']." ".$invoice['city']));
- $pdf->addtext(15*$scale+$x,250*$scale+$y,30*$scale, iconv('UTF-8', 'ISO-8859-2',trans('Payment for invoice No. $0', $invoice['t_number'])));
+ $pdf->addtext(15*$scale+$x,250*$scale+$y,30*$scale, iconv('UTF-8', 'ISO-8859-2',trans('Payment for invoice No. $a', $invoice['t_number'])));
}
function simple_fill_mip($x,$y,$scale)
@@ -80,9 +80,9 @@ function simple_fill_mip($x,$y,$scale)
$pdf->addtext(15*$scale+$x,240*$scale+$y,30*$scale, iconv('UTF-8', 'ISO-8859-2',$invoice['zip']." ".$invoice['city']));
$font_size=30;
- while ($pdf->getTextWidth($font_size*$scale,trans('Invoice No. $0', $invoice['t_number']))>135)
+ while ($pdf->getTextWidth($font_size*$scale,trans('Invoice No. $a', $invoice['t_number']))>135)
$font_size=$font_size-1;
- $pdf->addtext(15*$scale+$x,385*$scale+$y,$font_size*$scale,trans('Invoice No. $0', $invoice['t_number']));
+ $pdf->addtext(15*$scale+$x,385*$scale+$y,$font_size*$scale,trans('Invoice No. $a', $invoice['t_number']));
}
diff --git a/modules/transferforms2.php b/modules/transferforms2.php
index 650c8b24a8..a7458a0fa1 100644
--- a/modules/transferforms2.php
+++ b/modules/transferforms2.php
@@ -72,7 +72,7 @@ function main_form($x, $y, $data)
$y -= $lineh;
$pdf->addtext($x+220,$y,$font_size,sprintf('%.2f',$balance));
$y -= $lineh;
- $pdf->addtext($x,$y,$font_size,iconv('UTF-8', 'ISO-8859-2',trans('$0 dollars $1 cents',to_words(floor($balance)),to_words(round(($balance-floor($balance))*100)))));
+ $pdf->addtext($x,$y,$font_size,iconv('UTF-8', 'ISO-8859-2',trans('$a dollars $b cents',to_words(floor($balance)),to_words(round(($balance-floor($balance))*100)))));
$y -= $lineh;
$pdf->addtext($x,$y,$font_size,truncate(iconv('UTF-8', 'ISO-8859-2',$data['customername'])));
$y -= $lineh;
@@ -80,7 +80,7 @@ function main_form($x, $y, $data)
$y -= $lineh;
$pdf->addtext($x,$y,$font_size,iconv('UTF-8', 'ISO-8859-2',$_TITLE));
$y -= $lineh;
- $pdf->addtext($x,$y,$font_size,iconv('UTF-8', 'ISO-8859-2',trans('Customer ID: $0',sprintf('%04d',$data['id']))));
+ $pdf->addtext($x,$y,$font_size,iconv('UTF-8', 'ISO-8859-2',trans('Customer ID: $a',sprintf('%04d',$data['id']))));
}
$balance = $_POST['balance'] ? $_POST['balance'] : 0;
diff --git a/modules/useredit.php b/modules/useredit.php
index 1972f1fce3..be4e2e84ed 100644
--- a/modules/useredit.php
+++ b/modules/useredit.php
@@ -131,7 +131,7 @@
WHERE customergroupid = g.id AND userid = ?
ORDER BY name', 'id', array($userinfo['id']));
-$layout['pagetitle'] = trans('User Edit: $0', $userinfo['login']);
+$layout['pagetitle'] = trans('User Edit: $a', $userinfo['login']);
$SESSION->save('backto', $_SERVER['QUERY_STRING']);
diff --git a/modules/userinfo.php b/modules/userinfo.php
index 578fba0181..995e48ed07 100644
--- a/modules/userinfo.php
+++ b/modules/userinfo.php
@@ -43,7 +43,7 @@
$ntype[] = trans('sms');
$userinfo['ntype'] = implode(', ', $ntype);
-$layout['pagetitle'] = trans('User Info: $0', $userinfo['login']);
+$layout['pagetitle'] = trans('User Info: $a', $userinfo['login']);
$SESSION->save('backto', $_SERVER['QUERY_STRING']);
diff --git a/modules/userpasswd.php b/modules/userpasswd.php
index 5192abe0e9..8d8438b887 100644
--- a/modules/userpasswd.php
+++ b/modules/userpasswd.php
@@ -47,7 +47,7 @@
$passwd['id'] = $id;
- $layout['pagetitle'] = trans('Password Change for User $0', $DB->GetOne('SELECT name FROM users WHERE id = ?', array($id)));
+ $layout['pagetitle'] = trans('Password Change for User $a', $DB->GetOne('SELECT name FROM users WHERE id = ?', array($id)));
$SMARTY->assign('error', $error);
$SMARTY->assign('passwd', $passwd);
diff --git a/modules/users/actions/edit.php b/modules/users/actions/edit.php
index 99f28b01d8..ca7fb3b863 100644
--- a/modules/users/actions/edit.php
+++ b/modules/users/actions/edit.php
@@ -66,7 +66,7 @@
if(!isset($userinfo[$key]))
$userinfo[$key] = $value;
-$layout['pagetitle'] = trans('User Edit: $0', $userinfo['login']);
+$layout['pagetitle'] = trans('User Edit: $a', $userinfo['login']);
$SESSION->save('backto', $_SERVER['QUERY_STRING']);
diff --git a/modules/users/actions/info.php b/modules/users/actions/info.php
index 5f2477a843..62d69c72f1 100644
--- a/modules/users/actions/info.php
+++ b/modules/users/actions/info.php
@@ -31,7 +31,7 @@
$userinfo = $LMS->GetUserInfo($_GET['id']);
-$layout['pagetitle'] = trans('User Info: $0', $userinfo['login']);
+$layout['pagetitle'] = trans('User Info: $a', $userinfo['login']);
$SESSION->save('backto', $_SERVER['QUERY_STRING']);
diff --git a/modules/users/actions/passwd.php b/modules/users/actions/passwd.php
index 9f518e5723..a93466f630 100644
--- a/modules/users/actions/passwd.php
+++ b/modules/users/actions/passwd.php
@@ -49,7 +49,7 @@
$passwd['realname'] = $LMS->GetUserName($id);
$passwd['id'] = $id;
- $layout['pagetitle'] = trans('Password Change for User $0',$passwd['realname']);
+ $layout['pagetitle'] = trans('Password Change for User $a',$passwd['realname']);
$SMARTY->assign('error', $error);
$SMARTY->assign('passwd', $passwd);
}
diff --git a/modules/voipaccountdel.php b/modules/voipaccountdel.php
index 4a404c9013..7d7802f53c 100644
--- a/modules/voipaccountdel.php
+++ b/modules/voipaccountdel.php
@@ -27,7 +27,7 @@
$voipaccountid = intval($_GET['id']);
$voipaccountlogin = $LMS->GetVoipAccountLogin($voipaccountid);
-$layout['pagetitle'] = trans('Delete Voip Account $0', $voipaccountlogin);
+$layout['pagetitle'] = trans('Delete Voip Account $a', $voipaccountlogin);
if (!$LMS->VoipAccountExists($voipaccountid))
{
@@ -36,7 +36,7 @@
if($_GET['is_sure']!=1)
{
- $body = ''.trans('Are you sure, you want to remove voip account \'$0\' from database?', $voipaccountlogin).'
'; + $body = ''.trans('Are you sure, you want to remove voip account \'$a\' from database?', $voipaccountlogin).'
'; $body .= ''; }else{ $owner = $LMS->GetVoipAccountOwner($voipaccountid); @@ -46,7 +46,7 @@ else header('Location: ?m=customerinfo&id='.$owner); - $body = ''.trans('Voip account $0 was deleted', $voipaccountname).'
'; + $body = ''.trans('Voip account $a was deleted', $voipaccountname).'
'; } } diff --git a/modules/voipaccountedit.php b/modules/voipaccountedit.php index 6c9d85cdee..b995702d33 100644 --- a/modules/voipaccountedit.php +++ b/modules/voipaccountedit.php @@ -39,7 +39,7 @@ else $SESSION->save('backto', $_SERVER['QUERY_STRING']); -$layout['pagetitle'] = trans('Voip Account Edit: $0', $voipaccountinfo['login']); +$layout['pagetitle'] = trans('Voip Account Edit: $a', $voipaccountinfo['login']); if(isset($_POST['voipaccountedit'])) { diff --git a/modules/voipaccountinfo.php b/modules/voipaccountinfo.php index d186b0be95..05f0f8b2f4 100644 --- a/modules/voipaccountinfo.php +++ b/modules/voipaccountinfo.php @@ -50,7 +50,7 @@ if(!isset($_GET['ownerid'])) $SESSION->save('backto', $SESSION->get('backto').'&ownerid='.$customerid); -$layout['pagetitle'] = trans('Voip Account Info: $0', $voipaccountinfo['login']); +$layout['pagetitle'] = trans('Voip Account Info: $a', $voipaccountinfo['login']); $SMARTY->assign('voipaccountinfo',$voipaccountinfo); $SMARTY->display('voipaccountinfo.html'); diff --git a/templates/accountinfo.html b/templates/accountinfo.html index 0cd7f9e779..2506d8cee7 100644 --- a/templates/accountinfo.html +++ b/templates/accountinfo.html @@ -185,7 +185,7 @@
- {t 0=$account.aliases|@count}Account aliases ($0):{/t}
+ {t a=$account.aliases|@count}Account aliases ($a):{/t}
![[ {t}Delete assignment{/t} ]](img/eraser.gif "[ {t}Delete assignment{/t} ]")
- ![[ {t}Delete{/t} ]](img/delete.gif "[ {t}Delete{/t} ]")
+ {assign var=name value="`$alias.login`@`$alias.domain`"}
+
+
![[ {t}Edit{/t} ]](img/edit.gif "[ {t}Edit{/t} ]")
![[ {t}Info{/t} ]](img/info.gif "[ {t}Info{/t} ]")
![[ {t}Change password{/t} ]](img/pass.gif "[ {t}Change password{/t} ]")
-
+
{t}Destination:{/t} {if $listdata.order eq "dest"}
{$aliaslist[aliaslist].forwards|replace:",":"![\"\"](\"img/forward.gif\")
"}{/if}
+ {assign var=alias value="`$aliaslist[aliaslist].login`@`$aliaslist[aliaslist].domain`"}
+
{t 0=$listdata.total}Total: $0{/t}
+ {t a=$listdata.total}Total: $a{/t}
diff --git a/templates/balancelist.html b/templates/balancelist.html
index d5f85af0e1..dd19e4dcd3 100644
--- a/templates/balancelist.html
+++ b/templates/balancelist.html
@@ -169,13 +169,13 @@ ![[ {t}Invoice{/t} ]](img/print.gif)
+
{elseif $balancelist[balancelist].doctype==$smarty.const.DOC_CNOTE}
- ![[ {t}Credit note{/t} ]](img/printn.gif)
+
{elseif $balancelist[balancelist].doctype==$smarty.const.DOC_RECEIPT}
- ![[ {t}Cash receipt{/t} ]](img/printr.gif)
+
{elseif $balancelist[balancelist].doctype==$smarty.const.DOC_DNOTE}
- ![[ {t}Debit note{/t} ]](img/printd.gif)
+
{/if}
{/if}
diff --git a/templates/calendar_js.html b/templates/calendar_js.html
index ef1925f6cc..301d16f3a2 100644
--- a/templates/calendar_js.html
+++ b/templates/calendar_js.html
@@ -108,18 +108,18 @@
var arr_date = str_date.split('/');
- if (arr_date.length != 3) return cal_error ("{/literal}{t 0="'\" + str_date + \"'"}Invalid date format: $0.\nFormat accepted is 'YYYY/MM/DD hh:mm'.{/t}{literal}");
- if (!arr_date[0]) return cal_error ("{/literal}{t 0="'\" + str_date + \"'"}Invalid date format: $0.\nNo year value can be found.{/t}{literal}");
- if (!RE_NUM.exec(arr_date[0])) return cal_error ("{/literal}{t 0="'\" + arr_date[0] + \"'"}Invalid year value: $0.\nAllowed values are unsigned integers.{/t}{literal}");
- if (!arr_date[1]) return cal_error ("{/literal}{t 0="'\" + str_date + \"'"}Invalid date format: $0.\nNo month value can be found.{/t}{literal}");
- if (!RE_NUM.exec(arr_date[1])) return cal_error ("{/literal}{t 0="'\" + arr_date[1] + \"'"}Invalid month value: $0.\nAllowed values are unsigned integers.{/t}{literal}");
- if (!arr_date[2]) return cal_error ("{/literal}{t 0="'\" + str_date + \"'"}Invalid date format: $0.\nNo day of month value can be found.{/t}{literal}");
- if (!RE_NUM.exec(arr_date[2])) return cal_error ("{/literal}{t 0="'\" + arr_date[2] + \"'"}Invalid day of month value: $0.\nAllowed values are unsigned integers.{/t}{literal}");
+ if (arr_date.length != 3) return cal_error ("{/literal}{t a="'\" + str_date + \"'"}Invalid date format: $a.\nFormat accepted is 'YYYY/MM/DD hh:mm'.{/t}{literal}");
+ if (!arr_date[0]) return cal_error ("{/literal}{t a="'\" + str_date + \"'"}Invalid date format: $a.\nNo year value can be found.{/t}{literal}");
+ if (!RE_NUM.exec(arr_date[0])) return cal_error ("{/literal}{t a="'\" + arr_date[0] + \"'"}Invalid year value: $a.\nAllowed values are unsigned integers.{/t}{literal}");
+ if (!arr_date[1]) return cal_error ("{/literal}{t a="'\" + str_date + \"'"}Invalid date format: $a.\nNo month value can be found.{/t}{literal}");
+ if (!RE_NUM.exec(arr_date[1])) return cal_error ("{/literal}{t a="'\" + arr_date[1] + \"'"}Invalid month value: $a.\nAllowed values are unsigned integers.{/t}{literal}");
+ if (!arr_date[2]) return cal_error ("{/literal}{t a="'\" + str_date + \"'"}Invalid date format: $a.\nNo day of month value can be found.{/t}{literal}");
+ if (!RE_NUM.exec(arr_date[2])) return cal_error ("{/literal}{t a="'\" + arr_date[2] + \"'"}Invalid day of month value: $a.\nAllowed values are unsigned integers.{/t}{literal}");
var dt_date = new Date();
dt_date.setDate(1);
- if (arr_date[1] < 1 || arr_date[1] > 12) return cal_error ("{/literal}{t 0="'\" + arr_date[1] + \"'"}Invalid month value: $0.\nAllowed range is 01-12.{/t}{literal}");
+ if (arr_date[1] < 1 || arr_date[1] > 12) return cal_error ("{/literal}{t a="'\" + arr_date[1] + \"'"}Invalid month value: $a.\nAllowed range is 01-12.{/t}{literal}");
dt_date.setMonth(arr_date[1]-1);
if (arr_date[0] < 100) arr_date[0] = Number(arr_date[0]) + (arr_date[0] < NUM_CENTYEAR ? 2000 : 1900);
@@ -127,7 +127,7 @@
var dt_numdays = new Date(arr_date[0], arr_date[1], 0);
dt_date.setDate(arr_date[2]);
- if (dt_date.getMonth() != (arr_date[1]-1)) return cal_error ("{/literal}{t 0="'\" + arr_date[2] + \"'" 1="\"+dt_numdays.getDate()+\""}Invalid day of month value: $0.\nAllowed range is 01-$1.{/t}{literal}");
+ if (dt_date.getMonth() != (arr_date[1]-1)) return cal_error ("{/literal}{t a="'\" + arr_date[2] + \"'" b="\"+dt_numdays.getDate()+\""}Invalid day of month value: $a.\nAllowed range is 01-$b.{/t}{literal}");
return (dt_date)
}
@@ -141,14 +141,14 @@
if (!arr_time[0]) dt_date.setHours(0);
else if (RE_NUM.exec(arr_time[0]))
if (arr_time[0] < 24) dt_date.setHours(arr_time[0]);
- else return cal_error ("{/literal}{t 0="'\" + arr_time[0] + \"'"}Invalid hour value: $0.\nAllowed range is 00-23.{/t}{literal}");
- else return cal_error ("{/literal}{t 0="'\" + arr_time[0] + \"'"}Invalid hour value: $0.\nAllowed values are unsigned integers.{/t}{literal}");
+ else return cal_error ("{/literal}{t a="'\" + arr_time[0] + \"'"}Invalid hour value: $a.\nAllowed range is 00-23.{/t}{literal}");
+ else return cal_error ("{/literal}{t a="'\" + arr_time[0] + \"'"}Invalid hour value: $a.\nAllowed values are unsigned integers.{/t}{literal}");
if (!arr_time[1]) dt_date.setMinutes(0);
else if (RE_NUM.exec(arr_time[1]))
if (arr_time[1] < 60) dt_date.setMinutes(arr_time[1]);
- else return cal_error ("{/literal}{t 0="'\" + arr_time[1] + \"'"}Invalid minutes value: $0.\nAllowed range is 00-59.{/t}{literal}");
- else return cal_error ("{/literal}{t 0="'\" + arr_time[1] + \"'"}Invalid minutes value: $0.\nAllowed values are unsigned integers.{/t}{literal}");
+ else return cal_error ("{/literal}{t a="'\" + arr_time[1] + \"'"}Invalid minutes value: $a.\nAllowed range is 00-59.{/t}{literal}");
+ else return cal_error ("{/literal}{t a="'\" + arr_time[1] + \"'"}Invalid minutes value: $a.\nAllowed values are unsigned integers.{/t}{literal}");
dt_date.setMilliseconds(0);
return dt_date;
diff --git a/templates/cashimport.html b/templates/cashimport.html
index e36fef691c..6363bbfb7b 100644
--- a/templates/cashimport.html
+++ b/templates/cashimport.html
@@ -213,7 +213,7 @@ 
- {t}Packages:{/t} ({t 0=10}last $0 packages{/t})
+ {t}Packages:{/t} ({t a=10}last $a packages{/t})
![[ {t}Browse{/t} ]](img/view.gif "[ {t}Browse{/t} ]")
-
+
+
- {t}Delete{/t}
+ {t}Delete{/t}
{t}Cancel{/t} 
![[ {if $configlist[configlist].disabled}{t}Enable{/t}{else}{t}Disable{/t}{/if} ]](img/wait.gif "[ {if $configlist[configlist].disabled}{t}Enable{/t}{else}{t}Disable{/t}{/if} ]")
-
+
+
+
{elseif $balancelist.doctype[balancelist] == $smarty.const.DOC_CNOTE}
-
+
{elseif $balancelist.doctype[balancelist] == $smarty.const.DOC_RECEIPT}
-
+
{elseif $balancelist.doctype[balancelist] == $smarty.const.DOC_DNOTE}
-
+
{/if}
{/if}
@@ -227,7 +227,7 @@
+ {t}Clear Account{/t}
{/if}
- {t}Customer's Documents:{/t} ({t 0=$limit}last $0 documents{/t})
+ {t}Customer's Documents:{/t} ({t a=$limit}last $a documents{/t})
{t}Customer Timetable:{/t}
{if $limit}
- ({t 0=$limit}last $0 events{/t})
+ ({t a=$limit}last $a events{/t})
{/if}
{if $customerlist[customerlist].info} 
{/if} {$customerlist[customerlist].customername|escape}{if $customerlist[customerlist].info} {/if} {$customerlist[customerlist].customername|escape}
{$customerlist[customerlist].address}{if $customerlist[customerlist].city neq ""},{/if} {$customerlist[customerlist].zip} {$customerlist[customerlist].city}{if $customerlist[customerlist].country neq ""}, {t}{$customerlist[customerlist].country}{/t}{/if}
+
{/if}
![[ {t}Account{/t} ]](img/pay.gif "[ {t}Account{/t} ]")
+
{/if}
{if $customerlist[customerlist].account}
{if $customerlist[customerlist].status eq 3}
@@ -127,7 +127,7 @@ ![[ {t}Recover{/t} ]](img/recover.gif "[ {t}Recover{/t} ]")
{else}
-
+
{/if}
diff --git a/templates/customermessages.html b/templates/customermessages.html
index 56258ccd69..b8125b92f8 100644
--- a/templates/customermessages.html
+++ b/templates/customermessages.html
@@ -5,7 +5,7 @@
{t}Customer Messages:{/t}
{if $limit}
- ({t 0=$limit}last $0 messages{/t})
+ ({t a=$limit}last $a messages{/t})
{/if}
- {t 0=$customernodes|@count|default:"0"}Customer Nodes ($0):{/t}
+ {t a=$customernodes|@count|default:"0"}Customer Nodes ($a):{/t}
+
{else}
- 
+
{/if}
{else}
@@ -115,7 +115,7 @@
+
{/if}
![[ {if ! $customernodes[customernodes].access}{t}Connect{/t}{else}{t}Disconnect{/t}{/if} ]](img/{if ! $customernodes[customernodes].access}no{/if}access.gif "[ {if ! $customernodes[customernodes].access}{t}Connect{/t}{else}{t}Disconnect{/t}{/if} ]")
![[ {if ! $customernodes[customernodes].warning}{t}Enable notice{/t}{else}{t}Disable notice{/t}{/if} ]](img/warning{if ! $customernodes[customernodes].warning}off{else}on{/if}.gif "[ {if ! $customernodes[customernodes].warning}{t}Enable notice{/t}{else}{t}Disable notice{/t}{/if} ]")
-
+
diff --git a/templates/customersearchresults.html b/templates/customersearchresults.html
index 8445ff8827..511c4563f9 100644
--- a/templates/customersearchresults.html
+++ b/templates/customersearchresults.html
@@ -51,7 +51,7 @@ {if $customerlist[customerlist].info} {/if} {$customerlist[customerlist].customername}{if $customerlist[customerlist].deleted} ({t}deleted customer{/t}){/if}{if $customerlist[customerlist].info} {/if} {$customerlist[customerlist].customername}{if $customerlist[customerlist].deleted} ({t}deleted customer{/t}){/if} {$customerlist[customerlist].address}{if $customerlist[customerlist].city neq ""},{/if} {$customerlist[customerlist].zip} {$customerlist[customerlist].city}{if $customerlist[customerlist].country neq ""}, {t}{$customerlist[customerlist].country}{/t}{/if}
+
{/if}
+
{/if}
{if $customerlist[customerlist].account}
{if $customerlist[customerlist].status eq 3}
@@ -114,7 +114,7 @@
{else}
-
+
{/if}
diff --git a/templates/customervoipaccountsbox.html b/templates/customervoipaccountsbox.html
index 40936236bc..48b49dece1 100644
--- a/templates/customervoipaccountsbox.html
+++ b/templates/customervoipaccountsbox.html
@@ -3,7 +3,7 @@
- {t 0=$customervoipaccounts.total|default:"0"}Voip Accounts ($0):{/t}
+ {t a=$customervoipaccounts.total|default:"0"}Voip Accounts ($a):{/t}
![[ {t}Clone{/t} ]](img/clone.gif "[ {t}Clone{/t} ]")
-
+
-
+
-
+
{if ! $invoice.closed}
-
+
{/if}
{/if}
{if $invoice.type == $smarty.const.DOC_CNOTE && !$invoice.closed}
-
+
{/if}
{if $invoice.type == $smarty.const.DOC_INVOICE}
diff --git a/templates/invoicereport-ext.html b/templates/invoicereport-ext.html
index 7548c06609..6164093520 100644
--- a/templates/invoicereport-ext.html
+++ b/templates/invoicereport-ext.html
@@ -4,12 +4,12 @@
| - {$layout.pagetitle}{if $pagescount} ({t 0=$item 1=$pagescount}Page $0 from $1{/t}){/if} + {$layout.pagetitle}{if $pagescount} ({t a=$item b=$pagescount}Page $a from $b{/t}){/if} |
LMS {$layout.lmsv} @ {$layout.hostname} {$smarty.now|date_format:"%A, %x"} - {t 0=$layout.logname}Created by: $0{/t} + {t a=$layout.logname}Created by: $a{/t} |
- {t 0=$netdevlist|@count}Connected devices ($0):{/t}
+ {t a=$netdevlist|@count}Connected devices ($a):{/t}
- {t 0=$netdevips|@count}IP addresses ($0):{/t}
+ {t a=$netdevips|@count}IP addresses ($a):{/t}
-
+
- {t}Delete{/t}
+ {t}Delete{/t}
+
- {t 0=$netcomplist|@count}Connected nodes ($0):{/t}
+ {t a=$netcomplist|@count}Connected nodes ($a):{/t}
{$netcomplist[netcomplist].name}
{$netcomplist[netcomplist].owner}
+ {$netcomplist[netcomplist].owner}
+
{t}Network size:{/t}
- {t}Remove{/t}
+ {t}Remove{/t}
{t}Cancel{/t}
{else}
{t}Edit{/t}
- {t}Remove{/t}
+ {t}Remove{/t}
{/if}
@@ -178,7 +178,7 @@ 
{t}DHCP range:{/t}![[ {t}Enable{/t} ]](img/noaccess.gif "[ {t}Enable{/t} ]")
{else}![[ {t}Disable{/t} ]](img/access.gif "[ {t}Disable{/t} ]")
{/if}
-
+
- {t}Delete{/t}
+ {t}Delete{/t}
{t}MAC address:{/t}{if $listdata.order eq "mac"}
{/if}
{$nodelist[nodelist].name} {if ! $nodelist[nodelist].access}{/if}{$nodelist[nodelist].owner|truncate:40:"...":true|replace:" ":" "}{if ! $nodelist[nodelist].access}{/if}
+ {if ! $nodelist[nodelist].access}{/if}{$nodelist[nodelist].owner|truncate:40:"...":true|replace:" ":" "}{if ! $nodelist[nodelist].access}{/if}
({$nodelist[nodelist].id|string_format:"%04d"})![[ {if ! $nodelist[nodelist].access}{t}Connect{/t}{else}{t}Disconnect{/t}{/if} ]](img/{if ! $nodelist[nodelist].access}no{/if}access.gif "[ {if ! $nodelist[nodelist].access}{t}Connect{/t}{else}{t}Disconnect{/t}{/if} ]")
![[ {if ! $nodelist[nodelist].warning}{t}Enable notice{/t}{else}{t}Disable notice{/t}{/if} ]](img/warning{if ! $nodelist[nodelist].warning}off{else}on{/if}.gif "[ {if ! $nodelist[nodelist].warning}{t}Enable notice{/t}{else}{t}Disable notice{/t}{/if} ]")
-
+
+
{else}
-
+
{/if}
{else}
diff --git a/templates/nodesearchresults.html b/templates/nodesearchresults.html
index 92491fc191..a9c4412d92 100644
--- a/templates/nodesearchresults.html
+++ b/templates/nodesearchresults.html
@@ -16,7 +16,7 @@ {t}MAC address:{/t} {if $listdata.order eq "mac"}
{/if}
{$nodelist[nodelist].name} {if ! $nodelist[nodelist].access}{/if}{$nodelist[nodelist].owner|truncate:60:" ..."|replace:" ":" "}{if ! $nodelist[nodelist].access}{/if}
+ {if ! $nodelist[nodelist].access}{/if}{$nodelist[nodelist].owner|truncate:60:" ..."|replace:" ":" "}{if ! $nodelist[nodelist].access}{/if}
({$nodelist[nodelist].id|string_format:"%04d"})
-
+
+
{/if}
diff --git a/templates/numberplanlist.html b/templates/numberplanlist.html
index 54f1070c9a..2da36c24a3 100644
--- a/templates/numberplanlist.html
+++ b/templates/numberplanlist.html
@@ -46,7 +46,7 @@
+
|
- {$layout.pagetitle}{if $pagescount} ({t 0=$item 1=$pagescount}Page $0 from $1{/t}){/if} + {$layout.pagetitle}{if $pagescount} ({t a=$item b=$pagescount}Page $a from $b{/t}){/if} {if $layout.username} {$layout.username}{/if} {if $layout.registry} {$layout.registry}{/if} {if $layout.group} {$layout.group}{/if} @@ -13,7 +13,7 @@ |
LMS {$layout.lmsv} @ {$layout.hostname} {$smarty.now|date_format:"%A, %x"} - {t 0=$layout.logname}Created by: $0{/t} + {t a=$layout.logname}Created by: $a{/t} |
{else}{/if}
-
+
- {t 0=$schema.tariffs|@count}Schema's Tariffs ($0):{/t}
+ {t a=$schema.tariffs|@count}Schema's Tariffs ($a):{/t}
- {t 0=$promotion.schemas|@count}Promotion's Schemas ($0):{/t}
+ {t a=$promotion.schemas|@count}Promotion's Schemas ($a):{/t}
{else}{/if}
-
+
- {t 0=$promotion.tariffs|@count}Promotion's Tariffs ($0):{/t}
+ {t a=$promotion.tariffs|@count}Promotion's Tariffs ($a):{/t}
{/if}
-
+
diff --git a/templates/recordlist.html b/templates/recordlist.html
index a843eff0ee..ecc76746b5 100644
--- a/templates/recordlist.html
+++ b/templates/recordlist.html
@@ -7,7 +7,7 @@
{if $recordslist[recordslist].type != "SOA"}
-
+
{/if}
- {t}Delete{/t}
+ {t}Delete{/t}
{t}Cancel{/t}
{t}Edit{/t}
- {t}Delete{/t}
+ {t}Delete{/t}
-
+
- {t}Delete{/t}
+ {t}Delete{/t}
{t}Cancel{/t}
{t}Edit{/t}
- {t}Delete{/t}
+ {t}Delete{/t}
-
+
+
{elseif $queue[ticket].state == 1}
- 
+
{elseif $queue[ticket].state == 2}
- 
+
{elseif $queue[ticket].state == 3}
- 
+
{/if}
-
+
+
{elseif $queue[ticket].state == 1}
-
+
{elseif $queue[ticket].state == 2}
-
+
{elseif $queue[ticket].state == 3}
-
+
{/if}
-
+
- {t 0=$ticket.ticketid|string_format:"%06d"}Ticket No. $0{/t}
+ {t a=$ticket.ticketid|string_format:"%06d"}Ticket No. $a{/t}
- {t 0=$ticket.ticketid|string_format:"%06d"}Ticket No. $0{/t}
+ {t a=$ticket.ticketid|string_format:"%06d"}Ticket No. $a{/t}
{/if}
- {t}Delete{/t}
+ {t}Delete{/t}
{t}Edit{/t}
{t}Print{/t}
diff --git a/templates/rtticketinfoshort.html b/templates/rtticketinfoshort.html
index d2933eb5a2..5278e0ed86 100644
--- a/templates/rtticketinfoshort.html
+++ b/templates/rtticketinfoshort.html
@@ -14,7 +14,7 @@
- {t 0=$ticket.id|string_format:"%06d"}Ticket No. $0{/t}
+ {t a=$ticket.id|string_format:"%06d"}Ticket No. $a{/t}
- {t 0=$ticket.ticketid|string_format:"%06d"}Ticket No. $0{/t}+{t a=$ticket.ticketid|string_format:"%06d"}Ticket No. $a{/t} |
|
|
-
+
|
|
diff --git a/templates/taxratelist.html b/templates/taxratelist.html
index 0c9531306b..5659ef721e 100644
--- a/templates/taxratelist.html
+++ b/templates/taxratelist.html
@@ -48,7 +48,7 @@
-
+
|
diff --git a/templates/traffic.html b/templates/traffic.html
index 877398f5ce..cad79e6e77 100644
--- a/templates/traffic.html
+++ b/templates/traffic.html
@@ -22,7 +22,7 @@
- 
+
{$download.data[download]|string_format:"%.2f"} {$download.unit[download]} ({$download.avg[download]|string_format:"%d"} kbit/s)
|
@@ -47,7 +47,7 @@
- 
+
{$upload.data[upload]|string_format:"%.2f"} {$upload.unit[upload]} ({$upload.avg[upload]|string_format:"%d"} kbit/s)
|
@@ -61,7 +61,7 @@
| {t 0= $smarty.section.download.index_next}Rows: $0{/t} | |
| {t a=$smarty.section.download.index_next}Rows: $a{/t} | |
- {t}Delete{/t}
+ {t}Delete{/t}
{$voipaccountlist[voipaccountlist].login} {$voipaccountlist[voipaccountlist].owner|truncate:40:"...":true|replace:" ":" "} ({$voipaccountlist[voipaccountlist].ownerid|string_format:"%04d"})
+ {$voipaccountlist[voipaccountlist].owner|truncate:40:"...":true|replace:" ":" "} ({$voipaccountlist[voipaccountlist].ownerid|string_format:"%04d"})
![[ {if ! $voipaccountlist[voipaccountlist].access}{t}Connect{/t}{else}{t}Disconnect{/t}{/if} ]](img/{if ! $voipaccountlist[voipaccountlist].access}no{/if}access.gif "[ {if ! $voipaccountlist[voipaccountlist].access}{t}Connect{/t}{else}{t}Disconnect{/t}{/if} ]")
-
+
{$voipaccountlist[voipaccountlist].login} {$voipaccountlist[voipaccountlist].owner|truncate:60:" ..."|replace:" ":" "} ({$voipaccountlist[voipaccountlist].ownerid|string_format:"%04d"})
+ {$voipaccountlist[voipaccountlist].owner|truncate:60:" ..."|replace:" ":" "} ({$voipaccountlist[voipaccountlist].ownerid|string_format:"%04d"})
+