Attachment 153116 Details for Bug 34074 – Bug 34074: Improve translations of strings on the about page

[patch] Bug 34074: Improve translations of strings on the about page

Bug-34074-Improve-translations-of-strings-on-the-a.patch (text/plain), 9.83 KB, created by Jonathan Druart on 2023-07-07 06:53:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2023-07-07 06:53:45 UTC

Size: 9.83 KB

patch

obsolete

>From 9de37d217351626b6b8c051282ea94ea378f9aec Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <samalau@gmail.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../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 c067af06953..c5c90e97c4b 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 %]
> <td>
> [% 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: <emph>[% index.index_count | html %]</emph>)[% 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 %]
> <td>
> [% 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 %]
> </td>
> </tr>
>@@ -190,18 +192,19 @@
> [% timezone_config_class = (time_zone.config_invalid) ? 'bg-warning' : '' %]
> [% timezone_env_class = (time_zone.env_invalid) ? 'bg-warning' : '' %]
> <th scope="row">Time zone: </th>
>- <td>Used: [% time_zone.actual | html %]
>+ <td>
>+ 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 @@
> </table>
> [% 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 @@
> <th scope="row">Warning </th>
> <td>
> [% 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 %]
> </td>
> </tr>
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 34074: 152517 | 152873 | 153116