@fleetbase/fleetops-engine 0.3.9 → 0.4.1

package/addon/controllers/operations/orders/index.js

@@ -23,6 +23,13 @@ export default class OperationsOrdersIndexController extends BaseController {
      */
     @service fetch;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `filters` service
      *
@@ -317,7 +324,7 @@ export default class OperationsOrdersIndexController extends BaseController {
      */
     @tracked columns = [
         {
-            label: 'ID',
+            label: this.intl.t('fleet-ops.common.id'),
             valuePath: 'public_id',
             width: '150px',
             cellComponent: 'table/cell/link-to',
@@ -329,7 +336,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Internal ID',
+            label: this.intl.t('fleet-ops.common.internal-id'),
             valuePath: 'internal_id',
             width: '125px',
             resizable: true,
@@ -338,7 +345,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Payload',
+            label: this.intl.t('fleet-ops.operations.orders.index.payload'),
             valuePath: 'payload.public_id',
             resizable: true,
             hidden: true,
@@ -349,7 +356,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Customer',
+            label: this.intl.t('fleet-ops.operations.orders.index.customer'),
             valuePath: 'customer.name',
             cellComponent: 'table/cell/base',
             width: '125px',
@@ -363,7 +370,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             model: 'customer',
         },
         {
-            label: 'Facilitator',
+            label: this.intl.t('fleet-ops.operations.orders.index.facilitator'),
             valuePath: 'facilitator.name',
             cellComponent: 'table/cell/base',
             width: '125px',
@@ -377,7 +384,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             model: 'vendor',
         },
         {
-            label: 'Pickup',
+            label: this.intl.t('fleet-ops.operations.orders.index.pickup'),
             valuePath: 'pickupName',
             cellComponent: 'table/cell/base',
             width: '160px',
@@ -392,7 +399,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             model: 'place',
         },
         {
-            label: 'Dropoff',
+            label: this.intl.t('fleet-ops.operations.orders.index.dropoff'),
             valuePath: 'dropoffName',
             cellComponent: 'table/cell/base',
             width: '160px',
@@ -406,7 +413,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             model: 'place',
         },
         {
-            label: 'Scheduled At',
+            label: this.intl.t('fleet-ops.operations.orders.index.scheduled-at'),
             valuePath: 'scheduledAt',
             sortParam: 'scheduled_at',
             filterParam: 'scheduled_at',
@@ -417,7 +424,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterComponent: 'filter/date',
         },
         {
-            label: '# Items',
+            label: this.intl.t('fleet-ops.operations.orders.index.items'),
             cellComponent: 'table/cell/base',
             valuePath: 'item_count',
             resizable: true,
@@ -425,7 +432,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             width: '50px',
         },
         {
-            label: 'Transaction Total',
+            label: this.intl.t('fleet-ops.operations.orders.index.transaction'),
             cellComponent: 'table/cell/base',
             valuePath: 'transaction_amount',
             width: '50px',
@@ -434,7 +441,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             sortable: true,
         },
         {
-            label: 'Tracking Number',
+            label: this.intl.t('fleet-ops.operations.orders.index.tracking'),
             cellComponent: 'table/cell/base',
             valuePath: 'tracking_number.tracking_number',
             width: '170px',
@@ -444,7 +451,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Driver Assigned',
+            label: this.intl.t('fleet-ops.operations.orders.index.driver-assigned'),
             cellComponent: 'table/cell/driver-name',
             valuePath: 'driver_assigned',
             modelPath: 'driver_assigned',
@@ -458,7 +465,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             model: 'driver',
         },
         {
-            label: 'Type',
+            label: this.intl.t('fleet-ops.common.type'),
             valuePath: 'type',
             width: '100px',
             resizable: true,
@@ -472,7 +479,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterComponentPlaceholder: 'Filter by order type',
         },
         {
-            label: 'Status',
+            label: this.intl.t('fleet-ops.common.status'),
             valuePath: 'status',
             cellComponent: 'table/cell/status',
             width: '120px',
@@ -483,7 +490,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterOptions: this.statusOptions,
         },
         {
-            label: 'Created At',
+            label: this.intl.t('fleet-ops.common.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
             filterParam: 'created_at',
@@ -494,7 +501,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterComponent: 'filter/date',
         },
         {
-            label: 'Updated At',
+            label: this.intl.t('fleet-ops.common.updated-at'),
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
             filterParam: 'updated_at',
@@ -506,7 +513,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterComponent: 'filter/date',
         },
         {
-            label: 'Created By',
+            label: this.intl.t('fleet-ops.operations.orders.index.created-by'),
             valuePath: 'created_by_name',
             width: '125px',
             resizable: true,
@@ -518,7 +525,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             model: 'user',
         },
         {
-            label: 'Updated By',
+            label: this.intl.t('fleet-ops.operations.orders.index.updated-by'),
             valuePath: 'updated_by_name',
             width: '125px',
             resizable: true,
@@ -541,12 +548,12 @@ export default class OperationsOrdersIndexController extends BaseController {
             width: '12%',
             actions: [
                 {
-                    label: 'View Order',
+                    label: this.intl.t('fleet-ops.operations.orders.index.view-order'),
                     icon: 'eye',
                     fn: this.viewOrder,
                 },
                 {
-                    label: 'Cancel Order',
+                    label: this.intl.t('fleet-ops.operations.orders.index.cancel-order'),
                     icon: 'ban',
                     fn: this.cancelOrder,
                 },
@@ -554,7 +561,7 @@ export default class OperationsOrdersIndexController extends BaseController {
                     separator: true,
                 },
                 {
-                    label: 'Delete Order',
+                    label: this.intl.t('fleet-ops.operations.orders.index.delete-order'),
                     icon: 'trash',
                     fn: this.deleteOrder,
                 },
@@ -814,15 +821,15 @@ export default class OperationsOrdersIndexController extends BaseController {
      */
     @action cancelOrder(order, options = {}) {
         this.modalsManager.confirm({
-            title: `Are you sure you wish to cancel this order?`,
-            body: `Once this order is canceled, the order record will still be visible but activity cannot be added to this order.`,
+            title: this.intl.t('fleet-ops.operations.orders.index.cancel-title'),
+            body: this.intl.t('fleet-ops.operations.orders.index.cancel-body'),
             order,
             confirm: (modal) => {
                 modal.startLoading();
 
                 return this.fetch.patch(`orders/cancel`, { order: order.id }).then(() => {
                     order.set('status', 'canceled');
-                    this.notifications.success(`Order ${order.public_id} has been canceled.`);
+                    this.notifications.success(this.intl.t('fleet-ops.operations.orders.index.cancel-success', { orderId: order.public_id }));
                 });
             },
             ...options,
@@ -838,8 +845,8 @@ export default class OperationsOrdersIndexController extends BaseController {
      */
     @action dispatchOrder(order, options = {}) {
         this.modalsManager.confirm({
-            title: `Are you sure you want to dispatch this order?`,
-            body: `Once this order is dispatched the assigned driver will be notified.`,
+            title: this.intl.t('fleet-ops.operations.orders.index.dispatch-title'),
+            body: this.intl.t('fleet-ops.operations.orders.index.dispatch-body'),
             acceptButtonScheme: 'primary',
             acceptButtonText: 'Dispatch',
             acceptButtonIcon: 'paper-plane',
@@ -851,7 +858,7 @@ export default class OperationsOrdersIndexController extends BaseController {
                     .patch(`orders/dispatch`, { order: order.id })
                     .then(() => {
                         order.set('status', 'dispatched');
-                        this.notifications.success(`Order ${order.public_id} has been dispatched.`);
+                        this.notifications.success(this.intl.t('fleet-ops.operations.orders.index.dispatch-success', { orderId: order.public_id }));
                     })
                     .catch((error) => {
                         modal.stopLoading();

package/addon/controllers/operations/scheduler/index.js

@@ -9,6 +9,7 @@ export default class OperationsSchedulerIndexController extends BaseController {
     @service modalsManager;
     @service notifications;
     @service store;
+    @service intl;
     @service hostRouter;
     @tracked scheduledOrders = [];
     @tracked unscheduledOrders = [];
@@ -53,11 +54,11 @@ export default class OperationsSchedulerIndexController extends BaseController {
 
                     if (order.scheduled_at) {
                         // notify order has been scheduled
-                        this.notifications.success(`Order '${order.public_id}' has been scheduled at ${order.scheduledAt}.`);
+                        this.notifications.success(this.intl.t('fleet-ops.operations.scheduler.index.info-message', { orderId: order.public_id, orderAt: order.scheduledAt }));
                         // add event to calendar
                         event = this.calendar.addEvent(createFullCalendarEventFromOrder(order));
                     } else {
-                        this.notifications.info(`Order '${order.public_id}' has been unscheduled.`);
+                        this.notifications.info(this.intl.t('fleet-ops.operations.scheduler.index.info-message', { orderId: order.public_id }));
                     }
 
                     // update event props

package/addon/controllers/operations/service-rates/index/edit.js

@@ -1,8 +1,16 @@
 import OperationsServiceRatesIndexNewController from './new';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { inject as service } from '@ember/object';
 
 export default class OperationsServiceRatesIndexEditController extends OperationsServiceRatesIndexNewController {
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * True if updating service rate.
      *
@@ -40,7 +48,7 @@ export default class OperationsServiceRatesIndexEditController extends Operation
             .save()
             .then((serviceRate) => {
                 return this.transitionToRoute('operations.service-rates.index').then(() => {
-                    this.notifications.success(`Service rate '${serviceRate.service_name}' updated`);
+                    this.notifications.success(this.intl.t('fleet-ops.operations.service-rates.index.edit.success-message', { serviceName: serviceRate.service_name }));
                     this.resetForm();
                 });
             })

package/addon/controllers/operations/service-rates/index/new.js

@@ -19,6 +19,13 @@ export default class OperationsServiceRatesIndexNewController extends BaseContro
      */
     @service notifications;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `loader` service
      *
@@ -300,8 +307,9 @@ export default class OperationsServiceRatesIndexNewController extends BaseContro
             .save()
             .then((serviceRate) => {
                 return this.transitionToRoute('operations.service-rates.index').then(() => {
-                    this.notifications.success(`New Service Rate ${serviceRate.service_name} Created`);
+                    this.notifications.success(this.intl.t('fleet-ops.operations.service-rates.index.new.success-message', { serviceName: serviceRate.service_name }));
                     this.resetForm();
+                    return this.hostRouter.refresh();
                 });
             })
             .catch((error) => {

package/addon/controllers/operations/service-rates/index.js

@@ -21,6 +21,13 @@ export default class OperationsServiceRatesIndexController extends BaseControlle
      */
     @service currentUser;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `fetch` service
      *
@@ -112,7 +119,7 @@ export default class OperationsServiceRatesIndexController extends BaseControlle
      */
     @tracked columns = [
         {
-            label: 'ID',
+            label: this.intl.t('fleet-ops.common.id'),
             valuePath: 'public_id',
             width: '150px',
             cellComponent: 'table/cell/anchor',
@@ -123,7 +130,7 @@ export default class OperationsServiceRatesIndexController extends BaseControlle
             filterComponent: 'filter/string',
         },
         {
-            label: 'Service',
+            label: this.intl.t('fleet-ops.common.service'),
             valuePath: 'service_name',
             cellComponent: 'table/cell/base',
             width: '125px',
@@ -132,7 +139,7 @@ export default class OperationsServiceRatesIndexController extends BaseControlle
             filterable: false,
         },
         {
-            label: 'Service Area',
+            label: this.intl.t('fleet-ops.common.service-area'),
             valuePath: 'service_area.name',
             cellComponent: 'table/cell/base',
             width: '125px',
@@ -145,7 +152,7 @@ export default class OperationsServiceRatesIndexController extends BaseControlle
             model: 'service-area',
         },
         {
-            label: 'Zone',
+            label: this.intl.t('fleet-ops.common.zone'),
             valuePath: 'zone.name',
             cellComponent: 'table/cell/base',
             width: '125px',
@@ -158,7 +165,7 @@ export default class OperationsServiceRatesIndexController extends BaseControlle
             model: 'zone',
         },
         {
-            label: 'Created At',
+            label: this.intl.t('fleet-ops.common.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
             width: '125px',
@@ -168,7 +175,7 @@ export default class OperationsServiceRatesIndexController extends BaseControlle
             filterComponent: 'filter/date',
         },
         {
-            label: 'Updated At',
+            label: this.intl.t('fleet-ops.common.updated-at'),
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
             width: '125px',
@@ -189,11 +196,11 @@ export default class OperationsServiceRatesIndexController extends BaseControlle
             width: '10%',
             actions: [
                 {
-                    label: 'Edit Service Rate',
+                    label: this.intl.t('fleet-ops.operations.service-rates.index.edit-service'),
                     fn: this.editServiceRate,
                 },
                 {
-                    label: 'Delete Service Rate',
+                    label: this.intl.t('fleet-ops.operations.service-rates.index.delete-service'),
                     fn: this.deleteServiceRate,
                 },
             ],
@@ -280,7 +287,7 @@ export default class OperationsServiceRatesIndexController extends BaseControlle
     @action bulkDeleteServiceRates(selected) {
         this.crud.bulkDelete(selected, {
             modelNamePath: `public_id`,
-            acceptButtonText: "Delete Service's",
+            acceptButtonText: this.intl.t('fleet-ops.operations.service-rates.index.accept-button'),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },

package/addon/routes/management/places/index.js

@@ -26,7 +26,7 @@ export default class ManagementPlacesIndexRoute extends Route {
 
     @action willTransition(transition) {
         if (isNestedRouteTransition(transition)) {
-            set(this.queryParams, 'page.refreshModel', false);
+            // set(this.queryParams, 'page.refreshModel', false);
             set(this.queryParams, 'sort.refreshModel', false);
         }
     }

package/addon/routes/operations/orders/index/view.js

@@ -25,9 +25,7 @@ export default class OperationsOrdersIndexViewRoute extends Route {
         return this.transitionTo('operations.orders.index');
     }
 
-    model(order) {
-        const { public_id } = order;
-
+    model({ public_id }) {
         return this.store.queryRecord('order', {
             public_id,
             single: true,
@@ -80,16 +78,6 @@ export default class OperationsOrdersIndexViewRoute extends Route {
 
     async setupController(controller, model) {
         super.setupController(controller, model);
-
-        controller.isLoadingAdditionalData = true;
-
-        await model.loadPayload();
-        await model.loadDriver();
-        await model.loadTrackingNumber();
-        await model.loadCustomer();
-        await model.loadTrackingActivity();
-        await model.loadOrderConfig();
-
-        controller.isLoadingAdditionalData = false;
+        controller.loadOrderRelations.perform(model);
     }
 }

package/addon/services/driver-actions.js

@@ -7,11 +7,12 @@ export default class DriverActionsService extends Service {
     @service modalsManager;
     @service universe;
     @service crud;
+    @service intl;
 
     assignOrder(driver, options = {}) {
         this.modalsManager.show('modals/driver-assign-order', {
-            title: `Assign Order to this Driver`,
-            acceptButtonText: 'Assign Order',
+            title: this.intl.t('fleet-ops.management.drivers.index.order-driver'),
+            acceptButtonText: this.intl.t('fleet-ops.management.drivers.index.assign-order'),
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',
             acceptButtonDisabled: true,
@@ -25,7 +26,7 @@ export default class DriverActionsService extends Service {
             confirm: (modal) => {
                 const selectedOrder = modal.getOption('selectedOrder');
                 if (!selectedOrder) {
-                    this.notifications.warning('No order selected!');
+                    this.notifications.warning(this.intl.t('fleet-ops.management.drivers.index.no-order-warning'));
                     return;
                 }
 
@@ -35,7 +36,7 @@ export default class DriverActionsService extends Service {
                 return driver
                     .save()
                     .then(() => {
-                        this.notifications.success(`${driver.name} assigned to order.`);
+                        this.notifications.success(this.intl.t('fleet-ops.management.drivers.index.assign-driver', { driverName: driver.name }));
                     })
                     .catch((error) => {
                         driver.rollbackAttributes();
@@ -49,8 +50,8 @@ export default class DriverActionsService extends Service {
 
     assignVehicle(driver, options = {}) {
         this.modalsManager.show('modals/driver-assign-vehicle', {
-            title: `Assign Vehicle to this Driver`,
-            acceptButtonText: 'Confirm & Create',
+            title: this.intl.t('fleet-ops.management.drivers.index.title-vehicle'),
+            acceptButtonText: this.intl.t('fleet-ops.management.drivers.index.confirm-button'),
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',
             hideDeclineButton: true,
@@ -61,7 +62,7 @@ export default class DriverActionsService extends Service {
                 return driver
                     .save()
                     .then((driver) => {
-                        this.notifications.success(`${driver.name} assigned to vehicle.`);
+                        this.notifications.success(this.intl.t('fleet-ops.management.drivers.index.assign-vehicle', { driverName: driver.name }));
                     })
                     .catch((error) => {
                         driver.rollbackAttributes();
@@ -78,7 +79,7 @@ export default class DriverActionsService extends Service {
         const [latitude, longitude] = location.coordinates;
 
         this.modalsManager.show('modals/point-map', {
-            title: `Current Location of ${driver.name}`,
+            title: this.intl.t('fleet-ops.management.drivers.index.locate-driver', { driverName: driver.name }),
             acceptButtonText: 'Done',
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',

package/addon/services/vehicle-actions.js

@@ -7,13 +7,14 @@ export default class VehicleActionsService extends Service {
     @service modalsManager;
     @service universe;
     @service crud;
+    @service intl;
 
     locate(vehicle, options = {}) {
         const { location } = vehicle;
         const [latitude, longitude] = location.coordinates;
 
         this.modalsManager.show('modals/point-map', {
-            title: `Current Location of ${vehicle.displayName}`,
+            title: this.intl.t('fleet-ops.management.vehicles.index.locate-title', { vehicleName: vehicle.displayName }),
             acceptButtonText: 'Done',
             acceptButtonIcon: 'check',
             acceptButtonIconPrefix: 'fas',

package/addon/templates/management/contacts/index.hbs

@@ -1,5 +1,5 @@
-<Layout::Section::Header @title="Contacts" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-    <Button @icon="refresh" @onClick={{this.reload}} @helpText="Reload data" class="mr-2" />
+<Layout::Section::Header @title={{t "fleet-ops.management.contacts.index.title"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+    <Button @icon="refresh" @onClick={{this.reload}} @helpText={{t "fleet-ops.common.reload-data"}} class="mr-2" />
     <FiltersPicker
         @columns={{this.columns}}
         @onApply={{fn this.filters.apply this}}
@@ -10,18 +10,18 @@
     />
     <VisibleColumnPicker @columns={{this.columns}} @onChange={{fn (mut this.columns)}} class="mr-2" />
     {{#if (safe-has this.table "selectedRows")}}
-        <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
+        <DropdownButton @icon="layer-group" @text={{t "fleet-ops.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
                     <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeleteContacts)}}>
-                        Delete Contacts
+                        {{t "fleet-ops.management.contacts.index.delete-contacts"}}
                     </a>
                 </div>
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="New" class="mr-2" @onClick={{this.createContact}} />
-    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text="Export" @onClick={{this.exportContacts}} />
+    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text={{t "fleet-ops.common.new"}} class="mr-2" @onClick={{this.createContact}} />
+    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text={{t "fleet-ops.common.export"}} @onClick={{this.exportContacts}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>

package/addon/templates/management/drivers/index.hbs

@@ -1,10 +1,10 @@
 <Layout::Section::Header
     @title={{t "fleet-ops.management.drivers.index.title"}}
-    @searchPlaceholder={{t "fleet-ops.management.drivers.index.fields.search.placeholder"}}
+    @searchPlaceholder={{t "fleet-ops.management.drivers.index.search-placeholder"}}
     @searchQuery={{this.query}}
     @onSearch={{perform this.search}}
 >
-    <Button @icon="refresh" @onClick={{this.reload}} @helpText="Reload data" class="mr-2" />
+    <Button @icon="refresh" @onClick={{this.reload}} @helpText={{t "fleet-ops.common.reload-data"}} class="mr-2" />
     <Button @icon="grip-horizontal" @prefix="fas" @onClick={{this.reload}} @disabled={{this.isGridLayout}} class="mr-2" />
     <Button @icon="table" @prefix="fas" @onClick={{fn this.changeLayout "table"}} @disabled={{this.isTableLayout}} class="mr-2" />
     <FiltersPicker
@@ -17,18 +17,18 @@
     />
     <VisibleColumnPicker @columns={{this.columns}} @onChange={{fn (mut this.columns)}} class="mr-2" />
     {{#if (safe-has this.table "selectedRows")}}
-        <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
+        <DropdownButton @icon="layer-group" @text={{t "fleet-ops.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
                     <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeleteDrivers)}}>
-                        Delete Drivers
+                        {{t "fleet-ops.management.drivers.index.delete-drivers"}}
                     </a>
                 </div>
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="New" class="mr-2" @onClick={{this.createDriver}} />
-    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text="Export" @wrapperClass="hidden md:flex" @onClick={{this.exportDrivers}} />
+    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text={{t "fleet-ops.common.new"}} class="mr-2" @onClick={{this.createDriver}} />
+    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text={{t "fleet-ops.common.export"}} @wrapperClass="hidden md:flex" @onClick={{this.exportDrivers}} />
 </Layout::Section::Header>
 
 {{#if this.isTableLayout}}

package/addon/templates/management/fleets/index.hbs

@@ -1,5 +1,5 @@
-<Layout::Section::Header @title="Fleets" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-    <Button @icon="refresh" @onClick={{this.reload}} @helpText="Reload data" class="mr-2" />
+<Layout::Section::Header @title={{t "fleet-ops.management.fleets.index.title"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+    <Button @icon="refresh" @onClick={{this.reload}} @helpText={{t "fleet-ops.common.reload-data"}} class="mr-2" />
     <FiltersPicker
         @columns={{this.columns}}
         @onApply={{fn this.filters.apply this}}
@@ -10,18 +10,18 @@
     />
     <VisibleColumnPicker @columns={{this.columns}} @onChange={{fn (mut this.columns)}} class="mr-2" />
     {{#if (safe-has this.table "selectedRows")}}
-        <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
+        <DropdownButton @icon="layer-group" @text={{t "fleet-ops.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
                     <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeleteFleets)}}>
-                        Delete Fleets
+                        {{t "fleet-ops.management.fleets.index.delete-fleets"}}
                     </a>
                 </div>
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="New" class="mr-2" @onClick={{this.createFleet}} />
-    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text="Export" @onClick={{this.exportFleets}} />
+    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text={{t "fleet-ops.common.new"}} class="mr-2" @onClick={{this.createFleet}} />
+    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text={{t "fleet-ops.common.export"}} @onClick={{this.exportFleets}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>

package/addon/templates/management/fuel-reports/index.hbs

@@ -1,5 +1,5 @@
-<Layout::Section::Header @title="Fuel Reports" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-    <Button @icon="refresh" @onClick={{this.reload}} @helpText="Reload data" class="mr-2" />
+<Layout::Section::Header @title={{t "fleet-ops.management.fuel-reports.index.title"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+    <Button @icon="refresh" @onClick={{this.reload}} @helpText={{t "fleet-ops.common.reload-data"}} class="mr-2" />
     <FiltersPicker
         @columns={{this.columns}}
         @onApply={{fn this.filters.apply this}}
@@ -10,18 +10,18 @@
     />
     <VisibleColumnPicker @columns={{this.columns}} @onChange={{fn (mut this.columns)}} class="mr-2" />
     {{#if (safe-has this.table "selectedRows")}}
-        <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
+        <DropdownButton @icon="layer-group" @text={{t "fleet-ops.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
-                    <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeleteFuelReports)}}>
-                        Delete Fuel Reports
+                    <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeleteFuelReports)}}>                        
+                        {{t "fleet-ops.management.fuel-reports.index.delete-fuel-reports"}}
                     </a>
                 </div>
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="New" class="mr-2" @onClick={{this.createFuelReport}} />
-    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text="Export" @onClick={{this.exportFuelReports}} />
+    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text={{t "fleet-ops.common.new"}} class="mr-2" @onClick={{this.createFuelReport}} />
+    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text={{t "fleet-ops.common.export"}} @onClick={{this.exportFuelReports}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body @pagination={{true}} @onToggleAll={{this.toggleAll}} @allToggled={{this.allToggled}}>