Refactor `i18n` to `locale` (#20153)

* Refactor `i18n` to `locale` - Currently we're using the `i18n` variable naming for the `locale` struct. This contains locale's specific information and cannot be used for general i18n purpose, therefore refactoring it to `locale` makes more sense. - Ref: https://github.com/go-gitea/gitea/pull/20096#discussion_r906699200 * Update routers/install/install.go
author: Gusted <williamzijl7@hotmail.com> 2022-06-27 22:58:46 +0200
committer: GitHub <noreply@github.com> 2022-06-27 15:58:46 -0500
commit: d55a0b723809f5b94acd948b924c8518014445e0 (patch)
tree: 0ef9ea54f30769ca1d16ce20e551bd7a078f7f5e /templates/base
parent: b551bc2a089d3310dde5706d1b9702f112fe3ea0 (diff)
download: gitea-d55a0b723809f5b94acd948b924c8518014445e0.tar.gz
gitea-d55a0b723809f5b94acd948b924c8518014445e0.zip
6 files changed, 55 insertions, 55 deletions
diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
index 324be8a707..fb4d31270a 100644
--- a/templates/base/delete_modal_actions.tmpl
+++ b/templates/base/delete_modal_actions.tmpl
@@ -1,10 +1,10 @@
 <div class="actions">
 	<div class="ui red basic inverted cancel button">
 		{{svg "octicon-x"}}
-		{{.i18n.Tr "modal.no"}}
+		{{.locale.Tr "modal.no"}}
 	</div>
 	<div class="ui green basic inverted ok button">
 		{{svg "octicon-check"}}
-		{{.i18n.Tr "modal.yes"}}
+		{{.locale.Tr "modal.yes"}}
 	</div>
 </div>
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index f5ec6b0bf3..dfc0646610 100644
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -1,9 +1,9 @@
 <footer>
 	<div class="ui container">
 		<div class="ui left">
-			{{.i18n.Tr "powered_by" "Gitea"}}
+			{{.locale.Tr "powered_by" "Gitea"}}
 			{{if (or .ShowFooterVersion .PageIsAdmin)}}
-				{{.i18n.Tr "version"}}:
+				{{.locale.Tr "version"}}:
 				{{if .IsAdmin}}
 					<a href="{{AppSubUrl}}/admin/config">{{AppVer}}</a>
 				{{else}}
@@ -11,8 +11,8 @@
 				{{end}}
 			{{end}}
 			{{if and .TemplateLoadTimes ShowFooterTemplateLoadTime}}
-				{{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong>
-				{{.i18n.Tr "template"}}
+				{{.locale.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong>
+				{{.locale.Tr "template"}}
 				{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
 			{{end}}
 		</div>
@@ -22,16 +22,16 @@
 			{{end}}
 			<div class="ui language bottom floating slide up dropdown link item">
 				{{svg "octicon-globe"}}
-				<div class="text">{{.i18n.LangName}}</div>
+				<div class="text">{{.locale.LangName}}</div>
 				<div class="menu language-menu">
 					{{range .AllLangs}}
-						<a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq $.i18n.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
+						<a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq $.locale.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
 					{{end}}
 				</div>
 			</div>
-			<a href="{{AssetUrlPrefix}}/js/licenses.txt">{{.i18n.Tr "licenses"}}</a>
+			<a href="{{AssetUrlPrefix}}/js/licenses.txt">{{.locale.Tr "licenses"}}</a>
 			{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
-			<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.i18n.Tr "website"}}</a>
+			<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.locale.Tr "website"}}</a>
 			{{template "custom/extra_links_footer" .}}
 		</div>
 	</div>
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index e75531746a..e0d2b26f2c 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{.i18n.Lang}}" class="theme-{{.SignedUser.Theme}}">
+<html lang="{{.locale.Lang}}" class="theme-{{.SignedUser.Theme}}">
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -78,7 +78,7 @@
 	{{template "custom/body_outer_pre" .}}
 
 	<div class="full height">
-		<noscript>{{.i18n.Tr "enable_javascript"}}</noscript>
+		<noscript>{{.locale.Tr "enable_javascript"}}</noscript>
 
 		{{template "custom/body_inner_pre" .}}
 
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index fab1d2d0b1..b04d8bcbb3 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -1,7 +1,7 @@
 <div class="ui container" id="navbar">
 	<div class="item brand" style="justify-content: space-between;">
-		<a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.i18n.Tr "dashboard"}}{{else}}{{.i18n.Tr "home"}}{{end}}">
-			<img class="ui mini image" width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.i18n.Tr "logo"}}" aria-hidden="true">
+		<a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}">
+			<img class="ui mini image" width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true">
 		</a>
 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
 			<i class="sidebar icon"></i>
