Koha-community
/
Koha
12
4
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Bug 9508: Standardize the dateformat value from C4::Auth 

- the dateformat value is send to all templates (from
  C4::Auth::get_template_and_user)
- remove all assignment of dateformat in all .pl files

- Remove "all" occurrences (those I found!) of dateformat_*
From now the only way to get the date format is a string comparaison
(dateformat == "metric")

Checked with the command:
  git grep "\(dateformat_us\|dateformat_metric\|dateformat_iso\)" | grep
  -v translator

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Tested all the datepickers I could find, looks good.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
new/bootstrap-opac
Jonathan Druart 10 years ago
committed by Galen Charlton
parent
14ac6cf11b
commit
537c664038
14 changed files with 21 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      C4/Auth.pm
  2. 1
      acqui/newordersubscription.pl
  3. 1
      admin/aqbudgets.pl
  4. 4
      koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
  5. 2
      koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
  6. 16
      koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
  7. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
  8. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
  9. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
  10. 2
      koha-tmpl/opac-tmpl/prog/en/includes/calendar.inc
  11. 2
      koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
  12. 2
      members/memberentry.pl
  13. 1
      reports/guided_reports.pl
  14. 1
      serials/serials-collection.pl

11
C4/Auth.pm
View File

@ -301,16 +301,7 @@ sub get_template_and_user {
}
if(C4::Context->preference('dateformat')){
$template->param( dateformat => C4::Context->preference('dateformat') );
if(C4::Context->preference('dateformat') eq "metric"){
$template->param(dateformat_metric => 1);
} elsif(C4::Context->preference('dateformat') eq "us"){
$template->param(dateformat_us => 1);
} else {
$template->param(dateformat_iso => 1);
}
} else {
$template->param(dateformat_iso => 1);
$template->param(dateformat => C4::Context->preference('dateformat'))
}
# these template parameters are set the same regardless of $in->{'type'}

1
acqui/newordersubscription.pl
View File

@ -102,6 +102,5 @@ $template->param(
basketno => $basket->{basketno},
basketname => $basket->{basketname},
booksellername => $bookseller->{name},
dateformat => C4::Context->preference("dateformat"),
);
output_html_with_http_headers $query, $cookie, $template->output;

1
admin/aqbudgets.pl
View File

