fix：修正跟读的双语

lib/components/ContentItem/index.js

@@ -307,7 +307,9 @@ var CommentItem = function (_Component) {
             _react2.default.createElement(
               "span",
               { className: "comment-item-speak-message" },
-              "[\u8DDF\u8BFB\u6D88\u606F]"
+              "[",
+              _reactIntlUniversal2.default.get("comment.speakComment"),
+              "]"
             ),
             _react2.default.createElement(
               "div",

lib/lang/en-US.js

@@ -17,6 +17,7 @@ var USdata = {
   "comment.reply": "Reply",
   "comment.moreComment": "More comments",
   "comment.filterSpeak": "Show imitations only",
+  "comment.speakComment": "Imitation audio",
 
   "reply.totalReply": "Total {total, plural, =1 {one reply} other {# replies}}",
   "reply.moreReply": "More replies",

lib/lang/en-US.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lang/en-US.js"],"names":["USdata"],"mappings":";;;;;AAAA,IAAMA,SAAS;AACb,2BAAyB,uBADZ;AAEb,wBAAsB,eAFT;AAGb,sBAAoB,2BAHP;AAIb,sBAAoB,MAJP;AAKb,sBAAoB,iBALP;AAMb,wBAAsB,iCANT;AAOb,sBAAoB,QAPP;;AASb,qBAAmB,SATN;AAUb,0BACE,4DAXW;AAYb,mBAAiB,OAZJ;AAab,yBAAuB,eAbV;AAcb,yBAAuB,sBAdV;;AAgBb,sBAAoB,yDAhBP;AAiBb,qBAAmB,cAjBN;AAkBb,oBAAkB,cAlBL;;AAoBb,sBAAoB,MApBP;AAqBb,0BAAwB,kBArBX;;AAuBb,sBAAoB,SAvBP;AAwBb,mBAAiB,SAxBJ;AAyBb,uBAAqB,QAzBR;AA0Bb,uBAAqB,QA1BR;;AA4Bb,2BAAyB,kBA5BZ;AA6Bb,wBAAsB,cA7BT;AA8Bb,qBAAmB,kBA9BN;AA+Bb,qBAAmB,eA/BN;AAgCb,yBAAuB,kBAhCV;AAiCb,0BAAwB,YAjCX;AAkCb,+BAA6B,SAlChB;AAmCb,yBAAuB;AAnCV,CAAf;;kBAsCeA,M","file":"en-US.js","sourcesContent":["const USdata = {\n  \"editor.alreadyEntered\": \"{count} words entered\",\n  \"editor.placeholder\": \"Say something\",\n  \"editor.maxLength\": \"Maximum {maxLength} words\",\n  \"editor.SubmitBtn\": \"Send\",\n  \"editor.uploadTip\": \"Upload pictures\",\n  \"editor.uploadCount\": \"(You could upload {count} more)\",\n  \"editor.uploadBtn\": \"Upload\",\n\n  \"comment.tourist\": \"Visitor\",\n  \"comment.totalComment\":\n    \"Total {total, plural, =1 {one comment} other {# comments}}\",\n  \"comment.reply\": \"Reply\",\n  \"comment.moreComment\": \"More comments\",\n  \"comment.filterSpeak\": \"Show imitations only\",\n\n  \"reply.totalReply\": \"Total {total, plural, =1 {one reply} other {# replies}}\",\n  \"reply.moreReply\": \"More replies\",\n  \"reply.collapse\": \"Fold replies\",\n\n  \"picture.collapse\": \"Fold\",\n  \"picture.viewOriginal\": \"See the original\",\n\n  \"popConfirm.title\": \"Delete?\",\n  \"popConfirm.ok\": \"Confirm\",\n  \"popConfirm.cancel\": \"Cancel\",\n  \"popConfirm.delete\": \"Delete\",\n\n  \"message.noMoreComment\": \"No more comments\",\n  \"message.noMoreData\": \"No more data\",\n  \"message.notNull\": \"It's still empty\",\n  \"message.success\": \"Comments sent\",\n  \"message.replyNoNull\": \"It's still empty\",\n  \"message.replySuccess\": \"Reply sent\",\n  \"message.cancelLickSuccess\": \"Unliked\",\n  \"message.likeSuccess\": \"Liked\"\n};\n\nexport default USdata;\n"]}
+{"version":3,"sources":["../../src/lang/en-US.js"],"names":["USdata"],"mappings":";;;;;AAAA,IAAMA,SAAS;AACb,2BAAyB,uBADZ;AAEb,wBAAsB,eAFT;AAGb,sBAAoB,2BAHP;AAIb,sBAAoB,MAJP;AAKb,sBAAoB,iBALP;AAMb,wBAAsB,iCANT;AAOb,sBAAoB,QAPP;;AASb,qBAAmB,SATN;AAUb,0BACE,4DAXW;AAYb,mBAAiB,OAZJ;AAab,yBAAuB,eAbV;AAcb,yBAAuB,sBAdV;AAeb,0BAAwB,iBAfX;;AAiBb,sBAAoB,yDAjBP;AAkBb,qBAAmB,cAlBN;AAmBb,oBAAkB,cAnBL;;AAqBb,sBAAoB,MArBP;AAsBb,0BAAwB,kBAtBX;;AAwBb,sBAAoB,SAxBP;AAyBb,mBAAiB,SAzBJ;AA0Bb,uBAAqB,QA1BR;AA2Bb,uBAAqB,QA3BR;;AA6Bb,2BAAyB,kBA7BZ;AA8Bb,wBAAsB,cA9BT;AA+Bb,qBAAmB,kBA/BN;AAgCb,qBAAmB,eAhCN;AAiCb,yBAAuB,kBAjCV;AAkCb,0BAAwB,YAlCX;AAmCb,+BAA6B,SAnChB;AAoCb,yBAAuB;AApCV,CAAf;;kBAuCeA,M","file":"en-US.js","sourcesContent":["const USdata = {\n  \"editor.alreadyEntered\": \"{count} words entered\",\n  \"editor.placeholder\": \"Say something\",\n  \"editor.maxLength\": \"Maximum {maxLength} words\",\n  \"editor.SubmitBtn\": \"Send\",\n  \"editor.uploadTip\": \"Upload pictures\",\n  \"editor.uploadCount\": \"(You could upload {count} more)\",\n  \"editor.uploadBtn\": \"Upload\",\n\n  \"comment.tourist\": \"Visitor\",\n  \"comment.totalComment\":\n    \"Total {total, plural, =1 {one comment} other {# comments}}\",\n  \"comment.reply\": \"Reply\",\n  \"comment.moreComment\": \"More comments\",\n  \"comment.filterSpeak\": \"Show imitations only\",\n  \"comment.speakComment\": \"Imitation audio\",\n\n  \"reply.totalReply\": \"Total {total, plural, =1 {one reply} other {# replies}}\",\n  \"reply.moreReply\": \"More replies\",\n  \"reply.collapse\": \"Fold replies\",\n\n  \"picture.collapse\": \"Fold\",\n  \"picture.viewOriginal\": \"See the original\",\n\n  \"popConfirm.title\": \"Delete?\",\n  \"popConfirm.ok\": \"Confirm\",\n  \"popConfirm.cancel\": \"Cancel\",\n  \"popConfirm.delete\": \"Delete\",\n\n  \"message.noMoreComment\": \"No more comments\",\n  \"message.noMoreData\": \"No more data\",\n  \"message.notNull\": \"It's still empty\",\n  \"message.success\": \"Comments sent\",\n  \"message.replyNoNull\": \"It's still empty\",\n  \"message.replySuccess\": \"Reply sent\",\n  \"message.cancelLickSuccess\": \"Unliked\",\n  \"message.likeSuccess\": \"Liked\"\n};\n\nexport default USdata;\n"]}

lib/lang/zh-CN.js

@@ -17,6 +17,7 @@ var CNdata = {
   "comment.reply": "回复",
   "comment.moreComment": "更多评论",
   "comment.filterSpeak": "只显示跟读",
+  "comment.speakComment": "跟读语音",
 
   "reply.totalReply": "共{total}条回复",
   "reply.moreReply": "更多回复",

lib/lang/zh-CN.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lang/zh-CN.js"],"names":["CNdata"],"mappings":";;;;;AAAA,IAAMA,SAAS;AACb,2BAAyB,yBADZ;AAEb,wBAAsB,UAFT;AAGb,sBAAoB,iBAHP;AAIb,sBAAoB,IAJP;AAKb,sBAAoB,MALP;AAMb,wBAAsB,mBANT;AAOb,sBAAoB,IAPP;;AASb,qBAAmB,IATN;AAUb,0BAAwB,aAVX;AAWb,mBAAiB,IAXJ;AAYb,yBAAuB,MAZV;AAab,yBAAuB,OAbV;;AAeb,sBAAoB,aAfP;AAgBb,qBAAmB,MAhBN;AAiBb,oBAAkB,MAjBL;;AAmBb,sBAAoB,IAnBP;AAoBb,0BAAwB,MApBX;;AAsBb,sBAAoB,QAtBP;AAuBb,mBAAiB,IAvBJ;AAwBb,uBAAqB,IAxBR;AAyBb,uBAAqB,IAzBR;;AA2Bb,2BAAyB,SA3BZ;AA4Bb,wBAAsB,UA5BT;AA6Bb,qBAAmB,OA7BN;AA8Bb,qBAAmB,QA9BN;AA+Bb,yBAAuB,OA/BV;AAgCb,0BAAwB,QAhCX;AAiCb,+BAA6B,QAjChB;AAkCb,yBAAuB;AAlCV,CAAf;;kBAqCeA,M","file":"zh-CN.js","sourcesContent":["const CNdata = {\n  \"editor.alreadyEntered\": \"已输入{count}/{maxLength}字\",\n  \"editor.placeholder\": \"说点什么吧...\",\n  \"editor.maxLength\": \"字数上限{maxLength}\",\n  \"editor.SubmitBtn\": \"发送\",\n  \"editor.uploadTip\": \"上传图片\",\n  \"editor.uploadCount\": \"(您还能上传{count}张图片)\",\n  \"editor.uploadBtn\": \"上传\",\n\n  \"comment.tourist\": \"游客\",\n  \"comment.totalComment\": \"共{total}条评论\",\n  \"comment.reply\": \"回复\",\n  \"comment.moreComment\": \"更多评论\",\n  \"comment.filterSpeak\": \"只显示跟读\",\n\n  \"reply.totalReply\": \"共{total}条回复\",\n  \"reply.moreReply\": \"更多回复\",\n  \"reply.collapse\": \"收起回复\",\n\n  \"picture.collapse\": \"收起\",\n  \"picture.viewOriginal\": \"查看原图\",\n\n  \"popConfirm.title\": \"确定要删除吗\",\n  \"popConfirm.ok\": \"确定\",\n  \"popConfirm.cancel\": \"取消\",\n  \"popConfirm.delete\": \"删除\",\n\n  \"message.noMoreComment\": \"没有更多评论了\",\n  \"message.noMoreData\": \"没有更多数据了！\",\n  \"message.notNull\": \"没写内容呢\",\n  \"message.success\": \"评论已发送！\",\n  \"message.replyNoNull\": \"没写内容呢\",\n  \"message.replySuccess\": \"回复已发送！\",\n  \"message.cancelLickSuccess\": \"已取消点赞！\",\n  \"message.likeSuccess\": \"已赞！\"\n};\n\nexport default CNdata;\n"]}
+{"version":3,"sources":["../../src/lang/zh-CN.js"],"names":["CNdata"],"mappings":";;;;;AAAA,IAAMA,SAAS;AACb,2BAAyB,yBADZ;AAEb,wBAAsB,UAFT;AAGb,sBAAoB,iBAHP;AAIb,sBAAoB,IAJP;AAKb,sBAAoB,MALP;AAMb,wBAAsB,mBANT;AAOb,sBAAoB,IAPP;;AASb,qBAAmB,IATN;AAUb,0BAAwB,aAVX;AAWb,mBAAiB,IAXJ;AAYb,yBAAuB,MAZV;AAab,yBAAuB,OAbV;AAcb,0BAAwB,MAdX;;AAgBb,sBAAoB,aAhBP;AAiBb,qBAAmB,MAjBN;AAkBb,oBAAkB,MAlBL;;AAoBb,sBAAoB,IApBP;AAqBb,0BAAwB,MArBX;;AAuBb,sBAAoB,QAvBP;AAwBb,mBAAiB,IAxBJ;AAyBb,uBAAqB,IAzBR;AA0Bb,uBAAqB,IA1BR;;AA4Bb,2BAAyB,SA5BZ;AA6Bb,wBAAsB,UA7BT;AA8Bb,qBAAmB,OA9BN;AA+Bb,qBAAmB,QA/BN;AAgCb,yBAAuB,OAhCV;AAiCb,0BAAwB,QAjCX;AAkCb,+BAA6B,QAlChB;AAmCb,yBAAuB;AAnCV,CAAf;;kBAsCeA,M","file":"zh-CN.js","sourcesContent":["const CNdata = {\n  \"editor.alreadyEntered\": \"已输入{count}/{maxLength}字\",\n  \"editor.placeholder\": \"说点什么吧...\",\n  \"editor.maxLength\": \"字数上限{maxLength}\",\n  \"editor.SubmitBtn\": \"发送\",\n  \"editor.uploadTip\": \"上传图片\",\n  \"editor.uploadCount\": \"(您还能上传{count}张图片)\",\n  \"editor.uploadBtn\": \"上传\",\n\n  \"comment.tourist\": \"游客\",\n  \"comment.totalComment\": \"共{total}条评论\",\n  \"comment.reply\": \"回复\",\n  \"comment.moreComment\": \"更多评论\",\n  \"comment.filterSpeak\": \"只显示跟读\",\n  \"comment.speakComment\": \"跟读语音\",\n\n  \"reply.totalReply\": \"共{total}条回复\",\n  \"reply.moreReply\": \"更多回复\",\n  \"reply.collapse\": \"收起回复\",\n\n  \"picture.collapse\": \"收起\",\n  \"picture.viewOriginal\": \"查看原图\",\n\n  \"popConfirm.title\": \"确定要删除吗\",\n  \"popConfirm.ok\": \"确定\",\n  \"popConfirm.cancel\": \"取消\",\n  \"popConfirm.delete\": \"删除\",\n\n  \"message.noMoreComment\": \"没有更多评论了\",\n  \"message.noMoreData\": \"没有更多数据了！\",\n  \"message.notNull\": \"没写内容呢\",\n  \"message.success\": \"评论已发送！\",\n  \"message.replyNoNull\": \"没写内容呢\",\n  \"message.replySuccess\": \"回复已发送！\",\n  \"message.cancelLickSuccess\": \"已取消点赞！\",\n  \"message.likeSuccess\": \"已赞！\"\n};\n\nexport default CNdata;\n"]}

lib/version.json

@@ -1,8 +1,8 @@
 {
     "name":       "comment",
-    "buildDate":  1588147494452,
+    "buildDate":  1588149501351,
     "version":    "1.0.4",
-    "numCommits": 210,
-    "hash":       "7da2eb9",
+    "numCommits": 211,
+    "hash":       "7a67067",
     "dirty":      true
 }

src/components/ContentItem/index.js

@@ -211,60 +211,63 @@ class CommentItem extends Component {
 
           {isSpeak && (
             <div className="comment-item-speak">
-              <span className="comment-item-speak-message">[跟读消息]</span>
+              <span className="comment-item-speak-message">
+                [{intl.get("comment.speakComment")}]
+              </span>
               <div className="comment-item-speak-audio-wrapper">
                 <AudioPlayer src={medias && medias[0] && medias[0].url} />
               </div>
             </div>
           )}
           {// image为空时不渲染comment-item-image
-          imageList.length > 0 && imageList[0] !== "" && (
-            <div className="comment-item-image">
-              {!this.state.showPreviewer &&
-                imgs.map((item, index) => {
-                  if (item.type === "divider") {
+          imageList.length > 0 &&
+            imageList[0] !== "" && (
+              <div className="comment-item-image">
+                {!this.state.showPreviewer &&
+                  imgs.map((item, index) => {
+                    if (item.type === "divider") {
+                      return (
+                        <div className="comment-item-image-wrapper" key={index}>
+                          <div className="comment-img-divider" />
+                          {/* <img src={item} alt={item} className="comment-img" /> */}
+                        </div>
+                      );
+                    }
                     return (
-                      <div className="comment-item-image-wrapper" key={index}>
-                        <div className="comment-img-divider" />
+                      <div
+                        className="comment-item-image-wrapper"
+                        key={index}
+                        onClick={() => {
+                          let i = index;
+                          if (needClear) {
+                            if (index > 3) {
+                              i -= 1;
+                            }
+                            if (index > 7) {
+                              i -= 1;
+                            }
+                          }
+                          this.showPreviewer(i);
+                        }}
+                      >
+                        <div
+                          style={{ backgroundImage: `url(${item})` }}
+                          className="comment-img-thumbnail"
+                        />
                         {/* <img src={item} alt={item} className="comment-img" /> */}
                       </div>
                     );
-                  }
-                  return (
-                    <div
-                      className="comment-item-image-wrapper"
-                      key={index}
-                      onClick={() => {
-                        let i = index;
-                        if (needClear) {
-                          if (index > 3) {
-                            i -= 1;
-                          }
-                          if (index > 7) {
-                            i -= 1;
-                          }
-                        }
-                        this.showPreviewer(i);
-                      }}
-                    >
-                      <div
-                        style={{ backgroundImage: `url(${item})` }}
-                        className="comment-img-thumbnail"
-                      />
-                      {/* <img src={item} alt={item} className="comment-img" /> */}
-                    </div>
-                  );
-                })}
-              {this.state.showPreviewer && (
-                <ImagePreviewer
-                  list={imageList}
-                  index={this.state.previewerIndex}
-                  onFold={this.hidePreviewer}
-                />
-              )}
-              <div className="clearfix" />
-            </div>
-          )}
+                  })}
+                {this.state.showPreviewer && (
+                  <ImagePreviewer
+                    list={imageList}
+                    index={this.state.previewerIndex}
+                    onFold={this.hidePreviewer}
+                  />
+                )}
+                <div className="clearfix" />
+              </div>
+            )}
           <div className="comment-item-bottom">
             {content.reply_count ? (
               <div>
@@ -275,21 +278,23 @@ class CommentItem extends Component {
                 </a>
               </div>
             ) : null}
-            {showEdit && !isSpeak && app.userId === content.user_id && (
-              <i
-                className="comment-item-edit"
-                onClick={() =>
-                  this.props.app.handleEdit({
-                    action,
-                    replyId,
-                    commentId,
-                    userId: content.user_id,
-                    content,
-                    replyPage: page
-                  })
-                }
-              />
-            )}
+            {showEdit &&
+              !isSpeak &&
+              app.userId === content.user_id && (
+                <i
+                  className="comment-item-edit"
+                  onClick={() =>
+                    this.props.app.handleEdit({
+                      action,
+                      replyId,
+                      commentId,
+                      userId: content.user_id,
+                      content,
+                      replyPage: page
+                    })
+                  }
+                />
+              )}
             {app.userId === content.user_id && (
               <Popconfirm
                 // title="确定要删除吗?"
@@ -329,7 +334,10 @@ class CommentItem extends Component {
                 }
               />
             </div>
-            <span>&nbsp;{content.favor_count}</span>
+            <span>
+              &nbsp;
+              {content.favor_count}
+            </span>
             <div
               onClick={this.handleToggleInput}
               className="comment-item-reply"

src/lang/en-US.js

@@ -13,6 +13,7 @@ const USdata = {
   "comment.reply": "Reply",
   "comment.moreComment": "More comments",
   "comment.filterSpeak": "Show imitations only",
+  "comment.speakComment": "Imitation audio",
 
   "reply.totalReply": "Total {total, plural, =1 {one reply} other {# replies}}",
   "reply.moreReply": "More replies",

src/lang/zh-CN.js

@@ -12,6 +12,7 @@ const CNdata = {
   "comment.reply": "回复",
   "comment.moreComment": "更多评论",
   "comment.filterSpeak": "只显示跟读",
+  "comment.speakComment": "跟读语音",
 
   "reply.totalReply": "共{total}条回复",
   "reply.moreReply": "更多回复",