Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-1960: Internationalize Airtime / Support translations 

- fix to some controller strings
This commit is contained in:
denise 2012-11-15 14:05:36 -05:00
parent 4f40efa376
commit d7495c6937
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/controllers/PreferenceController.php
View File

@ -66,7 +66,7 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetSoundCloudTrackType($values["SoundCloudTrackType"]); Application_Model_Preference::SetSoundCloudTrackType($values["SoundCloudTrackType"]);
Application_Model_Preference::SetSoundCloudLicense($values["SoundCloudLicense"]); 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; $this->view->form = $form;
die(json_encode(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml')))); die(json_encode(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))));
} else { } else {
@ -118,7 +118,7 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]); 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(); $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->enable_stream_conf = Application_Model_Preference::GetEnableStreamConf();
$this->view->form = $form; $this->view->form = $form;
$this->view->num_stream = $num_of_stream; $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')))); die(json_encode(array("valid"=>"true", "html"=>$this->view->render('preference/stream-setting.phtml'))));
} else { } else {
$live_stream_subform->updateVariables(); $live_stream_subform->updateVariables();

6
airtime_mvc/application/controllers/UserController.php
View File

@ -51,7 +51,7 @@ class UserController extends Zend_Controller_Action
&& $formData['login'] == 'admin' && $formData['login'] == 'admin'
&& $formData['user_id'] != 0) { && $formData['user_id'] != 0) {
$this->view->form = $form; $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')))); die(json_encode(array("valid"=>"false", "html"=>$this->view->render('user/add-user.phtml'))));
} elseif ($form->validateLogin($formData)) { } elseif ($form->validateLogin($formData)) {
$user = new Application_Model_User($formData['user_id']); $user = new Application_Model_User($formData['user_id']);
@ -75,9 +75,9 @@ class UserController extends Zend_Controller_Action
$this->view->form = $form; $this->view->form = $form;
if (strlen($formData['user_id']) == 0) { 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 { } 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')))); die(json_encode(array("valid"=>"true", "html"=>$this->view->render('user/add-user.phtml'))));

4
airtime_mvc/application/controllers/WebstreamController.php
View File

@ -135,7 +135,7 @@ class WebstreamController extends Zend_Controller_Action
Application_Model_Library::changePlaylist($streamId, "stream"); 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->streamId = $streamId;
$this->view->length = $di->format("%Hh %Im"); $this->view->length = $di->format("%Hh %Im");
} else { } else {
@ -143,7 +143,7 @@ class WebstreamController extends Zend_Controller_Action
} }
} catch (Exception $e) { } catch (Exception $e) {
Logging::debug($e->getMessage()); 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->streamId = -1;
$this->view->analysis = $analysis; $this->view->analysis = $analysis;
} }