From c3d10435a356de1288ca4ebaed32485f6380971d Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Tue, 18 Dec 2012 01:28:13 +0000
Subject: [PATCH] In ring groups change the multi-lingual label from cid to
 cid-prefix. Add spacing between phrases in app_languages.php.

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

diff --git a/app/ring_groups/app_languages.php b/app/ring_groups/app_languages.php
index b910f9f204..30e36c531c 100644
--- a/app/ring_groups/app_languages.php
+++ b/app/ring_groups/app_languages.php
@@ -24,51 +24,95 @@
 	Mark J Crane <markjcrane@fusionpbx.com>
 	James Rose <james.o.rose@gmail.com>
 */
+
 	$text['title']['en-us'] = 'Ring Groups';
+
 	$text['description']['en-us'] = 'A ring group is a set of extensions that can be called with a ring strategy.';
+
 	$text['label-name']['en-us'] = 'Name';
+
 	$text['label-extension']['en-us'] = 'Extension';
+
 	$text['label-enabled']['en-us'] = 'Enabled';
+
 	$text['label-description']['en-us'] = 'Description';
+
 	$text['message-delete']['en-us'] = 'Do you really want to delete this?';
+
 	$text['message-delete-done']['en-us'] = 'Delete Complete';
 
 	$text['message-name']['en-us'] = 'Please provide: Name';
+
 	$text['message-extension']['en-us'] = 'Please provide: Extension';
+
 	$text['message-strategy']['en-us'] = 'Please provide: Strategy';
+
 	$text['message-timeout']['en-us'] = 'Please provide: Timeout';
+
 	$text['message-timeout-action']['en-us'] = 'Please provide: Timeout Action';
+
 	$text['message-enabled']['en-us'] = 'Please provide: Enabled';
+
 	$text['message-add-complete']['en-us'] = 'Add Complete';
+
 	$text['message-update-complete']['en-us'] = 'Update Complete';
+
 	$text['label-ring-group']['en-us'] = 'Ring Group';
+
 	$text['button-back']['en-us'] = 'Back';
+
 	$text['description-name']['en-us'] = 'Enter the name.';
+
 	$text['description-extension']['en-us'] = 'Enter the extension.';
+
 	$text['label-context']['en-us'] = 'Context';
+
 	$text['description-enter-context']['en-us'] = 'Enter the context.';
+
 	$text['label-strategy']['en-us'] = 'Strategy';
+
 	$text['dropdown-sequence']['en-us'] = 'sequence';
+
 	$text['dropdown-simultaneous']['en-us'] = 'simultaneous';
+
 	$text['label-sequence']['en-us'] = 'Select the strategy.';
+
 	$text['button-add']['en-us'] = 'Add';
+
 	$text['description-extension']['en-us'] = 'Add the extensions to the ring group';
+
 	$text['label-timeout']['en-us'] = 'Timeout';
+
 	$text['description-timeout']['en-us'] = 'Enter the timeout in seconds.';
+
 	$text['label-destination']['en-us'] = 'Destination';
+
 	$text['description-destination']['en-us'] = 'Select the destination for the ring group.';
-	$text['label-cid']['en-us'] = 'CID Prefix';
-	$text['description-cid']['en-us'] = 'Set a prefix on the caller ID name';
+
+	$text['label-cid-prefix']['en-us'] = 'CID Prefix';
+
+	$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['dropdown-frring']['en-us'] = 'fr-ring';
+
 	$text['dropdown-ukring']['en-us'] = 'uk-ring';
+
 	$text['dropdown-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['dropdown-false']['en-us'] = 'false';
+
 	$text['description-enabled']['en-us'] ='Select to enable or disable the ring group.';
+
 	$text['description-description']['en-us'] = 'Enter the description';
+
 	$text['label-extensions']['en-us'] = 'Extensions';
 
 ?>
\ No newline at end of file
diff --git a/app/ring_groups/ring_groups_edit.php b/app/ring_groups/ring_groups_edit.php
index ca0c34371f..0a01d380bf 100644
--- a/app/ring_groups/ring_groups_edit.php
+++ b/app/ring_groups/ring_groups_edit.php
@@ -491,12 +491,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-cid'].":\n";
+	echo "	".$text['label-cid-prefix'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "  <input class='formfld' type='text' name='ring_group_cid_name_prefix' maxlength='255' value='$ring_group_cid_name_prefix'>\n";
 	echo "<br />\n";
-	echo $text['description-cid']." \n";
+	echo $text['description-cid-prefix']." \n";
 	echo "</td>\n";
 	echo "</tr>\n";