Merge branch 'master' of github.com:typecho/typecho

This commit is contained in:
fen 2016-07-16 13:07:57 +08:00
commit 89293e80aa
2 changed files with 5 additions and 5 deletions

View File

@ -27,8 +27,8 @@ include 'menu.php';
</colgroup>
<thead>
<th>截图</th>
<th>详情</th>
<th><?php _e('截图'); ?></th>
<th><?php _e('详情'); ?></th>
</thead>
<tbody>

View File

@ -370,10 +370,10 @@ class Helper
* @param string $formId 表单id
* @return void
*/
public static function cancleCommentReplyLink($word = 'Cancle', $formId = 'respond')
public static function cancelCommentReplyLink($word = 'Cancel', $formId = 'respond')
{
if (self::options()->commentsThreaded) {
echo '<a href="#' . $formId . '" rel="nofollow" onclick="return typechoCancleCommentReply(\'' .
echo '<a href="#' . $formId . '" rel="nofollow" onclick="return typechoCancelCommentReply(\'' .
$formId . '\');">' . $word . '</a>';
}
}
@ -419,7 +419,7 @@ var typechoAddCommentReply = function (cid, coid, cfid, style) {
return false;
};
var typechoCancleCommentReply = function (cfid) {
var typechoCancelCommentReply = function (cfid) {
var _cf = document.getElementById(cfid),
_cfh = document.getElementById('comment-form-place-holder');