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

(-)a/C4/Reports/Guided.pm (-17 / +22 lines)
Lines 835-857 sub get_sql { Link Here
835
}
835
}
836
836
837
sub _get_column_defs {
837
sub _get_column_defs {
838
	my ($cgi) = @_;
838
    my ($cgi) = @_;
839
	my %columns;
839
    my %columns;
840
	my $columns_def_file = "columns.def";
840
    my $columns_def_file = "columns.def";
841
	my $htdocs = C4::Context->config('intrahtdocs');                       
841
    my $htdocs = C4::Context->config('intrahtdocs');
842
	my $section='intranet';
842
    my $section = 'intranet';
843
    my ($theme, $lang, $availablethemes) = C4::Templates::themelanguage($htdocs, $columns_def_file, $section,$cgi);
843
844
844
    # We need the theme and the lang
845
	my $full_path_to_columns_def_file="$htdocs/$theme/$lang/$columns_def_file";    
845
    # Since columns.def is not in the modules directory, we cannot sent it for the $tmpl var
846
	open (COLUMNS,$full_path_to_columns_def_file);
846
    my ($theme, $lang, $availablethemes) = C4::Templates::themelanguage($htdocs, 'about.tt', $section, $cgi);
847
	while (my $input = <COLUMNS>){
847
848
		chomp $input;
848
    my $full_path_to_columns_def_file="$htdocs/$theme/$lang/$columns_def_file";
849
		my @row =split(/\t/,$input);
849
    open (my $fh, $full_path_to_columns_def_file);
850
		$columns{$row[0]}= $row[1];
850
    while ( my $input = <$fh> ){
851
	}
851
        chomp $input;
852
852
        $input =~ s|<translation>(.*)</translation>|$1|;
853
	close COLUMNS;
853
        if ( $input =~ m|([^:]*):(.*)| ) {
854
	return \%columns;
854
            my ( $field, $translation ) = ( $1, $2 );
855
            $columns{$field} = $translation;
856
        }
857
    }
858
    close $fh;
859
    return \%columns;
855
}
860
}
856
861
857
=head2 build_authorised_value_list($authorised_value)
862
=head2 build_authorised_value_list($authorised_value)
(-)a/koha-tmpl/intranet-tmpl/prog/en/columns.def (-140 / +140 lines)
Lines 1-140 Link Here
1
borrowers.borrowernumber	Borrower number
1
<translation>borrowers.borrowernumber: Borrower number</translation>
2
borrowers.title	Salutation
2
<translation>borrowers.title: Salutation</translation>
3
borrowers.surname	Surname
3
<translation>borrowers.surname: Surname</translation>
4
borrowers.firstname	First name
4
<translation>borrowers.firstname: First name</translation>
5
borrowers.dateofbirth	Date of birth
5
<translation>borrowers.dateofbirth: Date of birth</translation>
6
borrowers.initials	Initials
6
<translation>borrowers.initials: Initials</translation>
7
borrowers.othernames	Other name
7
<translation>borrowers.othernames: Other name</translation>
8
borrowers.sex	Gender
8
<translation>borrowers.sex: Gender</translation>
9
borrowers.relationship	Relationship
9
<translation>borrowers.relationship: Relationship</translation>
10
borrowers.guarantorid	Guarantor borrower number
10
<translation>borrowers.guarantorid: Guarantor borrower number</translation>
11
borrowers.streetnumber	Street number
11
<translation>borrowers.streetnumber: Street number</translation>
12
borrowers.streettype	Street type
12
<translation>borrowers.streettype: Street type</translation>
13
borrowers.address	Address
13
<translation>borrowers.address: Address</translation>
14
borrowers.address2	Address 2
14
<translation>borrowers.address2: Address 2</translation>
15
borrowers.city	City
15
<translation>borrowers.city: City</translation>
16
borrowers.state	State
16
<translation>borrowers.state: State</translation>
17
borrowers.zipcode	Zip/postal code
17
<translation>borrowers.zipcode: Zip/postal code</translation>
18
borrowers.country	Country
18
<translation>borrowers.country: Country</translation>
19
borrowers.phone	Primary phone
19
<translation>borrowers.phone: Primary phone</translation>
20
borrowers.phonepro	Secondary phone
20
<translation>borrowers.phonepro: Secondary phone</translation>
21
borrowers.mobile	Other phone
21
<translation>borrowers.mobile: Other phone</translation>
22
borrowers.email	Primary email
22
<translation>borrowers.email: Primary email</translation>
23
borrowers.emailpro	Secondary email
23
<translation>borrowers.emailpro: Secondary email</translation>
24
borrowers.fax	Fax
24
<translation>borrowers.fax: Fax</translation>
25
borrowers.B_streetnumber	Alternate address: Street number
25
<translation>borrowers.B_streetnumber: Alternate address: Street number</translation>
26
borrowers.B_streettype	Alternate address: Street type
26
<translation>borrowers.B_streettype: Alternate address: Street type</translation>
27
borrowers.B_address	Alternate address: Address
27
<translation>borrowers.B_address: Alternate address: Address</translation>
28
borrowers.B_address2	Alternate address: Address 2
28
<translation>borrowers.B_address2: Alternate address: Address 2</translation>
29
borrowers.B_city	Alternate address: City
29
<translation>borrowers.B_city: Alternate address: City</translation>
30
borrowers.B_state	Alternate address: State
30
<translation>borrowers.B_state: Alternate address: State</translation>
31
borrowers.B_zipcode	Alternate address: Zip/postal code
31
<translation>borrowers.B_zipcode: Alternate address: Zip/postal code</translation>
32
borrowers.B_country	Alternate address: Country
32
<translation>borrowers.B_country: Alternate address: Country</translation>
33
borrowers.B_phone	Alternate address: Phone
33
<translation>borrowers.B_phone: Alternate address: Phone</translation>
34
borrowers.B_email	Alternate address: Email
34
<translation>borrowers.B_email: Alternate address: Email</translation>
35
borrowers.contactnote	Alternate contact: Note
35
<translation>borrowers.contactnote: Alternate contact: Note</translation>
36
borrowers.altcontactfirstname	Alternate contact: Last name
36
<translation>borrowers.altcontactfirstname: Alternate contact: Last name</translation>
37
borrowers.altcontactsurname	Alternate contact: First name
37
<translation>borrowers.altcontactsurname: Alternate contact: First name</translation>
38
borrowers.altcontactaddress1	Alternate contact: Address
38
<translation>borrowers.altcontactaddress1: Alternate contact: Address</translation>
39
borrowers.altcontactaddress2	Alternate contact: Address 2
39
<translation>borrowers.altcontactaddress2: Alternate contact: Address 2</translation>
40
borrowers.altcontactaddress3	Alternate contact: City
40
<translation>borrowers.altcontactaddress3: Alternate contact: City</translation>
41
borrowers.contactname	Alternate contact: Surname
41
<translation>borrowers.contactname: Alternate contact: Surname</translation>
42
borrowers.contactfirstname	Alternate contact: First name
42
<translation>borrowers.contactfirstname: Alternate contact: First name</translation>
43
borrowers.contacttitle	Alternate contact: Title
43
<translation>borrowers.contacttitle: Alternate contact: Title</translation>
44
borrowers.altcontactstate	Alternate contact: State
44
<translation>borrowers.altcontactstate: Alternate contact: State</translation>
45
borrowers.altcontactzipcode	Alternate contact: Zip/postal code
45
<translation>borrowers.altcontactzipcode: Alternate contact: Zip/postal code</translation>
46
borrowers.altcontactcountry	Alternate contact: Country
46
<translation>borrowers.altcontactcountry: Alternate contact: Country</translation>
47
borrowers.altcontactphone	Alternate contact: Phone
47
<translation>borrowers.altcontactphone: Alternate contact: Phone</translation>
48
borrowers.cardnumber	Card number
48
<translation>borrowers.cardnumber: Card number</translation>
49
borrowers.branchcode	Home library
49
<translation>borrowers.branchcode: Home library</translation>
50
borrowers.categorycode	Category
50
<translation>borrowers.categorycode: Category</translation>
51
borrowers.sort1	Sort 1
51
<translation>borrowers.sort1: Sort 1</translation>
52
borrowers.sort2	Sort 2
52
<translation>borrowers.sort2: Sort 2</translation>
53
borrowers.dateenrolled	Registration date
53
<translation>borrowers.dateenrolled: Registration date</translation>
54
borrowers.dateexpiry	Expiry date
54
<translation>borrowers.dateexpiry: Expiry date</translation>
55
borrowers.opacnote	OPAC note
55
<translation>borrowers.opacnote: OPAC note</translation>
56
borrowers.borrowernotes	Circulation note
56
<translation>borrowers.borrowernotes: Circulation note</translation>
57
borrowers.userid	Username
57
<translation>borrowers.userid: Username</translation>
58
borrowers.password	Password
58
<translation>borrowers.password: Password</translation>
59
borrowers.flags	System permissions
59
<translation>borrowers.flags: System permissions</translation>
60
borrowers.gonenoaddress	Gone no address flag
60
<translation>borrowers.gonenoaddress: Gone no address flag</translation>
61
borrowers.lost	Lost card flag
61
<translation>borrowers.lost: Lost card flag</translation>
62
borrowers.debarred	Restricted [until] flag
62
<translation>borrowers.debarred: Restricted [until] flag</translation>
63
borrowers.debarredcomment	Comment
63
<translation>borrowers.debarredcomment: Comment</translation>
64
borrowers.smsalertnumber	Mobile phone number
64
<translation>borrowers.smsalertnumber: Mobile phone number</translation>
65
borrowers.privacy	Privacy settings
65
<translation>borrowers.privacy: Privacy settings</translation>
66
items.itemnumber	Item number (internal)
66
<translation>items.itemnumber: Item number (internal)</translation>
67
items.biblionumber	Biblio number (internal)
67
<translation>items.biblionumber: Biblio number (internal)</translation>
68
items.biblioitemnumber	Biblioitem number (internal)
68
<translation>items.biblioitemnumber: Biblioitem number (internal)</translation>
69
items.barcode	Barcode
69
<translation>items.barcode: Barcode</translation>
70
items.dateaccessioned	Date acquired
70
<translation>items.dateaccessioned: Date acquired</translation>
71
items.booksellerid	Source of acquisition
71
<translation>items.booksellerid: Source of acquisition</translation>
72
items.homebranch	Permanent library
72
<translation>items.homebranch: Permanent library</translation>
73
items.price	Price
73
<translation>items.price: Price</translation>
74
items.replacementprice	Replacement price
74
<translation>items.replacementprice: Replacement price</translation>
75
items.replacementpricedate	Price effective from
75
<translation>items.replacementpricedate: Price effective from</translation>
76
items.datelastborrowed	Date last checked out
76
<translation>items.datelastborrowed: Date last checked out</translation>
77
items.datelastseen	Date last seen
77
<translation>items.datelastseen: Date last seen</translation>
78
items.stack	Shelving control number
78
<translation>items.stack: Shelving control number</translation>
79
items.onloan	Due date
79
<translation>items.onloan: Due date</translation>
80
items.cn_source	Source of classification / shelving scheme
80
<translation>items.cn_source: Source of classification / shelving scheme</translation>
81
items.cn_sort	Koha normalized classification for sorting
81
<translation>items.cn_sort: Koha normalized classification for sorting</translation>
82
items.notforloan	Not for loan
82
<translation>items.notforloan: Not for loan</translation>
83
items.itemlost	Lost status
83
<translation>items.itemlost: Lost status</translation>
84
items.withdrawn	Withdrawn status
84
<translation>items.withdrawn: Withdrawn status</translation>
85
items.itemcallnumber	Call number
85
<translation>items.itemcallnumber: Call number</translation>
86
items.issues	Total checkouts
86
<translation>items.issues: Total checkouts</translation>
87
items.renewals	Total renewals
87
<translation>items.renewals: Total renewals</translation>
88
items.reserves	Total holds
88
<translation>items.reserves: Total holds</translation>
89
items.restricted	Use restrictions
89
<translation>items.restricted: Use restrictions</translation>
90
items.itemnotes	Public note
90
<translation>items.itemnotes: Public note</translation>
91
items.holdingbranch	Current library
91
<translation>items.holdingbranch: Current library</translation>
92
items.paidfor
92
<translation>items.paidfor</translation>
93
items.timestamp	Timestamp
93
<translation>items.timestamp: Timestamp</translation>
94
items.location	Shelving location
94
<translation>items.location: Shelving location</translation>
95
items.ccode	Collection code
95
<translation>items.ccode: Collection code</translation>
96
items.itype	Koha itemtype
96
<translation>items.itype: Koha itemtype</translation>
97
items.stocknumber	Inventory number
97
<translation>items.stocknumber: Inventory number</translation>
98
items.damaged	Damaged status
98
<translation>items.damaged: Damaged status</translation>
99
items.materials	Materials specified
99
<translation>items.materials: Materials specified</translation>
100
items.uri	Uniform Resource Identifier
100
<translation>items.uri: Uniform Resource Identifier</translation>
101
items.more_subfields_xml	Additional subfields (XML)
101
<translation>items.more_subfields_xml: Additional subfields (XML)</translation>
102
items.enumchron	Serial enumeraton/chronology
102
<translation>items.enumchron: Serial enumeraton/chronology</translation>
103
items.copynumber	Copy number
103
<translation>items.copynumber: Copy number</translation>
104
statistics.datetime	Statistics date and time
104
<translation>statistics.datetime: Statistics date and time</translation>
105
statistics.branch	Library
105
<translation>statistics.branch: Library</translation>
106
statistics.proccode	Type of procedure
106
<translation>statistics.proccode: Type of procedure</translation>
107
statistics.value	Value
107
<translation>statistics.value: Value</translation>
108
statistics.type	Type
108
<translation>statistics.type: Type</translation>
109
statistics.other
109
<translation>statistics.other</translation>
110
statistics.usercode	User code
110
<translation>statistics.usercode: User code</translation>
111
statistics.itemnumber	Item number
111
<translation>statistics.itemnumber: Item number</translation>
112
statistics.itemtype	Itemtype
112
<translation>statistics.itemtype: Itemtype</translation>
113
statistics.borrowernumber	Borrower number
113
<translation>statistics.borrowernumber: Borrower number</translation>
114
biblio.frameworkcode	Framework code
114
<translation>biblio.frameworkcode: Framework code</translation>
115
biblio.author	Author
115
<translation>biblio.author: Author</translation>
116
biblio.datecreated	Creation date
116
<translation>biblio.datecreated: Creation date</translation>
117
biblio.timestamp	Modification date
117
<translation>biblio.timestamp: Modification date</translation>
118
biblioitems.biblioitemnumber	Biblioitem number
118
<translation>biblioitems.biblioitemnumber: Biblioitem number</translation>
119
biblioitems.biblionumber	Biblio number
119
<translation>biblioitems.biblionumber: Biblio number</translation>
120
biblioitems.volume	Volume number
120
<translation>biblioitems.volume: Volume number</translation>
121
biblioitems.number	Number
121
<translation>biblioitems.number: Number</translation>
122
biblioitems.classification	Classification
122
<translation>biblioitems.classification: Classification</translation>
123
biblioitems.itemtype	Biblio-level item type
123
<translation>biblioitems.itemtype: Biblio-level item type</translation>
124
biblioitems.isbn	ISBN
124
<translation>biblioitems.isbn: ISBN</translation>
125
biblioitems.issn	ISSN
125
<translation>biblioitems.issn: ISSN</translation>
126
biblioitems.dewey	Dewey/classification
126
<translation>biblioitems.dewey: Dewey/classification</translation>
127
biblioitems.subclass	Sub classification
127
<translation>biblioitems.subclass: Sub classification</translation>
128
biblioitems.publicationyear	Publication date
128
<translation>biblioitems.publicationyear: Publication date</translation>
129
biblioitems.publishercode	Publisher
129
<translation>biblioitems.publishercode: Publisher</translation>
130
biblioitems.volumedate	Volume date
130
<translation>biblioitems.volumedate: Volume date</translation>
131
biblioitems.volumedesc	Volume information
131
<translation>biblioitems.volumedesc: Volume information</translation>
132
biblioitems.timestamp	Timestamp
132
<translation>biblioitems.timestamp: Timestamp</translation>
133
biblioitems.illus	Illustrator
133
<translation>biblioitems.illus: Illustrator</translation>
134
biblioitems.pages	Number of pages
134
<translation>biblioitems.pages: Number of pages</translation>
135
biblioitems.notes	Notes
135
<translation>biblioitems.notes: Notes</translation>
136
biblioitems.size	Size
136
<translation>biblioitems.size: Size</translation>
137
biblioitems.place	Place of publication
137
<translation>biblioitems.place: Place of publication</translation>
138
biblioitems.lccn	LCCN
138
<translation>biblioitems.lccn: LCCN</translation>
139
biblioitems.marcxml	MARC blob
139
<translation>biblioitems.marcxml: MARC blob</translation>
140
biblioitems.url	URL
140
<translation>biblioitems.url: URL</translation>
(-)a/misc/translator/tmpl_process3.pl (-2 / +1 lines)
Lines 242-248 usage_error('You must at least specify input and string list filenames.') Link Here
242
    if !$in_dir || !defined $str_file;
242
    if !$in_dir || !defined $str_file;
243
243
244
# Type match defaults to *.tt plus *.inc if not specified
244
# Type match defaults to *.tt plus *.inc if not specified
245
$type = "tt|inc|xsl|xml" if !defined($type);
245
$type = "tt|inc|xsl|xml|def" if !defined($type);
246
246
247
# Check the inputs for being directories
247
# Check the inputs for being directories
248
usage_error("$in_dir: Input must be a directory.\n"
248
usage_error("$in_dir: Input must be a directory.\n"
249
- 

Return to bug 9216