From ab48bbb271275c3ca209f1877d29dc6ae6b0d54d Mon Sep 17 00:00:00 2001 From: dhawes Date: Tue, 17 May 2005 15:21:32 +0000 Subject: [PATCH] updated strings to match guidelines - removed underscores and removed block_rss_ prefix --- blocks/rss_client/block_rss_client.php | 10 +++++----- blocks/rss_client/block_rss_client_action.php | 16 ++++++++-------- blocks/rss_client/config_global.html | 8 ++++---- blocks/rss_client/config_instance.html | 14 +++++++------- blocks/rss_client/config_instance_tabs.php | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php index 75c5714a762..39f5c4e55c4 100644 --- a/blocks/rss_client/block_rss_client.php +++ b/blocks/rss_client/block_rss_client.php @@ -7,7 +7,7 @@ define('BLOCK_RSS_SECONDARY_CACHE_ENABLED', true); class block_rss_client extends block_base { function init() { - $this->title = get_string('block_rss_feeds_title', 'block_rss_client'); + $this->title = get_string('feedstitle', 'block_rss_client'); $this->version = 2004112000; } @@ -22,7 +22,7 @@ class block_rss_client extends block_base { $this->title = $this->config->title; } else { // No customized block title, use localized remote news feed string - $this->title = get_string('block_rss_remote_news_feed', 'block_rss_client'); + $this->title = get_string('remotenewsfeed', 'block_rss_client'); } } @@ -91,11 +91,11 @@ class block_rss_client extends block_base { if (isset($this->config)) { // this instance is configured - show Add/Edit feeds link $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds')); - $output .= '
'. get_string('block_rss_feeds_add_edit', 'block_rss_client') .'

'; + $output .= '
'. get_string('feedsaddedit', 'block_rss_client') .'

'; } else { // this instance has not been configured yet - show configure link $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock')); - $output .= '
'. get_string('block_rss_feeds_configure_new_instance)', 'block_rss_client') .'

'; + $output .= '
'. get_string('feedsconfigurenewinstance)', 'block_rss_client') .'

