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

(-)a/C4/Templates.pm (-15 lines)
Lines 163-182 sub utf8_hashref { Link Here
163
        utf8::encode($hashref->{$key}) if utf8::is_utf8($hashref->{$key});
163
        utf8::encode($hashref->{$key}) if utf8::is_utf8($hashref->{$key});
164
    }
164
    }
165
}
165
}
166
        
167
        
168
# FIXME - this is a horrible hack to cache
169
# the current known-good language, temporarily
170
# put in place to resolve bug 4403.  It is
171
# used only by C4::XSLT::XSLTParse4Display;
172
# the language is set via the usual call
173
# to themelanguage.
174
my $_current_language = 'en';
175
176
sub _current_language {
177
    return $_current_language;
178
}
179
180
166
181
# wrapper method to allow easier transition from HTML template pro to Template Toolkit
167
# wrapper method to allow easier transition from HTML template pro to Template Toolkit
182
sub param {
168
sub param {
Lines 296-302 sub themelanguage { Link Here
296
    # Try to find first theme for the selected language
282
    # Try to find first theme for the selected language
297
    for my $theme (@themes) {
283
    for my $theme (@themes) {
298
        if ( -e "$htdocs/$theme/$lang/modules/$tmpl" ) {
284
        if ( -e "$htdocs/$theme/$lang/modules/$tmpl" ) {
299
            $_current_language = $lang;
300
            return ($theme, $lang, \@themes)
285
            return ($theme, $lang, \@themes)
301
        }
286
        }
302
    }
287
    }
(-)a/C4/XSLT.pm (-2 / +2 lines)
Lines 162-168 sub XSLTParse4Display { Link Here
162
    if ( $xslfilename =~ /^\s*"?default"?\s*$/i ) {
162
    if ( $xslfilename =~ /^\s*"?default"?\s*$/i ) {
163
        my $htdocs;
163
        my $htdocs;
164
        my $theme;
164
        my $theme;
165
        my $lang = C4::Templates::_current_language();
165
        my $lang = C4::Languages::getlanguage();
166
        my $xslfile;
166
        my $xslfile;
167
        if ($xslsyspref eq "XSLTDetailsDisplay") {
167
        if ($xslsyspref eq "XSLTDetailsDisplay") {
168
            $htdocs  = C4::Context->config('intrahtdocs');
168
            $htdocs  = C4::Context->config('intrahtdocs');
Lines 189-195 sub XSLTParse4Display { Link Here
189
    }
189
    }
190
190
191
    if ( $xslfilename =~ m/\{langcode\}/ ) {
191
    if ( $xslfilename =~ m/\{langcode\}/ ) {
192
        my $lang = C4::Templates::_current_language();
192
        my $lang = C4::Languages::getlanguage();
193
        $xslfilename =~ s/\{langcode\}/$lang/;
193
        $xslfilename =~ s/\{langcode\}/$lang/;
194
    }
194
    }
195
195
(-)a/catalogue/showmarc.pl (-1 / +1 lines)
Lines 55-61 if(!ref $record) { Link Here
55
}
55
}
56
56
57
if($view eq 'card') {
57
if($view eq 'card') {
58
    my $themelang =  '/' . C4::Templates::_current_language();
58
    my $themelang =  '/' . C4::Languages::getlanguage($input);
59
    my $xmlrecord= $importid? $record->as_xml(): GetXmlBiblio($biblionumber);
59
    my $xmlrecord= $importid? $record->as_xml(): GetXmlBiblio($biblionumber);
60
    my $xslfile =
60
    my $xslfile =
61
      C4::Context->config('intrahtdocs') . '/prog' . $themelang . "/xslt/compact.xsl";
61
      C4::Context->config('intrahtdocs') . '/prog' . $themelang . "/xslt/compact.xsl";
(-)a/opac/opac-showmarc.pl (-2 / +1 lines)
Lines 57-63 if ($view eq 'card' || $view eq 'html') { Link Here
57
    my $xslfilename;
57
    my $xslfilename;
58
    my $htdocs  = C4::Context->config('opachtdocs');
58
    my $htdocs  = C4::Context->config('opachtdocs');
59
    my $theme   = C4::Context->preference("opacthemes");
59
    my $theme   = C4::Context->preference("opacthemes");
60
    my $lang = C4::Templates::_current_language();
60
    my $lang = C4::Languages::getlanguage($input);
61
61
62
    if ($view eq 'card'){
62
    if ($view eq 'card'){
63
        $xslfile = "compact.xsl";
63
        $xslfile = "compact.xsl";
64
- 

Return to bug 12237