Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 14:35:45 +01:00
Code Issues Packages Projects Releases Activity

merge

Browse Source
This commit is contained in:
Florian Scholdei
2019-02-07 11:57:06 +01:00
parent fbaa5041a7 96c593faca
commit 9598c1865e
199 changed files with 2057 additions and 1748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetAuthor.js
View File

@@ -28,7 +28,7 @@ class ChangesetAuthor extends React.Component<Props> {
renderWithMail(name: string, mail: string) {
const { t } = this.props;
return (
<a href={"mailto: " + mail} title={t("changesets.author.mailto") + " " + mail}>
<a href={"mailto: " + mail} title={t("changeset.author.mailto") + " " + mail}>
{name}
</a>
);
@@ -38,7 +38,7 @@ class ChangesetAuthor extends React.Component<Props> {
const { t } = this.props;
return (
<>
{t("changesets.author.prefix")} {child}
{t("changeset.author.prefix")} {child}
<ExtensionPoint
name="changesets.author.suffix"
props={{ changeset: this.props.changeset }}

4
scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
View File

@@ -29,7 +29,7 @@ class ChangesetButtonGroup extends React.Component<Props> {
<i className="fas fa-code-branch"></i>
</span>
<span className="is-hidden-mobile is-hidden-tablet-only">
{t("changesets.buttons.details")}
{t("changeset.buttons.details")}
</span>
</Button>
<Button link={sourcesLink}>
@@ -37,7 +37,7 @@ class ChangesetButtonGroup extends React.Component<Props> {
<i className="fas fa-code"></i>
</span>
<span className="is-hidden-mobile is-hidden-tablet-only">
{t("changesets.buttons.sources")}
{t("changeset.buttons.sources")}
</span>
</Button>
</ButtonGroup>

2
scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetDiff.js
View File

@@ -25,7 +25,7 @@ class ChangesetDiff extends React.Component<Props> {
render() {
const { changeset, t } = this.props;
if (!this.isDiffSupported(changeset)) {
return <Notification type="danger">{t("changesets.diff.not-supported")}</Notification>;
return <Notification type="danger">{t("changeset.diffNotSupported")}</Notification>;
} else {
const url = this.createUrl(changeset);
return <LoadingDiff url={url} />;

2
scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetList.js
View File

@@ -21,7 +21,7 @@ class ChangesetList extends React.Component<Props> {
/>
);
});
return <div className="box">{content}</div>;
return <>{content}</>;
}
}

6
scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetRow.js
View File

@@ -70,7 +70,7 @@ class ChangesetRow extends React.Component<Props> {
<h4 className="has-text-weight-bold is-ellipsis-overflow">
<ExtensionPoint
name="changesets.changeset.description"
name="changeset.description"
props={{ changeset, value: description.title }}
renderAll={false}
>
@@ -89,14 +89,14 @@ class ChangesetRow extends React.Component<Props> {
<div className={classNames(classes.metadata, "media-right")}>
<p className="is-hidden-mobile is-hidden-tablet-only">
<Interpolate
i18nKey="changesets.changeset.summary"
i18nKey="changeset.summary"
id={changesetId}
time={dateFromNow}
/>
</p>
<p className="is-hidden-desktop">
<Interpolate
i18nKey="changesets.changeset.short-summary"
i18nKey="changeset.shortSummary"
id={changesetId}
time={dateFromNow}
/>

2
scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetTagsCollapsed.js
View File

@@ -18,7 +18,7 @@ class ChangesetTagsCollapsed extends React.Component<Props> {
const message = tags.map((tag) => tag.name).join(", ");
return (
<Tooltip location="top" message={message}>
<ChangesetTagBase icon={"fa-tags"} label={ tags.length + " " + t("changesets.tags") } />
<ChangesetTagBase icon={"fa-tags"} label={ tags.length + " " + t("changeset.tags") } />
</Tooltip>
);
}