'; } } @@ -227,7 +227,7 @@ class block_rss_client extends block_base { if (!empty($rss->channel['link'])) { if (!empty($this->config) && isset($this->config->block_rss_client_show_channel_link) && $this->config->block_rss_client_show_channel_link) { - $this->content->footer = ''. get_string('block_rss_client_channel_link', 'block_rss_client') .''; + $this->content->footer = ''. get_string('clientchannellink', 'block_rss_client') .''; } if (!empty($feedtitle) ) { $feedtitle = ''. $feedtitle .''; diff --git a/blocks/rss_client/block_rss_client_action.php b/blocks/rss_client/block_rss_client_action.php index 44c1749f42b..65357597968 100644 --- a/blocks/rss_client/block_rss_client_action.php +++ b/blocks/rss_client/block_rss_client_action.php @@ -28,7 +28,7 @@ define('MAGPIE_OUTPUT_ENCODING', get_string('thischarset')); // see bug 3107 } - $straddedit = get_string('block_rss_feeds_add_edit', 'block_rss_client'); + $straddedit = get_string('feedsaddedit', 'block_rss_client'); if ( isadmin() ) { $stradmin = get_string('administration'); $strconfiguration = get_string('configuration'); @@ -40,8 +40,8 @@ $navigation = $straddedit; } - print_header(get_string('block_rss_feeds_add_edit', 'block_rss_client'), - get_string('block_rss_feeds_add_edit', 'block_rss_client'), + print_header(get_string('feedsaddedit', 'block_rss_client'), + get_string('feedsaddedit', 'block_rss_client'), $navigation ); //check to make sure that the user is allowed to post new feeds @@ -88,7 +88,7 @@ error('There was an error trying to update rss feed with id:'. $rssid); } - redirect($referrer, get_string('block_rss_feed_updated', 'block_rss_client')); + redirect($referrer, get_string('feedupdated', 'block_rss_client')); /* rss_display_feeds(); rss_get_form($act, $dataobject->url, $rssid, $dataobject->preferredtitle); */ @@ -128,7 +128,7 @@ if (!update_record('block_rss_client', $dataobject)) { error('There was an error trying to update rss feed with id:'. $rssid); } - $message = get_string('block_rss_feed_added', 'block_rss_client'); + $message = get_string('feedadded', 'block_rss_client'); } redirect($referrer, $message); /* @@ -158,7 +158,7 @@ $sql = 'DELETE FROM '. $CFG->prefix .'block_rss_client WHERE id='. $rssid; $res= $db->Execute($sql); - redirect($referrer, get_string('block_rss_feed_deleted', 'block_rss_client') ); + redirect($referrer, get_string('feeddeleted', 'block_rss_client') ); /* rss_display_feeds(); rss_get_form($act, $url, $rssid, $preferredtitle); @@ -168,7 +168,7 @@ // print_object($res); //debug $rss_record = get_record('block_rss_client', 'id', $rssid); if (!$rss_record->id) { - print ''. get_string('block_rss_could_not_find_feed', 'block_rss_client') .': '. $rssid .''; + print ''. get_string('couldnotfindfeed', 'block_rss_client') .': '. $rssid .''; } else { // By capturing the output from fetch_rss this way // error messages do not display and clutter up the moodle interface @@ -203,7 +203,7 @@ if (file_exists($CFG->dirroot .'/blog/lib.php')) { //Blog module is installed - provide "blog this" link print ''."\n"; - print ''. get_string('blog_blog_this', 'blog').''."\n"; + print ''. get_string('blogthis', 'blog').''."\n"; print ''. get_string('blog_blog_this', 'blog') .''."\n"; } else { print ' '; diff --git a/blocks/rss_client/config_global.html b/blocks/rss_client/config_global.html index fcf9b756a1d..677a0351727 100644 --- a/blocks/rss_client/config_global.html +++ b/blocks/rss_client/config_global.html @@ -14,7 +14,7 @@ } ?>" /> - + @@ -28,7 +28,7 @@ } ?>" /> - + @@ -52,7 +52,7 @@ ?> - + @@ -63,6 +63,6 @@ -

+

diff --git a/blocks/rss_client/config_instance.html b/blocks/rss_client/config_instance.html index bb4a47027f1..f4faeb6bb22 100644 --- a/blocks/rss_client/config_instance.html +++ b/blocks/rss_client/config_instance.html @@ -19,7 +19,7 @@ if ($currentaction == 'configblock') { - + - +
- +
- + - + wwwroot .'/blocks/rss_client/block_rss_client_action.php"> '. get_string('block_rss_edit_news_feeds', 'block_rss_client') .'
'; + print '  '. get_string('editnewsfeeds', 'block_rss_client') .'
'; } } ?> @@ -119,7 +119,7 @@ if ($currentaction == 'configblock') {
config) && isset($this->config->block_rss_client_show_channel_link)) { @@ -135,7 +135,7 @@ if ($currentaction == 'configblock') {
config) && isset($this->config->block_rss_client_show_channel_image)) { diff --git a/blocks/rss_client/config_instance_tabs.php b/blocks/rss_client/config_instance_tabs.php index 1c5704a30c7..4c785c705b3 100644 --- a/blocks/rss_client/config_instance_tabs.php +++ b/blocks/rss_client/config_instance_tabs.php @@ -7,11 +7,11 @@ $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock')); $row[] = new tabobject('configblock', $script, - get_string('block_rss_configblock', 'block_rss_client')); + get_string('configblock', 'block_rss_client')); $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds')); $row[] = new tabobject('managefeeds', $script, - get_string('block_rss_managefeeds', 'block_rss_client')); + get_string('managefeeds', 'block_rss_client')); $tabs[] = $row;