Merge remote-tracking branch 'origin/master'

application/admin/lang/zh-cn/general/attachment.php

@@ -13,6 +13,12 @@ return [
     'Filename'                 => '文件名',
     'Filesize'                 => '文件大小',
     'Mimetype'                 => 'Mime类型',
+    'Image'                    => '图片',
+    'Audio'                    => '音频',
+    'Video'                    => '视频',
+    'Text'                     => '文档',
+    'Application'              => '应用',
+    'Zip'                      => '压缩包',
     'Extparam'                 => '透传数据',
     'Createtime'               => '创建日期',
     'Uploadtime'               => '上传时间',

application/common/model/Attachment.php

@@ -24,12 +24,12 @@ class Attachment extends Model
     public static function getMimetypeList()
     {
         $data = [
-            "image/*"        => "图片",
-            "audio/*"        => "音频",
-            "video/*"        => "视频",
-            "text/*"         => "文档",
-            "application/*"  => "应用",
-            "zip,rar,7z,tar" => "压缩包",
+            "image/*"        => __("Image"),
+            "audio/*"        => __("Audio"),
+            "video/*"        => __("Video"),
+            "text/*"         => __("Text"),
+            "application/*"  => __("Application"),
+            "zip,rar,7z,tar" => __("Zip"),
         ];
         return $data;
     }