From 88aea2e14931a9b7b4a3eab8ecd02cddc9774885 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sat, 18 May 2013 23:43:11 +0000
Subject: [PATCH] Minor language updates to Ring Groups for clarity and
 consistency.

---
 app/ring_groups/app_languages.php    | 48 ++++++++++-----------
 app/ring_groups/ring_groups_edit.php | 62 ++++++++++++++--------------
 2 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/app/ring_groups/app_languages.php b/app/ring_groups/app_languages.php
index 4bfd41ad4f..55dd8b6273 100644
--- a/app/ring_groups/app_languages.php
+++ b/app/ring_groups/app_languages.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /*
 	FusionPBX
 	Version: MPL 1.1
@@ -61,9 +61,7 @@
 
 	$text['button-back']['en-us'] = 'Back';
 
-	$text['description-name']['en-us'] = 'Enter the name.';
-
-	$text['description-extension']['en-us'] = 'Enter the extension.';
+	$text['description-name']['en-us'] = 'Enter a name.';
 
 	$text['label-context']['en-us'] = 'Context';
 
@@ -71,51 +69,55 @@
 
 	$text['label-strategy']['en-us'] = 'Strategy';
 
-	$text['select-sequence']['en-us'] = 'sequence';
+	$text['option-sequence']['en-us'] = 'Sequence';
 
-	$text['select-simultaneous']['en-us'] = 'simultaneous';
+	$text['option-simultaneous']['en-us'] = 'Simultaneous';
 
-	$text['select-enterprise']['en-us'] = 'enterprise';
+	$text['option-enterprise']['en-us'] = 'Enterprise';
 
-	$text['label-sequence']['en-us'] = 'Select the strategy.';
+	$text['description-strategy']['en-us'] = 'Select the ring strategy.';
+
+	$text['label-extensions']['en-us'] = 'Extensions';
+
+	$text['description-extensions']['en-us'] = 'Add an extension and ring parameters to the ring group.';
 
 	$text['button-add']['en-us'] = 'Add';
 
-	$text['description-extension']['en-us'] = 'Add the extensions to the ring group';
+	$text['description-extension']['en-us'] = 'Define an extension number for this ring group.';
 
-	$text['label-timeout']['en-us'] = 'Timeout';
+	$text['label-duration']['en-us'] = 'Duration';
 
-	$text['description-timeout']['en-us'] = 'Enter the timeout in seconds.';
+	$text['label-call-timeout']['en-us'] = 'Call Timeout';
+
+	$text['description-timeout']['en-us'] = 'Enter the total call timeout in seconds';
 
 	$text['label-destination']['en-us'] = 'Destination';
 
-	$text['description-destination']['en-us'] = 'Select the destination for the ring group.';
+	$text['description-destination']['en-us'] = 'Select the timeout destination for this ring group.';
 
 	$text['label-cid-prefix']['en-us'] = 'CID Prefix';
 
-	$text['description-cid-prefix']['en-us'] = 'Set a prefix on the caller ID name';
+	$text['description-cid-prefix']['en-us'] = 'Set a prefix on the caller ID name.';
 
 	$text['label-ringback']['en-us'] = 'Ring Back';
 
-	$text['dropdown-usring']['en-us'] = 'us-ring';
+	$text['option-usring']['en-us'] = 'us-ring';
 
-	$text['dropdown-frring']['en-us'] = 'fr-ring';
+	$text['option-frring']['en-us'] = 'fr-ring';
 
-	$text['dropdown-ukring']['en-us'] = 'uk-ring';
+	$text['option-ukring']['en-us'] = 'uk-ring';
 
-	$text['dropdown-rsring']['en-us'] = 'rs-ring';
+	$text['option-rsring']['en-us'] = 'rs-ring';
 
 	$text['description-ringback']['en-us'] = 'Defines what the caller will hear while the destination is being called.';
 
-	$text['dropdown-true']['en-us'] = 'true';
+	$text['option-true']['en-us'] = 'True';
 
-	$text['dropdown-false']['en-us'] = 'false';
+	$text['option-false']['en-us'] = 'False';
 
-	$text['description-enabled']['en-us'] ='Select to enable or disable the ring group.';
+	$text['description-enabled']['en-us'] ='Set the status of this ring group.';
 
-	$text['description-description']['en-us'] = 'Enter the description';
-
-	$text['label-extensions']['en-us'] = 'Extensions';
+	$text['description-description']['en-us'] = 'Enter a description (optional).';
 
 	$text['label-delay']['en-us'] = 'Delay';
 	$text['label-delay']['pt-pt'] = '';
diff --git a/app/ring_groups/ring_groups_edit.php b/app/ring_groups/ring_groups_edit.php
index 5b8f17f2f9..f5106d6a91 100644
--- a/app/ring_groups/ring_groups_edit.php
+++ b/app/ring_groups/ring_groups_edit.php
@@ -335,7 +335,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					require_once "includes/footer.php";
 					exit;
 			}
-		} //if ($_POST["persistformvar"] != "true") 
+		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 //pre-populate the form
@@ -429,7 +429,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (if_group("superadmin")) {
 		echo "<tr>\n";
 		echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	",$text['label-context'],":\n";
+		echo "	".$text['label-context'].":\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
 		echo "	<input class='formfld' type='text' name='ring_group_context' maxlength='255' value=\"$ring_group_context\">\n";
@@ -447,26 +447,26 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	<select class='formfld' name='ring_group_strategy'>\n";
 	echo "	<option value=''></option>\n";
 	if ($ring_group_strategy == "sequence") {
-		echo "	<option value='sequence' selected='selected'>".$text['select-sequence']."</option>\n";
+		echo "	<option value='sequence' selected='selected'>".$text['option-sequence']."</option>\n";
 	}
 	else {
-		echo "	<option value='sequence'>".$text['select-sequence']."</option>\n";
+		echo "	<option value='sequence'>".$text['option-sequence']."</option>\n";
 	}
 	if ($ring_group_strategy == "simultaneous") {
-		echo "	<option value='simultaneous' selected='selected'>".$text['select-simultaneous']."</option>\n";
+		echo "	<option value='simultaneous' selected='selected'>".$text['option-simultaneous']."</option>\n";
 	}
 	else {
-		echo "	<option value='simultaneous'>".$text['select-simultaneous']."</option>\n";
+		echo "	<option value='simultaneous'>".$text['option-simultaneous']."</option>\n";
 	}
 	if ($ring_group_strategy == "enterprise") {
-		echo "	<option value='enterprise' selected='selected'>".$text['select-enterprise']."</option>\n";
+		echo "	<option value='enterprise' selected='selected'>".$text['option-enterprise']."</option>\n";
 	}
 	else {
-		echo "	<option value='enterprise'>".$text['select-enterprise']."</option>\n";
+		echo "	<option value='enterprise'>".$text['option-enterprise']."</option>\n";
 	}
 	echo "	</select>\n";
 	echo "<br />\n";
-	echo $text['label-sequence']."\n";
+	echo $text['description-strategy']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
@@ -489,12 +489,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<tr>\n";
 		echo "	<td class='vtable'>".$text['label-extension']."</td>\n";
 		echo "	<td class='vtable'>".$text['label-delay']."</td>\n";
-		echo "	<td class='vtable'>".$text['label-timeout']."</td>\n";
+		echo "	<td class='vtable'>".$text['label-duration']."</td>\n";
 		echo "	<td></td>\n";
 		echo "</tr>\n";
 		foreach($result as $field) {
 			if (strlen($field['extension_delay']) == 0) { $field['extension_delay'] = "0"; }
-			if (strlen($field['extension_timeout']) == 0) { $field['extension_timeout'] = "30"; } 
+			if (strlen($field['extension_timeout']) == 0) { $field['extension_timeout'] = "30"; }
 			echo "			<tr>\n";
 			echo "				<td class='vtable'>\n";
 			echo "					".$field['extension'];
@@ -529,21 +529,21 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "	".$text['label-delay']."&nbsp;";
 	destination_select('extension_delay', $extension_delay, '0');
-	echo "	&nbsp;".$text['label-timeout']."&nbsp;\n";
+	echo "	&nbsp;".$text['label-duration']."&nbsp;\n";
 	destination_select('extension_timeout', $extension_timeout, '30');
 	if ($action == "update") {
 		echo "			<input type=\"submit\" class='btn' value=\"".$text['button-add']."\">\n";
 	}
 	unset($sql, $result);
 	echo "			<br>\n";
-	echo "			".$text['description-extension']."\n";
+	echo "			".$text['description-extensions']."\n";
 	echo "			<br />\n";
 	echo "		</td>";
 	echo "	</tr>";
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-timeout'].":\n";
+	echo "	".$text['label-call-timeout'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "  <input class='formfld' type='text' name='ring_group_timeout_sec' maxlength='255' value='$ring_group_timeout_sec'>\n";
@@ -582,29 +582,29 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td class='vtable' align='left'>\n";
 
 	$select_options = "";
-	if ($ring_group_ringback == "\${us-ring}" || $ring_group_ringback == "us-ring") { 
-		$select_options .= "		<option value='\${us-ring}' selected='selected'>".$text['dropdown-usring']."</option>\n";
+	if ($ring_group_ringback == "\${us-ring}" || $ring_group_ringback == "us-ring") {
+		$select_options .= "		<option value='\${us-ring}' selected='selected'>".$text['option-usring']."</option>\n";
 	}
 	else {
-		$select_options .= "		<option value='\${us-ring}'>".$text['dropdown-usring']."</option>\n";
+		$select_options .= "		<option value='\${us-ring}'>".$text['option-usring']."</option>\n";
 	}
 	if ($ring_group_ringback == "\${fr-ring}" || $ring_group_ringback == "fr-ring") {
-		$select_options .= "		<option value='\${fr-ring}' selected='selected'>".$text['dropdown-frring']."</option>\n";
+		$select_options .= "		<option value='\${fr-ring}' selected='selected'>".$text['option-frring']."</option>\n";
 	}
 	else {
-		$select_options .= "		<option value='\${fr-ring}'>".$text['dropdown-frring']."</option>\n";
+		$select_options .= "		<option value='\${fr-ring}'>".$text['option-frring']."</option>\n";
 	}
-	if ($ring_group_ringback == "\${uk-ring}" || $ring_group_ringback == "uk-ring") { 
-		$select_options .= "		<option value='\${uk-ring}' selected='selected'>".$text['dropdown-ukring']."</option>\n";
+	if ($ring_group_ringback == "\${uk-ring}" || $ring_group_ringback == "uk-ring") {
+		$select_options .= "		<option value='\${uk-ring}' selected='selected'>".$text['option-ukring']."</option>\n";
 	}
 	else {
-		$select_options .= "		<option value='\${uk-ring}'>".$text['dropdown-ukring']."</option>\n";
+		$select_options .= "		<option value='\${uk-ring}'>".$text['option-ukring']."</option>\n";
 	}
-	if ($ring_group_ringback == "\${rs-ring}" || $ring_group_ringback == "rs-ring") { 
-		$select_options .= "		<option value='\${rs-ring}' selected='selected'>".$text['dropdown-rsring']."</option>\n";
+	if ($ring_group_ringback == "\${rs-ring}" || $ring_group_ringback == "rs-ring") {
+		$select_options .= "		<option value='\${rs-ring}' selected='selected'>".$text['option-rsring']."</option>\n";
 	}
 	else {
-		$select_options .= "		<option value='\${rs-ring}'>".$text['dropdown-rsring']."</option>\n";
+		$select_options .= "		<option value='\${rs-ring}'>".$text['option-rsring']."</option>\n";
 	}
 	require_once "app/music_on_hold/resources/classes/switch_music_on_hold.php";
 	$moh = new switch_music_on_hold;
@@ -625,17 +625,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='ring_group_enabled'>\n";
 	echo "	<option value=''></option>\n";
-	if ($ring_group_enabled == "true") { 
-		echo "	<option value='true' selected='selected'>".$text['dropdown-true']."</option>\n";
+	if ($ring_group_enabled == "true") {
+		echo "	<option value='true' selected='selected'>".$text['option-true']."</option>\n";
 	}
 	else {
-		echo "	<option value='true'>".$text['dropdown-true']."</option>\n";
+		echo "	<option value='true'>".$text['option-true']."</option>\n";
 	}
-	if ($ring_group_enabled == "false") { 
-		echo "	<option value='false' selected='selected'>".$text['dropdown-false']."</option>\n";
+	if ($ring_group_enabled == "false") {
+		echo "	<option value='false' selected='selected'>".$text['option-false']."</option>\n";
 	}
 	else {
-		echo "	<option value='false'>".$text['dropdown-false']."</option>\n";
+		echo "	<option value='false'>".$text['option-false']."</option>\n";
 	}
 	echo "	</select>\n";
 	echo "<br />\n";