LP#19801356 Making 'username' consistent in the OPAC

Signed-off-by: Gina Monti <gmonti@biblio.org>
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 6c517fa..e4b88ca 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -4138,7 +4138,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field reporter:label="Suffix" name="suffix"  reporter:datatype="text"/>
                        <field reporter:label="Is Super User" name="super_user" reporter:datatype="bool"/>
                        <field reporter:label="Family Linkage or other Group" name="usrgroup" reporter:datatype="int"/>
-                       <field reporter:label="OPAC/Staff Client User Name" name="usrname"  reporter:datatype="text"/>
+                       <field reporter:label="OPAC/Staff Client Username" name="usrname"  reporter:datatype="text"/>
                        <field reporter:label="OPAC/Staff Client Holds Alias" name="alias"  reporter:datatype="text"/>
                        <field reporter:label="Juvenile" name="juvenile"  reporter:datatype="bool"/>
                        <field reporter:label="Record Last Update Time" name="last_update_time" reporter:datatype="timestamp"/>
@@ -11639,7 +11639,7 @@ SELECT  usr,
         <fields oils_persist:primary="row_id" oils_persist:sequence="staging.user_stage_row_id_seq">
             <field reporter:label="Row ID" name="row_id" reporter:datatype="id"/>
             <field reporter:label="Create Date" name="row_date" reporter:datatype="timestamp"/>
-            <field reporter:label="User Name" name="usrname" reporter:datatype="text"/>
+            <field reporter:label="Username" name="usrname" reporter:datatype="text"/>
             <field reporter:label="Main (Profile) Permission Group" name="profile" reporter:datatype="text"/>
             <field reporter:label="Email Address" name="email" reporter:datatype="text"/>
             <field reporter:label="Password" name="passwd" reporter:datatype="text"/>
@@ -11667,7 +11667,7 @@ SELECT  usr,
         <fields oils_persist:primary="row_id" oils_persist:sequence="staging.card_stage_row_id_seq">
             <field reporter:label="Row ID" name="row_id" reporter:datatype="id"/>
             <field reporter:label="Row Date" name="row_date" reporter:datatype="timestamp"/>
-            <field reporter:label="User Name" name="usrname" reporter:datatype="text"/>
+            <field reporter:label="Username" name="usrname" reporter:datatype="text"/>
             <field reporter:label="Barcode" name="barcode" reporter:datatype="text"/>
             <field reporter:label="Complete" name="complete" reporter:datatype="bool"/>
         </fields>
@@ -11677,7 +11677,7 @@ SELECT  usr,
         <fields oils_persist:primary="row_id" oils_persist:sequence="staging.mailing_address_stage_row_id_seq">
             <field reporter:label="Row ID" name="row_id" reporter:datatype="id"/>
             <field reporter:label="Row Date" name="row_date" reporter:datatype="timestamp"/>
-            <field reporter:label="User Name" name="usrname" reporter:datatype="text"/>
+            <field reporter:label="Username" name="usrname" reporter:datatype="text"/>
             <field reporter:label="Street (1)" name="street1" reporter:datatype="text"/>
             <field reporter:label="Street (2)" name="street2" reporter:datatype="text"/>
             <field reporter:label="City" name="city" reporter:datatype="text"/>
@@ -11693,7 +11693,7 @@ SELECT  usr,
         <fields oils_persist:primary="row_id" oils_persist:sequence="staging.mailing_address_stage_row_id_seq">
             <field reporter:label="Row ID" name="row_id" reporter:datatype="id"/>
             <field reporter:label="Row Date" name="row_date" reporter:datatype="timestamp"/>
-            <field reporter:label="User Name" name="usrname" reporter:datatype="text"/>
+            <field reporter:label="Username" name="usrname" reporter:datatype="text"/>
             <field reporter:label="Street (1)" name="street1" reporter:datatype="text"/>
             <field reporter:label="Street (2)" name="street2" reporter:datatype="text"/>
             <field reporter:label="City" name="city" reporter:datatype="text"/>
@@ -11709,7 +11709,7 @@ SELECT  usr,
         <fields oils_persist:primary="row_id" oils_persist:sequence="staging.statcat_stage_row_id_seq">
             <field reporter:label="Row ID" name="row_id" reporter:datatype="id"/>
             <field reporter:label="Row Date" name="row_date" reporter:datatype="timestamp"/>
-            <field reporter:label="User Name" name="usrname" reporter:datatype="text"/>
+            <field reporter:label="Username" name="usrname" reporter:datatype="text"/>
             <field reporter:label="Stat Cat ID" name="statcat" reporter:datatype="text"/>
             <field reporter:label="Stat Cat Value" name="value" reporter:datatype="text"/>
             <field reporter:label="Complete" name="complete" reporter:datatype="bool"/>
