From 858b12e807fcabf263f0fb8bfa21abbd37936a1b Mon Sep 17 00:00:00 2001
From: Alexander Shursha <kekek2@ya.ru>
Date: Fri, 13 Jan 2017 14:51:06 +0300
Subject: [PATCH] Translate wizards.

---
 src/wizard/openvpn.xml |  4 +--
 src/www/wizard.php     | 78 +++++++++++++++++++++---------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/wizard/openvpn.xml b/src/wizard/openvpn.xml
index 1efc921ac..78e7878ed 100644
--- a/src/wizard/openvpn.xml
+++ b/src/wizard/openvpn.xml
@@ -412,7 +412,7 @@
 		<field>
 			<name>city</name>
 			<displayname>City</displayname>
-			<description>City or other Locality name (e.g. Middelharnis, Leipzig, Île-de-France, Louisville).</description>
+			<description>City or other Locality name (e.g. Middelharnis, Leipzig, Louisville).</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step6->city</bindstofield>
@@ -541,7 +541,7 @@
 		<field>
 			<name>city</name>
 			<displayname>City</displayname>
-			<description>City or other Locality name (e.g. Middelharnis, Leipzig, Île-de-France, Louisville).</description>
+			<description>City or other Locality name (e.g. Middelharnis, Leipzig, Louisville).</description>
 			<type>input</type>
 			<size>30</size>
 			<bindstofield>ovpnserver->step9->city</bindstofield>
diff --git a/src/www/wizard.php b/src/www/wizard.php
index 448d16330..ab19047c1 100644
--- a/src/www/wizard.php
+++ b/src/www/wizard.php
@@ -171,8 +171,8 @@ if ($_POST && !$input_errors) {
 	}
 }
 
