From d7495c69372598976f9e015e0da7ae3cce951650 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 15 Nov 2012 14:05:36 -0500
Subject: [PATCH] CC-1960: Internationalize Airtime / Support translations

- fix to some controller strings
---
 .../application/controllers/PreferenceController.php        | 6 +++---
 airtime_mvc/application/controllers/UserController.php      | 6 +++---
 airtime_mvc/application/controllers/WebstreamController.php | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index d0d8ba89a..69a931c82 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -66,7 +66,7 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetSoundCloudTrackType($values["SoundCloudTrackType"]);
                 Application_Model_Preference::SetSoundCloudLicense($values["SoundCloudLicense"]);
 
-                $this->view->statusMsg = "<div class='success'>_(Preferences updated.)</div>";
+                $this->view->statusMsg = "<div class='success'>". _("Preferences updated.")."</div>";
                 $this->view->form = $form;
                 die(json_encode(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))));
             } else {
@@ -118,7 +118,7 @@ class PreferenceController extends Zend_Controller_Action
                         Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
                     }
                 }
-                $this->view->statusMsg = "<div class='success'>_(Support setting updated.)</div>";
+                $this->view->statusMsg = "<div class='success'>"._("Support setting updated.")."</div>";
             }
         }
         $logo = Application_Model_Preference::GetStationLogo();
@@ -301,7 +301,7 @@ class PreferenceController extends Zend_Controller_Action
                 $this->view->enable_stream_conf = Application_Model_Preference::GetEnableStreamConf();
                 $this->view->form = $form;
                 $this->view->num_stream = $num_of_stream;
-                $this->view->statusMsg = "<div class='success'>_(Stream Setting Updated.)</div>";
+                $this->view->statusMsg = "<div class='success'>"._("Stream Setting Updated.")."</div>";
                 die(json_encode(array("valid"=>"true", "html"=>$this->view->render('preference/stream-setting.phtml'))));
             } else {
                 $live_stream_subform->updateVariables();
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 57dd35cb1..b04a6e98b 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -51,7 +51,7 @@ class UserController extends Zend_Controller_Action
                         && $formData['login'] == 'admin' 
                         && $formData['user_id'] != 0) {
                     $this->view->form = $form;
-                    $this->view->successMessage = "<div class='errors'>_(Specific action is not allowed in demo version!)</div>";
+                    $this->view->successMessage = "<div class='errors'>"._("Specific action is not allowed in demo version!")."</div>";
                     die(json_encode(array("valid"=>"false", "html"=>$this->view->render('user/add-user.phtml'))));
                 } elseif ($form->validateLogin($formData)) {
                     $user = new Application_Model_User($formData['user_id']);
@@ -75,9 +75,9 @@ class UserController extends Zend_Controller_Action
                     $this->view->form = $form;
 
                     if (strlen($formData['user_id']) == 0) {
-                        $this->view->successMessage = "<div class='success'>_(User added successfully!)</div>";
+                        $this->view->successMessage = "<div class='success'>"._("User added successfully!")."</div>";
                     } else {
-                        $this->view->successMessage = "<div class='success'>_(User updated successfully!)</div>";
+                        $this->view->successMessage = "<div class='success'>"._("User updated successfully!")."</div>";
                     }
                     
                     die(json_encode(array("valid"=>"true", "html"=>$this->view->render('user/add-user.phtml'))));
diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php
index 4b5aa5298..8eb9a2ac5 100644
--- a/airtime_mvc/application/controllers/WebstreamController.php
+++ b/airtime_mvc/application/controllers/WebstreamController.php
@@ -135,7 +135,7 @@ class WebstreamController extends Zend_Controller_Action
 
                 Application_Model_Library::changePlaylist($streamId, "stream");
 
-                $this->view->statusMessage = "<div class='success'>_(Webstream saved.)</div>";
+                $this->view->statusMessage = "<div class='success'>"._("Webstream saved.")."</div>";
                 $this->view->streamId = $streamId;
                 $this->view->length = $di->format("%Hh %Im");
             } else {
@@ -143,7 +143,7 @@ class WebstreamController extends Zend_Controller_Action
             }
         } catch (Exception $e) {
             Logging::debug($e->getMessage());
-            $this->view->statusMessage = "<div class='errors'>_(Invalid form values.)</div>";
+            $this->view->statusMessage = "<div class='errors'>"._("Invalid form values.")."</div>";
             $this->view->streamId = -1;
             $this->view->analysis = $analysis;
         }