@@ -11720,7 +11720,7 @@ SELECT  usr,
         <fields oils_persist:primary="row_id" oils_persist:sequence="staging.setting_stage_row_id_seq">
             <field reporter:label="Row ID" name="row_id" reporter:datatype="id"/>
             <field reporter:label="Row Date" name="row_date" reporter:datatype="timestamp"/>
-            <field reporter:label="User Name" name="usrname" reporter:datatype="text"/>
+            <field reporter:label="Username" name="usrname" reporter:datatype="text"/>
             <field reporter:label="User Setting Code" name="setting" reporter:datatype="text"/>
             <field reporter:label="User Setting Value" name="value" reporter:datatype="text"/>
             <field reporter:label="Complete" name="complete" reporter:datatype="bool"/>
@@ -14604,7 +14604,7 @@ SELECT  usr,
                 sr:hide_from="display,filter" sr:force_transform="reporter.intersect_user_perm_ou,SR__USER_ID,VIEW_USER" sr:force_filter="true" sr:force_filtervalues="t"/>
             <field reporter:label="User ID" name="user_id" reporter:datatype="int" sr:suggest_transform="count_distinct" field_groups="common"/>
             <field reporter:label="Primary Barcode" name="barcode_primary" reporter:datatype="text" field_groups="common"/>
-            <field reporter:label="OPAC/Staff Client User Name" name="usrname" reporter:datatype="text" field_groups="common"/>
+            <field reporter:label="OPAC/Staff Client Username" name="usrname" reporter:datatype="text" field_groups="common"/>
             <field reporter:label="Email" name="email" reporter:datatype="text" field_groups="contact,common"/>
             <field reporter:label="Full Name" name="full_name" reporter:datatype="text" field_groups="name,common"/>
             <field reporter:label="Prefix" name="prefix" reporter:datatype="text" field_groups="name"/>

