From 154d88c8d761067c5fef29ef5b97305bfde14eb0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 14 Feb 2024 14:11:22 +0000 Subject: [PATCH] Bug 36091: Spelling: Use "card number" instead of cardnumber in text This patch replaces the term "cardnumber" with "card number" in labels and text where the patron's library card number is referred to. Where the database column is referenced "cardnumber" is kept. A full test plan would be very time-consuming and I think examining the patch should be verification enough for changes which are limited to adding a space. Signed-off-by: Magnus Enger Verified that the patch only changes "visible" text, and not references to the database column. Signed-off-by: Julian Maurice Signed-off-by: Katrin Fischer (cherry picked from commit f3feebbfe91764b684ee215b93e81e17fde74c94) Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../en/includes/csv_headers/reports/cash_register_stats.tt | 2 +- .../intranet-tmpl/prog/en/includes/onboarding_messages.inc | 2 +- .../prog/en/modules/admin/preferences/enhanced_content.pref | 2 +- .../prog/en/modules/admin/preferences/patrons.pref | 2 +- .../intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index f183253d9f..a768730419 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -283,7 +283,7 @@ [% ELSE %]
-

The patron must have a cardnumber before a patron photo can be uploaded.

+

The patron must have a card number before a patron photo can be uploaded.

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt index 501aeaa734..4d9901f68d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt @@ -1,6 +1,6 @@ [% FILTER collapse %] [%- PROCESS 'i18n.inc' -%] [%- BLOCK -%] - "[% t("Manager name") | html %]"[% sep | html %]"[% t("Patron cardnumber") | html %]"[% sep | html %]"[% t("Patron name") | html %]"[% sep | html %]"[% t("Transaction library") | html %]"[% sep | html %]"[% t("Transaction date") | html %]"[% sep | html %]"[% t("Updated") | html %]"[% sep | html %]"[% t("Transaction type") | html %]"[% sep |html %]"[% t("Notes") | html %]"[% sep | html %]"[% t("Amount") | html %]"[% sep | html %]"[% t("Title") | html %]"[% sep | html %]"[% t("Barcode") | html %]"[% sep | html %]"[% t("Item type") | html %]" + "[% t("Manager name") | html %]"[% sep | html %]"[% t("Patron card number") | html %]"[% sep | html %]"[% t("Patron name") | html %]"[% sep | html %]"[% t("Transaction library") | html %]"[% sep | html %]"[% t("Transaction date") | html %]"[% sep | html %]"[% t("Updated") | html %]"[% sep | html %]"[% t("Transaction type") | html %]"[% sep |html %]"[% t("Notes") | html %]"[% sep | html %]"[% t("Amount") | html %]"[% sep | html %]"[% t("Title") | html %]"[% sep | html %]"[% t("Barcode") | html %]"[% sep | html %]"[% t("Item type") | html %]" [%- END -%] [%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc index 135cc43787..b417a8edf0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc @@ -11,7 +11,7 @@ [% CASE 'success_on_insert_patron' %]
Administrator account created!
[% CASE 'error_on_insert_patron' %] -
The patron has not been created! Cardnumber or Userid may already exist.
+
The patron has not been created! Card number or Userid may already exist.
[% CASE 'ERROR_cardnumber_already_exists' %]
Card number already in use.
[% CASE 'ERROR_cardnumber_length' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref index 61c62e69c7..9b3abf9e62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref @@ -366,7 +366,7 @@ Enhanced content: - Overdrive uses the patron's - pref: OverDriveUsername choices: - cardnumber: cardnumber + cardnumber: card number userid: user name - for user access to OverDrive.
- A password is diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref index 09991d64b4..dedb1db92a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -198,7 +198,7 @@ Patrons: email: primary email emailpro: secondary email B_email: alternate email - cardnumber: cardnumber + cardnumber: card number "OFF": first valid email address - 'for sending out email notices.' - '
NOTE: If set to "first valid", the order in which the email addresses are checked is set in EmailFieldPrecedence.' diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index 443f7bf2de..716ca2116b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -430,10 +430,10 @@ [% END %]
- +
Search a patron
- +
[% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index 0378eaa2bc..0b19e170ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -188,7 +188,7 @@
    -
    2. +