Change `add_on` translation to `added_on` and include placeholder for the date (...

- Very similar to #24550

The correct thing to do is to translate the entire phrase into a single
string. The previous translation assumed all languages have a space
between the "added on" and the date (and that "added on" comes before
the date).

Some languages, like Hebrew, have no space between the "added on" and
the date. For example:
```ini
added_on=נוסף ב-%s
```
("added" becomes נוסף, "on" is ב and when paired with a date we use a
dash to connect ב with the date)

---------

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: delvh <dev.lh@web.de>

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index c988cb5964a8f4cf8f46a831a006d8ac9b980095..b3bf00a60a4f861e4d32585748e4f40700e45771 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -754,7 +754,7 @@ ssh_principal_deletion_desc = Removing a SSH Certificate Principal revokes its a
 ssh_key_deletion_success = The SSH key has been removed.
 gpg_key_deletion_success = The GPG key has been removed.
 ssh_principal_deletion_success = The principal has been removed.
-add_on = Added on
+added_on = Added on %s
 valid_until_date = Valid until %s
 valid_forever = Valid forever
 last_used = Last used on

diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 9012c1f8e2c61ee63f8a56a4222382e8e7b3b0f6..621e1fa01e22ae25a53001580eb89db1aede35be 100644 (file)
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -60,7 +60,7 @@
                                                                        {{.Fingerprint}}
                                                                </div>
                                                                <div class="activity meta">
-                                                                       <i>{{$.locale.Tr "settings.add_on"}} <span>{{DateTime "short" .CreatedUnix}}</span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
+                                                                       <i>{{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
                                                                </div>
                                                        </div>
                                                </div>

diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index e743c16f9586650aae1b636ea30cb51f4adf1dcb..8a6b7db9079e67281175f7c6d49b2c6f491e8440 100644 (file)
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -44,8 +44,7 @@
                                <div class="print meta">******</div>
                                <div class="activity meta">
                                        <i>
-                                               {{$.locale.Tr "settings.add_on"}}
-                                               <span>{{.CreatedUnix.FormatShort}}</span>
+                                               {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}}
                                        </i>
                                </div>
                        </div>

diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 39ea90e92a053474eedd04a418356239a5228cc0..84d02c0a003a06a90da081aa4e475401ffaca91a 100644 (file)
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -29,7 +29,7 @@
                                                                </ul>
                                                        </details>
                                                        <div class="activity meta">
-                                                               <i>{{$.locale.Tr "settings.add_on"}} <span>{{DateTime "short" .CreatedUnix}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+                                                               <i>{{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
                                                        </div>
                                                </div>
                                        </div>

diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index 8f48aee15ba79f7833f826e3b227262323872e00..8dd9ca21193dbc83ba506a2ada7f797852928544 100644 (file)
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -20,7 +20,7 @@
                                <div class="content">
                                        <strong>{{$grant.Application.Name}}</strong>
                                        <div class="activity meta">
-                                               <i>{{$.locale.Tr "settings.add_on"}} <span>{{DateTime "short" $grant.CreatedUnix}}</span></i>
+                                               <i>{{$.locale.Tr "settings.added_on" (DateTime "short" $grant.CreatedUnix) | Safe}}</i>
                                        </div>
                                </div>
                        </div>

diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index e57714c8a226e42d8d37c65803a55958cf1e7615..f442e8b2d6cca65bb7210d4718a4f7c5106d0c6d 100644 (file)
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -68,7 +68,7 @@
                                                <b>{{$.locale.Tr "settings.subkeys"}}:</b> {{range .SubsKey}} {{.PaddedKeyID}} {{end}}
                                        </div>
                                        <div class="activity meta">
-                                               <i>{{$.locale.Tr "settings.add_on"}} <span>{{DateTime "short" .AddedUnix}}</span></i>
+                                               <i>{{$.locale.Tr "settings.added_on" (DateTime "short" .AddedUnix) | Safe}}</i>
                                                -
                                                <i>{{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until_date" (DateTime "short" .ExpiredUnix) | Safe}}{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}}</i>
                                        </div>

diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index fbb35b90d6d6a2c98874f30fd766357e3514c683..7dda6665bdf01bf52b642ef82d3efccaeaca80d1 100644 (file)
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -25,7 +25,7 @@
                                        <div class="content">
                                                <strong>{{.Name}}</strong>
                                                <div class="activity meta">
-                                                       <i>{{$.locale.Tr "settings.add_on"}} <span>{{DateTime "short" .CreatedUnix}}</span> —  {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+                                                       <i>{{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} —  {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
                                                </div>
                                        </div>
                                </div>

diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index c365ef226da44511f8386b305aea54155052e521..b761d9093d9f525d10f6dee8eb735322980f24a1 100644 (file)
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -59,7 +59,7 @@
                                                                {{.Fingerprint}}
                                                </div>
                                                <div class="activity meta">
-                                                               <i>{{$.locale.Tr "settings.add_on"}} <span>{{DateTime "short" .CreatedUnix}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+                                                               <i>{{$.locale.Tr "settings.add_on" (DateTime "short" .CreatedUnix) | Safe}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateTime "short" .UpdatedUnix}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
                                                </div>
                                </div>
                        </div>