projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proper use of date_format config for international date formats, RT#7009
[freeside.git]
/
httemplate
/
misc
/
cancel_pkg.html
diff --git
a/httemplate/misc/cancel_pkg.html
b/httemplate/misc/cancel_pkg.html
index
607ce13
..
67d2847
100755
(executable)
--- a/
httemplate/misc/cancel_pkg.html
+++ b/
httemplate/misc/cancel_pkg.html
@@
-31,7
+31,7
@@
<SCRIPT TYPE="text/javascript">
Calendar.setup({
inputField: "expire_date",
<SCRIPT TYPE="text/javascript">
Calendar.setup({
inputField: "expire_date",
- ifFormat: "
%m/%d/%Y
",
+ ifFormat: "
<% $date_format %>
",
button: "expire_button",
align: "BR"
});
button: "expire_button",
align: "BR"
});
@@
-58,7
+58,10
@@
<%init>
<%init>
-my $date = time2str("%m/%d/%Y", time);
+my %conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+my $date = time2str($date_format, time);
my($pkgnum, $reasonnum);
if ( $cgi->param('error') ) {
my($pkgnum, $reasonnum);
if ( $cgi->param('error') ) {