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 <oleonard@myacpl.org>
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 <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/installer/data/mysql/db_revs/220600079.pl b/installer/data/mysql/db_revs/220600079.pl
index 0c48462..5657bde 100755 (executable)
--- 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 fe92323..beebd27 100644 (file)
--- 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 3c62856..3b03287 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -44,7 +44,7 @@
                         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
                     [% END %]
                     [% IF Koha.Preference('ERMModule') && CAN_user_erm %]
-                        <li><a href="/cgi-bin/koha/erm/erm.pl">E-Resource management</a></li>
+                        <li><a href="/cgi-bin/koha/erm/erm.pl">E-resource management</a></li>
                     [% END %]
                     [% IF ( Koha.Preference('UseCourseReserves') ) %]
                         <li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>

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 42f6da0..8be1e62 100644 (file)
--- 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 ) %]
             <li class="active">
-                <a title="E-Resource management" href="/cgi-bin/koha/admin/preferences.pl?tab=erm">E-Resource management</a>
+                <a title="E-resource management" href="/cgi-bin/koha/admin/preferences.pl?tab=erm">E-resource management</a>
                 [% PROCESS subtabs  %]
         [% ELSE %]
             <li>
-                <a title="E-Resource management" href="/cgi-bin/koha/admin/preferences.pl?tab=erm">E-Resource management</a>
+                <a title="E-resource management" href="/cgi-bin/koha/admin/preferences.pl?tab=erm">E-resource management</a>
         [% END %]
         </li>
 

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 689730d..922a706 100644 (file)
--- 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' %]
             <p>Used in French UNIMARC installations in field 995 $o to identify item status. Similar to NOT_LOAN</p>
         [% CASE 'ERM_AGREEMENT_CLOSURE_REASON' %]
-            <p>Close reasons for agreements (E-Resource management module)</p>
+            <p>Close reasons for agreements (e-resource management module)</p>
         [% CASE 'ERM_AGREEMENT_LICENSE_LOCATION' %]
-            <p>Locations of the licenses' agreements (E-Resource management module)</p>
+            <p>Locations of the licenses' agreements (e-resource management module)</p>
         [% CASE 'ERM_AGREEMENT_LICENSE_STATUS' %]
-            <p>Statuses of the licenses' agreements(E-Resource management module)</p>
+            <p>Statuses of the licenses' agreements (e-resource management module)</p>
         [% CASE 'ERM_AGREEMENT_RENEWAL_PRIORITY' %]
-            <p>Renewal priorities of agreements (E-Resource management module)</p>
+            <p>Renewal priorities of agreements (e-resource management module)</p>
         [% CASE 'ERM_AGREEMENT_STATUS' %]
-            <p>Statuses of agreements (E-Resource management module)</p>
+            <p>Statuses of agreements (e-resource management module)</p>
         [% CASE 'ERM_USER_ROLES' %]
-            <p>Roles for users (E-Resource management module)</p>
+            <p>Roles for users (e-resource management module)</p>
         [% CASE 'ERM_LICENSE_STATUS' %]
-            <p>Statuses of the licenses (E-Resource management module)</p>
+            <p>Statuses of the licenses (e-resource management module)</p>
         [% CASE 'ERM_LICENSE_TYPE' %]
-            <p>Types of the licenses (E-Resource management module)</p>
+            <p>Types of the licenses (e-resource management module)</p>
         [% CASE 'ERM_PACKAGE_CONTENT_TYPE' %]
-            <p>Content type of the packages (E-Resource management module)</p>
+            <p>Content type of the packages (e-resource management module)</p>
         [% CASE 'ERM_PACKAGE_TYPE' %]
-            <p>Types of the packages (E-Resource management module)</p>
+            <p>Types of the packages (e-resource management module)</p>
         [% CASE 'ERM_TITLE_PUBLICATION_TYPE' %]
-            <p>Publication types of the titles (E-Resource management module)</p>
+            <p>Publication types of the titles (e-resource management module)</p>
         [% CASE 'HINGS_AS' %]
             <p>General holdings: acquisition status designator :: This data element specifies acquisition status for the unit at the time of the holdings report.</p>
         [% 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 f8ba1c3..63b0f12 100644 (file)
--- 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 @@
                                     <div class="panel-heading" role="tab" id="ermHeading">
                                         <h2 class="panel-title">
                                             <a class="collapsed" role="button" data-toggle="collapse" data-parent="#modules" href="#erm" aria-expanded="false" aria-controls="collapseOne">
-                                                 E-Resource management
+                                                 E-resource management
                                             </a>
                                         </h2>
                                     </div> <!-- /.panel-heading -->
                                     <div id="erm" class="panel-collapse collapse" role="tabpanel" aria-labelledby="ermHeading">
                                         <div class="panel-body">
-                                            <h3>E-Resource management tables</h3>
+                                            <h3>E-resource management tables</h3>
                                             [% PROCESS pagelist module=modules.erm modulename="erm" %]
                                         </div> <!-- /.panel-body -->
                                     </div> <!-- /.panel-collapse -->

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 ff0a42e..dafdaf1 100644 (file)
--- 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 80ea9ab..8171ea6 100644 (file)
--- 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' %]
 <title>
-    E-Resource management &rsaquo; Koha
+    E-resource management &rsaquo; Koha
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>

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 028ae1f..1b96d1a 100644 (file)
--- 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 %]
                             <li>
-                                <a class="icon_general icon_erm" href="/cgi-bin/koha/erm/erm.pl"><i class="fa fa-fw fa-external-link-square"></i>E-Resource management</a>
+                                <a class="icon_general icon_erm" href="/cgi-bin/koha/erm/erm.pl"><i class="fa fa-fw fa-external-link-square"></i>E-resource management</a>
                             </li>
                             [% 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 8298e21..e06683e 100644 (file)
--- 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 @@
                     <aside>
                         <div id="navmenu">
                             <div id="navmenulist">
-                                <h5>{{ $__("E-Resource management") }}</h5>
+                                <h5>{{ $__("E-resource management") }}</h5>
                                 <ul>
                                     <li>
                                         <router-link
@@ -112,7 +112,7 @@
     <div v-else>
         {{
             $__(
-                "The E-Resource management module is disabled, turn on 'ERMModule' to use it"
+                "The e-resource management module is disabled, turn on 'ERMModule' to use it"
             )
         }}
     </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js b/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js
index 4c94d4f..62421c2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js
@@ -30,7 +30,7 @@ const breadcrumbs = {
         path: "/cgi-bin/koha/mainpage.pl",
     },
     erm_home: {
-        text: "E-Resource management", // $t("E-Resource management")
+        text: "E-resource management", // $t("E-resource management")
         path: "/cgi-bin/koha/erm/erm.pl",
     },
     agreements: {