Attachment #27069 for bug #12072

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

Lines 54-59 sub reset_prefformat { # subroutine to clear the prefformat, called when we cha Link Here

(-)a/C4/Dates.pm (-1 / +4 lines)
54	our %format_map = (	54	our %format_map = (
55	iso => 'yyyy-mm-dd', # plus " HH:MM:SS"	55	iso => 'yyyy-mm-dd', # plus " HH:MM:SS"
56	metric => 'dd/mm/yyyy', # plus " HH:MM:SS"	56	metric => 'dd/mm/yyyy', # plus " HH:MM:SS"
		57	dol => 'dd.mm.yyyy',
57	us => 'mm/dd/yyyy', # plus " HH:MM:SS"	58	us => 'mm/dd/yyyy', # plus " HH:MM:SS"
58	sql => 'yyyymmdd HHMMSS',	59	sql => 'yyyymmdd HHMMSS',
59	rfc822 => 'a, dd b y HH:MM:SS z ',	60	rfc822 => 'a, dd b y HH:MM:SS z ',
Lines 61-66 our %format_map = ( Link Here
61	our %posix_map = (	62	our %posix_map = (
62	iso => '%Y-%m-%d', # or %F, "Full Date"	63	iso => '%Y-%m-%d', # or %F, "Full Date"
63	metric => '%d/%m/%Y',	64	metric => '%d/%m/%Y',
		65	dol => '%d.%m.%Y',
64	us => '%m/%d/%Y',	66	us => '%m/%d/%Y',
65	sql => '%Y%m%d %H%M%S',	67	sql => '%Y%m%d %H%M%S',
66	rfc822 => '%a, %d %b %Y %H:%M:%S %z',	68	rfc822 => '%a, %d %b %Y %H:%M:%S %z',
Lines 70-75 our %dmy_subs = ( # strings to eval (after using regular ex Link Here
70	# make arrays for POSIX::strftime()	72	# make arrays for POSIX::strftime()
71	iso => '[(($6\|\|0),($5\|\|0),($4\|\|0),$3, $2 - 1, $1 - 1900)]',	73	iso => '[(($6\|\|0),($5\|\|0),($4\|\|0),$3, $2 - 1, $1 - 1900)]',
72	metric => '[(($6\|\|0),($5\|\|0),($4\|\|0),$1, $2 - 1, $3 - 1900)]',	74	metric => '[(($6\|\|0),($5\|\|0),($4\|\|0),$1, $2 - 1, $3 - 1900)]',
		75	dol => '[(($6\|\|0),($5\|\|0),($4\|\|0),$1, $2 - 1, $3 - 1900)]',
73	us => '[(($6\|\|0),($5\|\|0),($4\|\|0),$2, $1 - 1, $3 - 1900)]',	76	us => '[(($6\|\|0),($5\|\|0),($4\|\|0),$2, $1 - 1, $3 - 1900)]',
74	sql => '[(($6\|\|0),($5\|\|0),($4\|\|0),$3, $2 - 1, $1 - 1900)]',	77	sql => '[(($6\|\|0),($5\|\|0),($4\|\|0),$3, $2 - 1, $1 - 1900)]',
75	rfc822 => '[($7, $6, $5, $2, $3, $4 - 1900, $8)]',	78	rfc822 => '[($7, $6, $5, $2, $3, $4 - 1900, $8)]',
Lines 81-87 our @days = qw(Sun Mon Tue Wed Thu Fri Sat); Link Here
81		84
82	sub regexp ($;$) {	85	sub regexp ($;$) {
83	my $self = shift;	86	my $self = shift;
84	my $delim = qr/:?\:\|\/\|-/; # "non memory" cluster: no backreference	87	my $delim = qr/:?\:\|\/\|-\|\./; # "non memory" cluster: no backreference
85	my $format = (@_) ? _recognize_format(shift) : ( $self->{'dateformat'} \|\| _prefformat() );	88	my $format = (@_) ? _recognize_format(shift) : ( $self->{'dateformat'} \|\| _prefformat() );
86		89
87	# Extra layer of checking $self->{'dateformat'}.	90	# Extra layer of checking $self->{'dateformat'}.

Lines 68-73 sub dt_from_string { Link Here

(-)a/Koha/DateUtils.pm (+10 lines)
68	$date_string =~ s#-#/#g;	68	$date_string =~ s#-#/#g;
69	$date_string =~ s/^00/01/; # system allows the 0th of the month	69	$date_string =~ s/^00/01/; # system allows the 0th of the month
70	$date_string =~ s#^(\d{1,2})/(\d{1,2})#$2/$1#;	70	$date_string =~ s#^(\d{1,2})/(\d{1,2})#$2/$1#;
		71	}
		72	elsif ( $date_format eq 'dol' ) {
		73	$date_string =~ s#\.#/#g;
		74	$date_string =~ s/^00/01/; # system allows the 0th of the month
		75	$date_string =~ s#^(\d{1,2})/(\d{1,2})#$2/$1#;
71	} else {	76	} else {
72	if ( $date_format eq 'iso' ) {	77	if ( $date_format eq 'iso' ) {
73	$date_string =~ s/-00/-01/;	78	$date_string =~ s/-00/-01/;
Lines 140-145 sub output_pref { Link Here
140	? $dt->strftime("%d/%m/%Y")	145	? $dt->strftime("%d/%m/%Y")
141	: $dt->strftime("%d/%m/%Y $time");	146	: $dt->strftime("%d/%m/%Y $time");
142	}	147	}
		148	elsif ( $pref =~ m/^dol/ ) {
		149	return $dateonly
		150	? $dt->strftime("%d.%m.%Y")
		151	: $dt->strftime("%d.%m.%Y $time");
		152	}
143	elsif ( $pref =~ m/^us/ ) {	153	elsif ( $pref =~ m/^us/ ) {
144		154
145	return $dateonly	155	return $dateonly

Lines 83-89 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
83	('COinSinOPACResults','1','','If ON, use COinS in OPAC search results page. NOTE: this can slow down search response time significantly','YesNo'),	83	('COinSinOPACResults','1','','If ON, use COinS in OPAC search results page. NOTE: this can slow down search response time significantly','YesNo'),
84	('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'),	84	('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'),
85	('CurrencyFormat','US','US\|FR','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\' in \'FR\' or \'360,000.00\' in \'US\'.','Choice'),	85	('CurrencyFormat','US','US\|FR','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\' in \'FR\' or \'360,000.00\' in \'US\'.','Choice'),
86	('dateformat','us','metric\|us\|iso','Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy-mm-dd)','Choice'),	86	('dateformat','us','metric\|us\|iso\|dol','Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy-mm-dd, Dot on the line dd.mm.yyyy)','Choice'),
87	('DebugLevel','2','0\|1\|2','Define the level of debugging information sent to the browser when errors are encountered (set to 0 in production). 0=none, 1=some, 2=most','Choice'),	87	('DebugLevel','2','0\|1\|2','Define the level of debugging information sent to the browser when errors are encountered (set to 0 in production). 0=none, 1=some, 2=most','Choice'),
88	('decreaseLoanHighHolds',NULL,'','Decreases the loan period for items with number of holds above the threshold specified in decreaseLoanHighHoldsValue','YesNo'),	88	('decreaseLoanHighHolds',NULL,'','Decreases the loan period for items with number of holds above the threshold specified in decreaseLoanHighHoldsValue','YesNo'),
89	('decreaseLoanHighHoldsDuration',NULL,'','Specifies a number of days that a loan is reduced to when used in conjunction with decreaseLoanHighHolds','Integer'),	89	('decreaseLoanHighHoldsDuration',NULL,'','Specifies a number of days that a loan is reduced to when used in conjunction with decreaseLoanHighHolds','Integer'),

Lines 8106-8111 if(CheckVersion($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+9 lines)
8106	SetVersion($DBversion);	8106	SetVersion($DBversion);
8107	}	8107	}
8108		8108
		8109	$DBversion = "3.15.00.XXX";
		8110	if(CheckVersion($DBversion)) {
		8111	$dbh->do(q{
		8112	UPDATE systempreferences SET options = 'metric\|us\|iso\|dol', explanation = 'Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy-mm-dd, Dot on the line dd.mm.yyyy)' WHERE variable = 'dateformat'
		8113	});
		8114	print "Upgrade to $DBversion done (Bug 12072 - New dateformat dd.mm.yyyy)\n";
		8115	SetVersion($DBversion);
		8116	}
		8117
8109	=head1 FUNCTIONS	8118	=head1 FUNCTIONS
8110		8119
8111	=head2 TableExists($table)	8120	=head2 TableExists($table)




if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}

function Date_from_syspref(dstring) {
        var dateX = dstring.split(/[-/\.]/);
        if (debug > 1 && sentmsg < 1) {sentmsg++; alert("Date_from_syspref(" + dstring + ") splits to:\n" + dateX.join("\n"));}
        if (dformat === "iso") {
                return new Date(dateX[0], (dateX[1] - 1), dateX[2]);  // YYYY-MM-DD to (YYYY,m(0-11),d)
        } else if (dformat === "us") {
                return new Date(dateX[2], (dateX[0] - 1), dateX[1]);  // MM/DD/YYYY to (YYYY,m(0-11),d)
        } else if (dformat === "metric" || dformat === "dol") {
                return new Date(dateX[2], (dateX[1] - 1), dateX[0]);  // DD/MM/YYYY or DD.MM.YYYY to (YYYY,m(0-11),d)
        } else {
                if (debug > 0) {alert("KOHA ERROR - Unrecognized date format: " +dformat);}
                return 0;

        dayNamesShort: [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat")],
        dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],
        weekHeader: _("Wk"),
        dateFormat: "[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSIF ( dateformat == "dol" ) %]dd.mm.yy[% ELSE %]yy-mm-dd[% END %]",
        firstDay: [% CalendarFirstDayOfWeek %],
        isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
        showMonthAfterYear: false,

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc (-1 / +1 lines)

Line 1 Link Here

[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSE %](YYYY-MM-DD)[% END %]

[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSIF ( dateformat == "dol" ) %](DD.MM.YYYY)[% ELSE %](YYYY-MM-DD)[% END %]

Lines 33-38 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (+2 lines)
33	var MSG_DATE_FORMAT = _("Dates of birth should be entered in the format 'YYYY-MM-DD'");	33	var MSG_DATE_FORMAT = _("Dates of birth should be entered in the format 'YYYY-MM-DD'");
34	[% ELSIF dateformat == 'metric' %]	34	[% ELSIF dateformat == 'metric' %]
35	var MSG_DATE_FORMAT = _("Dates of birth should be entered in the format 'DD/MM/YYYY'");	35	var MSG_DATE_FORMAT = _("Dates of birth should be entered in the format 'DD/MM/YYYY'");
		36	[% ELSIF dateformat == 'dol' %]
		37	var MSG_DATE_FORMAT = _("Dates of birth should be entered in the format 'DD.MM.YYYY'");
36	[% END %]	38	[% END %]
37	$('#searchmember').attr("title",MSG_DATE_FORMAT).tooltip('show');	39	$('#searchmember').attr("title",MSG_DATE_FORMAT).tooltip('show');
38	} else {	40	} else {

Lines 6-11 I18N/L10N: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref (+1 lines)
6	choices:	6	choices:
7	us: mm/dd/yyyy	7	us: mm/dd/yyyy
8	metric: dd/mm/yyyy	8	metric: dd/mm/yyyy
		9	dol: dd.mm.yyyy
9	iso: yyyy-mm-dd	10	iso: yyyy-mm-dd
10	- .	11	- .
11	-	12	-

Lines 37-43 var NO_UPLOAD_PENDING_MESSAGE = _("You do not have any pending transactions in t Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt (-1 / +1 lines)
37		37
38	var start;	38	var start;
39		39
40	var dateformat = '[% IF ( dateformat_us ) %]mm/dd/yy[% ELSIF ( dateformat_metric ) %]dd/mm/yy[% ELSE %]yy-mm-dd[% END %]';	40	var dateformat = '[% IF ( dateformat_us ) %]mm/dd/yy[% ELSIF ( dateformat_metric ) %]dd/mm/yy[% ELSIF ( dateformat_dol ) %]dd.mm.yy[% ELSE %]yy-mm-dd[% END %]';
41		41
42	function checkin(barcode, item, error) {	42	function checkin(barcode, item, error) {
43	var alerts = checkAlerts(barcode, item);	43	var alerts = checkAlerts(barcode, item);




        if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}

        function Date_from_syspref(dstring) {
                var dateX = dstring.split(/[-/\.]/);
                if (debug > 1 && sentmsg < 1) {sentmsg++; alert("Date_from_syspref(" + dstring + ") splits to:\n" + dateX.join("\n"));}
                if (dformat === "iso") {
                        return new Date(dateX[0], (dateX[1] - 1), dateX[2]);  // YYYY-MM-DD to (YYYY,m(0-11),d)
                } else if (dformat === "us") {
                        return new Date(dateX[2], (dateX[0] - 1), dateX[1]);  // MM/DD/YYYY to (YYYY,m(0-11),d)
                } else if (dformat === "metric" || dformat === "dol") {
                        return new Date(dateX[2], (dateX[1] - 1), dateX[0]);  // DD/MM/YYYY or DD.MM.YYYY to (YYYY,m(0-11),d)
                } else {
                        if (debug > 0) {alert("KOHA ERROR - Unrecognized date format: " +dformat);}
                        return 0;

                dayNamesShort: [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat")],
                dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],
                weekHeader: _("Wk"),
                dateFormat: '[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSIF ( dateformat == "dol" ) %]dd.mm.yy[% ELSE %]yy-mm-dd[% END %]',
                firstDay: [% CalendarFirstDayOfWeek %],
                isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
                showMonthAfterYear: false,

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc (-1 / +1 lines)

Line 1 Link Here

<span class="dateformat">[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSE %](YYYY-MM-DD)[% END %]</span>

<span class="dateformat">[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSIF ( dateformat == "dol" ) %](DD.MM.YYYY)[% ELSE %](YYYY-MM-DD)[% END %]</span>




if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}

function Date_from_syspref(dstring) {
        var dateX = dstring.split(/[-/\.]/);
        if (debug > 1 && sentmsg < 1) {sentmsg++; alert("Date_from_syspref(" + dstring + ") splits to:\n" + dateX.join("\n"));}
        if (dformat === "iso") {
                return new Date(dateX[0], (dateX[1] - 1), dateX[2]);  // YYYY-MM-DD to (YYYY,m(0-11),d)
        } else if (dformat === "us") {
                return new Date(dateX[2], (dateX[0] - 1), dateX[1]);  // MM/DD/YYYY to (YYYY,m(0-11),d)
        } else if (dformat === "metric" || dformat === "dol") {
                return new Date(dateX[2], (dateX[1] - 1), dateX[0]);  // DD/MM/YYYY to (YYYY,m(0-11),d)
        } else {
                if (debug > 0) {alert("KOHA ERROR - Unrecognized date format: " +dformat);}

        dayNamesShort: [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat")],
        dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],
        weekHeader: _("Wk"),
        dateFormat: '[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSIF ( dateformat == "dol" ) %]dd.mm.yy[% ELSE %]yy-mm-dd[% END %]',
        firstDay: [% CalendarFirstDayOfWeek %],
        isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
        showMonthAfterYear: false,

Line 1 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/includes/date-format.inc (-2 / +1 lines)
1	[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSE %](YYYY-MM-DD)[% END %]	1	[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSIF ( dateformat == "dol" ) %](DD.MM.YYYY)[% ELSE %](YYYY-MM-DD)[% END %]
2	-

Return to bug 12072

Lines 7-20 var sentmsg = 0; Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc (-4 / +4 lines)
7	if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}	7	if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}
8		8
9	function Date_from_syspref(dstring) {	9	function Date_from_syspref(dstring) {
10	var dateX = dstring.split(/[-/]/);	10	var dateX = dstring.split(/[-/\.]/);
11	if (debug > 1 && sentmsg < 1) {sentmsg++; alert("Date_from_syspref(" + dstring + ") splits to:\n" + dateX.join("\n"));}	11	if (debug > 1 && sentmsg < 1) {sentmsg++; alert("Date_from_syspref(" + dstring + ") splits to:\n" + dateX.join("\n"));}
12	if (dformat === "iso") {	12	if (dformat === "iso") {
13	return new Date(dateX[0], (dateX[1] - 1), dateX[2]); // YYYY-MM-DD to (YYYY,m(0-11),d)	13	return new Date(dateX[0], (dateX[1] - 1), dateX[2]); // YYYY-MM-DD to (YYYY,m(0-11),d)
14	} else if (dformat === "us") {	14	} else if (dformat === "us") {
15	return new Date(dateX[2], (dateX[0] - 1), dateX[1]); // MM/DD/YYYY to (YYYY,m(0-11),d)	15	return new Date(dateX[2], (dateX[0] - 1), dateX[1]); // MM/DD/YYYY to (YYYY,m(0-11),d)
16	} else if (dformat === "metric") {	16	} else if (dformat === "metric" \|\| dformat === "dol") {
17	return new Date(dateX[2], (dateX[1] - 1), dateX[0]); // DD/MM/YYYY to (YYYY,m(0-11),d)	17	return new Date(dateX[2], (dateX[1] - 1), dateX[0]); // DD/MM/YYYY or DD.MM.YYYY to (YYYY,m(0-11),d)
18	} else {	18	} else {
19	if (debug > 0) {alert("KOHA ERROR - Unrecognized date format: " +dformat);}	19	if (debug > 0) {alert("KOHA ERROR - Unrecognized date format: " +dformat);}
20	return 0;	20	return 0;
Lines 37-43 jQuery(function($){ Link Here
37	dayNamesShort: [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat")],	37	dayNamesShort: [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat")],
38	dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],	38	dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],
39	weekHeader: _("Wk"),	39	weekHeader: _("Wk"),
40	dateFormat: "[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSE %]yy-mm-dd[% END %]",	40	dateFormat: "[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSIF ( dateformat == "dol" ) %]dd.mm.yy[% ELSE %]yy-mm-dd[% END %]",
41	firstDay: [% CalendarFirstDayOfWeek %],	41	firstDay: [% CalendarFirstDayOfWeek %],
42	isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],	42	isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
43	showMonthAfterYear: false,	43	showMonthAfterYear: false,