ZEVA 310 - government wording

frontend/src/app/components/Alert.js

@@ -10,35 +10,35 @@ const Alert = (props) => {
   let title;
   let icon = 'exclamation-circle';
   let classname;
-  let message = 'ZEV credits cannot be issued until validated by government.';
+  let message = 'ZEV credits cannot be issued until validated by Government of B.C.';
   let historyMessage;
   if (alertType === 'vehicle') {
     const { user, status } = props;
     switch (status) {
       case 'CHANGES_REQUESTED':
         title = 'Changes Requested';
-        message = `information or change requested by government ${date}, see comments. ${message}`;
+        message = `information or change requested by Government of B.C. ${date}, see comments. ${message}`;
         classname = 'alert-warning';
         break;
       case 'DRAFT':
         title = 'Draft';
-        message = `saved ${date} by ${user}, awaiting submission to government. ${message}`;
+        message = `saved ${date} by ${user}, awaiting submission to Government of B.C. ${message}`;
         classname = 'alert-warning';
         break;
       case 'SUBMITTED':
-        message = `submitted to government ${date} by ${user}, awaiting validation by government. ${message}`;
+        message = `submitted to Government of B.C. ${date} by ${user}, awaiting validation by Government of B.C. ${message}`;
         title = 'Submitted';
         classname = 'alert-primary';
         break;
       case 'VALIDATED':
         title = 'Validated';
-        message = `validated by government ${date}. Credits can be issued for eligible sales of this model`;
+        message = `validated by Government of B.C. ${date}. Credits can be issued for eligible sales of this model`;
         classname = 'alert-success';
         icon = 'check-circle';
         break;
       case 'REJECTED':
         title = 'Rejected';
-        message = `rejected by government ${date}. Credits cannot be issued for sales of this model.`;
+        message = `rejected by Government of B.C. ${date}. Credits cannot be issued for sales of this model.`;
         classname = 'alert-danger';
         break;
       default:
@@ -75,11 +75,11 @@ const Alert = (props) => {
           break;
         }
         title = 'Draft';
-        message = `${excelUploadMessage}, awaiting submission to government. `;
+        message = `${excelUploadMessage}, awaiting submission to Government of B.C. `;
         classname = 'alert-warning';
         break;
       case 'SUBMITTED':
-        message = `Application submitted to government ${moment(statusFilter('SUBMITTED').createTimestamp).format('MMM D, YYYY')}, by ${statusFilter('SUBMITTED').createUser.displayName}. Awaiting review by government.`;
+        message = `Application submitted to Government of B.C. ${moment(statusFilter('SUBMITTED').createTimestamp).format('MMM D, YYYY')}, by ${statusFilter('SUBMITTED').createUser.displayName}. Awaiting review by Government of B.C.`;
         title = 'Submitted';
         if (isGovernment || excelUploadMessage === '') {
           classname = 'alert-warning';
@@ -95,8 +95,8 @@ const Alert = (props) => {
         if (isGovernment || excelUploadMessage === '') {
           message = `Credits issued ${moment(statusFilter('VALIDATED').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('VALIDATED').createUser.displayName}.`;
         } else {
-          message = `Credits issued ${moment(statusFilter('VALIDATED').createTimestamp).format('MMM D, YYYY')} by government.`;
-          historyMessage = `${excelUploadMessage}. Application submitted to government ${moment(statusFilter('SUBMITTED').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('SUBMITTED').createUser.displayName}`;
+          message = `Credits issued ${moment(statusFilter('VALIDATED').createTimestamp).format('MMM D, YYYY')} by Government of B.C.`;
+          historyMessage = `${excelUploadMessage}. Application submitted to Government of B.C. ${moment(statusFilter('SUBMITTED').createTimestamp).format('MMM D, YYYY')} by ${statusFilter('SUBMITTED').createUser.displayName}`;
         }
         break;
       case 'RECOMMEND_APPROVAL':

frontend/src/credits/components/CreditRequestDetailsPage.js

@@ -46,7 +46,7 @@ const CreditRequestDetailsPage = (props) => {
         confirmLabel: ' Submit',
         handleSubmit: () => { handleSubmit('SUBMITTED'); },
         buttonClass: 'button primary',
-        modalText: 'Submit credit request to government?',
+        modalText: 'Submit credit request to Government of B.C.?',
         icon: <FontAwesomeIcon icon="paper-plane" />,
       };
       break;

frontend/src/dashboard/components/ActionsBceid.js

@@ -54,7 +54,7 @@ const ActionsBceid = (props) => {
           colour="green"
           icon="car"
           boldText="ZEV Models"
-          regularText={`${activityCount.modelsValidated} validated by government`}
+          regularText={`${activityCount.modelsValidated} validated by Government of B.C.`}
           linkTo={`${ROUTES_VEHICLES.LIST}?col-status=Validated`}
         />
         )}
@@ -95,7 +95,7 @@ const ActionsBceid = (props) => {
           colour="green"
           icon="check-square"
           boldText="Credit Applications"
-          regularText={`${activityCount.creditsIssued} processed by government`}
+          regularText={`${activityCount.creditsIssued} processed by Government of B.C.`}
           linkTo={`${ROUTES_CREDIT_REQUESTS.LIST}?status=Issued`}
         />
         )}
@@ -126,7 +126,7 @@ const ActionsBceid = (props) => {
           colour="blue"
           icon="exchange-alt"
           boldText="Credit Transfer"
-          regularText={`${activityCount.transfersAwaitingGovernment} awaiting  government action`}
+          regularText={`${activityCount.transfersAwaitingGovernment} awaiting  Government of B.C. action`}
           linkTo={`${ROUTES_CREDIT_TRANSFERS.LIST}?status=Approved`}
         />
         )}
@@ -136,7 +136,7 @@ const ActionsBceid = (props) => {
           colour="green"
           icon="exchange-alt"
           boldText="Credit Transfer"
-          regularText={`${activityCount.transfersRecorded} recorded by government`}
+          regularText={`${activityCount.transfersRecorded} recorded by Government of B.C.`}
           linkTo={`${ROUTES_CREDIT_TRANSFERS.LIST}?status=Issued`}
         />
         )}

frontend/src/dashboard/components/Administration.js

@@ -24,7 +24,7 @@ const Administration = (props) => {
                 History.push(ROUTES_ORGANIZATIONS.USERS.replace(/:id/gi, user.organization.id));
               }}
             >
-              Manage government users
+              Manage Government of B.C. users
             </button>
           </div>
         </div>

frontend/src/stories/DashboardPage.stories.js

@@ -107,14 +107,14 @@ storiesOf('Activity Banner BCEID', module)
       />
     </div>
   ))
-  .add('green validated by government', () => (
+  .add('green validated by Government of B.C.', () => (
     <div id="actions" className="dashboard-card">
       <ActivityBanner
         user={BceidUser}
         colour="green"
         icon="car"
         boldText="ZEV Models"
-        regularText="2 validated by government"
+        regularText="2 validated by Government of B.C."
         linkTo="/"
       />
     </div>

frontend/src/vehicles/components/VehicleForm.js

@@ -40,7 +40,7 @@ const VehicleForm = (props) => {
     newVehicle,
   } = props;
   const [showModal, setShowModal] = useState(false);
-  const modalText = (fields && fields.hasPassedUs06Test) ? 'Submit vehicle model and range test results to government' : 'Submit ZEV model to government?';
+  const modalText = (fields && fields.hasPassedUs06Test) ? 'Submit vehicle model and range test results to Government of B.C.' : 'Submit ZEV model to Government of B.C.?';
   const modal = (
     <Modal
       confirmLabel=" Submit"