From 795e239ff3989d9ed38b9861e6145183ec143dce Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Thu, 6 Nov 2014 18:24:29 -0500 Subject: [PATCH] Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. --- .../application/controllers/ApiController.php | 6 ++-- .../application/forms/AddShowLiveStream.php | 2 +- .../application/forms/RegisterAirtime.php | 9 ++++-- .../application/forms/SupportSettings.php | 9 ++++-- .../application/layouts/scripts/login.phtml | 27 ++++++++++++------ airtime_mvc/application/models/Auth.php | 3 +- .../views/scripts/dashboard/about.phtml | 28 +++++++++++-------- .../views/scripts/dashboard/help.phtml | 14 ++++++---- .../form/preferences_watched_dirs.phtml | 3 +- .../views/scripts/form/register-dialog.phtml | 20 +++++++------ .../views/scripts/form/support-setting.phtml | 17 +++++++---- .../views/scripts/login/index.phtml | 2 +- .../views/scripts/partialviews/trialBox.phtml | 2 +- .../views/scripts/systemstatus/index.phtml | 26 ++++++++--------- 14 files changed, 101 insertions(+), 67 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 4001f7d50..6448342ae 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -768,7 +768,7 @@ class ApiController extends Zend_Controller_Action //File is not in database anymore. if (is_null($file)) { - $return_hash['error'] = _("File does not exist in Airtime."); + $return_hash['error'] = sprintf(_("File does not exist in %s"), PRODUCT_NAME); } //Updating a metadata change. else { @@ -788,7 +788,7 @@ class ApiController extends Zend_Controller_Action $md['MDATA_KEY_ORIGINAL_PATH'], $con); if (is_null($file)) { - $return_hash['error'] = _('File does not exist in Airtime'); + $return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME); } else { $filepath = $md['MDATA_KEY_FILEPATH']; //$filepath = str_replace("\\", "", $filepath); @@ -800,7 +800,7 @@ class ApiController extends Zend_Controller_Action $file = Application_Model_StoredFile::RecallByFilepath($filepath, $con); if (is_null($file)) { - $return_hash['error'] = _("File doesn't exist in Airtime."); + $return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME); Logging::warn("Attempt to delete file that doesn't exist. Path: '$filepath'"); } else { diff --git a/airtime_mvc/application/forms/AddShowLiveStream.php b/airtime_mvc/application/forms/AddShowLiveStream.php index 65e2a19d3..923c6993d 100644 --- a/airtime_mvc/application/forms/AddShowLiveStream.php +++ b/airtime_mvc/application/forms/AddShowLiveStream.php @@ -7,7 +7,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm public function init() { $cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth"); - $cb_airtime_auth->setLabel(_("Use Airtime Authentication:")) + $cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME)) ->setRequired(false) ->setDecorators(array('ViewHelper')); $this->addElement($cb_airtime_auth); diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php index 2da7083c8..1fcafc840 100644 --- a/airtime_mvc/application/forms/RegisterAirtime.php +++ b/airtime_mvc/application/forms/RegisterAirtime.php @@ -123,7 +123,7 @@ class Application_Form_RegisterAirtime extends Zend_Form // checkbox for publicise $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise"); - $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org')) + $checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE)) ->setRequired(false) ->setDecorators(array('ViewHelper')) ->setValue(Application_Model_Preference::GetPublicise()); @@ -143,11 +143,14 @@ class Application_Form_RegisterAirtime extends Zend_Form ) )); + $privacyPolicyAnchorOpen = ""; // checkbox for privacy policy $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy"); $checkboxPrivacy->setLabel( - sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."), - "", + sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'), + COMPANY_NAME, + $privacyPolicyAnchorOpen, "")) ->setDecorators(array('ViewHelper')); $this->addElement($checkboxPrivacy); diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php index 7ce63bcf0..87e5588de 100644 --- a/airtime_mvc/application/forms/SupportSettings.php +++ b/airtime_mvc/application/forms/SupportSettings.php @@ -119,7 +119,7 @@ class Application_Form_SupportSettings extends Zend_Form // checkbox for publicise $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise"); - $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org')) + $checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE)) ->setRequired(false) ->setDecorators(array('ViewHelper')) ->setValue(Application_Model_Preference::GetPublicise()); @@ -142,11 +142,14 @@ class Application_Form_SupportSettings extends Zend_Form ) )); + $privacyPolicyAnchorOpen = ""; // checkbox for privacy policy $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy"); $checkboxPrivacy->setLabel( - sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."), - "", + sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'), + COMPANY_NAME, + $privacyPolicyAnchorOpen, "")) ->setDecorators(array('ViewHelper')); $this->addElement($checkboxPrivacy); diff --git a/airtime_mvc/application/layouts/scripts/login.phtml b/airtime_mvc/application/layouts/scripts/login.phtml index aa4030390..6a9879673 100644 --- a/airtime_mvc/application/layouts/scripts/login.phtml +++ b/airtime_mvc/application/layouts/scripts/login.phtml @@ -1,11 +1,11 @@ doctype() ?> - - headTitle() ?> - headLink() ?> - headScript() ?> - google_analytics)?$this->google_analytics:"" ?> + + headTitle() ?> + headLink() ?> + headScript() ?> + google_analytics)?$this->google_analytics:"" ?> @@ -13,9 +13,20 @@ layout()->content ?>
- ", "" ,"");?> + " + . LICENSE_VERSION + . ""; + $companySiteAnchor = "" + . $company + . ""; + echo sprintf(_('%1$s copyright © %2$s All rights reserved.%3$s' + . 'Maintained and distributed under the %4$s by %5$s'), + PRODUCT_NAME, $company, "
", + $licenseSiteAnchor, + $companySiteAnchor); + ?>
diff --git a/airtime_mvc/application/models/Auth.php b/airtime_mvc/application/models/Auth.php index fd39e0407..34e36bbe4 100644 --- a/airtime_mvc/application/models/Auth.php +++ b/airtime_mvc/application/models/Auth.php @@ -33,7 +33,8 @@ class Application_Model_Auth $message = sprintf(_("Hi %s, \n\nClick this link to reset your password: "), $user->getDbLogin()); $message .= "{$e_link_protocol}://{$e_link_base}:{$e_link_port}{$e_link_path}"; - $success = Application_Model_Email::send(_('Airtime Password Reset'), $message, $user->getDbEmail()); + $str = sprintf(_('%s Password Reset'), PRODUCT_NAME); + $success = Application_Model_Email::send($str, $message, $user->getDbEmail()); return $success; } diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml index f2ccfa02d..98e93e724 100644 --- a/airtime_mvc/application/views/scripts/dashboard/about.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml @@ -2,19 +2,25 @@