-$description = $pkg['step'][$stepid]['description'];
-$title = $pkg['step'][$stepid]['title'];
+$description = gettext($pkg['step'][$stepid]['description']);
+$title = gettext($pkg['step'][$stepid]['title']);
 
 function update_config_field($field, $updatetext, $unset, $arraynum, $field_type) {
 	global $config;
@@ -433,11 +433,11 @@ function showchange() {
 			case "input":
 				if ($field['displayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['displayname'];
+					echo gettext($field['displayname']);
 					echo ":</td>\n";
 				} else if(!$field['dontdisplayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo fixup_string($field['name']);
+					echo fixup_string(gettext($field['name']));
 					echo ":</td>\n";
 				}
 				if(!$field['dontcombinecells'])
@@ -451,23 +451,23 @@ function showchange() {
 				echo " />\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 				break;
 			case "text":
 				echo "<td colspan=\"2\" align=\"center\" class=\"vncell\">\n";
 				if($field['description'] <> "") {
-					echo "<center><br /> " . $field['description'] . "</center>";
+					echo "<center><br /> " . gettext($field['description']) . "</center>";
 				}
 				break;
 			case "inputalias":
 				if ($field['displayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['displayname'];
+					echo gettext($field['displayname']);
 					echo ":</td>\n";
 				} else if(!$field['dontdisplayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo fixup_string($field['name']);
+					echo fixup_string(gettext($field['name']));
 					echo ":</td>\n";
 				}
 				if(!$field['dontcombinecells'])
@@ -482,7 +482,7 @@ function showchange() {
 				echo " />\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 				break;
 			case "interfaces_selection":
@@ -491,7 +491,7 @@ function showchange() {
 				$multiple = "";
 				$name = strtolower($name);
 				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-				echo fixup_string($field['displayname'] ? $field['displayname'] : $field['name']) . ":\n";
+				echo fixup_string($field['displayname'] ? gettext($field['displayname']) : gettext($field['name'])) . ":\n";
 				echo "</td>";
 				echo "<td class=\"vtable\">\n";
 				if($field['size'] <> "") $size = "size=\"{$field['size']}\"";
@@ -531,18 +531,18 @@ function showchange() {
 				echo "</select>\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 
 				break;
 			case "password":
 				if ($field['displayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['displayname'];
+					echo gettext($field['displayname']);
 					echo ":</td>\n";
 				} else if(!$field['dontdisplayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo fixup_string($field['name']);
+					echo fixup_string(gettext($field['name']));
 					echo ":</td>\n";
 				}
 				if(!$field['dontcombinecells'])
@@ -553,7 +553,7 @@ function showchange() {
 				echo " />\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 
 				break;
@@ -562,7 +562,7 @@ function showchange() {
 				$multiple = "";
 				$name = strtolower($name);
 				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-				echo fixup_string($field['displayname'] ? $field['displayname'] : $field['name']) . ":\n";
+				echo fixup_string($field['displayname'] ? gettext($field['displayname']) : gettext($field['name'])) . ":\n";
 				echo "</td>";
 				echo "<td class=\"vtable\">\n";
 				if($field['size'] <> "") $size = "size=\"{$field['size']}\"";
@@ -591,7 +591,7 @@ function showchange() {
 				echo "</select>\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 
 				break;
@@ -600,7 +600,7 @@ function showchange() {
 				$multiple = "";
 				$name = strtolower($name);
 				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-				echo fixup_string($field['displayname'] ? $field['displayname'] : $field['name']) . ":\n";
+				echo fixup_string($field['displayname'] ? gettext($field['displayname']) : gettext($field['name'])) . ":\n";
 				echo "</td>";
 				echo "<td class=\"vtable\">\n";
 				if($field['size'] <> "") $size = "size=\"{$field['size']}\"";
@@ -631,18 +631,18 @@ function showchange() {
 				echo "</select>\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 
 				break;
 			case "select":
 				if ($field['displayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['displayname'];
+					echo gettext($field['displayname']);
 					echo ":</td>\n";
 				} else if(!$field['dontdisplayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo fixup_string($field['name']);
+					echo fixup_string(gettext($field['name']));
 					echo ":</td>\n";
 				}
 				if($field['size']) $size = " size='" . $field['size'] . "' ";
@@ -671,18 +671,18 @@ function showchange() {
 				echo "<!-- {$value} -->\n";
 
 				if($field['description'] <> "") {
-					echo $field['description'];
+					echo gettext($field['description']);
 				}
 
 				break;
 			case "textarea":
 				if ($field['displayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['displayname'];
+					echo gettext($field['displayname']);
 					echo ":</td>\n";
 				} else if(!$field['dontdisplayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo fixup_string($field['name']);
+					echo fixup_string(gettext($field['name']));
 					echo ":</td>";
 				}
 				if(!$field['dontcombinecells'])
@@ -696,33 +696,33 @@ function showchange() {
 
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 
 				break;
 			case "submit":
 				echo "<td colspan=\"2\">&nbsp;</td></tr>";
 				echo "<tr><td colspan=\"2\" align=\"center\">";
-				echo "<input type='submit' class=\"btn btn-primary\" name='" . $name . "' value=\"" . htmlspecialchars($field['name']) . "\" />\n";
+				echo "<input type='submit' class=\"btn btn-primary\" name='" . $name . "' value=\"" . htmlspecialchars(gettext($field['name'])) . "\" />\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 
 				break;
 			case "listtopic":
 				echo "<td colspan=\"2\">&nbsp;</td></tr>";
-				echo "<tr><td colspan=\"2\" class=\"listtopic\">" . $field['name'] . "<br />\n";
+				echo "<tr><td colspan=\"2\" class=\"listtopic\">" . gettext($field['name']) . "<br />\n";
 
 				break;
 			case "subnet_select":
 				if ($field['displayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['displayname'];
+					echo gettext($field['displayname']);
 					echo ":</td>\n";
 				} else if(!$field['dontdisplayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo fixup_string($field['name']);
+					echo fixup_string(gettext($field['name']));
 					echo ":</td>";
 				}
 				if(!$field['dontcombinecells'])
@@ -745,7 +745,7 @@ function showchange() {
 				echo "</select>\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 
 				break;
@@ -754,11 +754,11 @@ function showchange() {
 
 				if ($field['displayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['displayname'];
+					echo gettext($field['displayname']);
 					echo ":</td>\n";
 				} else if(!$field['dontdisplayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo fixup_string($field['name']);
+					echo fixup_string(gettext($field['name']));
 					echo ":</td>";
 				}
 				if(!$field['dontcombinecells'])
@@ -774,7 +774,7 @@ function showchange() {
 				echo "</select>\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 
 				break;
@@ -783,11 +783,11 @@ function showchange() {
 
 				if ($field['displayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['displayname'];
+					echo gettext($field['displayname']);
 					echo ":</td>\n";
 				} else if(!$field['dontdisplayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo fixup_string($field['name']);
+					echo fixup_string(gettext($field['name']));
 					echo ":</td>";
 				}
 				if(!$field['dontcombinecells'])
@@ -805,18 +805,18 @@ function showchange() {
 				echo "</select>\n";
 
 				if($field['description'] <> "") {
-					echo "<br /> " . $field['description'];
+					echo "<br /> " . gettext($field['description']);
 				}
 
 				break;
 			case "checkbox":
 				if ($field['displayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['displayname'];
+					echo gettext($field['displayname']);
 					echo ":</td>\n";
 				} else if(!$field['dontdisplayname']) {
 					echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
-					echo $field['name'];
+					echo gettext($field['name']);
 					echo ":</td>";
 				}
 				$checked = "";
@@ -830,7 +830,7 @@ function showchange() {
 				echo " />\n";
 
 				if($field['description'] <> "") {
-					echo $field['description'];
+					echo gettext($field['description']);
 				}
 
 				break;