Merge pull request #6 from LiMingYuGuang/canary

Master merge Canary 3.0.3
idawnlight · Jul 18, 2017 · e7d9d60 · e7d9d60
2 parents 0f08335 + cd91c26
commit e7d9d60
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 1,538 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@
 
 - Author 作者：Viosey
 - Maintainer 维护者：黎明余光
-- Version 版本：3.0.1
+- Version 版本：3.0.3
 - Compatibility 兼容：PHP 5.4+, MySQL, Typecho 1.0
 
 ## Feature 特性

diff --git a/archive.php b/archive.php
@@ -43,13 +43,7 @@
                     <?php $this->excerpt(80, '...'); ?> &nbsp;&nbsp;&nbsp;
                     <span>
                         <a href="<?php $this->permalink(); ?>" target="_self">
-                            <?php if ($this->options->langis == '0'): ?>
-                                Continue Reading
-                            <?php elseif ($this->options->langis == '1'): ?>
-                                继续阅读
-                            <?php elseif ($this->options->langis == '2'): ?>
-                                繼續閱讀
-                            <?php endif; ?>
+                            <?php echo tranMsg("Continue Reading", "继续阅读", $this->options->langis) ?>
                         </a>
                     </span>
                 </div>
@@ -76,7 +70,7 @@
                                     </span>
                                         </div>
                                     </div>
-                    
+
                     <div id="post_entry-right-info" style="color:<?php $this->options->alinkcolor(); ?>">
                         <span class="post_entry-category">
                             <?php $this->category(', '); ?> |
@@ -96,11 +90,11 @@
                 <?php $this->pageLink(
                     '<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon"><i class="material-icons" role="presentation">arrow_back</i></button>'); ?>
                 <span class="page-number current"><?php if ($this->_currentPage>1) {
-                    echo $this->_currentPage;
-                } else {
-                    echo 1;
-                }?> of <?php echo   ceil($this->getTotal() / $this->parameter->pageSize); ?></span>
-                                
+                        echo $this->_currentPage;
+                    } else {
+                        echo 1;
+                    }?> of <?php echo   ceil($this->getTotal() / $this->parameter->pageSize); ?></span>
+
                 <?php $this->pageLink(
                     '<button class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon"><i class="material-icons" role="presentation">arrow_forward</i></button>', 'next'); ?>
             </nav>

diff --git a/comments.php b/comments.php
@@ -70,14 +70,14 @@
             <?php $comments->threadedComments($options); ?>
             <!--嵌套评论所有内容-->
         </div>
-        <?php 
+        <?php
     } ?>
         <!--是否嵌套评论判断结束-->
     </div>
 
 </div>
 
-<?php 
+<?php
 } ?>
 
 <!-- 使用原生评论 -->
@@ -150,7 +150,7 @@
 
             <!-- Input comment content -->
             <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label" id="comment-input-div">
-                <textarea name="text" rows="1" id="comment" class="mdl-textfield__input"></textarea>
+                <textarea name="text" rows="<?php $this->options->CommentRows() ?>" id="comment" class="mdl-textfield__input"></textarea>
                 <label for="comment" class="mdl-textfield__label">
                             <?php if ($this->options->langis == '0'): ?>
                                 Join the discussion
@@ -165,7 +165,6 @@
                     <button id="comment-button" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon">
                         <i class="material-icons" role="presentation">check</i><span class="visuallyhidden">add comment</span>
                     </button>'); ?>
-            <div class="mdl-tooltip" for="comment-button">Submit</div>
 
         </form>
     </div>
@@ -176,7 +175,7 @@
     <?php else: ?>
 
     <div class="comments__closed">
-        <span id="commentCount">评论已关闭</span>
+        <span id="commentCount"><?php echo tranMsg("Comment has been closed", "评论已关闭", $this->options->langis) ?></span>
     </div>
 
     <?php endif; ?>