From 187e7c019d04c413fbc2f949494149e47e206473 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 5 Feb 2023 01:51:12 +0100 Subject: [PATCH] Bug 32222: Fix capitalization in various "id is invalid" ID is an abbreviation and should be written with capitals. See: https://www.oxfordlearnersdictionaries.com/definition/english/identification This fixes all occurences of "id is invalid" to read "ID is invalid" To test: * As some are hard to trigger warnings, the best way here is to review the patch. Signed-off-by: Owen Leonard --- C4/Creators/Batch.pm | 2 +- C4/Creators/Layout.pm | 2 +- C4/Creators/Profile.pm | 2 +- C4/Creators/Template.pm | 2 +- .../prog/en/modules/admin/identity_provider_domains.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/identity_providers.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/C4/Creators/Batch.pm b/C4/Creators/Batch.pm index e81f6d6020..41a7c0c035 100644 --- a/C4/Creators/Batch.pm +++ b/C4/Creators/Batch.pm @@ -180,7 +180,7 @@ sub delete { @query_params = ($opts{'batch_id'}, $opts{'branch_code'}); } if ($query_params[0] eq '') { # If there is no template id then we cannot delete it - warn sprintf('%s : Cannot delete batch as the batch id is invalid or non-existent.', $call_type); + warn sprintf('%s : Cannot delete batch as the batch ID is invalid or non-existent.', $call_type); return -1; } my $query = "DELETE FROM creator_batches WHERE batch_id = ? AND branch_code =?"; diff --git a/C4/Creators/Layout.pm b/C4/Creators/Layout.pm index a3216360fa..4ac7908123 100644 --- a/C4/Creators/Layout.pm +++ b/C4/Creators/Layout.pm @@ -126,7 +126,7 @@ sub delete { push @params, $opts{'layout_id'}, $opts{'creator'}; } if (scalar(@params) < 2) { # If there is no layout id or creator type then we cannot delete it - warn sprintf('%s : Cannot delete layout as the profile id is invalid or non-existent.', $call_type) if !$params[0]; + warn sprintf('%s : Cannot delete layout as the profile ID is invalid or non-existent.', $call_type) if !$params[0]; warn sprintf('%s : Cannot delete layout as the creator type is invalid or non-existent.', $call_type) if !$params[1]; return -1; } diff --git a/C4/Creators/Profile.pm b/C4/Creators/Profile.pm index b9759bd6a8..d9b84ca77a 100644 --- a/C4/Creators/Profile.pm +++ b/C4/Creators/Profile.pm @@ -106,7 +106,7 @@ sub delete { push @params, $opts{'profile_id'}, $opts{'creator'}; } if (scalar(@params) < 2) { # If there is no profile id or creator type then we cannot delete it - warn sprintf('%s : Cannot delete profile as the profile id is invalid or non-existent.', $call_type) if !$params[0]; + warn sprintf('%s : Cannot delete profile as the profile ID is invalid or non-existent.', $call_type) if !$params[0]; warn sprintf('%s : Cannot delete profile as the creator type is invalid or non-existent.', $call_type) if !$params[1]; return -1; } diff --git a/C4/Creators/Template.pm b/C4/Creators/Template.pm index 1636c16cfb..2699886361 100644 --- a/C4/Creators/Template.pm +++ b/C4/Creators/Template.pm @@ -146,7 +146,7 @@ sub delete { push @query_params, $opts{'template_id'}, $opts{'creator'}; } if (scalar(@query_params) < 2) { # If there is no template id or creator type then we cannot delete it - warn sprintf('%s : Cannot delete template as the template id is invalid or non-existent.', $call_type) if !$query_params[0]; + warn sprintf('%s : Cannot delete template as the template ID is invalid or non-existent.', $call_type) if !$query_params[0]; warn sprintf('%s : Cannot delete template as the creator type is invalid or non-existent.', $call_type) if !$query_params[1]; return -1; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt index 4ca4767461..ad1bd8735e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt @@ -70,7 +70,7 @@
[% SWITCH m.code %] [% CASE 'error_on_update' %] - An error occurred trying to open the identity provider domain for editing. The passed id is invalid. + An error occurred trying to open the identity provider domain for editing. The passed ID is invalid. [% CASE 'error_on_insert' %] An error occurred when adding a new identity provider domain. [% CASE 'success_on_update' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt index 30c78ff2f2..39bb7cd86a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_providers.tt @@ -66,7 +66,7 @@
[% SWITCH m.code %] [% CASE 'error_on_update' %] - An error occurred trying to open the identity provider for editing. The passed id is invalid. + An error occurred trying to open the identity provider for editing. The passed ID is invalid. [% CASE 'error_on_insert' %] An error occurred when adding a new identity provider. [% CASE 'success_on_update' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt index 0a2855af88..a82eab4b97 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt @@ -162,7 +162,7 @@

Patron restrictions

[% IF searchfield %] - You Searched for [% searchfield | html %] + You searched for [% searchfield | html %] [% END %] [% IF restrictions %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt index c48d1bdc00..701e687ef3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt @@ -64,7 +64,7 @@
[% SWITCH m.code %] [% CASE 'error_on_update' %] - An error occurred trying to open the server for editing. The passed id is invalid. + An error occurred trying to open the server for editing. The passed ID is invalid. [% CASE 'error_on_insert' %] An error occurred when adding the server. The library already has an SMTP server set. [% CASE 'success_on_update' %] -- 2.20.1