+18 -12

options/locale/locale_en-US.ini

reviewed

··· 64 64 new_project = New project 65 65 new_project_column = New column 66 66 admin_panel = Site administration 67 67 - account_settings = Account settings 68 67 settings = Settings 69 68 your_profile = Profile 70 69 your_starred = Starred ··· 171 170 team_kind = Search teams... 172 171 code_kind = Search code... 173 172 code_search_unavailable = Code search is currently not available. Please contact the site administrator. 174 174 - 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. 173 173 + 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. 175 174 package_kind = Search packages... 176 175 project_kind = Search projects... 177 176 branch_kind = Search branches... ··· 545 544 546 545 [form] 547 546 UserName = Username 547 547 + FullName = Full name 548 548 + Description = Description 549 549 + Pronouns = Pronouns 550 550 + Biography = Biography 551 551 + Website = Website 552 552 + Location = Location 548 553 RepoName = Repository name 549 554 Email = Email address 550 555 Password = Password ··· 555 560 TeamName = Team name 556 561 AuthName = Authorization name 557 562 AdminEmail = Admin email 563 563 + To = Branch name 558 564 559 565 NewBranchName = New branch name 560 566 CommitSummary = Commit summary ··· 2137 2143 settings.pull_mirror_sync_in_progress = Pulling changes from the remote %s at the moment. 2138 2144 settings.push_mirror_sync_in_progress = Pushing changes to the remote %s at the moment. 2139 2145 settings.site = Website 2140 2140 - settings.update_settings = Update settings 2146 2146 + settings.update_settings = Save settings 2141 2147 settings.update_mirror_settings = Update mirror settings 2142 2148 settings.branches.switch_default_branch = Switch default branch 2143 2149 settings.branches.update_default_branch = Update default branch ··· 2416 2422 settings.protected_branch_can_push = Allow push? 2417 2423 settings.protected_branch_can_push_yes = You can push 2418 2424 settings.protected_branch_can_push_no = You cannot push 2419 2419 - settings.branch_protection = Branch protection rules for branch "<b>%s</b>" 2425 2425 + settings.branch_protection = Protection rules for branch "<b>%s</b>" 2420 2426 settings.protect_this_branch = Enable branch protection 2421 2427 settings.protect_this_branch_desc = Prevents deletion and restricts Git pushing and merging to the branch. 2422 2428 settings.protect_disable_push = Disable push ··· 2990 2996 users.cannot_delete_self = You cannot delete yourself 2991 2997 users.still_own_repo = This user still owns one or more repositories. Delete or transfer these repositories first. 2992 2998 users.still_has_org = This user is a member of an organization. Remove the user from any organizations first. 2993 2993 - users.purge = Purge User 2999 2999 + users.purge = Purge user 2994 3000 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. 2995 3001 users.still_own_packages = This user still owns one or more packages, delete these packages first. 2996 3002 users.deletion_success = The user account has been deleted. ··· 3000 3006 users.list_status_filter.is_active = Active 3001 3007 users.list_status_filter.not_active = Inactive 3002 3008 users.list_status_filter.is_admin = Admin 3003 3003 - users.list_status_filter.not_admin = Not Admin 3009 3009 + users.list_status_filter.not_admin = Not admin 3004 3010 users.list_status_filter.is_restricted = Restricted 3005 3005 - users.list_status_filter.not_restricted = Not Restricted 3006 3006 - users.list_status_filter.is_prohibit_login = Prohibit Login 3007 3007 - users.list_status_filter.not_prohibit_login = Allow Login 3008 3008 - users.list_status_filter.is_2fa_enabled = 2FA Enabled 3009 3009 - users.list_status_filter.not_2fa_enabled = 2FA Disabled 3010 3010 - users.details = User Details 3011 3011 + users.list_status_filter.not_restricted = Not restricted 3012 3012 + users.list_status_filter.is_prohibit_login = Prohibit login 3013 3013 + users.list_status_filter.not_prohibit_login = Allow login 3014 3014 + users.list_status_filter.is_2fa_enabled = 2FA enabled 3015 3015 + users.list_status_filter.not_2fa_enabled = 2FA disabled 3016 3016 + users.details = User details 3011 3017 3012 3018 emails.email_manage_panel = Manage user emails 3013 3019 emails.primary = Primary

+1 -1

routers/web/user/setting/profile.go

reviewed

··· 95 95 opts := &user_service.UpdateOptions{ 96 96 FullName: optional.Some(form.FullName), 97 97 KeepEmailPrivate: optional.Some(form.KeepEmailPrivate), 98 98 - Description: optional.Some(form.Description), 98 98 + Description: optional.Some(form.Biography), 99 99 Pronouns: optional.Some(form.Pronouns), 100 100 Website: optional.Some(form.Website), 101 101 Location: optional.Some(form.Location),

+1 -1

services/forms/user_form.go

reviewed

··· 219 219 Website string `binding:"ValidSiteUrl;MaxSize(255)"` 220 220 Location string `binding:"MaxSize(50)"` 221 221 Pronouns string `binding:"MaxSize(50)"` 222 222 - Description string `binding:"MaxSize(255)"` 222 222 + Biography string `binding:"MaxSize(255)"` 223 223 Visibility structs.VisibleType 224 224 KeepActivityPrivate bool 225 225 }

+3 -3

templates/user/settings/profile.tmpl

reviewed

··· 55 55 <label>{{ctx.Locale.Tr "email"}}</label> 56 56 <p id="signed-user-email">{{.SignedUser.Email}}</p> 57 57 </div> 58 58 - <div class="field {{if .Err_Description}}error{{end}}"> 59 59 - <label for="description">{{ctx.Locale.Tr "user.user_bio"}}</label> 60 60 - <textarea id="description" name="description" rows="2" placeholder="{{ctx.Locale.Tr "settings.biography_placeholder"}}" maxlength="255">{{.SignedUser.Description}}</textarea> 58 58 + <div class="field {{if .Err_Biography}}error{{end}}"> 59 59 + <label for="biography">{{ctx.Locale.Tr "user.user_bio"}}</label> 60 60 + <textarea id="biography" name="biography" rows="2" placeholder="{{ctx.Locale.Tr "settings.biography_placeholder"}}" maxlength="255">{{.SignedUser.Description}}</textarea> 61 61 </div> 62 62 <div class="field {{if .Err_Website}}error{{end}}"> 63 63 <label for="website">{{ctx.Locale.Tr "settings.website"}}</label>