diff --git a/Open-ILS/src/extras/import/marc2sre.pl.in b/Open-ILS/src/extras/import/marc2sre.pl.in
index 58e7fa6..1694ca5 100755 (executable)
--- a/Open-ILS/src/extras/import/marc2sre.pl.in
+++ b/Open-ILS/src/extras/import/marc2sre.pl.in
@@ -65,7 +65,7 @@ Fieldmapper->import(IDL => OpenSRF::Utils::SettingsClient->new->config_value("ID
 
 my ($result, $evt) = get_user_id($user);
 if ($evt || !$result->id) {
-    print("Could not retrieve user with user name '$user'\n");
+    print("Could not retrieve user with username '$user'\n");
     exit(0);
 }
 

diff --git a/Open-ILS/src/support-scripts/eg_db_config.in b/Open-ILS/src/support-scripts/eg_db_config.in
index c224e95..9e14f17 100755 (executable)
--- a/Open-ILS/src/support-scripts/eg_db_config.in
+++ b/Open-ILS/src/support-scripts/eg_db_config.in
@@ -211,7 +211,7 @@ sub load_sample_data {
        chdir($cwd);
 }
 
-=item set_admin_account() - Sets the administrative user's user name and password
+=item set_admin_account() - Sets the administrative user's username and password
 =cut
 sub set_admin_account {
        my $admin_user = shift;
@@ -399,14 +399,14 @@ DATABASE CONFIGURATION OPTIONS
 
     --port            port number for database access
 
-    --admin-user      administration user's user name
+    --admin-user      administration user's username
 
     --admin-pass      administration user's password
 
 EXAMPLES
    This script is normally used during the initial installation and
    configuration process. This creates the database schema, sets
-   the administration user's user name and password, and modifies your
+   the administration user's username and password, and modifies your
    configuration files to include the correct database connection
    information.
 

diff --git a/Open-ILS/src/templates-bootstrap/opac/password_reset.tt2 b/Open-ILS/src/templates-bootstrap/opac/password_reset.tt2
index 1137ebb..eabe3b2 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/password_reset.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/password_reset.tt2
@@ -16,7 +16,7 @@
         NOT_ACTIVE => l('This was not an active password reset request. Your password has not been reset.'),
         NOT_STRONG => l('The password you chose was not considered complex enough to protect your account. Your password has not been reset.'),
         TWO_PASSWORDS => l('Please enter and repeat your new password.'),
-        REQUEST_SUCCESS => l('Your user name or barcode has been submitted for a password reset. ' _
+        REQUEST_SUCCESS => l('Your username or barcode has been submitted for a password reset. ' _
             'If a matching account with an email address is found, you will soon receive an email at that address with further instructions for resetting your password.')
     }
 %]
@@ -47,7 +47,7 @@
             </form>
             [% END %]
         [% ELSIF !ctx.pwreset.status %]
-        <h2>[% l('Please enter your user name or barcode to identify your library account and request a password reset') %]</h2>
+        <h2>[% l('Please enter your username or barcode to identify your library account and request a password reset') %]</h2>
         [%- INCLUDE "opac/password_reset_msg.tt2" %]
         <form method="post">
             <div class="form-group row">
@@ -55,7 +55,7 @@
                     <input type="text" class="form-control col-sm-6" id="barcode" name="barcode"/>
                     </div>
                 <div class="form-group row">
-                    <label for="username" class="col-sm-6 col-form-label">[% l('User name:') %] </label>
+                    <label for="username" class="col-sm-6 col-form-label">[% l('Username:') %] </label>
                     <input type="text" class="form-control col-sm-6" id="username" name="username"/>
                     </div>
 

diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index 2856e47..f4dbea8 100644 (file)
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -16,7 +16,7 @@
         NOT_ACTIVE => l('This was not an active password reset request. Your password has not been reset.'),
         NOT_STRONG => l('The password you chose was not considered complex enough to protect your account. Your password has not been reset.'),
         TWO_PASSWORDS => l('Please enter and repeat your new password.'),
-        REQUEST_SUCCESS => l('Your user name or barcode has been submitted for a password reset. ' _ 
+        REQUEST_SUCCESS => l('Your username or barcode has been submitted for a password reset. ' _ 
             'If a matching account with an email address is found, you will soon receive an email at that address with further instructions for resetting your password.')
     }
 %]
@@ -48,7 +48,7 @@
             </form>
             [% END %]
         [% ELSIF !ctx.pwreset.status %]
-        <h2>[% l('Please enter your user name or barcode to identify your library account and request a password reset') %]</h2>
+        <h2>[% l('Please enter your username or barcode to identify your library account and request a password reset') %]</h2>
         [%- INCLUDE "opac/password_reset_msg.tt2" %]
         <form method="post">
             <table>
@@ -57,7 +57,7 @@
                     <td><input type="text" id="barcode" name="barcode"/></td>
                 </tr>
                 <tr>
-                    <td><label for="username">[% l('User name:') %] </label></td>
+                    <td><label for="username">[% l('Username:') %] </label></td>
                     <td><input type="text" id="username" name="username"/></td>
                 </tr>
             </table>

diff --git a/Open-ILS/web/js/dojo/openils/opac/nls/opac.js b/Open-ILS/web/js/dojo/openils/opac/nls/opac.js
index 59ae500..7dcd279 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/opac/nls/opac.js
+++ b/Open-ILS/web/js/dojo/openils/opac/nls/opac.js
@@ -1,6 +1,6 @@
 {
     "BARCODE_PROMPT": "Barcode: ",
-    "USERNAME_PROMPT": "User name: ",
+    "USERNAME_PROMPT": "Username: ",
     "CANCEL_BUTTON_LABEL": "Cancel",
     "SUBMIT_BUTTON_LABEL": "Submit",
     "OK": "OK",
@@ -10,7 +10,7 @@
     "PWD_RESET_SUBMIT_STATUS": "Sending request...",
     "PWD_RESET_FORGOT_PROMPT": "Forgot your password?",
     "PWD_RESET_FORM_TITLE": "Request password reset",
-    "PWD_RESET_SUBMIT_PROMPT": "To begin the password reset process, enter either your barcode or user name in the form below and click 'Submit'",
+    "PWD_RESET_SUBMIT_PROMPT": "To begin the password reset process, enter either your barcode or username in the form below and click 'Submit'",
        "CREATE_MFHD": "Add MFHD Record",
        "CREATED_MFHD_RECORD": "Created MFHD record for ${0}",
        "DELETE_MFHD": "Delete Record",

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index ef72fec..2039fc6 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -193,7 +193,7 @@
 <!ENTITY staff.au_super_user_label "Super User">
 <!ENTITY staff.au_survey_responses_label "Survey Responses">
 <!ENTITY staff.au_usrgroup_label "User group">
-<!ENTITY staff.au_usrname_label "User name">
+<!ENTITY staff.au_usrname_label "Username">
 <!ENTITY staff.admin.survey.available.label "Available to:">
 <!ENTITY staff.admin.survey.description.label "Description:">
 <!ENTITY staff.admin.survey.end.label "End:">
@@ -3538,7 +3538,7 @@
 <!ENTITY staff.patron.user_buckets.stub_not_implemented "Just a stub, Not Yet Implemented">
 <!ENTITY staff.patron.user_edit.title "Evergreen User Editor">
 <!ENTITY staff.patron.user_edit.user_info.label "User Information">
-<!ENTITY staff.patron.user_edit.user_name.label "User Name:">
+<!ENTITY staff.patron.user_edit.user_name.label "Username:">
 <!ENTITY staff.patron.user_edit.barcode.label "Barcode:">
 <!ENTITY staff.patron.user_edit.firstname.label "First Name:">
 <!ENTITY staff.patron.user_edit.middlename.label "Middle Name:">