Просмотр исходного кода

Update hestiacp.pot (#3563)

* Update hestiacp.pot

- Use all lower case for comments
- Use Name server 1 instead of NS1

* Update Database email template

* Replace select box with Yes / No
Jaap Marcus 2 лет назад
Родитель
Сommit
164619b149

+ 1 - 1
web/add/db/index.php

@@ -150,7 +150,7 @@ if (!empty($_POST["ok"])) {
 				"Database has been created.\n" .
 					"\n" .
 					"Database: {{database}}\n" .
-					"User: {{username}}\n" .
+					"Username: {{username}}\n" .
 					"Password: {{password}}\n" .
 					"SQL Manager: {{dbadmin}}\n" .
 					"\n" .

+ 2 - 2
web/add/package/index.php

@@ -86,10 +86,10 @@ if (!empty($_POST["ok"])) {
 	// Check if name server entries are blank if DNS server is installed
 	if (isset($_SESSION["DNS_SYSTEM"]) && !empty($_SESSION["DNS_SYSTEM"])) {
 		if (empty($_POST["v_ns1"])) {
-			$errors[] = _("NS1");
+			$errors[] = _("Nameserver 1");
 		}
 		if (empty($_POST["v_ns2"])) {
-			$errors[] = _("NS2");
+			$errors[] = _("Nameserver 2");
 		}
 	}
 	if (!empty($errors[0])) {

+ 2 - 2
web/edit/package/index.php

@@ -195,10 +195,10 @@ if (!empty($_POST["save"])) {
 	// Check if name server entries are blank if DNS server is installed
 	if (isset($_SESSION["DNS_SYSTEM"]) && !empty($_SESSION["DNS_SYSTEM"])) {
 		if (empty($_POST["v_ns1"])) {
-			$errors[] = _("NS1");
+			$errors[] = _("Nameserver 1");
 		}
 		if (empty($_POST["v_ns2"])) {
-			$errors[] = _("NS2");
+			$errors[] = _("Nameserver 2");
 		}
 	}
 

Разница между файлами не показана из-за своего большого размера
+ 176 - 179
web/locale/hestiacp.pot


+ 1 - 1
web/templates/pages/add_mail_acc.php

@@ -105,7 +105,7 @@
 						</div>
 						<div class="u-mt10 u-mb10">
 							<label for="v_rate" class="form-label">
-								<?= _("Rate Limit") ?> <span class="optional">(<?= _("Email / Hour") ?>)</span>
+								<?= _("Rate Limit") ?> <span class="optional">(<?= _("email / hour") ?>)</span>
 							</label>
 							<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
 						</div>

+ 4 - 4
web/templates/pages/add_package.php

@@ -84,7 +84,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_web_aliases" class="form-label">
-						<?= _("Web Aliases") ?> <span class="optional">(<?= _("Per Domain") ?>)</span>
+						<?= _("Web Aliases") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
 						<input type="text" class="form-control" name="v_web_aliases" id="v_web_aliases" value="<?= htmlentities(trim($v_web_aliases, "'")) ?>">
@@ -182,7 +182,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_dns_records" class="form-label">
-						<?= _("DNS Records") ?> <span class="optional">(<?= _("Per Domain") ?>)</span>
+						<?= _("DNS Records") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
 						<input type="text" class="form-control" name="v_dns_records" id="v_dns_records" value="<?= htmlentities(trim($v_dns_records, "'")) ?>">
@@ -261,7 +261,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_mail_accounts" class="form-label">
-						<?= _("Mail Accounts") ?> <span class="optional">(<?= _("Per Domain") ?>)</span>
+						<?= _("Mail Accounts") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
 						<input type="text" class="form-control" name="v_mail_accounts" id="v_mail_accounts" value="<?= htmlentities(trim($v_mail_accounts, "'")) ?>">
@@ -272,7 +272,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_ratelimit" class="form-label">
-						<?= _("Rate Limit") ?> <span class="optional">(<?= _("Per Account / Hour") ?>)</span>
+						<?= _("Rate Limit") ?> <span class="optional">(<?= _("per account / hour") ?>)</span>
 					</label>
 					<input type="text" class="form-control" name="v_ratelimit" id="v_ratelimit" value="<?= htmlentities(trim($v_ratelimit, "'")) ?>">
 				</div>

+ 1 - 1
web/templates/pages/edit_mail.php

@@ -61,7 +61,7 @@
 			</div>
 			<div class="u-mb20">
 				<label for="v_rate" class="form-label">
-					<?= _("Rate Limit") ?> <span class="optional">(<?= _("Email / Hour / Account") ?>)</span>
+					<?= _("Rate Limit") ?> <span class="optional">(<?= _("email / hour / account") ?>)</span>
 				</label>
 				<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
 			</div>

+ 1 - 1
web/templates/pages/edit_mail_acc.php

@@ -115,7 +115,7 @@
 					</div>
 					<div class="u-mb20">
 						<label for="v_rate" class="form-label">
-							<?= _("Rate Limit") ?> <span class="optional">(<?= _("Email / Hour") ?>)</span>
+							<?= _("Rate Limit") ?> <span class="optional">(<?= _("email / hour") ?>)</span>
 						</label>
 						<input type="text" class="form-control" name="v_rate" id="v_rate" value="<?=htmlentities(trim($v_rate, "'"))?>" <?php if($_SESSION['userContext'] != "admin"){ echo "disabled";}?>>
 					</div>

+ 4 - 4
web/templates/pages/edit_package.php

@@ -86,7 +86,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_web_aliases" class="form-label">
-						<?= _("Web Aliases") ?> <span class="optional">(<?= _("Per Domain") ?>)</span>
+						<?= _("Web Aliases") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
 						<input type="text" class="form-control" name="v_web_aliases" id="v_web_aliases" value="<?= htmlentities(trim($v_web_aliases, "'")) ?>">
@@ -186,7 +186,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_dns_records" class="form-label">
-						<?= _("DNS Records") ?> <span class="optional">(<?= _("Per Domain") ?>)</span>
+						<?= _("DNS Records") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
 						<input type="text" class="form-control" name="v_dns_records" id="v_dns_records" value="<?= htmlentities(trim($v_dns_records, "'")) ?>">
@@ -265,7 +265,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_mail_accounts" class="form-label">
-						<?= _("Mail Accounts") ?> <span class="optional">(<?= _("Per Domain") ?>)</span>
+						<?= _("Mail Accounts") ?> <span class="optional">(<?= _("per domain") ?>)</span>
 					</label>
 					<div class="u-pos-relative">
 						<input type="text" class="form-control" name="v_mail_accounts" id="v_mail_accounts" value="<?= htmlentities(trim($v_mail_accounts, "'")) ?>">
@@ -276,7 +276,7 @@
 				</div>
 				<div class="u-mb10">
 					<label for="v_ratelimit" class="form-label">
-						<?= _("Rate Limit") ?> <span class="optional">(<?= _("Per Account / Hour") ?>)</span>
+						<?= _("Rate Limit") ?> <span class="optional">(<?= _("per account / hour") ?>)</span>
 					</label>
 					<input type="text" class="form-control" name="v_ratelimit" id="v_ratelimit" value="<?= htmlentities(trim($v_ratelimit, "'")) ?>">
 				</div>

+ 2 - 2
web/templates/pages/edit_whitelabel.php

@@ -107,8 +107,8 @@
 							<?= _("Hide link to Documentation") ?>
 						</label>
 						<select x-model="hide_docs" class="form-select" name="v_hide_docs" id="v_hide_docs">
-							<option value="yes"><?=_('Hide Documentation Link');?></option>
-							<option value="no"><?=_('Display Documentation Link');?></option>
+							<option value="yes"><?=_('Yes');?></option>
+							<option value="no"><?=_('No');?></option>
 						</select>
 					</div>
 				</div>

Некоторые файлы не были показаны из-за большого количества измененных файлов