mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 00:20:25 +08:00 
			
		
		
		
	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
This commit is contained in:
		@@ -4,18 +4,18 @@
 | 
			
		||||
	<div class="ui container">
 | 
			
		||||
		{{template "base/alert" .}}
 | 
			
		||||
		<h4 class="ui top attached header">
 | 
			
		||||
			{{.i18n.Tr "admin.monitor.queue" .Queue.Name}}
 | 
			
		||||
			{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
 | 
			
		||||
		</h4>
 | 
			
		||||
		<div class="ui attached table segment">
 | 
			
		||||
			<table class="ui very basic striped table">
 | 
			
		||||
				<thead>
 | 
			
		||||
					<tr>
 | 
			
		||||
						<th>{{.i18n.Tr "admin.monitor.queue.name"}}</th>
 | 
			
		||||
						<th>{{.i18n.Tr "admin.monitor.queue.type"}}</th>
 | 
			
		||||
						<th>{{.i18n.Tr "admin.monitor.queue.exemplar"}}</th>
 | 
			
		||||
						<th>{{.i18n.Tr "admin.monitor.queue.numberworkers"}}</th>
 | 
			
		||||
						<th>{{.i18n.Tr "admin.monitor.queue.maxnumberworkers"}}</th>
 | 
			
		||||
						<th>{{.i18n.Tr "admin.monitor.queue.numberinqueue"}}</th>
 | 
			
		||||
						<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
 | 
			
		||||
						<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
 | 
			
		||||
						<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
 | 
			
		||||
						<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
 | 
			
		||||
						<th>{{.locale.Tr "admin.monitor.queue.maxnumberworkers"}}</th>
 | 
			
		||||
						<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
 | 
			
		||||
					</tr>
 | 
			
		||||
				</thead>
 | 
			
		||||
				<tbody>
 | 
			
		||||
@@ -32,141 +32,141 @@
 | 
			
		||||
		</div>
 | 
			
		||||
		{{if lt $sum 0 }}
 | 
			
		||||
		<h4 class="ui top attached header">
 | 
			
		||||
			{{.i18n.Tr "admin.monitor.queue.nopool.title"}}
 | 
			
		||||
			{{.locale.Tr "admin.monitor.queue.nopool.title"}}
 | 
			
		||||
		</h4>
 | 
			
		||||
		<div class="ui attached segment">
 | 
			
		||||
			{{if eq .Queue.Type "wrapped" }}
 | 
			
		||||
			<p>{{.i18n.Tr "admin.monitor.queue.wrapped.desc"}}</p>
 | 
			
		||||
			<p>{{.locale.Tr "admin.monitor.queue.wrapped.desc"}}</p>
 | 
			
		||||
			{{else if eq .Queue.Type "persistable-channel"}}
 | 
			
		||||
			<p>{{.i18n.Tr "admin.monitor.queue.persistable-channel.desc"}}</p>
 | 
			
		||||
			<p>{{.locale.Tr "admin.monitor.queue.persistable-channel.desc"}}</p>
 | 
			
		||||
			{{else}}
 | 
			
		||||
			<p>{{.i18n.Tr "admin.monitor.queue.nopool.desc"}}</p>
 | 
			
		||||
			<p>{{.locale.Tr "admin.monitor.queue.nopool.desc"}}</p>
 | 
			
		||||
			{{end}}
 | 
			
		||||
		</div>
 | 
			
		||||
		{{else}}
 | 
			
		||||
		<h4 class="ui top attached header">
 | 
			
		||||
			{{.i18n.Tr "admin.monitor.queue.settings.title"}}
 | 
			
		||||
			{{.locale.Tr "admin.monitor.queue.settings.title"}}
 | 
			
		||||
		</h4>
 | 
			
		||||
		<div class="ui attached segment">
 | 
			
		||||
			<p>{{.i18n.Tr "admin.monitor.queue.settings.desc"}}</p>
 | 
			
		||||
			<p>{{.locale.Tr "admin.monitor.queue.settings.desc"}}</p>
 | 
			
		||||
			<form method="POST" action="{{.Link}}/set">
 | 
			
		||||
				{{$.CsrfTokenHtml}}
 | 
			
		||||
				<div class="ui form">
 | 
			
		||||
					<div class="inline field">
 | 
			
		||||
						<label for="max-number">{{.i18n.Tr "admin.monitor.queue.settings.maxnumberworkers"}}</label>
 | 
			
		||||
						<input name="max-number" type="text" placeholder="{{.i18n.Tr "admin.monitor.queue.settings.maxnumberworkers.placeholder" .Queue.MaxNumberOfWorkers}}">
 | 
			
		||||
						<label for="max-number">{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers"}}</label>
 | 
			
		||||
						<input name="max-number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers.placeholder" .Queue.MaxNumberOfWorkers}}">
 | 
			
		||||
					</div>
 | 
			
		||||
					<div class="inline field">
 | 
			
		||||
						<label for="timeout">{{.i18n.Tr "admin.monitor.queue.settings.timeout"}}</label>
 | 
			
		||||
						<input name="timeout" type="text" placeholder="{{.i18n.Tr "admin.monitor.queue.settings.timeout.placeholder" .Queue.BoostTimeout }}">
 | 
			
		||||
						<label for="timeout">{{.locale.Tr "admin.monitor.queue.settings.timeout"}}</label>
 | 
			
		||||
						<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.timeout.placeholder" .Queue.BoostTimeout }}">
 | 
			
		||||
					</div>
 | 
			
		||||
					<div class="inline field">
 | 
			
		||||
						<label for="number">{{.i18n.Tr "admin.monitor.queue.settings.numberworkers"}}</label>
 | 
			
		||||
						<input name="number" type="text" placeholder="{{.i18n.Tr "admin.monitor.queue.settings.numberworkers.placeholder" .Queue.BoostWorkers}}">
 | 
			
		||||
						<label for="number">{{.locale.Tr "admin.monitor.queue.settings.numberworkers"}}</label>
 | 
			
		||||
						<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.numberworkers.placeholder" .Queue.BoostWorkers}}">
 | 
			
		||||
					</div>
 | 
			
		||||
					<div class="inline field">
 | 
			
		||||
						<label>{{.i18n.Tr "admin.monitor.queue.settings.blocktimeout"}}</label>
 | 
			
		||||
						<span>{{.i18n.Tr "admin.monitor.queue.settings.blocktimeout.value" .Queue.BlockTimeout}}</span>
 | 
			
		||||
						<label>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout"}}</label>
 | 
			
		||||
						<span>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout.value" .Queue.BlockTimeout}}</span>
 | 
			
		||||
					</div>
 | 
			
		||||
					<button class="ui submit button">{{.i18n.Tr "admin.monitor.queue.settings.submit"}}</button>
 | 
			
		||||
					<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.settings.submit"}}</button>
 | 
			
		||||
				</div>
 | 
			
		||||
			</form>
 | 
			
		||||
		</div>
 | 
			
		||||
		<h4 class="ui top attached header">
 | 
			
		||||
			{{.i18n.Tr "admin.monitor.queue.pool.addworkers.title"}}
 | 
			
		||||
			{{.locale.Tr "admin.monitor.queue.pool.addworkers.title"}}
 | 
			
		||||
		</h4>
 | 
			
		||||
		<div class="ui attached segment">
 | 
			
		||||
			<p>{{.i18n.Tr "admin.monitor.queue.pool.addworkers.desc"}}</p>
 | 
			
		||||
			<p>{{.locale.Tr "admin.monitor.queue.pool.addworkers.desc"}}</p>
 | 
			
		||||
			<form method="POST" action="{{.Link}}/add">
 | 
			
		||||
				{{$.CsrfTokenHtml}}
 | 
			
		||||
				<div class="ui form">
 | 
			
		||||
					<div class="fields">
 | 
			
		||||
						<div class="field">
 | 
			
		||||
							<label>{{.i18n.Tr "admin.monitor.queue.numberworkers"}}</label>
 | 
			
		||||
							<input name="number" type="text" placeholder="{{.i18n.Tr "admin.monitor.queue.pool.addworkers.numberworkers.placeholder"}}">
 | 
			
		||||
							<label>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</label>
 | 
			
		||||
							<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.numberworkers.placeholder"}}">
 | 
			
		||||
						</div>
 | 
			
		||||
						<div class="field">
 | 
			
		||||
							<label>{{.i18n.Tr "admin.monitor.queue.pool.timeout"}}</label>
 | 
			
		||||
							<input name="timeout" type="text" placeholder="{{.i18n.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
 | 
			
		||||
							<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
 | 
			
		||||
							<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
 | 
			
		||||
						</div>
 | 
			
		||||
					</div>
 | 
			
		||||
					<button class="ui submit button">{{.i18n.Tr "admin.monitor.queue.pool.addworkers.submit"}}</button>
 | 
			
		||||
					<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.addworkers.submit"}}</button>
 | 
			
		||||
				</div>
 | 
			
		||||
			</form>
 | 
			
		||||
		</div>
 | 
			
		||||
		{{if .Queue.Pausable}}
 | 
			
		||||
			{{if .Queue.IsPaused}}
 | 
			
		||||
				<h4 class="ui top attached header">
 | 
			
		||||
					{{.i18n.Tr "admin.monitor.queue.pool.resume.title"}}
 | 
			
		||||
					{{.locale.Tr "admin.monitor.queue.pool.resume.title"}}
 | 
			
		||||
				</h4>
 | 
			
		||||
				<div class="ui attached segment">
 | 
			
		||||
					<p>{{.i18n.Tr "admin.monitor.queue.pool.resume.desc"}}</p>
 | 
			
		||||
					<p>{{.locale.Tr "admin.monitor.queue.pool.resume.desc"}}</p>
 | 
			
		||||
					<form method="POST" action="{{.Link}}/resume">
 | 
			
		||||
						{{$.CsrfTokenHtml}}
 | 
			
		||||
						<div class="ui form">
 | 
			
		||||
							<button class="ui submit button">{{.i18n.Tr "admin.monitor.queue.pool.resume.submit"}}</button>
 | 
			
		||||
							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.resume.submit"}}</button>
 | 
			
		||||
						</div>
 | 
			
		||||
					</form>
 | 
			
		||||
				</div>
 | 
			
		||||
			{{else}}
 | 
			
		||||
				<h4 class="ui top attached header">
 | 
			
		||||
					{{.i18n.Tr "admin.monitor.queue.pool.pause.title"}}
 | 
			
		||||
					{{.locale.Tr "admin.monitor.queue.pool.pause.title"}}
 | 
			
		||||
				</h4>
 | 
			
		||||
				<div class="ui attached segment">
 | 
			
		||||
					<p>{{.i18n.Tr "admin.monitor.queue.pool.pause.desc"}}</p>
 | 
			
		||||
					<p>{{.locale.Tr "admin.monitor.queue.pool.pause.desc"}}</p>
 | 
			
		||||
					<form method="POST" action="{{.Link}}/pause">
 | 
			
		||||
						{{$.CsrfTokenHtml}}
 | 
			
		||||
						<div class="ui form">
 | 
			
		||||
							<button class="ui submit button">{{.i18n.Tr "admin.monitor.queue.pool.pause.submit"}}</button>
 | 
			
		||||
							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.pause.submit"}}</button>
 | 
			
		||||
						</div>
 | 
			
		||||
					</form>
 | 
			
		||||
				</div>
 | 
			
		||||
			{{end}}
 | 
			
		||||
		{{end}}
 | 
			
		||||
		<h4 class="ui top attached header">
 | 
			
		||||
			{{.i18n.Tr "admin.monitor.queue.pool.flush.title"}}
 | 
			
		||||
			{{.locale.Tr "admin.monitor.queue.pool.flush.title"}}
 | 
			
		||||
		</h4>
 | 
			
		||||
		<div class="ui attached segment">
 | 
			
		||||
			<p>{{.i18n.Tr "admin.monitor.queue.pool.flush.desc"}}</p>
 | 
			
		||||
			<p>{{.locale.Tr "admin.monitor.queue.pool.flush.desc"}}</p>
 | 
			
		||||
			<form method="POST" action="{{.Link}}/flush">
 | 
			
		||||
				{{$.CsrfTokenHtml}}
 | 
			
		||||
				<div class="ui form">
 | 
			
		||||
					<div class="fields">
 | 
			
		||||
						<div class="field">
 | 
			
		||||
							<label>{{.i18n.Tr "admin.monitor.queue.pool.timeout"}}</label>
 | 
			
		||||
							<input name="timeout" type="text" placeholder="{{.i18n.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
 | 
			
		||||
							<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
 | 
			
		||||
							<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
 | 
			
		||||
						</div>
 | 
			
		||||
					</div>
 | 
			
		||||
					<button class="ui submit button">{{.i18n.Tr "admin.monitor.queue.pool.flush.submit"}}</button>
 | 
			
		||||
					<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.flush.submit"}}</button>
 | 
			
		||||
				</div>
 | 
			
		||||
			</form>
 | 
			
		||||
		</div>
 | 
			
		||||
		<h4 class="ui top attached header">
 | 
			
		||||
			{{.i18n.Tr "admin.monitor.queue.pool.workers.title"}}
 | 
			
		||||
			{{.locale.Tr "admin.monitor.queue.pool.workers.title"}}
 | 
			
		||||
		</h4>
 | 
			
		||||
		<div class="ui attached table segment">
 | 
			
		||||
			<table class="ui very basic striped table">
 | 
			
		||||
				<thead>
 | 
			
		||||
					<tr>
 | 
			
		||||
						<th>{{.i18n.Tr "admin.monitor.queue.numberworkers"}}</th>
 | 
			
		||||
						<th>{{.i18n.Tr "admin.monitor.start"}}</th>
 | 
			
		||||
						<th>{{.i18n.Tr "admin.monitor.queue.pool.timeout"}}</th>
 | 
			
		||||
						<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
 | 
			
		||||
						<th>{{.locale.Tr "admin.monitor.start"}}</th>
 | 
			
		||||
						<th>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</th>
 | 
			
		||||
						<th></th>
 | 
			
		||||
					</tr>
 | 
			
		||||
				</thead>
 | 
			
		||||
				<tbody>
 | 
			
		||||
					{{range .Queue.Workers}}
 | 
			
		||||
					<tr>
 | 
			
		||||
						<td>{{.Workers}}{{if .IsFlusher}}<span title="{{.i18n.Tr "admin.monitor.queue.flush"}}">{{svg "octicon-sync"}}</span>{{end}}</td>
 | 
			
		||||
						<td>{{.Workers}}{{if .IsFlusher}}<span title="{{.locale.Tr "admin.monitor.queue.flush"}}">{{svg "octicon-sync"}}</span>{{end}}</td>
 | 
			
		||||
						<td>{{DateFmtLong .Start}}</td>
 | 
			
		||||
						<td>{{if .HasTimeout}}{{DateFmtLong .Timeout}}{{else}}-{{end}}</td>
 | 
			
		||||
						<td>
 | 
			
		||||
							<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}"><span class="text red" title="{{$.i18n.Tr "remove"}}">{{svg "octicon-trash"}}</span></a>
 | 
			
		||||
							<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}"><span class="text red" title="{{$.locale.Tr "remove"}}">{{svg "octicon-trash"}}</span></a>
 | 
			
		||||
						</td>
 | 
			
		||||
					</tr>
 | 
			
		||||
					{{else}}
 | 
			
		||||
						<tr>
 | 
			
		||||
							<td colspan="4">{{.i18n.Tr "admin.monitor.queue.pool.workers.none" }}
 | 
			
		||||
							<td colspan="4">{{.locale.Tr "admin.monitor.queue.pool.workers.none" }}
 | 
			
		||||
						</tr>
 | 
			
		||||
					{{end}}
 | 
			
		||||
				</tbody>
 | 
			
		||||
