Merge pull request '[v7.0/forgejo] Improve English locale' (#3241) from bp-v7.0/forgejo-3b23633 into v7.0/forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3241
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>

options/locale/locale_en-US.ini

@@ -64,7 +64,6 @@ new_org = New organization
 new_project = New project
 new_project_column = New column
 admin_panel = Site administration
-account_settings = Account settings
 settings = Settings
 your_profile = Profile
 your_starred = Starred
@@ -171,7 +170,7 @@ org_kind = Search orgs...
 team_kind = Search teams...
 code_kind = Search code...
 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...
 project_kind = Search projects...
 branch_kind = Search branches...
@@ -545,6 +544,12 @@ modify = Update
 
 [form]
 UserName = Username
+FullName = Full name
+Description = Description
+Pronouns = Pronouns
+Biography = Biography
+Website = Website
+Location = Location
 RepoName = Repository name
 Email = Email address
 Password = Password
@@ -555,6 +560,7 @@ PayloadUrl = Payload URL
 TeamName = Team name
 AuthName = Authorization name
 AdminEmail = Admin email
+To = Branch name
 
 NewBranchName = New branch name
 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.push_mirror_sync_in_progress = Pushing changes to the remote %s at the moment.
 settings.site = Website
-settings.update_settings = Update settings
+settings.update_settings = Save settings
 settings.update_mirror_settings = Update mirror settings
 settings.branches.switch_default_branch = Switch 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_yes = You can 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_desc = Prevents deletion and restricts Git pushing and merging to the branch.
 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.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.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.still_own_packages = This user still owns one or more packages, delete these packages first.
 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.not_active = Inactive
 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.not_restricted = Not Restricted
-users.list_status_filter.is_prohibit_login = Prohibit Login
-users.list_status_filter.not_prohibit_login = Allow Login
-users.list_status_filter.is_2fa_enabled = 2FA Enabled
-users.list_status_filter.not_2fa_enabled = 2FA Disabled
-users.details = User Details
+users.list_status_filter.not_restricted = Not restricted
+users.list_status_filter.is_prohibit_login = Prohibit login
+users.list_status_filter.not_prohibit_login = Allow login
+users.list_status_filter.is_2fa_enabled = 2FA enabled
+users.list_status_filter.not_2fa_enabled = 2FA disabled
+users.details = User details
 
 emails.email_manage_panel = Manage user emails
 emails.primary = Primary

routers/web/user/setting/profile.go

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

services/forms/user_form.go

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

templates/user/settings/profile.tmpl

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