gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 33237: Add display of which language default language is expected 

This patch adds the display of 'Default language' to the 'Default'
language in the notices editor tool.

This is so that librarians know which language they are expected to be
writing the notice in so we can remain consistent in both template and
include language used.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit dc55479043)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Martin Renvoize 2024-04-24 14:44:05 +01:00 committed by Fridolin Somers
parent 92a6638fa5
commit ca8c6d3499
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
View File

@ -318,7 +318,7 @@
<input type="hidden" name="add" value="1" />
[% END %]
<fieldset class="rows">
<fieldset class="rows page-section">
<input type="hidden" name="oldbranchcode" value="[% oldbranchcode | html %]" />
[% IF independant_branch %]
<input type="hidden" name="branchcode" value="[% independant_branch | html %]" />
@ -481,6 +481,9 @@
[% WRAPPER tab_panels %]
[% FOREACH lang IN letters.keys %]
[% WRAPPER tab_panel tabname="lang_${lang}" %]
[% IF lang == 'default' %]
<p><span class="label">Default language:</span> [% default_language | html %]</p>
[% END %]
[% PROCESS message_templates %]
[% END # /WRAPPER tab_panel %]
[% END # /FOREACH lang %]
@ -488,9 +491,14 @@
[% END # /WRAPPER tabs#tabs %]
[% ELSE %]
<div style="clear:both"></div>
<div class="page-section">
[% FOREACH lang IN letters.keys %]
[% IF lang == 'default' %]
<p><span class="label">Default language:</span> [% default_language | html %]</p>
[% END %]
[% PROCESS message_templates %]
[% END # /FOREACH lang %]
</div>
[% END # /IF TranslateNotices %]
<input type="hidden" id="redirect" name="redirect" value="" />

29
tools/letter.pl
View File

@ -162,33 +162,32 @@ sub add_form {
my $templates = { map { $_ => { message_transport_type => $_ } } sort @$message_transport_types };
my %letters = ( default => { templates => $templates } );
my $translated_languages = C4::Languages::getTranslatedLanguages(
'opac',
C4::Context->preference('template')
);
if ( C4::Context->preference('TranslateNotices') ) {
my $translated_languages =
C4::Languages::getTranslatedLanguages( 'opac',
C4::Context->preference('template') );
for my $language (@$translated_languages) {
for my $sublanguage( @{ $language->{sublanguages_loop} } ) {
for my $sublanguage ( @{ $language->{sublanguages_loop} } ) {
if ( $language->{plural} ) {
$letters{ $sublanguage->{rfc4646_subtag} } = {
description => $sublanguage->{native_description}
. ' '
. $sublanguage->{region_description} . ' ('
. $sublanguage->{rfc4646_subtag} . ')',
templates => { %$templates },
description => $sublanguage->{native_description} . ' '
. $sublanguage->{region_description} . ' ('
. $sublanguage->{rfc4646_subtag} . ')',
templates => {%$templates},
};
}
else {
} else {
$letters{ $sublanguage->{rfc4646_subtag} } = {
description => $sublanguage->{native_description}
. ' ('
. $sublanguage->{rfc4646_subtag} . ')',
templates => { %$templates },
description => $sublanguage->{native_description} . ' (' . $sublanguage->{rfc4646_subtag} . ')',
templates => {%$templates},
};
}
}
}
$template->param( languages => $translated_languages );
}
my $default_language = @{ @{$translated_languages}[0]->{sublanguages_loop} }[0]->{native_description};
$template->param( default_language => $default_language );
if ($letters) {
$template->param(
modify => 1,