View | Details | Raw Unified | Return to bug 929
Collapse All | Expand All

(-)a/C4/Dates.pm (+6 lines)
Lines 41-46 sub _prefformat { Link Here
41
    return $prefformat;
41
    return $prefformat;
42
}
42
}
43
43
44
sub reset_prefformat {  # subroutine to clear the prefformat, called when we change it
45
    if (defined $prefformat){
46
	$prefformat = C4::Context->preference('dateformat');
47
    }
48
}
49
44
our %format_map = (
50
our %format_map = (
45
    iso    => 'yyyy-mm-dd',           # plus " HH:MM:SS"
51
    iso    => 'yyyy-mm-dd',           # plus " HH:MM:SS"
46
    metric => 'dd/mm/yyyy',           # plus " HH:MM:SS"
52
    metric => 'dd/mm/yyyy',           # plus " HH:MM:SS"
(-)a/t/Koha_template_plugin_KohaDates.t (-1 / +42 lines)
Line 0 Link Here
0
- 
1
#!/usr/bin/perl
2
#
3
4
use strict;
5
use warnings;
6
use C4::Context;
7
use C4::Dates;
8
use Test::More tests => 5;
9
10
BEGIN {
11
        use_ok('Koha::Template::Plugin::KohaDates');
12
}
13
14
my $date = "1973-05-21";
15
my $context = C4::Context->new();
16
my $dateobj = C4::Dates->new();
17
18
my $filter = Koha::Template::Plugin::KohaDates->new();
19
ok ($filter, "new()");
20
21
22
$context->set_preference( "dateformat", 'iso' );
23
$context->clear_syspref_cache();
24
$dateobj->reset_prefformat;
25
26
my $filtered_date = $filter->filter($date);
27
is ($filtered_date,$date, "iso conversion") or diag ("iso conversion fails");
28
29
#$filter = Koha::Template::Plugin::KohaDates->new();
30
$context->set_preference( "dateformat", 'us' );
31
$context->clear_syspref_cache();
32
$dateobj->reset_prefformat;
33
34
$filtered_date = $filter->filter($date);
35
is ($filtered_date,'05/21/1973', "us conversion") or diag ("us conversion fails $filtered_date");
36
37
$context->set_preference( "dateformat", 'metric' );
38
$context->clear_syspref_cache();
39
$dateobj->reset_prefformat;
40
41
$filtered_date = $filter->filter($date);
42
is ($filtered_date,'21/05/1973', "metric conversion") or diag ("metric conversion fails $filtered_date");

Return to bug 929