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

#1819 PHP error in edit_server.html (#1823)

* Fix error in edit_server.html and make yes and no translateable

* Fix consistency between Yes/No and yes/no

Allow translating in the future for yes / no
Jaap Marcus 4 лет назад
Родитель
Сommit
3cdd85a3a7
1 измененных файлов с 40 добавлено и 40 удалено
  1. 40 40
      web/templates/pages/edit_server.html

+ 40 - 40
web/templates/pages/edit_server.html

@@ -332,10 +332,10 @@
 									</tr>
 									<tr>
 										<td class="vst-text">
-											<?=_('DNS Cluster');?>: <span class="optional"><?php if ($v_dns_cluster == 'yes') { echo 'Yes'; } else { echo 'No'; } ?></span>
+											<?=_('DNS Cluster');?>: <span class="optional"><?php if ($v_dns_cluster == 'yes') { echo _('Yes'); } else { echo _('No'); } ?></span>
 										</td>
 									</tr>
-									<?php if ($v_dns_cluster = 'yes') {
+									<?php if ($v_dns_cluster == 'yes') {
 										$i = 0;
 										foreach ($dns_cluster as $key => $value) {
 											$i++;
@@ -482,8 +482,8 @@
 									<tr>
 										<td>
 											<select class="vst-list" name="v_mysql" disabled>
-												<option value='no'><?=_('no'); ?></option>
-												<option value='yes' <?php if($v_mysql == 'yes') echo 'selected' ?>><?=_('yes'); ?></option>
+												<option value='no'><?=_('No'); ?></option>
+												<option value='yes' <?php if($v_mysql == 'yes') echo 'selected' ?>><?=_('Yes'); ?></option>
 											</select>
 											<br><br>
 										</td>
@@ -582,8 +582,8 @@
 										<tr>
 											<td>
 												<select class="vst-list" name="v_pgsql" disabled>
-													<option value='no'><?=_('no'); ?></option>
-													<option value='yes' <?php if($v_pgsql == 'yes') echo 'selected' ?>><?=_('yes'); ?></option>
+													<option value='no'><?=_('No'); ?></option>
+													<option value='yes' <?php if($v_pgsql == 'yes') echo 'selected' ?>><?=_('Yes'); ?></option>
 												</select>
 												<br><br>
 											</td>
@@ -660,8 +660,8 @@
 									<tr>
 										<td>
 											<select class="vst-list" name="v_backup">
-												<option value='no'><?=_('no'); ?></option>
-												<option value='yes' <?php if($v_backup == 'yes') echo 'selected' ?>><?=_('yes'); ?></option>
+												<option value='no'><?=_('No'); ?></option>
+												<option value='yes' <?php if($v_backup == 'yes') echo 'selected' ?>><?=_('Yes'); ?></option>
 											</select>
 											<br><br>
 										</td>
@@ -963,8 +963,8 @@
 												<tr>
 													<td>
 														<select class="vst-list" name="v_api" id="api">
-															<option value='yes'><?=_('yes'); ?></option>
-															<option value='no' <?php if($_SESSION['API'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
+															<option value='yes'><?=_('Yes'); ?></option>
+															<option value='no' <?php if($_SESSION['API'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
 														</select>
 														<br><br>
 													</td>
@@ -1017,8 +1017,8 @@
 												<tr>
 													<td>
 														<select class="vst-list" name="v_policy_system_password_reset">
-															<option value='yes'><?=_('yes'); ?></option>
-															<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
+															<option value='yes'><?=_('Yes'); ?></option>
+															<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
 														</select>
 														<br><br>
 													</td>
@@ -1061,8 +1061,8 @@
 													<tr>
 														<td>
 															<select class="vst-list" name="v_policy_system_protected_admin">
-																<option value='yes'><?=_('yes'); ?></option>
-																<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('no'); ?></option>
+																<option value='yes'><?=_('Yes'); ?></option>
+																<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('No'); ?></option>
 															</select>
 															<br><br>
 														</td>
@@ -1075,8 +1075,8 @@
 													<tr>
 														<td>
 															<select class="vst-list" name="v_policy_system_hide_admin">
-																<option value='yes'><?=_('yes'); ?></option>
-																<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('no'); ?></option>
+																<option value='yes'><?=_('Yes'); ?></option>
+																<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_ADMIN'] !== 'yes') echo 'selected' ?>><?=_('No'); ?></option>
 															</select>
 															<br><br>
 														</td>
@@ -1089,8 +1089,8 @@
 													<tr>
 														<td>
 															<select class="vst-list" name="v_policy_system_hide_services">
-																<option value='yes'><?=_('yes'); ?></option>
-																<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes') echo 'selected' ?>><?=_('no'); ?></option>
+																<option value='yes'><?=_('Yes'); ?></option>
+																<option value='no' <?php if($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes') echo 'selected' ?>><?=_('No'); ?></option>
 															</select>
 															<br><br>
 														</td>
@@ -1122,8 +1122,8 @@
 												<tr>
 													<td>
 														<select class="vst-list" name="v_policy_user_view_suspended">
-															<option value='yes' <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
-															<option value='no' <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
+															<option value='yes' <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
+															<option value='no' <?php if($_SESSION['POLICY_USER_VIEW_SUSPENDED'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
 														</select>
 														<br><br>
 													</td>
@@ -1137,8 +1137,8 @@
 												<tr>
 													<td>
 														<select class="vst-list" name="v_policy_user_edit_details">
-															<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
-															<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
+															<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
+															<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DETAILS'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
 														</select>
 														<br><br>
 													</td>
@@ -1151,8 +1151,8 @@
 												<tr>
 													<td>
 														<select class="vst-list" name="v_policy_user_edit_web_templates">
-															<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
-															<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
+															<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
+															<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_WEB_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
 														</select>
 														<br><br>
 													</td>
@@ -1165,8 +1165,8 @@
 												<tr>
 													<td>
 														<select class="vst-list" name="v_policy_user_edit_dns_templates">
-															<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
-															<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
+															<option value='yes' <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
+															<option value='no' <?php if($_SESSION['POLICY_USER_EDIT_DNS_TEMPLATES'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
 														</select>
 														<br><br>
 													</td>
@@ -1179,8 +1179,8 @@
 												<tr>
 													<td>
 														<select class="vst-list" name="v_policy_user_view_logs">
-															<option value='yes' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
-															<option value='no' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
+															<option value='yes' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
+															<option value='no' <?php if($_SESSION['POLICY_USER_VIEW_LOGS'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
 														</select>
 														<br><br>
 													</td>
@@ -1193,8 +1193,8 @@
 												<tr>
 													<td>
 														<select class="vst-list" name="v_policy_user_delete_logs">
-															<option value='yes' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no') echo 'selected' ?>><?=_('yes'); ?></option>
-															<option value='no' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
+															<option value='yes' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no') echo 'selected' ?>><?=_('Yes'); ?></option>
+															<option value='no' <?php if($_SESSION['POLICY_USER_DELETE_LOGS'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
 														</select>
 														<br><br>
 													</td>
@@ -1212,8 +1212,8 @@
 												<tr>
 													<td>
 														<select class="vst-list" name="v_enforce_subdomain_ownership">
-															<option value='yes'><?=_('yes'); ?></option>
-															<option value='no' <?php if($_SESSION['ENFORCE_SUBDOMAIN_OWNERSHIP'] == 'no') echo 'selected' ?>><?=_('no'); ?></option>
+															<option value='yes'><?=_('Yes'); ?></option>
+															<option value='no' <?php if($_SESSION['ENFORCE_SUBDOMAIN_OWNERSHIP'] == 'no') echo 'selected' ?>><?=_('No'); ?></option>
 														</select>
 													</td>
 												</tr>
@@ -1246,8 +1246,8 @@
 									<tr>
 										<td>
 											<select class="vst-list" name="v_plugin_app_installer">
-												<option value='false'><?=_('no'); ?></option>
-												<option value='true' <?php if($_SESSION['PLUGIN_APP_INSTALLER'] == 'true') echo 'selected' ?>><?=_('yes'); ?></option>
+												<option value='false'><?=_('No'); ?></option>
+												<option value='true' <?php if($_SESSION['PLUGIN_APP_INSTALLER'] == 'true') echo 'selected' ?>><?=_('Yes'); ?></option>
 											</select>
 											<br><br>
 										</td>
@@ -1260,8 +1260,8 @@
 									<tr>
 										<td>
 											<select class="vst-list" name="v_filemanager">
-												<option value='false'><?=_('no'); ?></option>
-												<option value='true' <?php if($_SESSION['FILE_MANAGER'] == 'true') echo 'selected' ?>><?=_('yes'); ?></option>
+												<option value='false'><?=_('No'); ?></option>
+												<option value='true' <?php if($_SESSION['FILE_MANAGER'] == 'true') echo 'selected' ?>><?=_('Yes'); ?></option>
 											</select>
 											<br><br>
 										</td>
@@ -1274,8 +1274,8 @@
 									<tr>
 										<td>
 											<select class="vst-list" name="v_quota">
-												<option value='no'><?=_('no'); ?></option>
-												<option value='yes' <?php if($_SESSION['DISK_QUOTA'] == 'yes') echo 'selected' ?>><?=_('yes'); ?></option>
+												<option value='no'><?=_('No'); ?></option>
+												<option value='yes' <?php if($_SESSION['DISK_QUOTA'] == 'yes') echo 'selected' ?>><?=_('Yes'); ?></option>
 											</select>
 											<br><br>
 										</td>
@@ -1288,8 +1288,8 @@
 									<tr>
 										<td>
 											<select class="vst-list" name="v_firewall">
-												<option value='no'><?=_('no'); ?></option>
-												<option value='yes' <?php if($_SESSION['FIREWALL_SYSTEM'] == 'iptables') echo 'selected' ?>><?=_('yes'); ?></option>
+												<option value='no'><?=_('No'); ?></option>
+												<option value='yes' <?php if($_SESSION['FIREWALL_SYSTEM'] == 'iptables') echo 'selected' ?>><?=_('Yes'); ?></option>
 											</select>
 											<br><br>
 										</td>