2 Commit-ok 4d21daaa8b ... ddb106eafb

Szerző SHA1 Üzenet Dátum
  panda ddb106eafb Merge branch 'master' of http://git.huxiukeji.com/lizhen/yueke 10 hónapja
  panda 69b54538c2 zh_to_en 10 hónapja

+ 2 - 2
application/admin/lang/en/appplat.php

@@ -7,8 +7,8 @@ return [
     'Url'       => 'Url',
     'Weigh'     => 'Weigh',
     'Type'      => 'Type',
-    'Type 1'    => '留个好评',
-    'Type 2'    => '关注我们',
+    'Type 1'    => 'leave a good comment',//留个好评
+    'Type 2'    => 'follow us',//关注我们
     'Biglogo'   => 'Big logo',
     'Biglogo 1' => 'yes',
     'Biglogo 0' => 'no'

+ 2 - 2
application/admin/lang/en/banner.php

@@ -10,7 +10,7 @@ return [
     'Video_file' => 'video',
     'Url'        => 'Url',
     'Status'     => 'Status',
-    'Status 1'   => 'on',
-    'Status 0'   => 'off',
+    'Status 1'   => 'On',
+    'Status 0'   => 'Off',
     'Weigh'      => 'Weigh'
 ];

+ 12 - 12
application/admin/lang/en/category.php

@@ -2,17 +2,17 @@
 
 return [
     'Id'                                 => 'ID',
-    'Pid'                                => 'ID',
-    'Type'                               => '类型',
-    'All'                                => '全部',
-    'Image'                              => '图片',
-    'Keywords'                           => '关键字',
-    'Description'                        => '描述',
-    'Diyname'                            => '自定义名称',
-    'Createtime'                         => '创建时间',
-    'Updatetime'                         => '更新时间',
-    'Weigh'                              => '权重',
+    'Pid'                                => 'Parent ID',
+    'Type'                               => 'Type',
+    'All'                                => 'All',
+    'Image'                              => 'Image',
+    'Keywords'                           => 'Keywords',
+    'Description'                        => 'Description',
+    'Diyname'                            => 'Diy name',
+    'Createtime'                         => 'Create time',
+    'Updatetime'                         => 'Update time',
+    'Weigh'                              => 'Weigh',
     'Category warmtips'                  => '温馨提示:栏目类型请前往<b>常规管理</b>-><b>系统配置</b>-><b>字典配置</b>中进行管理',
-    'Can not change the parent to child or itself' => '父组别不能是它的子组别或它自己',
-    'Status'                             => '状态'
+    'Can not change the parent to child or itself' => 'Can not change the parent to child or itself',
+    'Status'                             => 'Status'
 ];

+ 20 - 20
application/admin/lang/en/coach.php

@@ -2,21 +2,21 @@
 
 return [
     'Id'             => 'id',
-    'Username'       => '用户名',
-    'Nickname'       => '昵称',
-    'Tag_ids'        => '课程标签',
-    'Desc'           => '个人简介',
-    'Firstname'      => '',
-    'Lastname'       => '',
-    'Password'       => '密码',
-    'Salt'           => '密码盐',
-    'Email'          => '电子邮箱',
-    'Mobile'         => '手机号',
-    'Simplemobile'   => '短手机号',
-    'Avatar'         => '头像',
-    'Gender'         => '性别',
-    'Gender 1'       => '',
-    'Gender 0'       => '',
+    'Username'       => 'Username',
+    'Nickname'       => 'Nickname',
+    'Tag_ids'        => 'Tags',
+    'Desc'           => 'Desc',
+    'Firstname'      => 'Firstname',
+    'Lastname'       => 'Lastname',
+    'Password'       => 'Password',
+    'Salt'           => 'Salt',
+    'Email'          => 'Email',
+    'Mobile'         => 'Mobile',
+    'Simplemobile'   => 'Simple mobile',
+    'Avatar'         => 'Avatar',
+    'Gender'         => 'Gender',
+    'Gender 1'       => 'boy',
+    'Gender 0'       => 'girl',
     'Successions'    => '连续登录天数',
     'Maxsuccessions' => '最大连续登录天数',
     'Prevtime'       => '上次登录时间',
@@ -25,12 +25,12 @@ return [
     'Loginfailure'   => '失败次数',
     'Joinip'         => '加入IP',
     'Jointime'       => '加入时间',
-    'Createtime'     => '创建时间',
-    'Updatetime'     => '更新时间',
+    'Createtime'     => 'Create time',
+    'Updatetime'     => 'Update time',
     'Token'          => 'Token',
-    'Status'         => '状态',
-    'Status 0'       => '禁用',
-    'Status 1'       => '正常',
+    'Status'         => 'Status',
+    'Status 0'       => 'Off',
+    'Status 1'       => 'On',
     'Tag.name'       => '标签名',
     'Tag.name_en'    => '标签名(en)'
 ];

+ 2 - 2
application/admin/lang/en/coachtag.php

@@ -2,6 +2,6 @@
 
 return [
     'Id'      => 'id',
-    'Name'    => '标签名',
-    'Name_en' => '标签名(en)'
+    'Name'    => 'Name',
+    'Name_en' => 'Name(en)'
 ];

+ 14 - 14
application/admin/lang/en/companyapply.php

@@ -2,20 +2,20 @@
 
 return [
     'Id'             => 'id',
-    'User_id'        => '用户id',
-    'Name'           => '姓名',
-    'Mobile'         => '手机号',
-    'Email'          => '电子邮箱',
-    'Company_name'   => '公司名称',
-    'Company_type'   => '公司类型',
-    'Remark'         => '定制信息',
-    'Createtime'     => '创建时间',
-    'Updatetime'     => '更新时间',
-    'Status'         => '标记状态',
-    'Status 0'       => '待处理',
-    'Status 1'       => '已处理',
-    'Audittime'      => '处理时间',
-    'Auditremark'    => '处理备注',
+    'User_id'        => 'user id',
+    'Name'           => 'Name',
+    'Mobile'         => 'Mobile',
+    'Email'          => 'Email',
+    'Company_name'   => 'Company name',
+    'Company_type'   => 'Company type',
+    'Remark'         => 'Remark',
+    'Createtime'     => 'Create time',
+    'Updatetime'     => 'Update time',
+    'Status'         => 'Status',
+    'Status 0'       => 'pending',
+    'Status 1'       => 'processed',
+    'Audittime'      => 'processing time',
+    'Auditremark'    => 'processing remarks',
     'User.firstname' => '名',
     'User.lastname'  => '姓'
 ];

+ 14 - 14
application/admin/lang/en/lesson.php

@@ -2,18 +2,18 @@
 
 return [
     'Id'            => 'id',
-    'Name'          => '标题',
-    'Name_en'       => '标题(en)',
-    'Image'         => '主图',
-    'Price'         => '价格',
-    'Oldprice'      => '原价格',
-    'Content'       => '信息内容',
-    'Content_en'    => '信息内容(en)',
-    'Lessoncate_id' => '课程分类id',
-    'Is_show'       => '是否显示',
-    'Is_show 1'     => '上架',
-    'Is_show 0'     => '下架',
-    'Weigh'         => '排序',
-    'Cate.name'     => '课程分类',
-    'Cate.name_en'  => '课程分类en'
+    'Name'          => 'Name',
+    'Name_en'       => 'Name(en)',
+    'Image'         => 'Image',
+    'Price'         => 'Price',
+    'Oldprice'      => 'Old price',
+    'Content'       => 'Content',
+    'Content_en'    => 'Content(en)',
+    'Lessoncate_id' => 'Lesson cate',
+    'Is_show'       => 'Is show',
+    'Is_show 1'     => 'up',
+    'Is_show 0'     => 'down',
+    'Weigh'         => 'Weigh',
+    'Cate.name'     => 'Cate name',
+    'Cate.name_en'  => 'Cate name(en)'
 ];

+ 2 - 2
application/admin/lang/en/lessoncate.php

@@ -2,6 +2,6 @@
 
 return [
     'Id'      => 'id',
-    'Name'    => '课程分类',
-    'Name_en' => '课程分类en'
+    'Name'    => 'Name',
+    'Name_en' => 'Name(en)'
 ];

+ 32 - 32
application/admin/lang/en/lessonorder.php

@@ -2,36 +2,36 @@
 
 return [
     'Id'               => 'id',
-    'Order_no'         => '订单号',
-    'User_id'          => '用户id',
-    'Slot_id'          => '日程表id',
-    'Lesson_id'        => '课程id',
-    'Order_amount'     => '订单金额',
-    'Order_status'     => '状态',
-    'Order_status 0'   => '待支付',
-    'Order_status 10'  => '已支付',
-    'Order_status 20'  => '已点名',
-    'Order_status 30'  => '已取消',
-    'Order_status 40'  => '已退课',
-    'Paytype'          => '支付类型',
-    'Paytype 1'        => '课程套餐',
-    'Paytype 2'        => '线上付款',
-    'Paytype 3'        => '购买套餐中',
-    'Paytime'          => '在线支付时间',
-    'Createtime'       => '创建时间',
-    'Updatetime'       => '更新时间',
-    'Finishtime'       => '点名时间',
-    'Usernumber'       => '预约人数',
-    'Usernumber_sign'  => '签到人数',
-    'Userremark'       => '参与者信息备注',
-    'Package_order_id' => '套餐订单id',
-    'Package_remark'   => '套餐第几课时',
-    'Cancel_reason'    => '取消原因',
-    'Cancel_time'      => '取消时间',
-    'User.firstname'   => '',
-    'User.lastname'    => '',
-    'Slot.starttime'   => '开始时间',
-    'Slot.endtime'     => '结束时间',
-    'Lesson.name'      => '课程标题',
-    'Lesson.name_en'   => '课程标题(en)'
+    'Order_no'         => 'Order no',
+    'User_id'          => 'User id',
+    'Slot_id'          => 'Slot id',
+    'Lesson_id'        => 'Lesson id',
+    'Order_amount'     => 'Order amount',
+    'Order_status'     => 'Order status',
+    'Order_status 0'   => 'unpaid',
+    'Order_status 10'  => 'have paid',
+    'Order_status 20'  => 'signed',
+    'Order_status 30'  => 'canceled',
+    'Order_status 40'  => 'returned',
+    'Paytype'          => 'Pay type',
+    'Paytype 1'        => 'package',
+    'Paytype 2'        => 'Online payment',
+    'Paytype 3'        => 'Purchase package',
+    'Paytime'          => 'Pay time',
+    'Createtime'       => 'Create time',
+    'Updatetime'       => 'Update time',
+    'Finishtime'       => 'sign time',
+    'Usernumber'       => 'Reservation number',
+    'Usernumber_sign'  => 'Number of sign-ups',
+    'Userremark'       => 'User remark',
+    'Package_order_id' => 'Package order id',
+    'Package_remark'   => 'Package remark',
+    'Cancel_reason'    => 'Cancel reason',
+    'Cancel_time'      => 'Cancel time',
+    'User.firstname'   => 'firstname',
+    'User.lastname'    => 'lastname',
+    'Slot.starttime'   => 'start time',
+    'Slot.endtime'     => 'end time',
+    'Lesson.name'      => 'Lesson name',
+    'Lesson.name_en'   => 'Lesson name(en)'
 ];

+ 23 - 23
application/admin/lang/en/lessonpackage.php

@@ -2,27 +2,27 @@
 
 return [
     'Id'              => 'id',
-    'Image'           => '图片',
-    'Name'            => '套餐标题',
-    'Name_en'         => '套餐标题(en)',
-    'Lesson_ids'      => '课程ids',
-    'Sessions'        => '课程数量',
-    'Validity'        => '显示有效期',
-    'Validity_en'     => '显示有效期(en)',
-    'Days'            => '实际有效天数',
-    'Price'           => '价格',
-    'Activeremark'    => '显示活动备注',
-    'Activeremark_en' => '显示活动备注(en)',
-    'Gift_lesson_id'  => '赠送课程id',
-    'Gift_sessions'   => '赠送课程数量',
-    'Is_show'         => '是否上架',
-    'Is_show 1'       => '上架',
-    'Is_show 0'       => '下架',
-    'Weigh'           => '排序',
-    'Content'         => '套餐介绍',
-    'Content_en'      => '套餐介绍en',
-    'Lessona.name'     => '课程标题',
-    'Lessona.name_en'  => '课程标题(en)',
-    'Lessonb.name'     => '赠送课程标题',
-    'Lessonb.name_en'  => '赠送课程标题(en)'
+    'Image'           => 'Image',
+    'Name'            => 'Name',
+    'Name_en'         => 'Name(en)',
+    'Lesson_ids'      => 'Lesson ids',
+    'Sessions'        => 'Sessions',
+    'Validity'        => 'Validity',
+    'Validity_en'     => 'Validity(en)',
+    'Days'            => 'Days',
+    'Price'           => 'Price',
+    'Activeremark'    => 'Active remark',
+    'Activeremark_en' => 'Active remark(en)',
+    'Gift_lesson_id'  => 'Gift lesson id',
+    'Gift_sessions'   => 'Gift sessions',
+    'Is_show'         => 'Is show',
+    'Is_show 1'       => 'On',
+    'Is_show 0'       => 'Off',
+    'Weigh'           => 'Weigh',
+    'Content'         => 'Content',
+    'Content_en'      => 'Content(en)',
+    'Lessona.name'     => 'Lesson name',
+    'Lessona.name_en'  => 'Lesson name(en)',
+    'Lessonb.name'     => 'Gift Lesson name',
+    'Lessonb.name_en'  => 'Gift Lesson name(en)'
 ];

+ 22 - 22
application/admin/lang/en/lessonslot.php

@@ -2,26 +2,26 @@
 
 return [
     'Id'              => 'id',
-    'Starttime'       => '开始时间',
-    'Hours'           => '小时数',
-    'Endtime'         => '结束时间',
-    'Num_min'         => '最少人数(取消)',
-    'Num_max'         => '最多人数',
-    'Coach_ids'       => '选择教练',
-    'Lesson_id'       => '课程id',
-    'Address'         => '地址',
-    'Status'          => '状态',
-    'Status 0'        => '报名中',
-    'Status 20'       => '已点名',
-    'Status 30'       => '已取消',
-    'Remark'          => '备注说明',
-    'Notice_status'   => '计划任务',
-    'Notice_status 0' => '未通知',
-    'Notice_status 1' => '已通知',
-    'Finishtime'      => '点名时间',
-    'Cancel_reason'   => '取消原因',
-    'Cancel_time'     => '取消时间',
-    'Coach.nickname'  => '教练昵称',
-    'Lesson.name'     => '课程标题',
-    'Lesson.name_en'  => '课程标题(en)'
+    'Starttime'       => 'Start time',
+    'Hours'           => 'Hours',
+    'Endtime'         => 'End time',
+    'Num_min'         => 'Num min(cancel)',
+    'Num_max'         => 'Num max',
+    'Coach_ids'       => 'Coach ids',
+    'Lesson_id'       => 'Lesson id',
+    'Address'         => 'Address',
+    'Status'          => 'Status',
+    'Status 0'        => 'Signing up',
+    'Status 20'       => 'Signed in',
+    'Status 30'       => 'canceled',
+    'Remark'          => 'Remark',
+    'Notice_status'   => 'Planned task',
+    'Notice_status 0' => 'Failure to advise',
+    'Notice_status 1' => 'Have notified',
+    'Finishtime'      => 'Signed time',
+    'Cancel_reason'   => 'Cancel reason',
+    'Cancel_time'     => 'Cancel time',
+    'Coach.nickname'  => 'Coach nickname',
+    'Lesson.name'     => 'Lesson name',
+    'Lesson.name_en'  => 'Lesson name(en)'
 ];

+ 12 - 12
application/admin/lang/en/messagesys.php

@@ -2,16 +2,16 @@
 
 return [
     'Id'         => 'ID',
-    'Title'      => '消息标题',
-    'Title_en'   => '消息标题(en)',
-    'Info'       => '消息内容',
-    'Info_en'    => '消息内容(en)',
-    'Createtime' => '创建时间',
-    'Is_index'   => '放到首页',
-    'Is_index 0' => '',
-    'Is_index 1' => '',
-    'Is_show'    => '是否显示',
-    'Is_show 1'  => '上架',
-    'Is_show 0'  => '下架',
-    'Weigh'      => '排序'
+    'Title'      => 'Title',
+    'Title_en'   => 'Title(en)',
+    'Info'       => 'Info',
+    'Info_en'    => 'Info(en)',
+    'Createtime' => 'Create time',
+    'Is_index'   => 'Place to home',
+    'Is_index 0' => 'no',
+    'Is_index 1' => 'yes',
+    'Is_show'    => 'Is show',
+    'Is_show 1'  => 'On',
+    'Is_show 0'  => 'Off',
+    'Weigh'      => 'Weigh'
 ];

+ 21 - 21
application/admin/lang/en/orderrefund.php

@@ -2,25 +2,25 @@
 
 return [
     'Id'             => 'id',
-    'User_id'        => '用户id',
-    'Name'           => '姓名',
-    'Mobile'         => '手机号',
-    'Email'          => '电子邮箱',
-    'Order_table'    => '预约类型',
-    'Order_table 1'  => '售课',
-    'Order_table 2'  => '试课',
-    'Order_id'       => '预约单id',
-    'Order_no'       => '订单号',
-    'Reason_files'   => '医疗文件或支持文件',
-    'Remark'         => '其他备注信息',
-    'Createtime'     => '创建时间',
-    'Updatetime'     => '更新时间',
-    'Status'         => '状态',
-    'Status 0'       => '待审核',
-    'Status 1'       => '审核通过',
-    'Status 2'       => '审核驳回',
-    'Audittime'      => '审核时间',
-    'Auditremark'    => '审核备注',
-    'User.firstname' => '',
-    'User.lastname'  => ''
+    'User_id'        => 'User id',
+    'Name'           => 'Name',
+    'Mobile'         => 'Mobile',
+    'Email'          => 'Email',
+    'Order_table'    => 'Order table',
+    'Order_table 1'  => 'Sale of lessons',
+    'Order_table 2'  => 'Trial lesson',
+    'Order_id'       => 'Order id',
+    'Order_no'       => 'Order no',
+    'Reason_files'   => 'Medical documents or supporting documents',
+    'Remark'         => 'Remark',
+    'Createtime'     => 'Create time',
+    'Updatetime'     => 'Update time',
+    'Status'         => 'Status',
+    'Status 0'       => 'pending',
+    'Status 1'       => 'pass',
+    'Status 2'       => 'reject',
+    'Audittime'      => 'Audit time',
+    'Auditremark'    => 'Audit remark',
+    'User.firstname' => 'firstname',
+    'User.lastname'  => 'lastname'
 ];

+ 19 - 18
application/admin/lang/en/packagedelay.php

@@ -2,22 +2,23 @@
 
 return [
     'Id'               => 'id',
-    'User_id'          => '用户id',
-    'Name'             => '姓名',
-    'Mobile'           => '手机号',
-    'Email'            => '电子邮箱',
-    'Package_order_id' => '套餐订单id',
-    'Delay_week'       => '延长几周',
-    'Reason'           => '原因',
-    'Reason_files'     => '医疗文件或支持文件',
-    'Remark'           => '其他备注信息',
-    'Createtime'       => '创建时间',
-    'Updatetime'       => '更新时间',
-    'Status'           => '状态',
-    'Status 0'         => '待审核',
-    'Status 1'         => '审核通过',
-    'Status 2'         => '审核驳回',
-    'Audittime'        => '审核时间',
-    'Auditremark'      => '审核备注',
-    'Order.order_no'   => '套餐订单号'
+    'User_id'          => 'User id',
+    'Name'             => 'Name',
+    'Mobile'           => 'Mobile',
+    'Email'            => 'Email',
+    'Package_order_id' => 'Package order id',
+    'Delay_week'       => 'Delay week',
+    'Reason'           => 'Reason',
+    'Reason_files'     => 'Reason files',
+    'Remark'           => 'Remark',
+    'Createtime'       => 'Create time',
+    'Updatetime'       => 'Update time',
+    'Status'           => 'Status',
+    'Status'           => 'Status',
+    'Status 0'         => 'pending',
+    'Status 1'         => 'pass',
+    'Status 2'         => 'reject',
+    'Audittime'        => 'Audit time',
+    'Auditremark'      => 'Audit remark',
+    'Order.order_no'   => 'order no'
 ];

+ 26 - 26
application/admin/lang/en/packagemove.php

@@ -2,30 +2,30 @@
 
 return [
     'Id'               => 'id',
-    'User_id'          => '用户id',
-    'Name'             => '姓名',
-    'Mobile'           => '手机号',
-    'Email'            => '电子邮箱',
-    'Reason'           => '原因',
-    'Reason_files'     => '医疗文件或支持文件',
-    'Package_order_id' => '套餐订单id',
-    'Sessions'         => '转让几节课',
-    'To_name'          => '要转让给谁(姓名)',
-    'To_mobile'        => '要转让给谁(联系号码)',
-    'To_email'         => '要转让给谁(电邮地址)',
-    'To_user_id'       => '要转让给谁(用户id)',
-    'Remark'           => '其他备注信息',
-    'Createtime'       => '创建时间',
-    'Updatetime'       => '更新时间',
-    'Status'           => '状态',
-    'Status 0'         => '待审核',
-    'Status 1'         => '审核通过',
-    'Status 2'         => '审核驳回',
-    'Audittime'        => '审核时间',
-    'Auditremark'      => '审核备注',
-    'Usera.firstname'   => '',
-    'Usera.lastname'    => '',
-    'Order.order_no'   => '订单号',
-    'Userb.firstname'   => '',
-    'Userb.lastname'    => ''
+    'User_id'          => 'User id',
+    'Name'             => 'Name',
+    'Mobile'           => 'Mobile',
+    'Email'            => 'Email',
+    'Reason'           => 'Reason',
+    'Reason_files'     => 'Reason files',
+    'Package_order_id' => 'Package order id',
+    'Sessions'         => 'Transfer a few lessons',
+    'To_name'          => 'To user name(姓名)',
+    'To_mobile'        => 'To mobile(联系号码)',
+    'To_email'         => 'To email(电邮地址)',
+    'To_user_id'       => 'To user id(用户id)',
+    'Remark'           => 'Remark',
+    'Createtime'       => 'Create time',
+    'Updatetime'       => 'Update time',
+    'Status'           => 'Status',
+    'Status 0'         => 'pending',
+    'Status 1'         => 'pass',
+    'Status 2'         => 'reject',
+    'Audittime'        => 'Audit time',
+    'Auditremark'      => 'Audit remark',
+    'Usera.firstname'   => 'firstname',
+    'Usera.lastname'    => 'lastname',
+    'Order.order_no'   => 'order no',
+    'Userb.firstname'   => 'firstname',
+    'Userb.lastname'    => 'lastname'
 ];

+ 24 - 24
application/admin/lang/en/packageorder.php

@@ -2,33 +2,33 @@
 
 return [
     'Id'              => 'id',
-    'Order_no'        => '订单号',
-    'User_id'         => '用户id',
-    'Package_id'      => '套餐id',
-    'Lesson_ids'      => '课程ids',
-    'Sessions'        => '共计获得课程数量',
-    'Starttime'       => '开始时间',
-    'Days'            => '实际有效天数',
-    'Endtime'         => '到期时间',
-    'Price'           => '价格',
-    'Remain'          => '剩余课程数量',
-    'Order_status'    => '状态',
-    'Order_status 0'  => '待支付',
-    'Order_status 1'  => '已支付',
-    'Paytime'         => '支付时间',
-    'Createtime'      => '创建时间',
-    'Updatetime'      => '更新时间',
-    'Is_gift'         => '是否赠品',
-    'Is_gift 0'       => '',
-    'Is_gift 1'       => '',
+    'Order_no'        => 'Order no',
+    'User_id'         => 'User id',
+    'Package_id'      => 'Package id',
+    'Lesson_ids'      => 'Lesson ids',
+    'Sessions'        => 'Sessions',
+    'Starttime'       => 'Start time',
+    'Days'            => 'Days',
+    'Endtime'         => 'End time',
+    'Price'           => 'Price',
+    'Remain'          => 'Remain',
+    'Order_status'    => 'Order status',
+    'Order_status 0'  => 'unpaid',
+    'Order_status 1'  => 'have paid',
+    'Paytime'         => 'Pay time',
+    'Createtime'      => 'Create time',
+    'Updatetime'      => 'Update time',
+    'Is_gift'         => 'Is gift',
+    'Is_gift 0'       => 'no',
+    'Is_gift 1'       => 'yes',
     'Notice_status'   => '计划任务',
     'Notice_status 0' => '未通知',
     'Notice_status 1' => '一月通知',
     'Notice_status 2' => '两周通知',
     'Notice_status 3' => '一周通知',
-    'Remark'          => '备注',
-    'User.firstname'  => '',
-    'User.lastname'   => '',
-    'Package.name'    => '套餐标题',
-    'Package.name_en' => '套餐标题(en)'
+    'Remark'          => 'Remark',
+    'User.firstname'  => 'firstname',
+    'User.lastname'   => 'lastname',
+    'Package.name'    => 'Package name',
+    'Package.name_en' => 'Package name(en)'
 ];

+ 14 - 14
application/admin/lang/en/trylesson.php

@@ -2,18 +2,18 @@
 
 return [
     'Id'            => 'id',
-    'Name'          => '标题',
-    'Name_en'       => '标题(en)',
-    'Image'         => '主图',
-    'Price'         => '价格',
-    'Oldprice'      => '原价格',
-    'Content'       => '信息内容',
-    'Content_en'    => '信息内容(en)',
-    'Lessoncate_id' => '课程分类id',
-    'Is_show'       => '是否显示',
-    'Is_show 1'     => '上架',
-    'Is_show 0'     => '下架',
-    'Weigh'         => '排序',
-    'Cate.name'     => '课程分类',
-    'Cate.name_en'  => '课程分类en'
+    'Name'          => 'Name',
+    'Name_en'       => 'Name(en)',
+    'Image'         => 'Image',
+    'Price'         => 'Price',
+    'Oldprice'      => 'Old price',
+    'Content'       => 'Content',
+    'Content_en'    => 'Content(en)',
+    'Lessoncate_id' => 'Lesson cate id',
+    'Is_show'       => 'Is show',
+    'Is_show 1'     => 'up',
+    'Is_show 0'     => 'down',
+    'Weigh'         => 'Weigh',
+    'Cate.name'     => 'Cate name',
+    'Cate.name_en'  => 'Cate name(en)'
 ];

+ 31 - 31
application/admin/lang/en/trylessonorder.php

@@ -2,35 +2,35 @@
 
 return [
     'Id'                => 'id',
-    'Order_no'          => '订单号',
-    'User_id'           => '用户id',
-    'Trylesson_id'      => '课程id',
-    'Order_amount'      => '订单金额',
-    'Order_status'      => '状态',
-    'Order_status 0'    => '待支付',
-    'Order_status 10'   => '已支付',
-    'Order_status 20'   => '已点名',
-    'Order_status 30'   => '已取消',
-    'Order_status 40'   => '已退课',
-    'Paytime'           => '支付时间',
-    'Firstname'         => '',
-    'Lastname'          => '',
-    'Mobile'            => '手机号',
-    'Email'             => '电子邮箱',
-    'Height'            => '身高',
-    'Age'               => '年龄',
-    'Weight'            => '体重',
-    'Address'           => '联系地址',
-    'Health'            => '健康状况声明',
-    'Emergency'         => '紧急联系人姓名和联系号码',
-    'Comefrom'          => '如何知道我们',
-    'Is_first'          => '是否上过课',
-    'Is_first 0'        => '',
-    'Is_first 1'        => '',
-    'Createtime'        => '创建时间',
-    'Updatetime'        => '更新时间',
-    'User.firstname'    => '',
-    'User.lastname'     => '',
-    'Trylesson.name'    => '标题',
-    'Trylesson.name_en' => '标题(en)'
+    'Order_no'          => 'Order no',
+    'User_id'           => 'User id',
+    'Trylesson_id'      => 'Try lesson id',
+    'Order_amount'      => 'Order amount',
+    'Order_status'      => 'Order status',
+    'Order_status 0'    => 'unpaid',
+    'Order_status 10'   => 'have paid',
+    'Order_status 20'   => 'signed in',
+    'Order_status 30'   => 'canceled',
+    'Order_status 40'   => 'returned',
+    'Paytime'           => 'Pay time',
+    'Firstname'         => 'Firstname',
+    'Lastname'          => 'Lastname',
+    'Mobile'            => 'Mobile',
+    'Email'             => 'Email',
+    'Height'            => 'Height',
+    'Age'               => 'Age',
+    'Weight'            => 'Weight',
+    'Address'           => 'Address',
+    'Health'            => 'Health',
+    'Emergency'         => 'Emergency',
+    'Comefrom'          => 'Come from',
+    'Is_first'          => 'Is first',
+    'Is_first 0'        => 'no',
+    'Is_first 1'        => 'yes',
+    'Createtime'        => 'Create time',
+    'Updatetime'        => 'Update time',
+    'User.firstname'    => 'firstname',
+    'User.lastname'     => 'lastname',
+    'Trylesson.name'    => 'Try lesson name',
+    'Trylesson.name_en' => 'Try lesson name(en)'
 ];

+ 2 - 2
application/admin/lang/en/user/user.php

@@ -28,8 +28,8 @@ return [
     'Updatetime'        => 'Update time',
     'Token'             => 'Token',
     'Status'            => 'Status',
-    'Status 0'          => '禁用',
-    'Status 1'          => '正常',
+    'Status 0'          => 'Off',
+    'Status 1'          => 'On',
     'Verification'      => 'Verification',
     'Height'            => 'Height',
     'Age'               => 'Age',