From 7d63e807f85eec2f6baf3812eb09d168016af714 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 6 Apr 2023 10:21:35 +0000 Subject: [PATCH] Bug 34074: Improve translations of strings on the about page This patch makes a few simple changes to the about page template to improve how the translation tool picks up strings to translate. The patch also corrects a couple of lines where template tags contained line breaks. To test, apply the patch and view the about page in the staff interface. Everything should look correct. Signed-off-by: Sam Lau Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1b579868d5568e40225fce079161ae98746ea0ad) Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/modules/about.tt | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index c067af0695..c5c90e97c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -91,19 +91,21 @@ [% ELSE %] [% END %] - Version: + Version: [% elasticsearch_status.version | html %] | - Nodes: + Nodes: [% elasticsearch_status.nodes.join(' / ') | html %] | - Status: + Status: [% IF elasticsearch_status.running %] running | - Indices: + Indices: [% FOREACH index IN elasticsearch_status.indexes %] - [% index.index_name | html %] (count: [% index.index_count | html %])[% UNLESS loop.last %], [% END %] + [% index.index_name | html %] + (count: [% index.index_count | html %]) + [% UNLESS loop.last %], [% END %] [% END %] [% ELSE %] not running @@ -119,19 +121,19 @@ [% ELSE %] [% END %] - Servers: + Servers: [% IF memcached_servers %] [% memcached_servers | html %] [% ELSE %] undefined [% END %] | - Namespace: + Namespace: [% IF memcached_namespace %] [% memcached_namespace | html %] [% ELSE %] undefined [% END %] | - Status: + Status: [% IF memcached_servers %] [% IF memcached_running and is_memcached_still_active %] running. @@ -144,19 +146,19 @@ [% ELSE %] unknown [% END %] | - Config read from: + Config read from: [% SWITCH where_is_memcached_config %] [% CASE 'config_only' %] koha-conf.xml [% CASE 'ENV_only' %] - ENV Note that the right place to define the memcached config is in your $KOHA_CONF file + ENV Note that the right place to define the memcached config is in your $KOHA_CONF file [% CASE 'both' %] - ENV and koha-conf.xml Note that the right place to define the memcached config is in your $KOHA_CONF file. To avoid any misunderstanding you should not export the memcached config from ENV. + ENV and koha-conf.xml Note that the right place to define the memcached config is in your $KOHA_CONF file. To avoid any misunderstanding you should not export the memcached config from ENV. [% CASE # nowhere %] - Nowhere Note that the right place to define the memcached config is in your $KOHA_CONF file. Currently you do not have a valid memcached configuration defined. + Nowhere Note that the right place to define the memcached config is in your $KOHA_CONF file. Currently you do not have a valid memcached configuration defined. [% END %] [% IF effective_caching_method != 'Cache::Memcached::Fast::Safe' %] - | Effective caching method: [% effective_caching_method | html %] + | Effective caching method: [% effective_caching_method | html %] [% END %] @@ -190,18 +192,19 @@ [% timezone_config_class = (time_zone.config_invalid) ? 'bg-warning' : '' %] [% timezone_env_class = (time_zone.env_invalid) ? 'bg-warning' : '' %] Time zone: - Used: [% time_zone.actual | html %] + + Used: [% time_zone.actual | html %] [% IF time_zone.actual_bad_tz_fallback %] (This is a fallback value due to a bad configuration) [% END %] | - Config: + Config: [% IF time_zone.config != '' %] [% time_zone.config | html %] [% ELSE %] Undefined [% END %] | - Environment (TZ): + Environment (TZ): [% IF time_zone.environment != '' %] [% time_zone.environment | html %] [% ELSE %] @@ -262,8 +265,7 @@ [% END # /WRAPPER tab_item perl %] - [% IF Asset.css("css/staff-global.css") == "" - || Asset.js("js/vue/dist/erm.js") == "" %] + [% IF Asset.css("css/staff-global.css") == "" || Asset.js("js/vue/dist/erm.js") == "" %] [% SET warnMissingCompiledFiles = 1 %] [% END %] [% WRAPPER tab_panel tabname= "sysinfo" %] @@ -570,7 +572,7 @@ Warning [% FOR w IN warnHiddenBiblionumbers %] - Biblio framework "[% w.frameworkcode | html %]" has the biblionumber field hidden at the interface [% w.interface | html %]
+ Biblio framework "[% w.frameworkcode | html %]" has the biblionumber field hidden at the interface [% w.interface | html %]
[% END %] -- 2.39.5