From 190a13a5e5f11c843e888a99ac2db1cc713c8edb Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 9 Nov 2022 14:36:05 +0100 Subject: [PATCH] Bug 32147: Capitalization: E-Resource management When e- is used as prefix, the second word should not be capitalized. And when e-resource-management is used as part of a sentence, the e shouldn't be either. See: e-mail, e-commerce. etc. To test: * Best to check the code... but: * All E-Resource should now read e-resource or E-resource, as on: * Koha start page * Breadcrumbs in the ERM module * Descriptions of AV categories... I chose to update the sysprefs.sql and the DB update as well as this hasn't been released yet. Signed-off-by: Owen Leonard Bug 32147: (follow-up) Fix missing space One of the AV category descriptions was missing a space before the (e-resource management). Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart --- installer/data/mysql/db_revs/220600079.pl | 2 +- installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../intranet-tmpl/prog/en/includes/header.inc | 2 +- .../prog/en/includes/prefs-menu.inc | 4 ++-- .../en/modules/admin/authorised_values.tt | 22 +++++++++---------- .../prog/en/modules/admin/columns_settings.tt | 4 ++-- .../en/modules/admin/preferences/erm.pref | 6 ++--- .../intranet-tmpl/prog/en/modules/erm/erm.tt | 2 +- .../prog/en/modules/intranet-main.tt | 2 +- .../prog/js/vue/components/ERM/ERMMain.vue | 4 ++-- koha-tmpl/intranet-tmpl/prog/js/vue/routes.js | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/installer/data/mysql/db_revs/220600079.pl b/installer/data/mysql/db_revs/220600079.pl index 0c484622cf3..5657bdef836 100755 --- a/installer/data/mysql/db_revs/220600079.pl +++ b/installer/data/mysql/db_revs/220600079.pl @@ -9,7 +9,7 @@ return { $dbh->do(q{ INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) - VALUES ('ERMModule', '0', NULL, 'Enable the E-Resource management module', 'YesNo'); + VALUES ('ERMModule', '0', NULL, 'Enable the e-resource management module', 'YesNo'); }); say $out "Added new system preference 'ERMModule'"; diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index fe9232379ee..beebd27a6fd 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -222,7 +222,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('EnableItemGroupHolds','0','','Enable item groups holds feature','YesNo'), ('EnhancedMessagingPreferences','1','','If ON, allows patrons to select to receive additional messages about items due or nearly due.','YesNo'), ('EnhancedMessagingPreferencesOPAC', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'), -('ERMModule', '0', NULL, 'Enable the E-Resource management module', 'YesNo'), +('ERMModule', '0', NULL, 'Enable the e-resource management module', 'YesNo'), ('ERMProviders', 'local', 'local|ebsco', 'Set the providers for the ERM module', 'Choice'), ('ERMProviderEbscoApiKey', '', '', 'API key for EBSCO', 'free'), ('ERMProviderEbscoCustomerID', '', '', 'Customer ID for EBSCO', 'free'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 3c6285643c6..3b03287160c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -44,7 +44,7 @@
  • Serials
  • [% END %] [% IF Koha.Preference('ERMModule') && CAN_user_erm %] -
  • E-Resource management
  • +
  • E-resource management
  • [% END %] [% IF ( Koha.Preference('UseCourseReserves') ) %]
  • Course reserves
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc index 42f6da01089..8be1e6243cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc @@ -71,11 +71,11 @@ [% IF ( erm ) %]
  • - E-Resource management + E-resource management [% PROCESS subtabs %] [% ELSE %]
  • - E-Resource management + E-resource management [% END %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 689730d7d24..922a7069a98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -502,27 +502,27 @@ [% CASE 'ETAT' %]

    Used in French UNIMARC installations in field 995 $o to identify item status. Similar to NOT_LOAN

    [% CASE 'ERM_AGREEMENT_CLOSURE_REASON' %] -

    Close reasons for agreements (E-Resource management module)

    +

    Close reasons for agreements (e-resource management module)

    [% CASE 'ERM_AGREEMENT_LICENSE_LOCATION' %] -

    Locations of the licenses' agreements (E-Resource management module)

    +

    Locations of the licenses' agreements (e-resource management module)

    [% CASE 'ERM_AGREEMENT_LICENSE_STATUS' %] -

    Statuses of the licenses' agreements(E-Resource management module)

    +

    Statuses of the licenses' agreements (e-resource management module)

    [% CASE 'ERM_AGREEMENT_RENEWAL_PRIORITY' %] -

    Renewal priorities of agreements (E-Resource management module)

    +

    Renewal priorities of agreements (e-resource management module)

    [% CASE 'ERM_AGREEMENT_STATUS' %] -

    Statuses of agreements (E-Resource management module)

    +

    Statuses of agreements (e-resource management module)

    [% CASE 'ERM_USER_ROLES' %] -

    Roles for users (E-Resource management module)

    +

    Roles for users (e-resource management module)

    [% CASE 'ERM_LICENSE_STATUS' %] -

    Statuses of the licenses (E-Resource management module)

    +

    Statuses of the licenses (e-resource management module)

    [% CASE 'ERM_LICENSE_TYPE' %] -

    Types of the licenses (E-Resource management module)

    +

    Types of the licenses (e-resource management module)

    [% CASE 'ERM_PACKAGE_CONTENT_TYPE' %] -

    Content type of the packages (E-Resource management module)

    +

    Content type of the packages (e-resource management module)

    [% CASE 'ERM_PACKAGE_TYPE' %] -

    Types of the packages (E-Resource management module)

    +

    Types of the packages (e-resource management module)

    [% CASE 'ERM_TITLE_PUBLICATION_TYPE' %] -

    Publication types of the titles (E-Resource management module)

    +

    Publication types of the titles (e-resource management module)

    [% CASE 'HINGS_AS' %]

    General holdings: acquisition status designator :: This data element specifies acquisition status for the unit at the time of the holdings report.

    [% CASE 'HINGS_C' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt index f8ba1c3e195..63b0f1299a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -318,13 +318,13 @@
    -

    E-Resource management tables

    +

    E-resource management tables

    [% PROCESS pagelist module=modules.erm modulename="erm" %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/erm.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/erm.pref index ff0a42e4fef..dafdaf1efdc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/erm.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/erm.pref @@ -1,13 +1,13 @@ -E-Resource management: +E-resource management: Interface: - - pref: ERMModule choices: 1: Enable 0: Disable - - the E-Resource management module + - the e-resource management module - - - Providers for the E-Resource management module + - Providers for the e-resource management module - pref: ERMProviders multiple: local: Local diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt index 80ea9ab5072..8171ea6a8a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt @@ -8,7 +8,7 @@ [% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] - E-Resource management › Koha + E-resource management › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 028ae1f2b81..1b96d1a8a52 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -114,7 +114,7 @@ [% IF Koha.Preference('ERMModule') && CAN_user_erm %]
  • - E-Resource management + E-resource management
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue index 8298e21a589..e06683ed2cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue @@ -14,7 +14,7 @@