diff --git a/docs/content/doc/usage/linked-references.en-us.md b/docs/content/doc/usage/linked-references.en-us.md index 8cd4ff7b1fc8f..4e9519301521c 100644 --- a/docs/content/doc/usage/linked-references.en-us.md +++ b/docs/content/doc/usage/linked-references.en-us.md @@ -178,28 +178,28 @@ In the examples, `User1/Repo1` refers to the repository where the reference is u | Reference in User1/Repo1 | Repo1 issues are external | RepoZ issues are external | Should render | | --------------------------- | :-----------------------: | :-----------------------: | ------------------------------------------------------- | -| `#1234` | no | N/A | A link to issue/pull 1234 in `User1/Repo1` | -| `!1234` | no | N/A | A link to issue/pull 1234 in `User1/Repo1` | -| `#1234` | yes | N/A | A link to _external issue_ 1234 for `User1/Repo1` | -| `!1234` | yes | N/A | A link to _PR_ 1234 for `User1/Repo1` | -| `User1/Repo1#1234` | no | N/A | A link to issue/pull 1234 in `User1/Repo1` | -| `User1/Repo1!1234` | no | N/A | A link to issue/pull 1234 in `User1/Repo1` | -| `User1/Repo1#1234` | yes | N/A | A link to _external issue_ 1234 for `User1/Repo1` | -| `User1/Repo1!1234` | yes | N/A | A link to _PR_ 1234 for `User1/Repo1` | -| `UserZ/RepoZ#1234` | N/A | no | A link to issue/pull 1234 in `UserZ/RepoZ` | -| `UserZ/RepoZ!1234` | N/A | no | A link to issue/pull 1234 in `UserZ/RepoZ` | -| `UserZ/RepoZ#1234` | N/A | yes | A link to _external issue_ 1234 for `UserZ/RepoZ` | -| `UserZ/RepoZ!1234` | N/A | yes | A link to _PR_ 1234 for `UserZ/RepoZ` | +| `#1234` | no | - | A link to issue/pull 1234 in `User1/Repo1` | +| `!1234` | no | - | A link to issue/pull 1234 in `User1/Repo1` | +| `#1234` | yes | - | A link to _external issue_ 1234 for `User1/Repo1` | +| `!1234` | yes | - | A link to _PR_ 1234 for `User1/Repo1` | +| `User1/Repo1#1234` | no | - | A link to issue/pull 1234 in `User1/Repo1` | +| `User1/Repo1!1234` | no | - | A link to issue/pull 1234 in `User1/Repo1` | +| `User1/Repo1#1234` | yes | - | A link to _external issue_ 1234 for `User1/Repo1` | +| `User1/Repo1!1234` | yes | - | A link to _PR_ 1234 for `User1/Repo1` | +| `UserZ/RepoZ#1234` | - | no | A link to issue/pull 1234 in `UserZ/RepoZ` | +| `UserZ/RepoZ!1234` | - | no | A link to issue/pull 1234 in `UserZ/RepoZ` | +| `UserZ/RepoZ#1234` | - | yes | A link to _external issue_ 1234 for `UserZ/RepoZ` | +| `UserZ/RepoZ!1234` | - | yes | A link to _PR_ 1234 for `UserZ/RepoZ` | | **Alphanumeric issue IDs:** | - | - | - | -| `AAA-1234` | yes | N/A | A link to _external issue_ `AAA-1234` for `User1/Repo1` | -| `!1234` | yes | N/A | A link to _PR_ 1234 for `User1/Repo1` | -| `User1/Repo1!1234` | yes | N/A | A link to _PR_ 1234 for `User1/Repo1` | -| _Not supported_ | N/A | yes | A link to _external issue_ `AAA-1234` for `UserZ/RepoZ` | -| `UserZ/RepoZ!1234` | N/A | yes | A link to _PR_ 1234 in `UserZ/RepoZ` | +| `AAA-1234` | yes | - | A link to _external issue_ `AAA-1234` for `User1/Repo1` | +| `!1234` | yes | - | A link to _PR_ 1234 for `User1/Repo1` | +| `User1/Repo1!1234` | yes | - | A link to _PR_ 1234 for `User1/Repo1` | +| _Not supported_ | - | yes | A link to _external issue_ `AAA-1234` for `UserZ/RepoZ` | +| `UserZ/RepoZ!1234` | - | yes | A link to _PR_ 1234 in `UserZ/RepoZ` | _The last section is for repositories with external issue trackers that use alphanumeric format._ -_**N/A**: not applicable._ +_**-**: not applicable._ Note: automatic references between repositories with different types of issues (external vs. internal) are not fully supported and may render invalid links. diff --git a/modules/timeutil/datetime.go b/modules/timeutil/datetime.go index 80b96fa656be3..83170b374b54c 100644 --- a/modules/timeutil/datetime.go +++ b/modules/timeutil/datetime.go @@ -30,13 +30,13 @@ func DateTime(format string, datetime any) template.HTML { var datetimeEscaped, textEscaped string switch v := datetime.(type) { case nil: - return "N/A" + return "-" case string: datetimeEscaped = html.EscapeString(v) textEscaped = datetimeEscaped case time.Time: if v.IsZero() || v.Unix() == 0 { - return "N/A" + return "-" } datetimeEscaped = html.EscapeString(v.Format(time.RFC3339)) if format == "full" { diff --git a/modules/timeutil/datetime_test.go b/modules/timeutil/datetime_test.go index a5639b34f19ae..f44b7aaae3c1b 100644 --- a/modules/timeutil/datetime_test.go +++ b/modules/timeutil/datetime_test.go @@ -23,10 +23,10 @@ func TestDateTime(t *testing.T) { refTime, _ := time.Parse(time.RFC3339, refTimeStr) refTimeStamp := TimeStamp(refTime.Unix()) - assert.EqualValues(t, "N/A", DateTime("short", nil)) - assert.EqualValues(t, "N/A", DateTime("short", 0)) - assert.EqualValues(t, "N/A", DateTime("short", time.Time{})) - assert.EqualValues(t, "N/A", DateTime("short", TimeStamp(0))) + assert.EqualValues(t, "-", DateTime("short", nil)) + assert.EqualValues(t, "-", DateTime("short", 0)) + assert.EqualValues(t, "-", DateTime("short", time.Time{})) + assert.EqualValues(t, "-", DateTime("short", TimeStamp(0))) actual := DateTime("short", "invalid") assert.EqualValues(t, `invalid`, actual) diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl index 6ab37ca354844..a7f44056204a5 100644 --- a/templates/admin/cron.tmpl +++ b/templates/admin/cron.tmpl @@ -22,7 +22,7 @@ {{$.locale.Tr (printf "admin.dashboard.%s" .Name)}} {{.Spec}} {{DateTime "full" .Next}} - {{if gt .Prev.Year 1}}{{DateTime "full" .Prev}}{{else}}N/A{{end}} + {{if gt .Prev.Year 1}}{{DateTime "full" .Prev}}{{else}}-{{end}} {{.ExecTimes}} {{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}} diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index 5e4390937c5f6..f44968c7758be 100644 --- a/templates/repo/pulls/tab_menu.tmpl +++ b/templates/repo/pulls/tab_menu.tmpl @@ -7,11 +7,11 @@ {{svg "octicon-git-commit"}} {{$.locale.Tr "repo.pulls.tab_commits"}} - {{if .NumCommits}}{{.NumCommits}}{{else}}N/A{{end}} + {{if .NumCommits}}{{.NumCommits}}{{else}}-{{end}} {{svg "octicon-diff"}} {{$.locale.Tr "repo.pulls.tab_files"}} - {{if .NumFiles}}{{.NumFiles}}{{else}}N/A{{end}} + {{if .NumFiles}}{{.NumFiles}}{{else}}-{{end}} diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 2102dac641027..494cadfcc1bee 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -174,7 +174,7 @@ {{else}} - N/A + - {{end}} diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl index e573d221d14be..8eba5cde68e28 100644 --- a/templates/repo/settings/webhook/history.tmpl +++ b/templates/repo/settings/webhook/history.tmpl @@ -37,7 +37,7 @@ {{.ResponseInfo.Status}} {{end}} {{else}} - N/A + - {{end}} {{if or $.Permission.IsAdmin $.IsOrganizationOwner $.PageIsAdmin $.PageIsUserSettings}} @@ -59,7 +59,7 @@
{{$.locale.Tr "repo.settings.webhook.payload"}}
{{.PayloadContent}}
{{else}} - N/A + - {{end}}
@@ -70,7 +70,7 @@
{{$.locale.Tr "repo.settings.webhook.body"}}
{{.ResponseInfo.Body}}
{{else}} - N/A + - {{end}}
diff --git a/web_src/js/features/repo-settings.js b/web_src/js/features/repo-settings.js index 9f094cd2d1624..7105a14b30265 100644 --- a/web_src/js/features/repo-settings.js +++ b/web_src/js/features/repo-settings.js @@ -32,7 +32,7 @@ export function initRepoSettingsCollaboration() { if ($item) { $dropdown.dropdown('set selected', $dropdown.attr('data-last-value')); } else { - $text.text('(N/A)'); // prevent from misleading users when the access mode is undefined + $text.text('(none)'); // prevent from misleading users when the access mode is undefined } }, 0); }