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

(-)a/C4/Auth.pm (-2 / +2 lines)
Lines 395-401 sub get_template_and_user { Link Here
395
            AmazonCoverImages                                                          => C4::Context->preference("AmazonCoverImages"),
395
            AmazonCoverImages                                                          => C4::Context->preference("AmazonCoverImages"),
396
            AutoLocation                                                               => C4::Context->preference("AutoLocation"),
396
            AutoLocation                                                               => C4::Context->preference("AutoLocation"),
397
            "BiblioDefaultView" . C4::Context->preference("IntranetBiblioDefaultView") => 1,
397
            "BiblioDefaultView" . C4::Context->preference("IntranetBiblioDefaultView") => 1,
398
            CalendarFirstDayOfWeek                                                     => ( C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday" ) ? 0 : 1,
398
            CalendarFirstDayOfWeek                                                     => C4::Context->preference("CalendarFirstDayOfWeek"),
399
            CircAutocompl                                                              => C4::Context->preference("CircAutocompl"),
399
            CircAutocompl                                                              => C4::Context->preference("CircAutocompl"),
400
            FRBRizeEditions                                                            => C4::Context->preference("FRBRizeEditions"),
400
            FRBRizeEditions                                                            => C4::Context->preference("FRBRizeEditions"),
401
            IndependentBranches                                                        => C4::Context->preference("IndependentBranches"),
401
            IndependentBranches                                                        => C4::Context->preference("IndependentBranches"),
Lines 469-475 sub get_template_and_user { Link Here
469
            AuthorisedValueImages                 => C4::Context->preference("AuthorisedValueImages"),
469
            AuthorisedValueImages                 => C4::Context->preference("AuthorisedValueImages"),
470
            BranchesLoop                          => GetBranchesLoop($opac_name),
470
            BranchesLoop                          => GetBranchesLoop($opac_name),
471
            BranchCategoriesLoop                  => GetBranchCategories( 'searchdomain', 1, $opac_name ),
471
            BranchCategoriesLoop                  => GetBranchCategories( 'searchdomain', 1, $opac_name ),
472
            CalendarFirstDayOfWeek                => ( C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday" ) ? 0 : 1,
472
            CalendarFirstDayOfWeek                => C4::Context->preference("CalendarFirstDayOfWeek"),
473
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
473
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
474
            LibraryNameTitle                      => "" . $LibraryNameTitle,
474
            LibraryNameTitle                      => "" . $LibraryNameTitle,
475
            LoginBranchname                       => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "",
475
            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 75-81 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
75
('BorrowerUnwantedField','',NULL,'Name the fields you don\'t need to store for a patron\'s account','free'),
75
('BorrowerUnwantedField','',NULL,'Name the fields you don\'t need to store for a patron\'s account','free'),
76
('BranchTransferLimitsType','ccode','itemtype|ccode','When using branch transfer limits, choose whether to limit by itemtype or collection code.','Choice'),
76
('BranchTransferLimitsType','ccode','itemtype|ccode','When using branch transfer limits, choose whether to limit by itemtype or collection code.','Choice'),
77
('CalculateFinesOnReturn','1','','Switch to control if overdue fines are calculated on return or not','YesNo'),
77
('CalculateFinesOnReturn','1','','Switch to control if overdue fines are calculated on return or not','YesNo'),
78
('CalendarFirstDayOfWeek','Sunday','Sunday|Monday','Select the first day of week to use in the calendar.','Choice'),
78
('CalendarFirstDayOfWeek','0','0|1|2|3|4|5|6','Select the first day of week to use in the calendar.','Choice'),
79
('canreservefromotherbranches','1','','With Independent branches on, can a user from one library place a hold on an item from another library','YesNo'),
79
('canreservefromotherbranches','1','','With Independent branches on, can a user from one library place a hold on an item from another library','YesNo'),
80
('CardnumberLength', '', '', 'Set a length for card numbers.', 'Free'),
80
('CardnumberLength', '', '', 'Set a length for card numbers.', 'Free'),
81
('casAuthentication','0','','Enable or disable CAS authentication','YesNo'),
81
('casAuthentication','0','','Enable or disable CAS authentication','YesNo'),
(-)a/installer/data/mysql/updatedatabase.pl (+16 lines)
Lines 10595-10600 if ( CheckVersion($DBversion) ) { Link Here
10595
    SetVersion($DBversion);
10595
    SetVersion($DBversion);
10596
}
10596
}
10597
10597
10598
$DBversion = "3.21.00.XXX";
10599
if ( CheckVersion($DBversion) ) {
10600
    $dbh->do(q{
10601
        UPDATE systempreferences SET value='0' WHERE variable='CalendarFirstDayOfWeek' AND value='Sunday';
10602
    });
10603
    $dbh->do(q{
10604
        UPDATE systempreferences SET value='1' WHERE variable='CalendarFirstDayOfWeek' AND value='Monday';
10605
    });
10606
    $dbh->do(q{
10607
        UPDATE systempreferences SET options='0|1|2|3|4|5|6' WHERE variable='CalendarFirstDayOfWeek';
10608
    });
10609
10610
    print "Upgrade to $DBversion done (Bug 12137 - Extend functionality of CalendarFirstDayOfWeek to be any day)\n";
10611
    SetVersion($DBversion);
10612
}
10613
10598
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
10614
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
10599
# SEE bug 13068
10615
# SEE bug 13068
10600
# if there is anything in the atomicupdate, read and execute it.
10616
# if there is anything in the atomicupdate, read and execute it.
(-)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