@@ -12,19 +12,19 @@
 		{{/* No links */}}
 	{{else if .IsSigned}}
 		{{if not .UnitIssuesGlobalDisabled}}
-		<a class="item {{if .PageIsIssues}}active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
+		<a class="item {{if .PageIsIssues}}active{{end}}" href="{{AppSubUrl}}/issues">{{.locale.Tr "issues"}}</a>
 		{{end}}
 		{{if not .UnitPullsGlobalDisabled}}
-		<a class="item {{if .PageIsPulls}}active{{end}}" href="{{AppSubUrl}}/pulls">{{.i18n.Tr "pull_requests"}}</a>
+		<a class="item {{if .PageIsPulls}}active{{end}}" href="{{AppSubUrl}}/pulls">{{.locale.Tr "pull_requests"}}</a>
 		{{end}}
 		{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
-		{{if .ShowMilestonesDashboardPage}}<a class="item {{if .PageIsMilestonesDashboard}}active{{end}}" href="{{AppSubUrl}}/milestones">{{.i18n.Tr "milestones"}}</a>{{end}}
+		{{if .ShowMilestonesDashboardPage}}<a class="item {{if .PageIsMilestonesDashboard}}active{{end}}" href="{{AppSubUrl}}/milestones">{{.locale.Tr "milestones"}}</a>{{end}}
 		{{end}}
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
 	{{else if .IsLandingPageOrganizations}}
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.i18n.Tr "explore"}}</a>
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.locale.Tr "explore"}}</a>
 	{{else}}
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
 	{{end}}
 
 	{{template "custom/extra_links" .}}
