summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2010-09-14 21:33:57 +0200
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2010-09-14 21:33:57 +0200
commit04b7af4620d6d3310676ce1f89365fd5c5ef8caf (patch)
treef0500036cbee4961a182f87429d6a4ea7e2278a8
parent39802077a861c2d4e15bae5f04c9f7dbf94151b8 (diff)
* i18n/L10n updates
* superfluous whitespace removed
-rw-r--r--plugins/Adsense/AdsensePlugin.php13
-rw-r--r--plugins/Adsense/adsenseadminpanel.php43
-rw-r--r--plugins/Autocomplete/AutocompletePlugin.php2
-rw-r--r--plugins/Autocomplete/autocomplete.php1
4 files changed, 18 insertions, 41 deletions
diff --git a/plugins/Adsense/AdsensePlugin.php b/plugins/Adsense/AdsensePlugin.php
index cd6fc3503..c02430a58 100644
--- a/plugins/Adsense/AdsensePlugin.php
+++ b/plugins/Adsense/AdsensePlugin.php
@@ -77,7 +77,6 @@ if (!defined('STATUSNET')) {
*
* @seeAlso UAPPlugin
*/
-
class AdsensePlugin extends UAPPlugin
{
public $adScript = 'http://pagead2.googlesyndication.com/pagead/show_ads.js';
@@ -89,7 +88,6 @@ class AdsensePlugin extends UAPPlugin
// A little bit of chicanery so we avoid overwriting values that
// are passed in with the constructor
-
foreach (array('mediumRectangle', 'rectangle', 'leaderboard', 'wideSkyscraper', 'adScript', 'client') as $setting) {
$value = common_config('adsense', strtolower($setting));
if (!empty($value)) { // not found
@@ -105,7 +103,6 @@ class AdsensePlugin extends UAPPlugin
*
* @return void
*/
-
protected function showMediumRectangle($action)
{
$this->showAdsenseCode($action, 300, 250, $this->mediumRectangle);
@@ -118,7 +115,6 @@ class AdsensePlugin extends UAPPlugin
*
* @return void
*/
-
protected function showRectangle($action)
{
$this->showAdsenseCode($action, 180, 150, $this->rectangle);
@@ -131,7 +127,6 @@ class AdsensePlugin extends UAPPlugin
*
* @return void
*/
-
protected function showWideSkyscraper($action)
{
$this->showAdsenseCode($action, 160, 600, $this->wideSkyscraper);
@@ -144,7 +139,6 @@ class AdsensePlugin extends UAPPlugin
*
* @return void
*/
-
protected function showLeaderboard($action)
{
$this->showAdsenseCode($action, 728, 90, $this->leaderboard);
@@ -160,7 +154,6 @@ class AdsensePlugin extends UAPPlugin
*
* @return void
*/
-
protected function showAdsenseCode($action, $width, $height, $slot)
{
$code = 'google_ad_client = "'.$this->client.'"; ';
@@ -198,11 +191,11 @@ class AdsensePlugin extends UAPPlugin
function onEndAdminPanelNav($menu) {
if (AdminPanelAction::canAdmin('adsense')) {
// TRANS: Menu item title/tooltip
- $menu_title = _('Adsense configuration');
+ $menu_title = _m('AdSense configuration');
// TRANS: Menu item for site administration
- $menu->out->menuItem(common_local_url('adsenseadminpanel'), _('Adsense'),
+ $menu->out->menuItem(common_local_url('adsenseadminpanel'), _m('AdSense'),
$menu_title, $action_name == 'adsenseadminpanel', 'nav_adsense_admin_panel');
}
return true;
}
-} \ No newline at end of file
+}
diff --git a/plugins/Adsense/adsenseadminpanel.php b/plugins/Adsense/adsenseadminpanel.php
index 7b99cf805..110cc9e2b 100644
--- a/plugins/Adsense/adsenseadminpanel.php
+++ b/plugins/Adsense/adsenseadminpanel.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class AdsenseadminpanelAction extends AdminPanelAction
{
/**
@@ -48,10 +47,9 @@ class AdsenseadminpanelAction extends AdminPanelAction
*
* @return string page title
*/
-
function title()
{
- return _('Adsense');
+ return _m('TITLE', 'AdSense');
}
/**
@@ -59,10 +57,9 @@ class AdsenseadminpanelAction extends AdminPanelAction
*
* @return string instructions
*/
-
function getInstructions()
{
- return _('Adsense settings for this StatusNet site');
+ return _m('AdSense settings for this StatusNet site');
}
/**
@@ -70,7 +67,6 @@ class AdsenseadminpanelAction extends AdminPanelAction
*
* @return void
*/
-
function showForm()
{
$form = new AdsenseAdminPanelForm($this);
@@ -83,7 +79,6 @@ class AdsenseadminpanelAction extends AdminPanelAction
*
* @return void
*/
-
function saveSettings()
{
static $settings = array('adsense' => array('adScript', 'client', 'mediumRectangle', 'rectangle', 'leaderboard', 'wideSkyscraper'));
@@ -97,11 +92,9 @@ class AdsenseadminpanelAction extends AdminPanelAction
}
// This throws an exception on validation errors
-
$this->validate($values);
// assert(all values are valid);
-
$config = new Config();
$config->query('BEGIN');
@@ -125,7 +118,6 @@ class AdsenseadminpanelAction extends AdminPanelAction
/**
* Form for the adsense admin panel
*/
-
class AdsenseAdminPanelForm extends AdminForm
{
/**
@@ -133,7 +125,6 @@ class AdsenseAdminPanelForm extends AdminForm
*
* @return int ID of the form
*/
-
function id()
{
return 'form_adsense_admin_panel';
@@ -144,7 +135,6 @@ class AdsenseAdminPanelForm extends AdminForm
*
* @return string class of the form
*/
-
function formClass()
{
return 'form_adsense';
@@ -155,7 +145,6 @@ class AdsenseAdminPanelForm extends AdminForm
*
* @return string URL of the action
*/
-
function action()
{
return common_local_url('adsenseadminpanel');
@@ -166,45 +155,44 @@ class AdsenseAdminPanelForm extends AdminForm
*
* @return void
*/
-
function formData()
{
$this->out->elementStart('fieldset', array('id' => 'adsense_admin'));
$this->out->elementStart('ul', 'form_data');
$this->li();
$this->input('client',
- _('Client ID'),
- _('Google client ID'),
+ _m('Client ID'),
+ _m('Google client ID'),
'adsense');
$this->unli();
$this->li();
$this->input('adScript',
- _('Ad Script URL'),
- _('Script URL (advanced)'),
+ _m('Ad script URL'),
+ _m('Script URL (advanced)'),
'adsense');
$this->unli();
$this->li();
$this->input('mediumRectangle',
- _('Medium rectangle'),
- _('Medium rectangle slot code'),
+ _m('Medium rectangle'),
+ _m('Medium rectangle slot code'),
'adsense');
$this->unli();
$this->li();
$this->input('rectangle',
- _('Rectangle'),
- _('Rectangle slot code'),
+ _m('Rectangle'),
+ _m('Rectangle slot code'),
'adsense');
$this->unli();
$this->li();
$this->input('leaderboard',
- _('Leaderboard'),
- _('Leaderboard slot code'),
+ _m('Leaderboard'),
+ _m('Leaderboard slot code'),
'adsense');
$this->unli();
$this->li();
$this->input('wideSkyscraper',
- _('Skyscraper'),
- _('Wide skyscraper slot code'),
+ _m('Skyscraper'),
+ _m('Wide skyscraper slot code'),
'adsense');
$this->unli();
$this->out->elementEnd('ul');
@@ -215,9 +203,8 @@ class AdsenseAdminPanelForm extends AdminForm
*
* @return void
*/
-
function formActions()
{
- $this->out->submit('submit', _('Save'), 'submit', null, _('Save AdSense settings'));
+ $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save AdSense settings'));
}
}
diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index b2be365dd..620b5e7b0 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -80,6 +80,4 @@ class AutocompletePlugin extends Plugin
_m('The autocomplete plugin allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user\'s friend\' screen names.'));
return true;
}
-
}
-?>
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
index 9a30ba01d..5a010572f 100644
--- a/plugins/Autocomplete/autocomplete.php
+++ b/plugins/Autocomplete/autocomplete.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class AutocompleteAction extends Action
{
private $result;