Merge branch 'master' of http://apollo.mttop.cn/gitlab/web_component/submodule

components/braftEditor/index.tsx

@@ -75,7 +75,7 @@ const EditorDemo: React.FC<IProps> = ({
         return (percent > 0 && percent < 100) ? (<Progress
             percent={percent}
             strokeColor="#04B4AD"
-            format={(p) => { return `图片上传中${parseInt(p, 10)}%`; }}
+            format={(p) => { return `${language === 'zh' ? '图片上传中' : 'uploading'}${parseInt(p, 10)}%`; }}
             className={styles.progress}
         />) : null;
     };