From 7e2258d2c9b6feeab03377e96818090fa3c7b7c1 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Wed, 23 Apr 2008 07:18:16 +0000 Subject: [PATCH] MDL-14129, fix print_error() call --- lang/en_utf8/error.php | 4 + lang/en_utf8/forum.php | 2 +- lang/en_utf8/help/emoticons.html | 131 ++++--------------------------- 3 files changed, 22 insertions(+), 115 deletions(-) diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php index 1d85c98ac1..36ec9c632b 100644 --- a/lang/en_utf8/error.php +++ b/lang/en_utf8/error.php @@ -8,6 +8,7 @@ $string['blockcannotinistantiate'] = 'Problem in instantiating block object'; $string['blockcannotconfig'] = 'This block does not support global configuration'; $string['backupcontainexternal'] = 'This backup file contains external Moodle Network Hosts that are not configured locally.'; $string['cannotassignrole'] = 'Cannot assign role in course'; +$string['cannotaddrss'] = 'You do not have permission to add rss feeds'; $string['cannotsaveconfig'] = 'Problem saving config \"$a[0]\" as \"$a[1]\" for plugin \"$a[2]\"'; $string['cannotsavefile'] = 'Cannot save the file\"$a[0]\/$a[1]\"!'; $string['cannotcreatelangdir'] = 'Cannot create lang dir.'; @@ -39,6 +40,7 @@ $string['cannotsetupcategory'] = 'Serious Error! Could not set up a default cour $string['cannotsetupsite'] = 'Serious Error! Could not set up the site!'; $string['cannotunzipfile'] = 'Cannot unzip file.'; $string['cannotupdaterole'] = 'Cannot update role!'; +$stirng['cannotupdaterss'] = 'Cannot '; $string['cannotuseadmin'] = 'You need to be an admin user to use this page.'; $string['cannotuseadminadminorteacher'] = 'You need to be a teacher or admin user to use this page.'; $string['cannotusepage'] = 'Only teacher and administrator can use this page.'; @@ -150,6 +152,7 @@ $string['unknowncourseidnumber'] = 'Unknown Course ID \"$a\"'; $string['unknowngroup'] = 'Unknown group \"$a\"'; $string['unknownrole'] = 'Unknown role \"$a\"'; $string['unknownuseraction'] = 'Sorry, I do not understand this user action.'; +$string['urlnotdefinerss'] = 'URL not defined for rss feed'; $string['userautherror'] = 'Unknown auth plugin.'; $string['userauthunsupported'] = 'Auth plugin not supported here.'; $string['useremailduplicate'] = 'Duplicate address'; @@ -168,6 +171,7 @@ $string['usernotrenamedoff'] = 'User not renamed - renaming not allowed.'; $string['usernotupdatedadmin'] = 'Can not update admin accounts.'; $string['usernotupdatederror'] = 'User not updated - error.'; $string['usernotupdatednotexists'] = 'User not updated - does not exist.'; +$string['updatersserror'] = 'There was an error trying to update rss feed with id: $a'; $string['wrongcall'] = 'This script is called wrongly'; $string['wrongcontextid'] = 'Context ID was incorrect (cannot find it)'; $string['wrongdestpath'] = 'Wrong destination path.'; diff --git a/lang/en_utf8/forum.php b/lang/en_utf8/forum.php index 8c75732760..d27588b2ae 100644 --- a/lang/en_utf8/forum.php +++ b/lang/en_utf8/forum.php @@ -153,7 +153,7 @@ $string['nameteacher'] = 'Teacher forum'; //depreciated after 1.7 $string['newforumposts'] = 'New forum posts'; $string['nodiscussions'] = 'There are no discussion topics yet in this forum'; $string['nodiscussionsstartedby'] = 'No discussions started by this user'; -$string['noguestpost'] = 'Sorry, guests are not allowed to post.'; +$string['noguestpost'] = 'Sorry, guests are not allowed to post. $a'; $string['noguestsubscribe'] = 'Sorry, guests are not allowed to subscribe to receive forum postings by email.'; $string['noguesttracking'] = 'Sorry, guests are not allowed to set tracking options.'; $string['nomorepostscontaining'] = 'No more posts containing \'$a\' were found'; diff --git a/lang/en_utf8/help/emoticons.html b/lang/en_utf8/help/emoticons.html index 5e3b1e4cd2..8d3390d1e8 100644 --- a/lang/en_utf8/help/emoticons.html +++ b/lang/en_utf8/help/emoticons.html @@ -1,118 +1,21 @@

Using Smilies (emoticons)

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
smile:-)
big grin:-D
wink;-)
mixed:-/
thoughtfulV-.
tongue out:-P
coolB-)
approve^-)
wide eyes8-)
surprise8-o
- 		- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
sad:-(
shy8-.
blush:-I
kisses:-X
clown:o)
black eyeP-|
angry8-[
deadxx-P
sleepy|-.
evil}-]
-
+ +
##emoticons_html##
+

When writing online, it can sometimes difficult to express emotion with plain text. These little icons can help.

-- 2.39.5