Attachment 165458 Details for Bug 33237 – Bug 33237: (follow-up) Restore final fallback

[patch] Bug 33237: (follow-up) Restore final fallback

Bug-33237-follow-up-Restore-final-fallback.patch (text/plain), 1.43 KB, created by Martin Renvoize (ashimema) on 2024-04-24 13:47:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-04-24 13:47:05 UTC

Size: 1.43 KB

patch

obsolete

>From c093aa314acda1fbba609049b70eaed069958495 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 23 Apr 2024 13:42:08 +0100
>Subject: [PATCH] Bug 33237: (follow-up) Restore final fallback
>
>This restores the final fallback to 'en' as mentioned by Jonathan
>---
> C4/Letters.pm | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/C4/Letters.pm b/C4/Letters.pm
>index 51ce4311b55..f099686bb0d 100644
>--- a/C4/Letters.pm
>+++ b/C4/Letters.pm
>@@ -1669,20 +1669,23 @@ sub _process_tt {
>     my $content    = $params->{content};
>     my $tables     = $params->{tables};
>     my $loops      = $params->{loops};
>-    my $objects    = $params->{objects} || {};
>+    my $objects    = $params->{objects}    || {};
>     my $substitute = $params->{substitute} || {};
>-    my $lang       = 'en';
>     my $interface  = C4::Context->interface;
>+    my $lang;
>     if ( defined( $params->{lang} ) && $params->{lang} ne 'default' ) {
>         $lang = $params->{lang};
>     } elsif ( $interface eq 'intranet' || $interface eq 'opac' ) {
>+
>         #use interface language
>         $lang = C4::Languages::getlanguage();
>     } else {
>+
>         # Pick the first selected syspref language
>         my @languages = split /,/, C4::Context->preference('language');
>         $lang = shift @languages;
>     }
>+    $lang //= 'en';
>     my ($theme, $availablethemes);
> 
>     my $htdocs = C4::Context->config('intrahtdocs');
>-- 
>2.44.0

Actions: View | Diff | Splinter Review

Attachments on bug 33237: 148281 | 148785 | 163952 | 163953 | 164521 | 165382 | 165383 | 165384 | 165404 | 165405 | 165406 | 165455 | 165456 | 165457 | 165458 | 165459 | 165460 | 165473 | 165474 | 165475 | 165476 | 165477 | 165478 | 165479 | 165480 | 166860