Merge pull request #482 from yast/fix-settings-headers

Remove the redundant ' Settings' suffix
agama-project · Mar 20, 2023 · f728607 · f728607
2 parents ad36760 + 791e7ca
commit f728607
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/web/package/cockpit-d-installer.changes b/web/package/cockpit-d-installer.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 20 13:40:08 UTC 2023 - Imobach Gonzalez Sosa <[email protected]>
+
+- Remove the redundant "Settings" suffix (gh#yast/d-installer#481).
+
 -------------------------------------------------------------------
 Mon Mar 20 11:51:56 UTC 2023 - Imobach Gonzalez Sosa <[email protected]>
 

diff --git a/web/src/components/core/Popup.jsx b/web/src/components/core/Popup.jsx
@@ -157,7 +157,7 @@ const AncillaryAction = ({ children, ...props }) => (
  *
  * @example <caption>Usage example</caption>
  *   <Popup
- *     title="User Settings"
+ *     title="Users"
  *     isOpen={showUserSettings}
  *   >
  *     <UserSettingsForm />
@@ -172,7 +172,7 @@ const AncillaryAction = ({ children, ...props }) => (
  *
  * @example <caption>Usage example using shortcuts actions</caption>
  *   <Popup
- *     title="User Settings"
+ *     title="Users"
  *     isOpen={showUserSettings}
  *   >
  *     <UserSettingsForm />

diff --git a/web/src/components/l10n/L10nPage.jsx b/web/src/components/l10n/L10nPage.jsx
@@ -79,7 +79,7 @@ export default function LanguageSelector() {
   };
 
   return (
-    <Page title="Localization settings" icon="translate" actionCallback={accept}>
+    <Page title="Localization" icon="translate" actionCallback={accept}>
       <Form id="language-selector">
         <LanguageField selected={language} />
       </Form>

diff --git a/web/src/components/network/NetworkPage.jsx b/web/src/components/network/NetworkPage.jsx
@@ -165,7 +165,7 @@ export default function NetworkPage() {
   };
 
   return (
-    <Page title="Network Settings" icon="settings_ethernet" actionLabel="Back" actionVariant="secondary">
+    <Page title="Network" icon="settings_ethernet" actionLabel="Back" actionVariant="secondary">
       <Section title="Wired networks" icon="lan">
         { ready ? <WiredConnections /> : <Skeleton /> }
       </Section>

diff --git a/web/src/components/storage/ProposalPage.jsx b/web/src/components/storage/ProposalPage.jsx
@@ -114,7 +114,7 @@ export default function ProposalPage() {
   };
 
   return (
-    <Page title="Storage Settings" icon="hard_drive" actionLabel="Back" actionVariant="secondary">
+    <Page title="Storage" icon="hard_drive" actionLabel="Back" actionVariant="secondary">
       <PageContent />
       <PageOptions title="Storage">
         <Link to="/storage/iscsi">

diff --git a/web/src/components/users/UsersPage.jsx b/web/src/components/users/UsersPage.jsx
@@ -25,7 +25,7 @@ import { FirstUser, RootAuthMethods } from "~/components/users";
 
 export default function UsersPage() {
   return (
-    <Page title="User Settings" icon="manage_accounts" actionLabel="Back" actionVariant="secondary">
+    <Page title="Users" icon="manage_accounts" actionLabel="Back" actionVariant="secondary">
       <Section title="User" icon="person">
         <FirstUser />
       </Section>