", - "", - $this->airtime_version, - "
") + +$productSiteAnchor = "" + . PRODUCT_NAME + . ""; +echo sprintf(_('%1$s %2$s, the open radio software for scheduling and remote station management.'), + $productSiteAnchor, + $this->airtime_version) ?> -
© 2013 +
+
© 2013 ", - "", - "", - "") +$companySiteAnchor = "" + . COMPANY_NAME . " " . COMPANY_SUFFIX + . ""; +$licenseAnchor = "" + . LICENSE_VERSION + . ""; +echo sprintf(_('%1$s %2$s is distributed under the %3$s'), + $companySiteAnchor, PRODUCT_NAME, $licenseAnchor) ?>

diff --git a/airtime_mvc/application/views/scripts/dashboard/help.phtml b/airtime_mvc/application/views/scripts/dashboard/help.phtml index 66857c7cd..7b4b9f5c8 100644 --- a/airtime_mvc/application/views/scripts/dashboard/help.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/help.phtml @@ -1,7 +1,7 @@
-

-

+

+

    2. @@ -10,8 +10,12 @@


-", - "") ?>

+"; +echo sprintf(_("For more detailed help, read the %suser manual%s."), + $userManualAnchorOpen, "") + +?> +

diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml index c44dcae4c..37dba574d 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml @@ -40,9 +40,8 @@
getExistsFlag())?"":""?>getDirectory());?> - " class="ui-icon ui-icon-refresh"> + " class="ui-icon ui-icon-refresh"> " class="ui-icon ui-icon-close"> -
diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml index 6f00586e6..999eb045d 100644 --- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml +++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml @@ -3,10 +3,10 @@
-
") ?> +
") ?>
- ", - "")?> + " + . COMPANY_SITE + . ""; + echo sprintf(_("Click the box below to promote your station on %s."), $whosUsingAnchor) + ?>
- + diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml index 4932cf3f9..b23925d70 100644 --- a/airtime_mvc/application/views/scripts/form/support-setting.phtml +++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml @@ -2,9 +2,10 @@
- ")?> + ."Click the 'Send support feedback' box and we'll make sure the features you use are constantly improving."), + PRODUCT_NAME, COMPANY_NAME, "
")?>
- ", - "")?> + " + . COMPANY_SITE + . ""; + echo sprintf(_("Click the box below to promote your station on %s."), $whosUsingAnchor) + ?>
diff --git a/airtime_mvc/application/views/scripts/login/index.phtml b/airtime_mvc/application/views/scripts/login/index.phtml index 178aca493..0ba4d7e0a 100644 --- a/airtime_mvc/application/views/scripts/login/index.phtml +++ b/airtime_mvc/application/views/scripts/login/index.phtml @@ -4,7 +4,7 @@
demo) && $this->demo == 1){?>

- +

message; ?>

diff --git a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml index 691d2983a..cbb04396a 100644 --- a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml @@ -6,7 +6,7 @@
- href="https://account.sourcefabric.com/clientarea.php" target="_blank"> + href="https://account.sourcefabric.com/clientarea.php" target="_blank">
diff --git a/airtime_mvc/application/views/scripts/systemstatus/index.phtml b/airtime_mvc/application/views/scripts/systemstatus/index.phtml index f859f2eab..2a31ac78e 100644 --- a/airtime_mvc/application/views/scripts/systemstatus/index.phtml +++ b/airtime_mvc/application/views/scripts/systemstatus/index.phtml @@ -1,19 +1,19 @@ - - - - - - - + + + + + + + @@ -26,8 +26,8 @@ - - + +