@@ -32,7 +32,7 @@
 	{{/* TODO
 		<div class="item">
 		<div class="ui icon input">
-		<input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
+		<input class="searchbox" type="text" placeholder="{{.locale.Tr "search_project"}}">
 		<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
 		</div>
 		</div>
@@ -41,22 +41,22 @@
 
 	{{if and .IsSigned .MustChangePassword}}
 		<div class="right stackable menu">
-			<div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}">
+			<div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}">
 				<span class="text">
 					{{avatar .SignedUser 24 "tiny"}}
-					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
+					<span class="sr-only">{{.locale.Tr "user_profile_and_more"}}</span>
 					<span class="mobile-only">{{.SignedUser.Name}}</span>
 					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu user-menu" tabindex="-1">
 					<div class="ui header">
-						{{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
+						{{.locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
 					</div>
 
 					<div class="divider"></div>
 					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
 						{{svg "octicon-sign-out"}}
-						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
+						{{.locale.Tr "sign_out"}}<!-- Sign Out -->
 					</a>
 				</div><!-- end content avatar menu -->
 			</div><!-- end dropdown avatar menu -->
@@ -69,7 +69,7 @@
 						{{svg "octicon-stopwatch"}}
 						<span class="red" style="position:absolute; right:-0.6em; top:-0.6em;">{{svg "octicon-dot-fill"}}</span>
 					</span>
-					<span class="sr-mobile-only">{{.i18n.Tr "active_stopwatch"}}</span>
+					<span class="sr-mobile-only">{{.locale.Tr "active_stopwatch"}}</span>
 				</span>
 			</a>
 			<div class="ui popup very wide">
@@ -85,7 +85,7 @@
 						{{.CsrfTokenHtml}}
 						<button
 							class="ui button mini compact basic icon fitted tooltip"
-							data-content="{{.i18n.Tr "repo.issues.stop_tracking"}}"
+							data-content="{{.locale.Tr "repo.issues.stop_tracking"}}"
 							data-position="top right"
 						>{{svg "octicon-square-fill"}}</button>
 					</form>
@@ -93,17 +93,17 @@
 						{{.CsrfTokenHtml}}
 						<button
 							class="ui button mini compact basic icon fitted tooltip"
-							data-content="{{.i18n.Tr "repo.issues.cancel_tracking"}}"
+							data-content="{{.locale.Tr "repo.issues.cancel_tracking"}}"
 							data-position="top right"
 						>{{svg "octicon-trash"}}</button>
 					</form>
 				</div>
 			</div>
 
-			<a href="{{AppSubUrl}}/notifications" class="item tooltip" data-content='{{.i18n.Tr "notifications"}}'>
+			<a href="{{AppSubUrl}}/notifications" class="item tooltip" data-content='{{.locale.Tr "notifications"}}'>
 				<span class="text">
 					<span class="fitted">{{svg "octicon-bell"}}</span>
-					<span class="sr-mobile-only">{{.i18n.Tr "notifications"}}</span>
+					<span class="sr-mobile-only">{{.locale.Tr "notifications"}}</span>
 					{{$notificationUnreadCount := 0}}
 					{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
 					<span class="ui red label {{if not $notificationUnreadCount}}hidden{{end}} notification_count">
@@ -112,87 +112,87 @@
 				</span>
 			</a>
 
-			<div class="ui dropdown jump item tooltip" data-content="{{.i18n.Tr "create_new"}}">
+			<div class="ui dropdown jump item tooltip" data-content="{{.locale.Tr "create_new"}}">
 				<span class="text">
 					<span class="fitted">{{svg "octicon-plus"}}</span>
-					<span class="sr-mobile-only">{{.i18n.Tr "create_new"}}</span>
+					<span class="sr-mobile-only">{{.locale.Tr "create_new"}}</span>
 					<span class="fitted not-mobile">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu">
 					<a class="item" href="{{AppSubUrl}}/repo/create">
-						<span class="fitted">{{svg "octicon-plus"}}</span> {{.i18n.Tr "new_repo"}}
+						<span class="fitted">{{svg "octicon-plus"}}</span> {{.locale.Tr "new_repo"}}
 					</a>
 					{{if not .DisableMigrations}}
 						<a class="item" href="{{AppSubUrl}}/repo/migrate">
-							<span class="fitted">{{svg "octicon-repo-push"}}</span> {{.i18n.Tr "new_migrate"}}
+							<span class="fitted">{{svg "octicon-repo-push"}}</span> {{.locale.Tr "new_migrate"}}
 						</a>
 					{{end}}
 					{{if .SignedUser.CanCreateOrganization}}
 					<a class="item" href="{{AppSubUrl}}/org/create">
-						<span class="fitted">{{svg "octicon-organization"}}</span> {{.i18n.Tr "new_org"}}
+						<span class="fitted">{{svg "octicon-organization"}}</span> {{.locale.Tr "new_org"}}
 					</a>
 					{{end}}
 				</div><!-- end content create new menu -->
 			</div><!-- end dropdown menu create new -->
 
-			<div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}">
+			<div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}">
 				<span class="text">
 					{{avatar .SignedUser 24 "tiny"}}
-					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
+					<span class="sr-only">{{.locale.Tr "user_profile_and_more"}}</span>
 					<span class="mobile-only">{{.SignedUser.Name}}</span>
 					<span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
 				</span>
 				<div class="menu user-menu" tabindex="-1">
 					<div class="ui header">
-						{{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
+						{{.locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
 					</div>
 
 					<div class="divider"></div>
 					<a class="item" href="{{.SignedUser.HomeLink}}">
 						{{svg "octicon-person"}}
-						{{.i18n.Tr "your_profile"}}<!-- Your profile -->
+						{{.locale.Tr "your_profile"}}<!-- Your profile -->
 					</a>
 					{{if not .DisableStars}}
 						<a class="item" href="{{.SignedUser.HomeLink}}?tab=stars">
 							{{svg "octicon-star"}}
-							{{.i18n.Tr "your_starred"}}
+							{{.locale.Tr "your_starred"}}
 						</a>
 					{{end}}
 					<a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
 						{{svg "octicon-tools"}}
-						{{.i18n.Tr "your_settings"}}<!-- Your settings -->
+						{{.locale.Tr "your_settings"}}<!-- Your settings -->
 					</a>
 					<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">
 						{{svg "octicon-question"}}
-						{{.i18n.Tr "help"}}<!-- Help -->
+						{{.locale.Tr "help"}}<!-- Help -->
 					</a>
 					{{if .IsAdmin}}
 						<div class="divider"></div>
 
 						<a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
 							{{svg "octicon-server"}}
-							{{.i18n.Tr "admin_panel"}}<!-- Admin Panel -->
+							{{.locale.Tr "admin_panel"}}<!-- Admin Panel -->
 						</a>
 					{{end}}
 
 					<div class="divider"></div>
 					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
 						{{svg "octicon-sign-out"}}
-						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
+						{{.locale.Tr "sign_out"}}<!-- Sign Out -->
 					</a>
 				</div><!-- end content avatar menu -->
 			</div><!-- end dropdown avatar menu -->
 		</div><!-- end signed user right menu -->
 	{{else}}
-		<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.i18n.Tr "help"}}</a>
+		<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.locale.Tr "help"}}</a>
 		<div class="right stackable menu">
 			{{if .ShowRegistrationButton}}
 				<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
-					{{svg "octicon-person"}} {{.i18n.Tr "register"}}
+					{{svg "octicon-person"}} {{.locale.Tr "register"}}
 				</a>
 			{{end}}
 			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
-				{{svg "octicon-sign-in"}} {{.i18n.Tr "sign_in"}}
+				{{svg "octicon-sign-in"}} {{.locale.Tr "sign_in"}}
 			</a>
 		</div><!-- end anonymous right menu -->
 	{{end}}
diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl
index e6a8060a16..2f74b959e2 100644
--- a/templates/base/head_script.tmpl
+++ b/templates/base/head_script.tmpl
@@ -38,10 +38,10 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
 		mermaidMaxSourceCharacters: {{MermaidMaxSourceCharacters}},
 		{{/* this global i18n object should only contain general texts. for specialized texts, it should be provided inside the related modules by: (1) API response (2) HTML data-attribute (3) PageData */}}
 		i18n: {
-			copy_success: '{{.i18n.Tr "copy_success"}}',
-			copy_error: '{{.i18n.Tr "copy_error"}}',
-			error_occurred: '{{.i18n.Tr "error.occurred"}}',
-			network_error: '{{.i18n.Tr "error.network_error"}}',
+			copy_success: '{{.locale.Tr "copy_success"}}',
+			copy_error: '{{.locale.Tr "copy_error"}}',
+			error_occurred: '{{.locale.Tr "error.occurred"}}',
+			network_error: '{{.locale.Tr "error.network_error"}}',
 		},
 	};
 	{{/* in case some pages don't render the pageData, we make sure it is an object to prevent null access */}}
