diff options
| -rwxr-xr-x | bin/aa.pl | 2 | ||||
| -rwxr-xr-x | bin/admin.pl | 6 | ||||
| -rwxr-xr-x | bin/arap.pl | 14 | ||||
| -rwxr-xr-x | bin/io.pl | 10 | ||||
| -rwxr-xr-x | bin/ir.pl | 2 | ||||
| -rwxr-xr-x | bin/oe.pl | 8 |
6 files changed, 19 insertions, 23 deletions
@@ -1317,7 +1317,7 @@ sub transactions { $callback .= "&transdateto=$form->{transdateto}"; $href .= "&transdateto=$form->{transdateto}"; $option .= "\n<br>" if ($option); - $option .= $locale->text('To')." ".$locale->date(\%myconfig, $form->{transdateto}, 1); + $option .= $locale->text('To [_1]', $locale->date(\%myconfig, $form->{transdateto}, 1)); } if ($form->{open}) { $callback .= "&open=$form->{open}"; diff --git a/bin/admin.pl b/bin/admin.pl index 2e208ca7..74f3f6cf 100755 --- a/bin/admin.pl +++ b/bin/admin.pl @@ -132,7 +132,7 @@ sub setup_initial_password { <p><button type="submit" class="submit" name="action" value="change_password">|.$locale->text('Change Password').qq|</button></p> </form> - <a href="http://www.ledgersmb.org/">LedgerSMB |.$locale->text('website').qq|</a> + <a href="http://www.ledgersmb.org/">|.$locale->text('LedgerSMB website').qq|</a> </div> </body> </html> @@ -175,7 +175,7 @@ sub adminlogin { >|.$locale->text("Application Login").qq|</a></p> - <a href="http://www.ledgersmb.org/">LedgerSMB |.$locale->text('website').qq|</a> + <a href="http://www.ledgersmb.org/">|.$locale->text('LedgerSMB website').qq|</a> </div> </body> </html> @@ -880,7 +880,7 @@ sub delete { $form->{templates} = ($form->{templates}) ? "${LedgerSMB::Sysconfig::templates}/$form->{templates}" : "$templates/$form->{login}"; - $form->error("${LedgerSMB::Sysconfig::memberfile} ".$locale->text('locked!')) if (-f ${memberfile}.LCK); + $form->error($locale->text("[_1] locked!", ${LedgerSMB::Sysconfig::memberfile}) if (-f ${memberfile}.LCK); open(FH, ">${memberfile}.LCK") or $form->error("${memberfile}.LCK : $!"); close(FH); diff --git a/bin/arap.pl b/bin/arap.pl index 7da220d7..6ddd6e7e 100755 --- a/bin/arap.pl +++ b/bin/arap.pl @@ -711,7 +711,7 @@ sub schedule { |; - $title = $locale->text('Recurring Transaction') ." ". $locale->text('for') ." $description"; + $title = $locale->text('Recurring Transaction for [_1]', $description); $form->header; @@ -906,15 +906,15 @@ sub reprint { if ($form->{media} eq 'email') { # add email message $now = scalar localtime; - $cc = $locale->text('Cc').qq|: $form->{cc}\n| if $form->{cc}; - $bcc = $locale->text('Bcc').qq|: $form->{bcc}\n| if $form->{bcc}; + $cc = $locale->text('Cc: [_1]', $form->{cc}).qq|\n| if $form->{cc}; + $bcc = $locale->text('Bcc: [_1]', $form->{bcc}).qq|\n| if $form->{bcc}; $form->{intnotes} .= qq|\n\n| if $form->{intnotes}; $form->{intnotes} .= qq|[email]\n| - .$locale->text('Date').qq|: $now\n| - .$locale->text('To').qq|: $form->{email}\n${cc}${bcc}| - .$locale->text('Subject').qq|: $form->{subject}\n\n| - .$locale->text('Message').qq|: |; + .$locale->text('Date: [_1]', $now).qq|\n| + .$locale->text('To: [_1]\n[_2][_3]', $form->{email}, ${cc}, ${bcc}) + .$locale->text('Subject: [_1]', $form->{subject}).qq|\n\n| + .$locale->text('Message: '); $form->{intnotes} .= ($form->{message}) ? $form->{message} : $locale->text('sent'); @@ -1468,15 +1468,15 @@ sub print_form { } $now = scalar localtime; - $cc = $locale->text('Cc').qq|: $form->{cc}\n| if $form->{cc}; - $bcc = $locale->text('Bcc').qq|: $form->{bcc}\n| if $form->{bcc}; + $cc = $locale->text('Cc: [_1]', $form->{cc}).qq|\n| if $form->{cc}; + $bcc = $locale->text('Bcc: [_1]', $form->{bcc}).qq|\n| if $form->{bcc}; if (defined %$old_form) { $old_form->{intnotes} = qq|$old_form->{intnotes}\n\n| if $old_form->{intnotes}; $old_form->{intnotes} .= qq|[email]\n| - .$locale->text('Date').qq|: $now\n| - .$locale->text('To').qq|: $form->{email}\n${cc}${bcc}| - .$locale->text('Subject').qq|: $form->{subject}\n|; + .$locale->text('Date: [_1]', $now).qq|\n| + .$locale->text('To: [_1]\n[_2][_3]', $form->{email}, ${cc}, ${bcc}) + .$locale->text('Subject: [_1]', $form->{subject}).qq|\n|; $old_form->{intnotes} .= qq|\n|.$locale->text('Message').qq|: |; $old_form->{intnotes} .= ($form->{message}) ? $form->{message} : $locale->text('sent'); @@ -883,7 +883,7 @@ sub post { ($form->{AP_paid}) = split /--/, $form->{AP_paid}; if (IR->post_invoice(\%myconfig, \%$form)) { - $form->redirect($locale->text('Invoice')." $form->{invnumber} ".$locale->text('posted!')); + $form->redirect($locale->text('Invoice [_1] posted!', $form->{invnumber})); } else { $form->error($locale->text('Cannot post invoice!')); } @@ -1367,7 +1367,7 @@ sub transactions { $quotation = $locale->text('RFQ'); if ($myconfig{acs} !~ /Quotations--Quotations/) { - $button{'Quotations--RFQ'}{code} = qq|<button class="submit" type="submit" name="action" value="rfq_">|.$locale->text('RFQ ').qq|"</button> |; + $button{'Quotations--RFQ'}{code} = qq|<button class="submit" type="submit" name="action" value="add">|.$locale->text('RFQ').qq|"</button> |; $button{'Quotations--RFQ'}{order} = $i++; } @@ -1417,7 +1417,7 @@ sub transactions { $quotation = $locale->text('Quotation'); if ($myconfig{acs} !~ /Quotations--Quotations/) { - $button{'Quotations--Quotation'}{code} = qq|<button class="submit" type="submit" name="action" value="quotation_">|.$locale->text('Quotation ').qq|</button> |; + $button{'Quotations--Quotation'}{code} = qq|<button class="submit" type="submit" name="action" value="add">|.$locale->text('Quotation').qq|</button> |; $button{'Quotations--Quotation'}{order} = $i++; } @@ -2740,10 +2740,6 @@ sub transfer { } -sub rfq_ { &add }; -sub quotation_ { &add }; - - sub generate_purchase_orders { for (1 .. $form->{rowcount}) { |