From 5c2445d6434009579a6c54dc36c06bb235f03793 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 25 Aug 2024 18:07:22 +0200 Subject: [PATCH] [SKIP CI] Don't duplicate key - Follow up #4819. - It introduces a duplicate key, which is wrong. Move to a unique translation key to avoid conflicts. --- options/locale/locale_en-US.ini | 2 +- templates/repo/settings/options.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 6fa4eb7192..0495dffd88 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2181,7 +2181,7 @@ settings.mirror_settings.push_mirror.none = No push mirrors configured settings.mirror_settings.push_mirror.remote_url = Git remote repository URL settings.mirror_settings.push_mirror.add = Add push mirror settings.mirror_settings.push_mirror.edit_sync_time = Edit mirror sync interval -settings.mirror_settings.push_mirror.none = None +settings.mirror_settings.push_mirror.none_ssh = None settings.units.units = Repository units settings.units.overview = Overview diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index d37169c078..a18a584c56 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -244,7 +244,7 @@ {{.RemoteAddress}} {{ctx.Locale.Tr "repo.settings.mirror_settings.direction.push"}} {{if .LastUpdateUnix}}{{DateTime "full" .LastUpdateUnix}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} {{if .LastError}}
{{ctx.Locale.Tr "error"}}
{{end}} - {{if not (eq (len .GetPublicKey) 0)}}{{ctx.Locale.Tr "repo.settings.mirror_settings.push_mirror.copy_public_key"}}{{else}}{{ctx.Locale.Tr "repo.settings.mirror_settings.push_mirror.none"}}{{end}} + {{if not (eq (len .GetPublicKey) 0)}}{{ctx.Locale.Tr "repo.settings.mirror_settings.push_mirror.copy_public_key"}}{{else}}{{ctx.Locale.Tr "repo.settings.mirror_settings.push_mirror.none_ssh"}}{{end}}