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

(-)a/C4/Auth.pm (-2 / +2 lines)
Lines 389-395 sub get_template_and_user { Link Here
389
            AmazonCoverImages                                                          => C4::Context->preference("AmazonCoverImages"),
389
            AmazonCoverImages                                                          => C4::Context->preference("AmazonCoverImages"),
390
            AutoLocation                                                               => C4::Context->preference("AutoLocation"),
390
            AutoLocation                                                               => C4::Context->preference("AutoLocation"),
391
            "BiblioDefaultView" . C4::Context->preference("IntranetBiblioDefaultView") => 1,
391
            "BiblioDefaultView" . C4::Context->preference("IntranetBiblioDefaultView") => 1,
392
            CalendarFirstDayOfWeek                                                     => ( C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday" ) ? 0 : 1,
392
            CalendarFirstDayOfWeek                                                     => C4::Context->preference("CalendarFirstDayOfWeek"),
393
            CircAutocompl                                                              => C4::Context->preference("CircAutocompl"),
393
            CircAutocompl                                                              => C4::Context->preference("CircAutocompl"),
394
            FRBRizeEditions                                                            => C4::Context->preference("FRBRizeEditions"),
394
            FRBRizeEditions                                                            => C4::Context->preference("FRBRizeEditions"),
395
            IndependentBranches                                                        => C4::Context->preference("IndependentBranches"),
395
            IndependentBranches                                                        => C4::Context->preference("IndependentBranches"),
Lines 464-470 sub get_template_and_user { Link Here
464
            AuthorisedValueImages                 => C4::Context->preference("AuthorisedValueImages"),
464
            AuthorisedValueImages                 => C4::Context->preference("AuthorisedValueImages"),
465
            BranchesLoop                          => GetBranchesLoop($opac_name),
465
            BranchesLoop                          => GetBranchesLoop($opac_name),
466
            BranchCategoriesLoop                  => GetBranchCategories( 'searchdomain', 1, $opac_name ),
466
            BranchCategoriesLoop                  => GetBranchCategories( 'searchdomain', 1, $opac_name ),
467
            CalendarFirstDayOfWeek                => ( C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday" ) ? 0 : 1,
467
            CalendarFirstDayOfWeek                => C4::Context->preference("CalendarFirstDayOfWeek"),
468
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
468
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
469
            LibraryNameTitle                      => "" . $LibraryNameTitle,
469
            LibraryNameTitle                      => "" . $LibraryNameTitle,
470
            LoginBranchname                       => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "",
470
            LoginBranchname                       => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "",
(-)a/installer/data/mysql/de-DE/mandatory/system_preferences.sql (-1 / +2 lines)
Lines 30-36 UPDATE systempreferences SET value = Link Here
30
    <li><a href="http://www.scholar.google.com/scholar?q={TITLE}" target="_blank">Google Scholar</a></li>
30
    <li><a href="http://www.scholar.google.com/scholar?q={TITLE}" target="_blank">Google Scholar</a></li>
31
    <li><a href="http://www.bookfinder.com/search/?author={AUTHOR}&amp;title={TITLE}&amp;st=xl&amp;ac=qr" target="_blank">Online-Buchhandel (Bookfinder.com)</a></li>' 
31
    <li><a href="http://www.bookfinder.com/search/?author={AUTHOR}&amp;title={TITLE}&amp;st=xl&amp;ac=qr" target="_blank">Online-Buchhandel (Bookfinder.com)</a></li>' 
32
    WHERE variable = 'OPACSearchForTitleIn';
32
    WHERE variable = 'OPACSearchForTitleIn';
33
UPDATE systempreferences SET value = 'Monday' WHERE variable = 'CalendarFirstDayOfWeek';
33
-- Sunday = 0, Monday = 1, etc.
34
UPDATE systempreferences SET value = '1' WHERE variable = 'CalendarFirstDayOfWeek';
34
UPDATE systempreferences SET value = '0.07|0.19|0.00' WHERE variable = 'gist';
35
UPDATE systempreferences SET value = '0.07|0.19|0.00' WHERE variable = 'gist';
35
UPDATE systempreferences SET value = 'Dieser Text wird über den Systemparameter <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped">RoutingListNote</a> konfiguriert.' where variable = 'RoutingListNote';
36
UPDATE systempreferences SET value = 'Dieser Text wird über den Systemparameter <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped">RoutingListNote</a> konfiguriert.' where variable = 'RoutingListNote';
36
UPDATE systempreferences SET value = 'barcode stocknumber' WHERE variable = 'uniqueitemfields';
37
UPDATE systempreferences SET value = 'barcode stocknumber' WHERE variable = 'uniqueitemfields';
(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql (-1 / +2 lines)
Lines 26-31 UPDATE systempreferences SET value = 'nb-NO' WHERE variable = 'opaclanguages'; Link Here
26
UPDATE systempreferences SET value = '<p>Velkommen til Koha...</p><hr />' WHERE variable = 'OpacMainUserBlock';
26
UPDATE systempreferences SET value = '<p>Velkommen til Koha...</p><hr />' WHERE variable = 'OpacMainUserBlock';
27
UPDATE systempreferences SET value = '<p>Viktige lenker kan plasseres her</p>' WHERE variable = 'OpacNav';
27
UPDATE systempreferences SET value = '<p>Viktige lenker kan plasseres her</p>' WHERE variable = 'OpacNav';
28
UPDATE systempreferences SET value = '<li><a href="http://worldcat.org/search?q={TITLE}" target="_blank">Andre bibliotek (WorldCat)</a></li><li><a href="http://www.scholar.google.com/scholar?q={TITLE}" target="_blank">Andre databaser (Google Scholar)</a></li><li><a href="http://www.bookfinder.com/search/?author={AUTHOR}&amp;title={TITLE}&amp;st=xl&amp;ac=qr" target="_blank">Nettbutikker (Bookfinder.com)</a></li>' WHERE variable = 'OPACSearchForTitleIn';
28
UPDATE systempreferences SET value = '<li><a href="http://worldcat.org/search?q={TITLE}" target="_blank">Andre bibliotek (WorldCat)</a></li><li><a href="http://www.scholar.google.com/scholar?q={TITLE}" target="_blank">Andre databaser (Google Scholar)</a></li><li><a href="http://www.bookfinder.com/search/?author={AUTHOR}&amp;title={TITLE}&amp;st=xl&amp;ac=qr" target="_blank">Nettbutikker (Bookfinder.com)</a></li>' WHERE variable = 'OPACSearchForTitleIn';
29
UPDATE systempreferences SET value = 'Monday' WHERE variable = 'CalendarFirstDayOfWeek';
29
-- Sunday = 0, Monday = 1, etc.
30
UPDATE systempreferences SET value = '1' WHERE variable = 'CalendarFirstDayOfWeek';
30
UPDATE systempreferences SET value = 'A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å' WHERE variable = 'alphabet';
31
UPDATE systempreferences SET value = 'A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å' WHERE variable = 'alphabet';
31
UPDATE systempreferences SET value = 'nor' WHERE variable = 'DefaultLanguageField008';
32
UPDATE systempreferences SET value = 'nor' WHERE variable = 'DefaultLanguageField008';
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 76-82 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
76
('BorrowerUnwantedField','',NULL,'Name the fields you don\'t need to store for a patron\'s account','free'),
76
('BorrowerUnwantedField','',NULL,'Name the fields you don\'t need to store for a patron\'s account','free'),
77
('BranchTransferLimitsType','ccode','itemtype|ccode','When using branch transfer limits, choose whether to limit by itemtype or collection code.','Choice'),
77
('BranchTransferLimitsType','ccode','itemtype|ccode','When using branch transfer limits, choose whether to limit by itemtype or collection code.','Choice'),
78
('CalculateFinesOnReturn','1','','Switch to control if overdue fines are calculated on return or not','YesNo'),
78
('CalculateFinesOnReturn','1','','Switch to control if overdue fines are calculated on return or not','YesNo'),
79
('CalendarFirstDayOfWeek','Sunday','Sunday|Monday','Select the first day of week to use in the calendar.','Choice'),
79
('CalendarFirstDayOfWeek','0','0|1|2|3|4|5|6','Select the first day of week to use in the calendar.','Choice'),
80
('canreservefromotherbranches','1','','With Independent branches on, can a user from one library place a hold on an item from another library','YesNo'),
80
('canreservefromotherbranches','1','','With Independent branches on, can a user from one library place a hold on an item from another library','YesNo'),
81
('casAuthentication','0','','Enable or disable CAS authentication','YesNo'),
81
('casAuthentication','0','','Enable or disable CAS authentication','YesNo'),
82
('casLogout','0','','Does a logout from Koha should also log the user out of CAS?','YesNo'),
82
('casLogout','0','','Does a logout from Koha should also log the user out of CAS?','YesNo'),
(-)a/installer/data/mysql/updatedatabase.pl (+17 lines)
Lines 9804-9809 if ( CheckVersion($DBversion) ) { Link Here
9804
    SetVersion($DBversion);
9804
    SetVersion($DBversion);
9805
}
9805
}
9806
9806
9807
$DBversion = "3.19.00.XXX";
9808
if ( CheckVersion($DBversion) ) {
9809
    $dbh->do(q{
9810
        UPDATE systempreferences SET value='0' WHERE variable='CalendarFirstDayOfWeek' AND value='Sunday';
9811
    });
9812
    $dbh->do(q{
9813
        UPDATE systempreferences SET value='1' WHERE variable='CalendarFirstDayOfWeek' AND value='Monday';
9814
    });
9815
    $dbh->do(q{
9816
        UPDATE systempreferences SET options='0|1|2|3|4|5|6' WHERE variable='CalendarFirstDayOfWeek';
9817
    });
9818
9819
    print "Upgrade to $DBversion done (Bug 12137 - Extend functionality of CalendarFirstDayOfWeek to be any day)\n";
9820
    SetVersion($DBversion);
9821
}
9822
9823
9807
=head1 FUNCTIONS
9824
=head1 FUNCTIONS
9808
9825
9809
=head2 TableExists($table)
9826
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref (-4 / +8 lines)
Lines 19-28 I18N/L10N: Link Here
19
    -
19
    -
20
        - Use
20
        - Use
21
        - pref: CalendarFirstDayOfWeek
21
        - pref: CalendarFirstDayOfWeek
22
          default: Sunday
22
          default: 0
23
          choices:
23
          choices:
24
              Sunday: Sunday
24
              0: Sunday
25
              Monday: Monday
25
              1: Monday
26
              2: Tuesday
27
              3: Wednesday
28
              4: Thursday
29
              5: Friday
30
              6: Saturday
26
        - as the first day of week in the calendar.
31
        - as the first day of week in the calendar.
27
    -
32
    -
28
        - "Enable the following languages on the staff interface:"
33
        - "Enable the following languages on the staff interface:"
29
- 

Return to bug 12137