Skip to content

Commit

Permalink
MDL-14129, fix print_error() call
Browse files Browse the repository at this point in the history
  • Loading branch information
dongsheng committed Apr 23, 2008
1 parent 58ffdbb commit 7e2258d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 115 deletions.
4 changes: 4 additions & 0 deletions lang/en_utf8/error.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
$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.';
Expand Down Expand Up @@ -39,6 +40,7 @@
$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.';
Expand Down Expand Up @@ -150,6 +152,7 @@
$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';
Expand All @@ -168,6 +171,7 @@
$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.';
Expand Down
2 changes: 1 addition & 1 deletion lang/en_utf8/forum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,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';
Expand Down
131 changes: 17 additions & 114 deletions lang/en_utf8/help/emoticons.html
View file
Original file line number Diff line number Diff line change
@@ -1,118 +1,21 @@
<h1>Using Smilies (emoticons)</h1>

<table border="1" align="center">
<tr valign="top">
<td>
<table border="0" align="center" cellpadding="5">
<tr>
<td><a href="javascript:inserttext(':-)')"><img src="pix/s/smiley.gif" class="icon" alt="" /></a></td>
<td>smile</td>
<td><code>:-)</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext(':-D')"><img src="pix/s/biggrin.gif" class="icon" alt="" /></a></td>
<td>big grin</td>
<td><code>:-D</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext(';-)')"><img src="pix/s/wink.gif" class="icon" alt="" /></a></td>
<td>wink</td>
<td><code>;-)</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext(':-/')"><img src="pix/s/mixed.gif" class="icon" alt="" /></a></td>
<td>mixed</td>
<td><code>:-/</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('V-.')"><img src="pix/s/thoughtful.gif" class="icon" alt="" /></a></td>
<td>thoughtful</td>
<td><code>V-.</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext(':-P')"><img src="pix/s/tongueout.gif" class="icon" alt="" /></a></td>
<td>tongue out</td>
<td><code>:-P</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('B-)')"><img src="pix/s/cool.gif" class="icon" alt="" /></a></td>
<td>cool</td>
<td><code>B-)</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('^-)')"><img src="pix/s/approve.gif" class="icon" alt="" /></a></td>
<td>approve</td>
<td><code>^-)</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('8-)')"><img src="pix/s/wideeyes.gif" class="icon" alt="" /></a></td>
<td>wide eyes</td>
<td><code>8-)</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('8-o')"><img src="pix/s/surprise.gif" class="icon" alt="" /></a></td>
<td>surprise</td>
<td><code>8-o</code></td>
</tr>
</table>
</td>

<td>
<table border="0" align="center" cellpadding="5">
<tr>
<td><a href="javascript:inserttext(':-(')"><img src="pix/s/sad.gif" class="icon" alt="" /></a></td>
<td>sad</td>
<td><code>:-(</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('8-.')"><img src="pix/s/shy.gif" class="icon" alt="" /></a></td>
<td>shy</td>
<td><code>8-.</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext(':-I')"><img src="pix/s/blush.gif" class="icon" alt="" /></a></td>
<td>blush</td>
<td><code>:-I</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext(':-X')"><img src="pix/s/kiss.gif" class="icon" alt="" /></a></td>
<td>kisses</td>
<td><code>:-X</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext(':o)')"><img src="pix/s/clown.gif" class="icon" alt="" /></a></td>
<td>clown</td>
<td><code>:o)</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('P-|')"><img src="pix/s/blackeye.gif" class="icon" alt="" /></a></td>
<td>black eye</td>
<td><code>P-|</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('8-[')"><img src="pix/s/angry.gif" class="icon" alt="" /></a></td>
<td>angry</td>
<td><code>8-[</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('xx-P')"><img src="pix/s/dead.gif" class="icon" alt="" /></a></td>
<td>dead</td>
<td><code>xx-P</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('|-.')"><img src="pix/s/sleepy.gif" class="icon" alt="" /></a></td>
<td>sleepy</td>
<td><code>|-.</code></td>
</tr>
<tr>
<td><a href="javascript:inserttext('}-]')"><img src="pix/s/evil.gif" class="icon" alt="" /></a></td>
<td>evil</td>
<td><code>}-]</code></td>
</tr>
</table>
</td>
</tr>
</table>
<style type="text/css">
#emotions{
align: center;clear:both;width: 300px;margin-right: auto; margin-left:auto;
}
#emotions ul{
list-style-type: none;
}
#emotions li{
margin-bottom: 3px;
width: 120px;
border-left: 3px solid gray;
padding-left: 7px;
float: left;
}
</style>
<div id='emotions'>##emoticons_html##</div>
<div style="clear:both"></div>

<p>When writing online, it can sometimes difficult to express emotion with plain text.
These little icons can help. </p>
Expand Down

0 comments on commit 7e2258d

Please sign in to comment.