i18n: add English config (#685)

packages/date-picker/src/panel/date-range.vue

@@ -152,11 +152,11 @@
       },
 
       leftLabel() {
-        return this.date.getFullYear() + ' ' + this.$t('el.datepicker.year') + ' ' + (this.date.getMonth() + 1) + ' ' + this.$t('el.datepicker.month');
+        return this.date.getFullYear() + ' ' + this.$t('el.datepicker.year') + ' ' + this.$t(`el.datepicker.month${ this.date.getMonth() + 1 }`);
       },
 
       rightLabel() {
-        return this.rightDate.getFullYear() + ' ' + this.$t('el.datepicker.year') + ' ' + (this.rightDate.getMonth() + 1) + ' ' + this.$t('el.datepicker.month');
+        return this.rightDate.getFullYear() + ' ' + this.$t('el.datepicker.year') + ' ' + this.$t(`el.datepicker.month${ this.rightDate.getMonth() + 1 }`);
       },
 
       leftYear() {

packages/date-picker/src/panel/date.vue

@@ -64,7 +64,7 @@
               @click="showMonthPicker"
               v-show="currentView === 'date'"
               class="el-date-picker__header-label"
-              :class="{ active: currentView === 'month' }">{{ month + 1 }} {{$t('el.datepicker.month')}}</span>
+              :class="{ active: currentView === 'month' }">{{$t(`el.datepicker.month${ month + 1 }`)}}</span>
             <button
               type="button"
               @click="nextYear"

packages/message-box/src/main.js

@@ -1,5 +1,7 @@
-var CONFIRM_TEXT = '确定';
-var CANCEL_TEXT = '取消';
+import { $t } from 'element-ui/src/locale';
+
+var CONFIRM_TEXT = $t('el.messagebox.confirm');
+var CANCEL_TEXT = $t('el.messagebox.cancel');
 
 var defaults = {
   title: '提示',

packages/select/src/select.vue

@@ -57,7 +57,7 @@
         <ul class="el-select-dropdown__list" v-show="options.length > 0 && filteredOptionsCount > 0 && !loading">
           <slot></slot>
         </ul>
-        <p class="el-select-dropdown__nodata" v-if="emptyText">{{ emptyText }}</p>
+        <p class="el-select-dropdown__empty" v-if="emptyText">{{ emptyText }}</p>
       </el-select-menu>
     </transition>
   </div>
@@ -116,7 +116,7 @@
             this.voidRemoteQuery = false;
             return false;
           }
-          if (this.filteredOptionsCount === 0) {
+          if (this.filterable && this.filteredOptionsCount === 0) {
             return this.$t('el.select.noMatch');
           }
           if (this.options.length === 0) {

packages/theme-default/src/pagination.css

@@ -21,7 +21,10 @@
     }
 
     .el-select .el-input {
-      width: 100px;
+      width: 110px;
+      input {
+        padding-right: 25px;
+      }
     }
 
     button {

packages/theme-default/src/select-dropdown.css

@@ -35,11 +35,12 @@
     }
   }
 
-  @b select-dropdown__nodata {
+  @b select-dropdown__empty {
     padding: 10px 0;
     margin: 0;
     text-align: center;
     color: #999;
+    font-size: 14px;
   }
 
   @b select-dropdown__list {

src/locale/lang/en.js

@@ -1,62 +1,73 @@
 export default {
   el: {
     datepicker: {
-      now: 'now',
-      today: 'today',
-      cancel: 'cancel',
-      clear: 'clear',
-      confirm: 'confirm',
-      selectDate: 'selectDate',
-      selectTime: 'selectTime',
-      startDate: 'startDate',
-      startTime: 'startTime',
-      endDate: 'endDate',
-      endTime: 'endTime',
-      year: 'year',
-      month: 'month',
-      week: 'week',
+      now: 'Now',
+      today: 'Today',
+      cancel: 'Cancel',
+      // clear: 'Clear',
+      confirm: 'OK',
+      selectDate: 'Select date',
+      selectTime: 'Select time',
+      startDate: 'Start Date',
+      startTime: 'Start Time',
+      endDate: 'End Date',
+      endTime: 'End Time',
+      year: '',
+      month1: 'January',
+      month2: 'February',
+      month3: 'March',
+      month4: 'April',
+      month5: 'May',
+      month6: 'June',
+      month7: 'July',
+      month8: 'August',
+      month9: 'September',
+      month10: 'October',
+      month11: 'November',
+      month12: 'December',
+      // week: 'week',
       weeks: {
-        sun: 'sun',
-        mon: 'mon',
-        tue: 'tue',
-        wed: 'wed',
-        thu: 'thu',
-        fri: 'fri',
-        sat: 'sat'
+        sun: 'Sun',
+        mon: 'Mon',
+        tue: 'Tue',
+        wed: 'Wed',
+        thu: 'Thu',
+        fri: 'Fri',
+        sat: 'Sat'
       },
       months: {
-        jan: 'jan',
-        feb: 'feb',
-        mar: 'mar',
-        apr: 'apr',
-        may: 'may',
-        jun: 'jun',
-        jul: 'jul',
-        aug: 'aug',
-        sep: 'sep',
-        oct: 'oct',
-        nov: 'nov',
-        dec: 'dec'
+        jan: 'Jan',
+        feb: 'Feb',
+        mar: 'Mar',
+        apr: 'Apr',
+        may: 'May',
+        jun: 'Jun',
+        jul: 'Jul',
+        aug: 'Aug',
+        sep: 'Sep',
+        oct: 'Oct',
+        nov: 'Nov',
+        dec: 'Dec'
       }
     },
     select: {
-      loading: 'loading',
-      noMatch: 'noMatch',
-      noData: 'noData',
-      placeholder: 'placeholder'
+      loading: 'Loading',
+      noMatch: 'No matching data',
+      noData: 'No data',
+      placeholder: 'Select'
     },
     pagination: {
-      pagesize: 'pagesize/页'
+      pagesize: '/page'
     },
     messagebox: {
-      confirm: 'confirm',
-      cancel: 'cancel',
-      error: 'error!'
+      confirm: 'OK',
+      cancel: 'Cancel',
+      error: 'Illegal input'
     },
     upload: {
-      delete: 'delete',
-      preview: 'preview',
-      continue: 'continue'
+      delete: 'Delete',
+      preview: 'Preview',
+      continue: 'Continue'
     }
   }
 };

src/locale/lang/zh-cn.js

@@ -4,7 +4,7 @@ export default {
       now: '此刻',
       today: '今天',
       cancel: '取消',
-      clear: '清空',
+      // clear: '清空',
       confirm: '确定',
       selectDate: '选择日期',
       selectTime: '选择时间',
@@ -13,8 +13,19 @@ export default {
       endDate: '结束日期',
       endTime: '结束时间',
       year: '年',
-      month: '月',
-      week: '周次',
+      month1: '1 月',
+      month2: '2 月',
+      month3: '3 月',
+      month4: '4 月',
+      month5: '5 月',
+      month6: '6 月',
+      month7: '7 月',
+      month8: '8 月',
+      month9: '9 月',
+      month10: '10 月',
+      month11: '11 月',
+      month12: '12 月',
+      // week: '周次',
       weeks: {
         sun: '日',
         mon: '一',