diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-04-17 18:24:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 10:24:08 +0000 |
| commit | 0798370f25ca3bd67933dd6d75c342aaded57095 (patch) | |
| tree | 547136123d98ea78e5acbd59cbddc7a8c451ab9f /options | |
| parent | 8e12ef911a1d10dedb03e3127c42ca76f9850aca (diff) | |
| download | gitea-0798370f25ca3bd67933dd6d75c342aaded57095.tar.gz gitea-0798370f25ca3bd67933dd6d75c342aaded57095.zip | |
Correct locale string rendering (#30522)
Since #29165, the translations are rendered as HTML in templates, so:
1. if the translation does contain `<>`, use `TrString`
2. use `{dummy}` instead of `<dummy>` as much as possible
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 0a3d12d7a4..ed274197c7 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -714,7 +714,7 @@ cancel = Cancel language = Language ui = Theme hidden_comment_types = Hidden comment types -hidden_comment_types_description = Comment types checked here will not be shown inside issue pages. Checking "Label" for example removes all "<user> added/removed <label>" comments. +hidden_comment_types_description = Comment types checked here will not be shown inside issue pages. Checking "Label" for example removes all "{user} added/removed {label}" comments. hidden_comment_types.ref_tooltip = Comments where this issue was referenced from another issue/commit/… hidden_comment_types.issue_ref_tooltip = Comments where the user changes the branch/tag associated with the issue comment_type_group_reference = Reference @@ -1289,7 +1289,7 @@ editor.or = or editor.cancel_lower = Cancel editor.commit_signed_changes = Commit Signed Changes editor.commit_changes = Commit Changes -editor.add_tmpl = Add '<filename>' +editor.add_tmpl = Add '{filename}' editor.add = Add %s editor.update = Update %s editor.delete = Delete %s @@ -3087,14 +3087,14 @@ auths.tips = Tips auths.tips.oauth2.general = OAuth2 Authentication auths.tips.oauth2.general.tip = When registering a new OAuth2 authentication, the callback/redirect URL should be: auths.tip.oauth2_provider = OAuth2 Provider -auths.tip.bitbucket = Register a new OAuth consumer on https://bitbucket.org/account/user/<your username>/oauth-consumers/new and add the permission 'Account' - 'Read' +auths.tip.bitbucket = Register a new OAuth consumer on https://bitbucket.org/account/user/{your-username}/oauth-consumers/new and add the permission 'Account' - 'Read' auths.tip.nextcloud = Register a new OAuth consumer on your instance using the following menu "Settings -> Security -> OAuth 2.0 client" auths.tip.dropbox = Create a new application at https://www.dropbox.com/developers/apps auths.tip.facebook = Register a new application at https://developers.facebook.com/apps and add the product "Facebook Login" auths.tip.github = Register a new OAuth application on https://github.com/settings/applications/new auths.tip.gitlab_new = Register a new application on https://gitlab.com/-/profile/applications auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console at https://console.developers.google.com/ -auths.tip.openid_connect = Use the OpenID Connect Discovery URL (<server>/.well-known/openid-configuration) to specify the endpoints +auths.tip.openid_connect = Use the OpenID Connect Discovery URL "https://{server}/.well-known/openid-configuration" to specify the endpoints auths.tip.twitter = Go to https://dev.twitter.com/apps, create an application and ensure that the “Allow this application to be used to Sign in with Twitter” option is enabled auths.tip.discord = Register a new application on https://discordapp.com/developers/applications/me auths.tip.gitea = Register a new OAuth2 application. Guide can be found at https://docs.gitea.com/development/oauth2-provider |