@@ -174,7 +174,7 @@
 | 
			
		||||
		</div>
 | 
			
		||||
		{{end}}
 | 
			
		||||
		<h4 class="ui top attached header">
 | 
			
		||||
			{{.i18n.Tr "admin.monitor.queue.configuration"}}
 | 
			
		||||
			{{.locale.Tr "admin.monitor.queue.configuration"}}
 | 
			
		||||
		</h4>
 | 
			
		||||
		<div class="ui attached segment">
 | 
			
		||||
			<pre>{{.Queue.Configuration | JsonPrettyPrint}}
 | 
			
		||||
@@ -184,11 +184,11 @@
 | 
			
		||||
<div class="ui small basic delete modal">
 | 
			
		||||
	<div class="ui icon header">
 | 
			
		||||
		{{svg "octicon-x" 16 "close inside"}}
 | 
			
		||||
		{{.i18n.Tr "admin.monitor.queue.pool.cancel"}}
 | 
			
		||||
		{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
 | 
			
		||||
	</div>
 | 
			
		||||
	<div class="content">
 | 
			
		||||
		<p>{{$.i18n.Tr "admin.monitor.queue.pool.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 | 
			
		||||
		<p>{{$.i18n.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
 | 
			
		||||
		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 | 
			
		||||
		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
 | 
			
		||||
	</div>
 | 
			
		||||
	{{template "base/delete_modal_actions" .}}
 | 
			
		||||
</div>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user