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

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 6-12 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
6
('AcquisitionDetails', '1', '', 'Hide/Show acquisition details on the biblio detail page.', 'YesNo'),
6
('AcquisitionDetails', '1', '', 'Hide/Show acquisition details on the biblio detail page.', 'YesNo'),
7
('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'),
7
('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'),
8
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
8
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
9
('AddressFormat','us','','Choose format to display postal addresses', 'Choice'),
9
('AddressFormat','us','us | de | fr','Choose format to display postal addresses', 'Choice'),
10
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
10
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
11
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
11
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
12
('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'),
12
('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc (+148 lines)
Line 0 Link Here
1
<fieldset class="rows" id="memberentry_address">
2
<legend id="alt_address_lgd">Alternate address</legend><ol>
3
4
[% UNLESS noB_streetnumber %]
5
    <li>
6
    [% IF ( mandatoryB_streetnumber ) %]
7
         <label for="B_streetnumber" class="required">
8
    [% ELSE %]
9
         <label for="B_streetnumber">
10
    [% END %]
11
    Street Number: </label>
12
    <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
13
    [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
14
    </li>
15
[% END %]
16
17
[% IF roadtypes %]
18
    <li>
19
    [% IF ( mandatoryB_streettype ) %]
20
         <label for="B_streettype" class="required">
21
    [% ELSE %]
22
         <label for="B_streettype">
23
    [% END %]
24
    Street type: </label>
25
    <select name="B_streettype">
26
    <option value=""></option>
27
    [% FOR roadtype IN roadtypes %]
28
        [% IF roadtype.authorised_value == B_streettype %]
29
            <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
30
        [% ELSE %]
31
            <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
32
        [% END %]
33
    [% END %]
34
    </select>
35
    [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
36
    </li>
37
[% END %]
38
39
[% UNLESS noB_address %]
40
    <li>
41
    [% IF ( mandatoryB_address ) %]
42
        <label for="B_address" class="required">
43
    [% ELSE %]
44
        <label for="B_address">
45
    [% END %]
46
        Address: </label>
47
        <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
48
    [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
49
        </li>
50
[% END %]
51
52
[% UNLESS noB_address2 %]
53
    <li>
54
    [% IF ( mandatoryB_address2 ) %]
55
        <label for="B_address2" class="required">
56
    [% ELSE %]
57
        <label for="B_address2">
58
    [% END %]
59
    Address 2: </label>
60
    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
61
    [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
62
    </li>
63
[% END %]
64
[% UNLESS noB_zipcode %]
65
    <li>
66
    [% IF ( mandatoryB_zipcode ) %]
67
        <label for="B_zipcode" class="required">
68
    [% ELSE %]
69
        <label for="B_zipcode">
70
    [% END %]
71
    ZIP/Postal code: </label>
72
    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
73
    [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
74
    </li>
75
[% END %]
76
[% UNLESS noB_city %]
77
    <li>
78
    [% IF ( mandatoryB_city ) %]
79
        <label for="B_city" class="required" >
80
    [% ELSE %]
81
        <label for="B_city">
82
    [% END %]
83
    City: </label>
84
    <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
85
    [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
86
    </li>
87
[% END %]
88
[% UNLESS noB_state %]
89
    <li>
90
    [% IF ( mandatoryB_state ) %]
91
        <label for="B_state" class="required" >
92
    [% ELSE %]
93
        <label for="B_state">
94
    [% END %]
95
        State: </label>
96
        <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
97
    [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
98
    </li>
99
[% END %]
100
[% UNLESS noB_country %]
101
    <li>
102
    [% IF ( mandatoryB_country ) %]
103
        <label for="B_country" class="required">
104
    [% ELSE %]
105
        <label for="B_country">
106
    [% END %]
107
        Country: </label>
108
        <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
109
    [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
110
    </li>
111
[% END %]
112
[% UNLESS noB_phone %]
113
   <li>
114
   [% IF ( mandatoryB_phone ) %]
115
       <label for="B_phone" class="required">
116
   [% ELSE %]
117
       <label for="B_phone">
118
   [% END %]
119
   Phone: </label>
120
   <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" />
121
   [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
122
   </li>
123
[% END %]
124
[% UNLESS noB_email %]
125
   <li>
126
   [% IF ( mandatoryB_email ) %]
127
       <label for="B_email" class="required">
128
   [% ELSE %]
129
       <label for="B_email">
130
   [% END %]
131
       Email: </label>
132
       <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
133
   [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
134
[% END %]
135
[% UNLESS nocontactnote %]
136
    <li>
137
    [% IF ( mandatorycontactnote ) %]
138
        <label for="contactnote" class="required">
139
    [% ELSE %]
140
        <label for="contactnote">
141
    [% END %]
142
        Contact note: </label>
143
        <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
144
    [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
145
        </li>
146
    [% END %]
147
</ol>
148
</fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc (+112 lines)
Line 0 Link Here
1
<fieldset class="rows" id="memberentry_altaddress">
2
    <legend id="alt_contact_lgd">Alternate contact</legend><ol>
3
[% UNLESS noaltcontactsurname %]
4
    <li>
5
    [% IF ( mandatoryaltcontactsurname ) %]
6
        <label for="altcontactsurname" class="required">
7
    [% ELSE %]
8
        <label for="altcontactsurname">
9
    [% END %]
10
    Surname:</label>
11
    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
12
    [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
13
    </li>
14
[% END %]
15
[% UNLESS noaltcontactfirstname %]
16
    <li>
17
    [% IF ( mandatoryaltcontactfirstname ) %]
18
        <label for="altcontactfirstname" class="required">
19
    [% ELSE %]
20
        <label for="altcontactfirstname">
21
    [% END %]
22
        First name:</label>
23
	<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
24
    [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
25
    </li>
26
[% END %]
27
[% UNLESS noaltcontactaddress1 %]
28
    <li>
29
    [% IF ( mandatoryaltcontactaddress1 ) %]
30
        <label for="altcontactaddress1" class="required">
31
    [% ELSE %]
32
        <label for="altcontactaddress1">
33
    [% END %]
34
    Address:</label>
35
    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
36
    [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
37
    </li>
38
[% END %]
39
[% UNLESS noaltcontactaddress2 %]
40
    <li>
41
    [% IF ( mandatoryaltcontactaddress2 ) %]
42
	<label for="altcontactaddress2" class="required">
43
    [% ELSE %]
44
	<label for="altcontactaddress2">
45
    [% END %]
46
    Address 2:</label>
47
    <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
48
    [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
49
    </li>
50
[% END %]
51
[% UNLESS noaltcontactzipcode %]
52
    <li>
53
    [% IF ( mandatoryaltcontactzipcode ) %]
54
        <label for="altcontactzipcode" class="required">
55
    [% ELSE %]
56
        <label for="altcontactzipcode">
57
    [% END %]
58
    ZIP/Postal code:</label>
59
    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
60
    [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
61
    </li>
62
[% END %]
63
[% UNLESS noaltcontactaddress3 %]
64
    <li>
65
    [% IF ( mandatoryaltcontactaddress3 ) %]
66
        <label for="altcontactaddress3" class="required">
67
    [% ELSE %]
68
        <label for="altcontactaddress3">
69
    [% END %]
70
    City:</label>
71
    <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
72
    [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
73
    </li>
74
[% END %]
75
[% UNLESS noaltcontactstate %]
76
    <li>
77
    [% IF ( mandatoryaltcontactstate ) %]
78
        <label for="altcontactstate" class="required">
79
    [% ELSE %]
80
        <label for="altcontactstate">
81
    [% END %]
82
    State:</label>
83
    <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
84
    [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
85
    </li>
86
[% END %]
87
[% UNLESS noaltcontactcountry %]
88
    <li>
89
    [% IF ( mandatoryaltcontactcountry ) %]
90
        <label for="altcontactcountry" class="required">
91
    [% ELSE %]
92
        <label for="altcontactcountry">
93
    [% END %]
94
    Country:</label>
95
    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
96
    [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
97
</li>
98
[% END %]
99
[% UNLESS noaltcontactphone %]
100
    <li>
101
    [% IF ( mandatoryaltcontactphone ) %]
102
        <label for="altcontactphone" class="required">
103
    [% ELSE %]
104
	<label for="altcontactphone">
105
    [% END %]
106
    Phone:</label>
107
    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
108
    [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
109
    </li>
110
[% END %]
111
</ol>
112
</fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc (+21 lines)
Line 0 Link Here
1
[% IF ( address or address2 ) %]
2
    [% IF ( address ) %]
3
        [% SET roadtype_desc = '' %]
4
        [% IF streettype %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
6
        [% END %]
7
        <li>
8
        [% IF streetnumber %] [% streetnumber %][% END %]
9
        [%IF roadtype_desc %] [% roadtype_desc %][% END %]
10
        </li>
11
            <li class="patronaddress1">[% address %]
12
            </li>
13
    [% END %]
14
    [% IF ( address2 ) %]
15
        <li class="patronaddress2">[% address2 %]</li>
16
    [% END %]
17
[% END %]
18
[% IF ( city ) %]<li class="patroncity">
19
    [%IF (zipcode ) %][% zipcode %] [% END %][% city %][% IF ( state ) %]</br>[% state %][% END %]
20
    [% IF ( country ) %]<br />[% country %][% END %]</li>
21
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc (+21 lines)
Line 0 Link Here
1
[% IF ( B_address or B_address2 ) %]
2
    [% IF ( B_address ) %]
3
        [% SET roadtype_desc = '' %]
4
        [% IF B_streetnumber %] [% B_streetnumber %][% END %]
5
        [% IF B_streettype %]
6
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
7
        [% END %]
8
        <li class="patronaddress1">[% B_address %]
9
        [%IF roadtype_desc %] [% roadtype_desc %][% END %]
10
        </li>
11
    [% END %]
12
    [% IF ( B_address2 ) %]
13
        <li class="patronaddress2">[% B_address2 %]</li>
14
    [% END %]
15
[% END %]
16
[% IF ( B_city ) %]<li class="patroncity">
17
    [%IF ( B_zipcode ) %][% B_zipcode %] [% END %]
18
    [% B_city %]
19
    [% IF ( B_state ) %]</br>[% B_state %][% END %]
20
    [% IF ( B_country ) %]<br />[% B_country %][% END %]</li>
21
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc (+125 lines)
Line 0 Link Here
1
<fieldset class="rows" id="memberentry_mainaddress">
2
    <legend id="main_address_lgd">Main address</legend><ol>
3
[% UNLESS nostreetnumber %]
4
    <li>
5
    [% IF ( mandatorystreetnumber ) %]
6
        <label for="streetnumber" class="required">
7
    [% ELSE %]
8
        <label for="streetnumber">
9
    [% END %]
10
        Street number: </label>
11
        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
12
    [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
13
    </li>
14
[% END %]
15
[% UNLESS nostreettype %]
16
    [% IF roadtypes %]
17
        <li>
18
        [% IF ( mandatorystreettype ) %]
19
            <label for="streettype" class="required">
20
        [% ELSE %]
21
            <label for="streettype">
22
        [% END %]
23
        Street type: </label>
24
        <select name="streettype">
25
           <option value=""></option>
26
        [% FOR roadtype IN roadtypes %]
27
            [% IF roadtype.authorised_value == streettype %]
28
                <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
29
            [% ELSE %]
30
                <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
31
            [% END %]
32
        [% END %]
33
        </select>
34
        [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
35
        </li>
36
    [% END %]
37
[% END %]
38
[% UNLESS noaddress %]
39
    <li>
40
    [% IF ( mandatoryaddress ) %]
41
        <label for="address" class="required">
42
    [% ELSE %]
43
        <label for="address">
44
    [% END %]
45
    Address: </label>
46
        <input type="text" id="address" name="address" size="35" value="[% address %]" />
47
    [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
48
      </li>
49
[% END %]
50
[% UNLESS noaddress2 %]
51
    <li>
52
    [% IF ( mandatoryaddress2 ) %]
53
        <label for="address2" class="required">
54
    [% ELSE %]
55
        <label for="address2">
56
    [% END %]
57
        Address 2: </label>
58
        <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
59
    [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
60
    </li>
61
[% END %]
62
[% UNLESS nozipcode %]
63
    <li>
64
    [% IF ( mandatoryzipcode ) %]
65
        <label for="zipcode" class="required">
66
    [% ELSE %]
67
        <label for="zipcode">
68
    [% END %]
69
    ZIP/Postal code: </label>
70
    <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
71
    [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
72
    </li>
73
[% END %]
74
[% UNLESS nocity %]
75
    <li>
76
    [% IF ( mandatorycity ) %]
77
    <label for="city" class="required">
78
    [% ELSE %]
79
        <label for="city">
80
    [% END %]
81
    City: </label>
82
    <input type="text" id="city" name="city" size="20" value="[% city %]" />
83
    [% IF cities.count %]or choose
84
        <select id="select_city" name="select_city">
85
            <option value="|||"></option>
86
        [% FOREACH c IN cities %]
87
            [% IF c.city_name == city %]
88
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
89
            [% ELSE %]
90
                 <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
91
            [% END %]
92
                [% c.city_name %] [% c.city_state %] [% c.city_zipcode %]
93
            </option>
94
        [% END %]
95
        </select>
96
    [% END %]
97
    [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
98
    </li>
99
[% END %]
100
[% UNLESS nostate %]
101
    <li>
102
    [% IF ( mandatorystate ) %]
103
        <label for="state" class="required">
104
    [% ELSE %]
105
        <label for="state">
106
    [% END %]
107
        State: </label>
108
        <input type="text" name="state" id="state" size="20" value="[% state %]" />
109
    [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
110
    </li>
111
[% END %]
112
[% UNLESS nocountry %]
113
    <li>
114
    [% IF ( mandatorycountry ) %]
115
        <label for="country" class="required">
116
    [% ELSE %]
117
      <label for="country">
118
    [% END %]
119
    Country: </label>
120
      <input type="text" name="country" id="country" size="20" value="[% country %]" />
121
    [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
122
    </li>
123
[% END %]
124
</ol>
125
</fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref (-1 / +1 lines)
Lines 58-60 I18N/L10N: Link Here
58
          choices:
58
          choices:
59
              us: US style ([Street number], [Address] - [City], [ZIP/Postal Code], [Country])
59
              us: US style ([Street number], [Address] - [City], [ZIP/Postal Code], [Country])
60
              de: German style ([Address] [Street number] - [ZIP/Postal Code] [City] - [Country])
60
              de: German style ([Address] [Street number] - [ZIP/Postal Code] [City] - [Country])
61
- 
61
              fr: French style ([Street number] [Address] - [ZIP/Postal Code] [City] - [Country])

Return to bug 18110