Infrastructure/forgejo
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 23:33:15 -05:00
Code Issues Activity

Merge pull request 'Improve English locale' (#2941) from 0ko/forgejo:english20240401 into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2941
Reviewed-by: Otto <otto@codeberg.org>
This commit is contained in:
0ko 2024-04-15 17:34:52 +00:00
commit ceba1abe06
4 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
options/locale/locale_en-US.ini
View file

@ -64,7 +64,6 @@ new_org = New organization
new_project = New project new_project = New project
new_project_column = New column new_project_column = New column
admin_panel = Site administration admin_panel = Site administration
account_settings = Account settings
settings = Settings settings = Settings
your_profile = Profile your_profile = Profile
your_starred = Starred your_starred = Starred
@ -171,7 +170,7 @@ org_kind = Search orgs...
team_kind = Search teams... team_kind = Search teams...
code_kind = Search code... code_kind = Search code...
code_search_unavailable = Code search is currently not available. Please contact the site administrator. code_search_unavailable = Code search is currently not available. Please contact the site administrator.
code_search_by_git_grep = Current code search results are provided by "git grep". There might be better results if site administrator enables Repository Indexer. code_search_by_git_grep = Current code search results are provided by "git grep". There might be better results if site administrator enables code indexer.
package_kind = Search packages... package_kind = Search packages...
project_kind = Search projects... project_kind = Search projects...
branch_kind = Search branches... branch_kind = Search branches...
@ -545,6 +544,12 @@ modify = Update
[form] [form]
UserName = Username UserName = Username
FullName = Full name
Description = Description
Pronouns = Pronouns
Biography = Biography
Website = Website
Location = Location
RepoName = Repository name RepoName = Repository name
Email = Email address Email = Email address
Password = Password Password = Password
@ -555,6 +560,7 @@ PayloadUrl = Payload URL
TeamName = Team name TeamName = Team name
AuthName = Authorization name AuthName = Authorization name
AdminEmail = Admin email AdminEmail = Admin email
To = Branch name
NewBranchName = New branch name NewBranchName = New branch name
CommitSummary = Commit summary CommitSummary = Commit summary
@ -2137,7 +2143,7 @@ settings.sync_mirror = Synchronize now
settings.pull_mirror_sync_in_progress = Pulling changes from the remote %s at the moment. settings.pull_mirror_sync_in_progress = Pulling changes from the remote %s at the moment.
settings.push_mirror_sync_in_progress = Pushing changes to the remote %s at the moment. settings.push_mirror_sync_in_progress = Pushing changes to the remote %s at the moment.
settings.site = Website settings.site = Website
settings.update_settings = Update settings settings.update_settings = Save settings
settings.update_mirror_settings = Update mirror settings settings.update_mirror_settings = Update mirror settings
settings.branches.switch_default_branch = Switch default branch settings.branches.switch_default_branch = Switch default branch
settings.branches.update_default_branch = Update default branch settings.branches.update_default_branch = Update default branch
@ -2416,7 +2422,7 @@ settings.protected_branch.delete_rule = Delete rule
settings.protected_branch_can_push = Allow push? settings.protected_branch_can_push = Allow push?
settings.protected_branch_can_push_yes = You can push settings.protected_branch_can_push_yes = You can push
settings.protected_branch_can_push_no = You cannot push settings.protected_branch_can_push_no = You cannot push
settings.branch_protection = Branch protection rules for branch "<b>%s</b>" settings.branch_protection = Protection rules for branch "<b>%s</b>"
settings.protect_this_branch = Enable branch protection settings.protect_this_branch = Enable branch protection
settings.protect_this_branch_desc = Prevents deletion and restricts Git pushing and merging to the branch. settings.protect_this_branch_desc = Prevents deletion and restricts Git pushing and merging to the branch.
settings.protect_disable_push = Disable push settings.protect_disable_push = Disable push
@ -2990,7 +2996,7 @@ users.delete_account = Delete user account
users.cannot_delete_self = You cannot delete yourself users.cannot_delete_self = You cannot delete yourself
users.still_own_repo = This user still owns one or more repositories. Delete or transfer these repositories first. users.still_own_repo = This user still owns one or more repositories. Delete or transfer these repositories first.
users.still_has_org = This user is a member of an organization. Remove the user from any organizations first. users.still_has_org = This user is a member of an organization. Remove the user from any organizations first.
users.purge = Purge User users.purge = Purge user
users.purge_help = Forcibly delete user and any repositories, organizations, and packages owned by the user. All comments and issues posted by this user will also be deleted. users.purge_help = Forcibly delete user and any repositories, organizations, and packages owned by the user. All comments and issues posted by this user will also be deleted.
users.still_own_packages = This user still owns one or more packages, delete these packages first. users.still_own_packages = This user still owns one or more packages, delete these packages first.
users.deletion_success = The user account has been deleted. users.deletion_success = The user account has been deleted.
@ -3000,14 +3006,14 @@ users.list_status_filter.reset = Reset
users.list_status_filter.is_active = Active users.list_status_filter.is_active = Active
users.list_status_filter.not_active = Inactive users.list_status_filter.not_active = Inactive
users.list_status_filter.is_admin = Admin users.list_status_filter.is_admin = Admin
users.list_status_filter.not_admin = Not Admin users.list_status_filter.not_admin = Not admin
users.list_status_filter.is_restricted = Restricted users.list_status_filter.is_restricted = Restricted
users.list_status_filter.not_restricted = Not Restricted users.list_status_filter.not_restricted = Not restricted
users.list_status_filter.is_prohibit_login = Prohibit Login users.list_status_filter.is_prohibit_login = Prohibit login
users.list_status_filter.not_prohibit_login = Allow Login users.list_status_filter.not_prohibit_login = Allow login
users.list_status_filter.is_2fa_enabled = 2FA Enabled users.list_status_filter.is_2fa_enabled = 2FA enabled
users.list_status_filter.not_2fa_enabled = 2FA Disabled users.list_status_filter.not_2fa_enabled = 2FA disabled
users.details = User Details users.details = User details
emails.email_manage_panel = Manage user emails emails.email_manage_panel = Manage user emails
emails.primary = Primary emails.primary = Primary

2
routers/web/user/setting/profile.go
View file

@ -95,7 +95,7 @@ func ProfilePost(ctx *context.Context) {
opts := &user_service.UpdateOptions{ opts := &user_service.UpdateOptions{
FullName: optional.Some(form.FullName), FullName: optional.Some(form.FullName),
KeepEmailPrivate: optional.Some(form.KeepEmailPrivate), KeepEmailPrivate: optional.Some(form.KeepEmailPrivate),
Description: optional.Some(form.Description), Description: optional.Some(form.Biography),
Pronouns: optional.Some(form.Pronouns), Pronouns: optional.Some(form.Pronouns),
Website: optional.Some(form.Website), Website: optional.Some(form.Website),
Location: optional.Some(form.Location), Location: optional.Some(form.Location),

2
services/forms/user_form.go
View file

@ -219,7 +219,7 @@ type UpdateProfileForm struct {
Website string `binding:"ValidSiteUrl;MaxSize(255)"` Website string `binding:"ValidSiteUrl;MaxSize(255)"`
Location string `binding:"MaxSize(50)"` Location string `binding:"MaxSize(50)"`
Pronouns string `binding:"MaxSize(50)"` Pronouns string `binding:"MaxSize(50)"`
Description string `binding:"MaxSize(255)"` Biography string `binding:"MaxSize(255)"`
Visibility structs.VisibleType Visibility structs.VisibleType
KeepActivityPrivate bool KeepActivityPrivate bool
} }

6
templates/user/settings/profile.tmpl
View file

@ -55,9 +55,9 @@
<label>{{ctx.Locale.Tr "email"}}</label> <label>{{ctx.Locale.Tr "email"}}</label>
<p id="signed-user-email">{{.SignedUser.Email}}</p> <p id="signed-user-email">{{.SignedUser.Email}}</p>
</div> </div>
<div class="field {{if .Err_Description}}error{{end}}"> <div class="field {{if .Err_Biography}}error{{end}}">
<label for="description">{{ctx.Locale.Tr "user.user_bio"}}</label> <label for="biography">{{ctx.Locale.Tr "user.user_bio"}}</label>
<textarea id="description" name="description" rows="2" placeholder="{{ctx.Locale.Tr "settings.biography_placeholder"}}" maxlength="255">{{.SignedUser.Description}}</textarea> <textarea id="biography" name="biography" rows="2" placeholder="{{ctx.Locale.Tr "settings.biography_placeholder"}}" maxlength="255">{{.SignedUser.Description}}</textarea>
</div> </div>
<div class="field {{if .Err_Website}}error{{end}}"> <div class="field {{if .Err_Website}}error{{end}}">
<label for="website">{{ctx.Locale.Tr "settings.website"}}</label> <label for="website">{{ctx.Locale.Tr "settings.website"}}</label>