diff --git a/templates/base/paginate.tmpl b/templates/base/paginate.tmpl
index a9ed8f12ef..ebca1b2be4 100644
--- a/templates/base/paginate.tmpl
+++ b/templates/base/paginate.tmpl
@@ -5,11 +5,11 @@
 			<div class="ui borderless pagination menu">
 				<a class="{{if .IsFirst}}disabled{{end}} item navigation" {{if not .IsFirst}}href="{{$.Link}}{{if $paginationLink}}?{{$paginationLink}}{{end}}"{{end}}>
 					{{svg "gitea-double-chevron-left" 16 "mr-2"}}
-					<span class="navigation_label">{{$.i18n.Tr "admin.first_page"}}</span>
+					<span class="navigation_label">{{$.locale.Tr "admin.first_page"}}</span>
 				</a>
 				<a class="{{if not .HasPrevious}}disabled{{end}} item navigation" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
 					{{svg "octicon-chevron-left" 16 "mr-2"}}
-					<span class="navigation_label">{{$.i18n.Tr "repo.issues.previous"}}</span>
+					<span class="navigation_label">{{$.locale.Tr "repo.issues.previous"}}</span>
 				</a>
 				{{range .Pages}}
 					{{if eq .Num -1}}
@@ -19,11 +19,11 @@
 					{{end}}
 				{{end}}
 				<a class="{{if not .HasNext}}disabled{{end}} item navigation" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
-					<span class="navigation_label">{{$.i18n.Tr "repo.issues.next"}}</span>
+					<span class="navigation_label">{{$.locale.Tr "repo.issues.next"}}</span>
 					{{svg "octicon-chevron-right" 16 "ml-2"}}
 				</a>
 				<a class="{{if .IsLast}}disabled{{end}} item navigation" {{if not .IsLast}}href="{{$.Link}}?page={{.TotalPages}}{{if $paginationLink}}&{{$paginationLink}}{{end}}"{{end}}>
-					<span class="navigation_label">{{$.i18n.Tr "admin.last_page"}}</span>
+					<span class="navigation_label">{{$.locale.Tr "admin.last_page"}}</span>
 					{{svg "gitea-double-chevron-right" 16 "ml-2"}}
 				</a>
 			</div>
author	Gusted <williamzijl7@hotmail.com>	2022-06-27 22:58:46 +0200
committer	GitHub <noreply@github.com>	2022-06-27 15:58:46 -0500
commit	d55a0b723809f5b94acd948b924c8518014445e0 (patch)
tree	0ef9ea54f30769ca1d16ce20e551bd7a078f7f5e /templates/base
parent	b551bc2a089d3310dde5706d1b9702f112fe3ea0 (diff)
download	gitea-d55a0b723809f5b94acd948b924c8518014445e0.tar.gz gitea-d55a0b723809f5b94acd948b924c8518014445e0.zip