External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 08:48:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

Add minor update to strings

Browse Source 
Add minor update to strings. And adjust the usage of `toTitleCase` to
dynamic strings.
This commit is contained in:
nixocio
2020-11-18 12:01:20 -05:00
parent 1deb4ff5e4
commit e23b47b997
6 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui_next/src/screens/Dashboard/shared/DashboardTemplateList.jsx
View File

@@ -9,7 +9,6 @@ import {
UnifiedJobTemplatesAPI, UnifiedJobTemplatesAPI,
WorkflowJobTemplatesAPI, WorkflowJobTemplatesAPI,
} from '../../../api'; } from '../../../api';
import { toTitleCase } from '../../../util/strings';
import AlertModal from '../../../components/AlertModal'; import AlertModal from '../../../components/AlertModal';
import DatalistToolbar from '../../../components/DataListToolbar'; import DatalistToolbar from '../../../components/DataListToolbar';
import ErrorDetail from '../../../components/ErrorDetail'; import ErrorDetail from '../../../components/ErrorDetail';
@@ -142,19 +141,19 @@ function DashboardTemplateList({ i18n }) {
const canAddWFJT = const canAddWFJT =
wfjtActions && Object.prototype.hasOwnProperty.call(wfjtActions, 'POST'); wfjtActions && Object.prototype.hasOwnProperty.call(wfjtActions, 'POST');
const addTempate = toTitleCase(i18n._(t`Add Job Template`)); const addTemplate = i18n._(t`Add job template`);
const addWFTemplate = toTitleCase(i18n._(t`Add Workflow Template`)); const addWFTemplate = i18n._(t`Add workflow template`);
const addButton = ( const addButton = (
<AddDropDownButton <AddDropDownButton
key="add" key="add"
dropdownItems={[ dropdownItems={[
<DropdownItem <DropdownItem
key={addTempate} key={addTemplate}
component={Link} component={Link}
to="/templates/job_template/add/" to="/templates/job_template/add/"
aria-label={addTempate} aria-label={addTemplate}
> >
{addTempate} {addTemplate}
</DropdownItem>, </DropdownItem>,
<DropdownItem <DropdownItem
component={Link} component={Link}

5
awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupList.jsx
View File

@@ -8,7 +8,6 @@ import { InstanceGroupsAPI } from '../../../api';
import { getQSConfig, parseQueryString } from '../../../util/qs'; import { getQSConfig, parseQueryString } from '../../../util/qs';
import useRequest, { useDeleteItems } from '../../../util/useRequest'; import useRequest, { useDeleteItems } from '../../../util/useRequest';
import useSelected from '../../../util/useSelected'; import useSelected from '../../../util/useSelected';
import { toTitleCase } from '../../../util/strings';
import PaginatedDataList, { import PaginatedDataList, {
ToolbarDeleteButton, ToolbarDeleteButton,
} from '../../../components/PaginatedDataList'; } from '../../../components/PaginatedDataList';
@@ -153,8 +152,8 @@ function InstanceGroupList({ i18n }) {
); );
} }
const addContainerGroup = toTitleCase(i18n._(t`Add Container Group`)); const addContainerGroup = i18n._(t`Add container group`);
const addInstanceGroup = toTitleCase(i18n._(t`Add Instance Group`)); const addInstanceGroup = i18n._(t`Add instance group`);
const addButton = ( const addButton = (
<AddDropDownButton <AddDropDownButton

5
awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
View File

@@ -20,7 +20,6 @@ import DisassociateButton from '../../../components/DisassociateButton';
import AdHocCommands from '../../../components/AdHocCommands/AdHocCommands'; import AdHocCommands from '../../../components/AdHocCommands/AdHocCommands';
import InventoryGroupHostListItem from './InventoryGroupHostListItem'; import InventoryGroupHostListItem from './InventoryGroupHostListItem';
import AddDropDownButton from '../../../components/AddDropDownButton'; import AddDropDownButton from '../../../components/AddDropDownButton';
import { toTitleCase } from '../../../util/strings';
const QS_CONFIG = getQSConfig('host', { const QS_CONFIG = getQSConfig('host', {
page: 1, page: 1,
@@ -144,8 +143,8 @@ function InventoryGroupHostList({ i18n }) {
const canAdd = const canAdd =
actions && Object.prototype.hasOwnProperty.call(actions, 'POST'); actions && Object.prototype.hasOwnProperty.call(actions, 'POST');
const addFormUrl = `/inventories/inventory/${inventoryId}/groups/${groupId}/nested_hosts/add`; const addFormUrl = `/inventories/inventory/${inventoryId}/groups/${groupId}/nested_hosts/add`;
const addExistingHost = toTitleCase(i18n._(t`Add Existing Host`)); const addExistingHost = i18n._(t`Add existing host`);
const addNewHost = toTitleCase(i18n._(t`Add New Host`)); const addNewHost = i18n._(t`Add new host`);
const addButton = ( const addButton = (
<AddDropDownButton <AddDropDownButton

5
awx/ui_next/src/screens/Inventory/InventoryList/InventoryList.jsx
View File

@@ -5,7 +5,6 @@ import { t } from '@lingui/macro';
import { Card, PageSection, DropdownItem } from '@patternfly/react-core'; import { Card, PageSection, DropdownItem } from '@patternfly/react-core';
import { InventoriesAPI } from '../../../api'; import { InventoriesAPI } from '../../../api';
import useRequest, { useDeleteItems } from '../../../util/useRequest'; import useRequest, { useDeleteItems } from '../../../util/useRequest';
import { toTitleCase } from '../../../util/strings';
import AlertModal from '../../../components/AlertModal'; import AlertModal from '../../../components/AlertModal';
import DatalistToolbar from '../../../components/DataListToolbar'; import DatalistToolbar from '../../../components/DataListToolbar';
import ErrorDetail from '../../../components/ErrorDetail'; import ErrorDetail from '../../../components/ErrorDetail';
@@ -125,8 +124,8 @@ function InventoryList({ i18n }) {
} }
} }
}; };
const addInventory = toTitleCase(i18n._(t`Add Inventory`)); const addInventory = i18n._(t`Add inventory`);
const addSmartInventory = toTitleCase(i18n._(t`Add Smart Inventory`)); const addSmartInventory = i18n._(t`Add smart inventory`);
const addButton = ( const addButton = (
<AddDropDownButton <AddDropDownButton
key="add" key="add"

5
awx/ui_next/src/screens/Inventory/InventoryRelatedGroups/InventoryRelatedGroupList.jsx
View File

@@ -18,7 +18,6 @@ import AlertModal from '../../../components/AlertModal';
import ErrorDetail from '../../../components/ErrorDetail'; import ErrorDetail from '../../../components/ErrorDetail';
import AssociateModal from '../../../components/AssociateModal'; import AssociateModal from '../../../components/AssociateModal';
import DisassociateButton from '../../../components/DisassociateButton'; import DisassociateButton from '../../../components/DisassociateButton';
import { toTitleCase } from '../../../util/strings';
const QS_CONFIG = getQSConfig('group', { const QS_CONFIG = getQSConfig('group', {
page: 1, page: 1,
@@ -126,8 +125,8 @@ function InventoryRelatedGroupList({ i18n }) {
const addFormUrl = `/inventories/inventory/${inventoryId}/groups/${groupId}/nested_groups/add`; const addFormUrl = `/inventories/inventory/${inventoryId}/groups/${groupId}/nested_groups/add`;
const addExistingGroup = toTitleCase(i18n._(t`Add Existing Group`)); const addExistingGroup = i18n._(t`Add existing group`);
const addNewGroup = toTitleCase(i18n._(t`Add New Group`)); const addNewGroup = i18n._(t`Add new group`);
const addButton = ( const addButton = (
<AddDropDownButton <AddDropDownButton
key="add" key="add"

11
awx/ui_next/src/screens/Template/TemplateList/TemplateList.jsx
View File

@@ -16,7 +16,6 @@ import PaginatedDataList, {
} from '../../../components/PaginatedDataList'; } from '../../../components/PaginatedDataList';
import useRequest, { useDeleteItems } from '../../../util/useRequest'; import useRequest, { useDeleteItems } from '../../../util/useRequest';
import { getQSConfig, parseQueryString } from '../../../util/qs'; import { getQSConfig, parseQueryString } from '../../../util/qs';
import { toTitleCase } from '../../../util/strings';
import useWsTemplates from '../../../util/useWsTemplates'; import useWsTemplates from '../../../util/useWsTemplates';
import AddDropDownButton from '../../../components/AddDropDownButton'; import AddDropDownButton from '../../../components/AddDropDownButton';
import TemplateListItem from './TemplateListItem'; import TemplateListItem from './TemplateListItem';
@@ -134,18 +133,18 @@ function TemplateList({ i18n }) {
const canAddWFJT = const canAddWFJT =
wfjtActions && Object.prototype.hasOwnProperty.call(wfjtActions, 'POST'); wfjtActions && Object.prototype.hasOwnProperty.call(wfjtActions, 'POST');
const addTempate = toTitleCase(i18n._(t`Add Job Template`)); const addTemplate = i18n._(t`Add job template`);
const addWFTemplate = toTitleCase(i18n._(t`Add Workflow Template`)); const addWFTemplate = i18n._(t`Add workflow template`);
const addDropDownButton = []; const addDropDownButton = [];
if (canAddJT) { if (canAddJT) {
addDropDownButton.push( addDropDownButton.push(
<DropdownItem <DropdownItem
key={addTempate} key={addTemplate}
component={Link} component={Link}
to="/templates/job_template/add/" to="/templates/job_template/add/"
aria-label={addTempate} aria-label={addTemplate}
> >
{addTempate} {addTemplate}
</DropdownItem> </DropdownItem>
); );
} }