diff options
| author | silverwind <me@silverwind.io> | 2023-05-02 11:54:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-02 05:54:29 -0400 |
| commit | d6f82384920e16ead14dd916fa38d49281678a35 (patch) | |
| tree | 5001259ce82a1401af827c544e264c22e730a182 /modules | |
| parent | df00ccacc9a4840fe86bed75a77841f8801d11d2 (diff) | |
| download | gitea-d6f82384920e16ead14dd916fa38d49281678a35.tar.gz gitea-d6f82384920e16ead14dd916fa38d49281678a35.zip | |
Replace `N/A` with `-` everywhere (#24474)
Followup to https://github.com/go-gitea/gitea/pull/24427.
Reasoning is that `N/A` is specific to english while `-` is
language-neutral and does not need translation.
Before:
<img width="891" alt="Screenshot 2023-05-01 at 20 58 20"
src="https://user-images.githubusercontent.com/115237/235511592-8a36d0f2-34ff-4dbe-b642-67c0ade644fe.png">
After:
<img width="901" alt="Screenshot 2023-05-01 at 20 59 59"
src="https://user-images.githubusercontent.com/115237/235511594-d49f6d09-92e8-4e99-be7b-2a37f5d24129.png">
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/timeutil/datetime.go | 4 | ||||
| -rw-r--r-- | modules/timeutil/datetime_test.go | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/timeutil/datetime.go b/modules/timeutil/datetime.go index 80b96fa656..83170b374b 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 a5639b34f1..f44b7aaae3 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, `<relative-time format="datetime" year="numeric" month="short" day="numeric" weekday="" datetime="invalid">invalid</relative-time>`, actual) |