@ -217,7 +217,6 @@ if ($op eq 'add_form') {
# if no buget_id is passed then its an add
$template->param(
add_validate => 1,
dateformat => C4::Dates->new()->visual(),
budget_parent_id => $budget_parent->{'budget_id'},
budget_parent_name => $budget_parent->{'budget_name'},
branchloop_select => \@branchloop_select,

4
koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
View File

@ -37,7 +37,7 @@ jQuery(function($){
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[% ELSE %]yy-mm-dd[% END %]',
dateFormat: "[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSE %]yy-mm-dd[% END %]",
firstDay: [% CalendarFirstDayOfWeek %],
isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
showMonthAfterYear: false,
@ -75,4 +75,4 @@ $.datepicker.setDefaults({
});
});
//]]>
</script>
</script>

2
koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc
View File

@ -1 +1 @@
[% 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)[% ELSE %](YYYY-MM-DD)[% END %]

16
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
View File

@ -274,12 +274,12 @@
<label for="dateofbirth">
[% END %]
Date of birth: </label>
[% IF ( metric ) %]
[% IF ( dateformat == "metric" ) %]
<input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="[% IF ( opduplicate ) %][% ELSE %][% dateofbirth %][% END %]" />
[% ELSE %]
[% ELSE %]
<input type="text" id="dateofbirth" name="dateofbirth" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% dateofbirth %][% END %]" />
[% END %]
[% END %]
[% IF ( mandatorydateofbirth ) %]<span class="required">Required</span>[% END %]
[% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %]
@ -1087,11 +1087,11 @@
<label for="from">
[% END %]
Registration date: </label>
[% IF ( metric ) %]
[% IF ( dateformat == "metric" ) %]
<input type="text" id="from" name="dateenrolled" maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="[% dateenrolled %]" class="datepickerfrom" />
[% ELSE %]
[% ELSE %]
<input type="text" id="from" name="dateenrolled" maxlength="10" size="10" value="[% dateenrolled %]" class="datepickerfrom" />
[% END %]
[% END %]
[% IF ( mandatorydateenrolled ) %]<span class="required">Required</span>[% END %]
[% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %]
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
@ -1108,7 +1108,7 @@
<label for="to">
[% END %]
Expiry date (leave blank for auto calc) </label>
[% IF ( metric ) %]
[% IF ( dateformat == "metric" ) %]
[% UNLESS ( opadd ) %]
<input type="text" id="to" name="dateexpiry" maxlength="10" size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="[% dateexpiry %]" class="datepickerto" />
[% ELSE %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
View File

@ -59,7 +59,7 @@ function CheckNone( node ) {
}
$(document).ready(function() {
$('#subscription_years').tabs();
[% IF dateformatmetric %]
[% IF dateformat == "metric" %]
dt_add_type_uk_date();
[% END %]

6
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
View File

@ -23,13 +23,13 @@ function formatDate(myDate) {
var d = new Array( myDate.getFullYear(), myDate.getMonth() + 1 ,myDate.getDate());
if(d[1].toString().length == 1) { d[1] = '0'+d[1] };
if(d[2].toString().length == 1) { d[2] = '0'+d[2] };
[% IF ( dateformat_us ) %]
[% IF ( dateformat == "us" ) %]
return(d[1] + '/' + d[2] + '/' + d[0]) ;
[% ELSIF ( dateformat_metric ) %]
[% ELSIF ( dateformat == "metric" ) %]
return(d[2] + '/' + d[1] + '/' + d[0]) ;
[% ELSE %]
return(''+d[0] + '-' + d[1] + '-' + d[2]) ;
[% END %]
[% END %]
}
Date.prototype.addDays = function(days) {

6
koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
View File

@ -259,7 +259,7 @@ td.repeatableyearly a.ui-state-default { background: #FFFF99 none; color : Bl
<strong>From Date:</strong>
<span id="showDaynameOutput"></span>,
[% IF ( dateformat_us ) %]<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>/<span id="showYearOutput"></span>[% ELSIF ( dateformat_metric ) %]<span id="showDayOutput"></span>/<span id="showMonthOutput"></span>/<span id="showYearOutput"></span>[% ELSE %]<span id="showYearOutput"></span>/<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>[% END %]
[% IF ( dateformat == "us" ) %]<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>/<span id="showYearOutput"></span>[% ELSIF ( dateformat == "metric" ) %]<span id="showDayOutput"></span>/<span id="showMonthOutput"></span>/<span id="showYearOutput"></span>[% ELSE %]<span id="showYearOutput"></span>/<span id="showMonthOutput"></span>/<span id="showDayOutput"></span>[% END %]
<input type="hidden" id="showDayname" name="showDayname" />
<input type="hidden" id="showWeekday" name="showWeekday" />
@ -329,7 +329,7 @@ td.repeatableyearly a.ui-state-default { background: #FFFF99 none; color : Bl
<strong>From date:</strong>
<span id="newDaynameOutput"></span>,
[% IF ( dateformat_us ) %]<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>/<span id="newYearOutput"></span>[% ELSIF ( dateformat_metric ) %]<span id="newDayOutput"></span>/<span id="newMonthOutput"></span>/<span id="newYearOutput"></span>[% ELSE %]<span id="newYearOutput"></span>/<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>[% END %]
[% IF ( dateformat == "us" ) %]<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>/<span id="newYearOutput"></span>[% ELSIF ( dateformat == "metric" ) %]<span id="newDayOutput"></span>/<span id="newMonthOutput"></span>/<span id="newYearOutput"></span>[% ELSE %]<span id="newYearOutput"></span>/<span id="newMonthOutput"></span>/<span id="newDayOutput"></span>[% END %]
<input type="hidden" id="newDayname" name="showDayname" />
<input type="hidden" id="newWeekday" name="newWeekday" />
@ -483,7 +483,7 @@ td.repeatableyearly a.ui-state-default { background: #FFFF99 none; color : Bl
<table id="holidaysyearlyrepeatable">
<thead>
<tr>
[% IF ( dateformat_metric ) %]
[% IF ( dateformat == "metric" ) %]
<th class="repeatableyearly">Day/Month</th>
[% ELSE %]
<th class="repeatableyearly">Month/Day</th>

2
koha-tmpl/opac-tmpl/prog/en/includes/calendar.inc
View File

@ -37,7 +37,7 @@ jQuery(function($){
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[% ELSE %]yy-mm-dd[% END %]',
dateFormat: '[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSE %]yy-mm-dd[% END %]',
firstDay: [% CalendarFirstDayOfWeek %],
isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
showMonthAfterYear: false,

2
koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
View File

@ -75,7 +75,7 @@ $(document).ready(function() {
dofocus();
[% IF ( patronid ) %]sco_init();[% END %]
$("#loanTable").tablesorter({
[% IF ( dateformat_metric ) %]
[% IF ( dateformat == "metric" ) %]
dateFormat: 'uk',
[% END %]
widgets: ['zebra'],

2
members/memberentry.pl
View File

@ -711,8 +711,6 @@ $template->param(
borrotitlepopup => $borrotitlepopup,
guarantorinfo => $guarantorinfo,
flagloop => \@flagdata,
dateformat => C4::Dates->new()->visual(),
C4::Context->preference('dateformat') => 1,
check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
category_type =>$category_type,
modify => $modify,

1
reports/guided_reports.pl
View File

@ -105,7 +105,6 @@ elsif ( $phase eq 'Build new' ) {
'savedreports' => get_saved_reports($filter),
'usecache' => $usecache,
'groups_with_subgroups'=> groups_with_subgroups($group, $subgroup),
dateformat => C4::Context->preference('dateformat'),
);
}

1
serials/serials-collection.pl
View File

@ -172,7 +172,6 @@ $template->param(
callnumber => $callnumber,
uc(C4::Context->preference("marcflavour")) => 1,
serialsadditems => $subscriptiondescs->[0]{'serialsadditems'},
dateformatmetric => C4::Context->preference("dateformat") eq "metric" ? 1 : 0,
);
output_html_with_http_headers $query, $cookie, $template->output;

Write Preview
Loading…
Cancel
Save