Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-31 18:46:07 +01:00
Code Issues Packages Projects Releases Activity

renamed lang + component

Browse Source
This commit is contained in:
Florian Scholdei
2019-01-23 15:08:28 +01:00
parent 4b24c8db06
commit b90588a6f4
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-ui/public/locales/en/groups.json
View File

@@ -18,7 +18,7 @@
"navigationLabel": "Group Navigation", "navigationLabel": "Group Navigation",
"informationNavLink": "Information", "informationNavLink": "Information",
"settingsNavLink": "Settings", "settingsNavLink": "Settings",
"editNavLink": "General", "generalNavLink": "General",
"setPermissionsNavLink": "Permissions" "setPermissionsNavLink": "Permissions"
} }
}, },

2
scm-ui/public/locales/en/repos.json
View File

@@ -26,7 +26,7 @@
"historyNavLink": "Commits", "historyNavLink": "Commits",
"sourcesNavLink": "Sources", "sourcesNavLink": "Sources",
"settingsNavLink": "Settings", "settingsNavLink": "Settings",
"editNavLink": "General", "generalNavLink": "General",
"permissionsNavLink": "Permissions" "permissionsNavLink": "Permissions"
} }
}, },

2
scm-ui/public/locales/en/users.json
View File

@@ -34,7 +34,7 @@
"navigationLabel": "User Navigation", "navigationLabel": "User Navigation",
"informationNavLink": "Information", "informationNavLink": "Information",
"settingsNavLink": "Settings", "settingsNavLink": "Settings",
"editNavLink": "General", "generalNavLink": "General",
"setPasswordNavLink": "Password", "setPasswordNavLink": "Password",
"setPermissionsNavLink": "Permissions" "setPermissionsNavLink": "Permissions"
} }

2
scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js
View File

@@ -18,7 +18,7 @@ class GeneralGroupNavLink extends React.Component<Props, State> {
if (!this.isEditable()) { if (!this.isEditable()) {
return null; return null;
} }
return <NavLink label={t("singleGroup.menu.editNavLink")} to={editUrl} />; return <NavLink label={t("singleGroup.menu.generalNavLink")} to={editUrl} />;
} }
isEditable = () => { isEditable = () => {

6
scm-ui/src/repos/components/EditNavLink.js → scm-ui/src/repos/components/GeneralRepoNavLink.js
View File

@@ -6,7 +6,7 @@ import type { Repository } from "@scm-manager/ui-types";
type Props = { editUrl: string, t: string => string, repository: Repository }; type Props = { editUrl: string, t: string => string, repository: Repository };
class EditNavLink extends React.Component<Props> { class GeneralRepoNavLink extends React.Component<Props> {
isEditable = () => { isEditable = () => {
return this.props.repository._links.update; return this.props.repository._links.update;
}; };
@@ -15,8 +15,8 @@ class EditNavLink extends React.Component<Props> {
return null; return null;
} }
const { editUrl, t } = this.props; const { editUrl, t } = this.props;
return <NavLink to={editUrl} label={t("repositoryRoot.menu.editNavLink")} />; return <NavLink to={editUrl} label={t("repositoryRoot.menu.generalNavLink")} />;
} }
} }
export default translate("repos")(EditNavLink); export default translate("repos")(GeneralRepoNavLink);

10
scm-ui/src/repos/components/EditNavLink.test.js → scm-ui/src/repos/components/GeneralRepoNavLink.test.js
View File

@@ -3,9 +3,9 @@ import { shallow, mount } from "enzyme";
import "../../tests/enzyme"; import "../../tests/enzyme";
import "../../tests/i18n"; import "../../tests/i18n";
import ReactRouterEnzymeContext from "react-router-enzyme-context"; import ReactRouterEnzymeContext from "react-router-enzyme-context";
import EditNavLink from "./EditNavLink"; import GeneralRepoNavLink from "./GeneralRepoNavLink";
describe("EditNavLink", () => { describe("GeneralNavLink", () => {
const options = new ReactRouterEnzymeContext(); const options = new ReactRouterEnzymeContext();
it("should render nothing, if the modify link is missing", () => { it("should render nothing, if the modify link is missing", () => {
@@ -14,7 +14,7 @@ describe("EditNavLink", () => {
}; };
const navLink = shallow( const navLink = shallow(
<EditNavLink repository={repository} editUrl="" />, <GeneralRepoNavLink repository={repository} editUrl="" />,
options.get() options.get()
); );
expect(navLink.text()).toBe(""); expect(navLink.text()).toBe("");
@@ -30,9 +30,9 @@ describe("EditNavLink", () => {
}; };
const navLink = mount( const navLink = mount(
<EditNavLink repository={repository} editUrl="" />, <GeneralRepoNavLink repository={repository} editUrl="" />,
options.get() options.get()
); );
expect(navLink.text()).toBe("repositoryRoot.menu.editNavLink"); expect(navLink.text()).toBe("repositoryRoot.menu.generalNavLink");
}); });
}); });

3
scm-ui/src/repos/containers/RepositoryRoot.js
View File

@@ -13,6 +13,7 @@ import GeneralRepo from "./GeneralRepo";
import Permissions from "../permissions/containers/Permissions"; import Permissions from "../permissions/containers/Permissions";
import type {History} from "history"; import type {History} from "history";
import GeneralRepoNavLink from "../components/GeneralRepoNavLink";
import BranchRoot from "./ChangesetsRoot"; import BranchRoot from "./ChangesetsRoot";
import ChangesetView from "./ChangesetView"; import ChangesetView from "./ChangesetView";
@@ -183,7 +184,7 @@ class RepositoryRoot extends React.Component<Props> {
to={`${url}/settings/general`} to={`${url}/settings/general`}
label={t("repositoryRoot.menu.settingsNavLink")} label={t("repositoryRoot.menu.settingsNavLink")}
> >
<NavLink repository={repository} editUrl={`${url}/settings/general`} /> <GeneralRepoNavLink repository={repository} editUrl={`${url}/settings/general`} />
<PermissionsNavLink <PermissionsNavLink
permissionUrl={`${url}/settings/permissions`} permissionUrl={`${url}/settings/permissions`}
repository={repository} repository={repository}

2
scm-ui/src/users/components/navLinks/GeneralUserNavLink.js
View File

@@ -17,7 +17,7 @@ class GeneralUserNavLink extends React.Component<Props> {
if (!this.isEditable()) { if (!this.isEditable()) {
return null; return null;
} }
return <NavLink label={t("singleUser.menu.editNavLink")} to={editUrl} />; return <NavLink label={t("singleUser.menu.generalNavLink")} to={editUrl} />;
} }
isEditable = () => { isEditable = () => {