Skip to content

Commit e416502

Browse files
committed
update naming
1 parent 595d86c commit e416502

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+142
-142
lines changed

examples/docs/en-US/popconfirm.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ You can customise Popconfirm like:
2424
```html
2525
<template>
2626
<el-popconfirm
27-
okText='OK'
28-
cancelText='No, Thanks'
27+
confirmButtonText='OK'
28+
cancelButtonText='No, Thanks'
2929
icon="el-icon-info"
3030
iconColor="red"
3131
title="Are you sure to delete this?"
@@ -40,10 +40,10 @@ You can customise Popconfirm like:
4040
| Attribute | Description | Type | Accepted Values | Default |
4141
|--------------------|----------------------------------------------------------|-------------------|-------------|--------|
4242
| title | Title | String |||
43-
| okText | OK button text | String |||
44-
| cancelText | Cancel button text | String |||
45-
| okType | OK button type | String || Primary |
46-
| cancelType | Cancel button type | String || Text |
43+
| confirmButtonText | Confirm button text | String |||
44+
| cancelButtonText | Cancel button text | String |||
45+
| confirmButtonType | Confirm button type | String || Primary |
46+
| cancelButtonType | Cancel button type | String || Text |
4747
| icon | Icon | String || el-icon-question |
4848
| iconColor | Icon color | String || #f90 |
4949
| hideIcon | is hide Icon | Boolean || false |

examples/docs/es/popconfirm.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ You can customise Popconfirm like:
2424
```html
2525
<template>
2626
<el-popconfirm
27-
okText='OK'
28-
cancelText='No, Thanks'
27+
confirmButtonText='OK'
28+
cancelButtonText='No, Thanks'
2929
icon="el-icon-info"
3030
iconColor="red"
3131
title="Are you sure to delete this?"
@@ -40,10 +40,10 @@ You can customise Popconfirm like:
4040
| Attribute | Description | Type | Accepted Values | Default |
4141
|--------------------|----------------------------------------------------------|-------------------|-------------|--------|
4242
| title | Title | String |||
43-
| okText | OK button text | String |||
44-
| cancelText | Cancel button text | String |||
45-
| okType | OK button type | String || Primary |
46-
| cancelType | Cancel button type | String || Text |
43+
| confirmButtonText | Confirm button text | String |||
44+
| cancelButtonText | Cancel button text | String |||
45+
| confirmButtonType | Confirm button type | String || Primary |
46+
| cancelButtonType | Cancel button type | String || Text |
4747
| icon | Icon | String || el-icon-question |
4848
| iconColor | Icon color | String || #f90 |
4949
| hideIcon | is hide Icon | Boolean || false |

examples/docs/fr-FR/popconfirm.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ You can customise Popconfirm like:
2424
```html
2525
<template>
2626
<el-popconfirm
27-
okText='OK'
28-
cancelText='No, Thanks'
27+
confirmButtonText='OK'
28+
cancelButtonText='No, Thanks'
2929
icon="el-icon-info"
3030
iconColor="red"
3131
title="Are you sure to delete this?"
@@ -40,10 +40,10 @@ You can customise Popconfirm like:
4040
| Attribute | Description | Type | Accepted Values | Default |
4141
|--------------------|----------------------------------------------------------|-------------------|-------------|--------|
4242
| title | Title | String |||
43-
| okText | OK button text | String |||
44-
| cancelText | Cancel button text | String |||
45-
| okType | OK button type | String || Primary |
46-
| cancelType | Cancel button type | String || Text |
43+
| confirmButtonText | Confirm button text | String |||
44+
| cancelButtonText | Cancel button text | String |||
45+
| confirmButtonType | Confirm button type | String || Primary |
46+
| cancelButtonType | Cancel button type | String || Text |
4747
| icon | Icon | String || el-icon-question |
4848
| iconColor | Icon color | String || #f90 |
4949
| hideIcon | is hide Icon | Boolean || false |

examples/docs/zh-CN/popconfirm.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Popconfirm 的属性与 Popover 很类似,因此对于重复属性,请参考
2424
```html
2525
<template>
2626
<el-popconfirm
27-
okText='好的'
28-
cancelText='不用了'
27+
confirmButtonText='好的'
28+
cancelButtonText='不用了'
2929
icon="el-icon-info"
3030
iconColor="red"
3131
title="这是一段内容确定删除吗?"
@@ -40,10 +40,10 @@ Popconfirm 的属性与 Popover 很类似,因此对于重复属性,请参考
4040
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
4141
|--------------------|----------------------------------------------------------|-------------------|-------------|--------|
4242
| title | 标题 | String |||
43-
| okText | 确认按钮文字 | String |||
44-
| cancelText | 取消按钮文字 | String |||
45-
| okType | 确认按钮类型 | String || Primary |
46-
| cancelType | 取消按钮类型 | String || Text |
43+
| confirmButtonText | 确认按钮文字 | String |||
44+
| cancelButtonText | 取消按钮文字 | String |||
45+
| confirmButtonType | 确认按钮类型 | String || Primary |
46+
| cancelButtonType | 取消按钮类型 | String || Text |
4747
| icon | Icon | String || el-icon-question |
4848
| iconColor | Icon 颜色 | String || #f90 |
4949
| hideIcon | 是否隐藏 Icon | Boolean || false |

packages/popconfirm/src/main.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
<div class="el-popconfirm__action">
1818
<el-button
1919
size="mini"
20-
:type="cancelType"
20+
:type="cancelButtonType"
2121
@click="cancel"
2222
>
23-
{{cancelText}}
23+
{{cancelButtonText}}
2424
</el-button>
2525
<el-button
2626
size="mini"
27-
:type="okType"
27+
:type="confirmButtonType"
2828
@click="confirm"
2929
>
30-
{{okText}}
30+
{{confirmButtonText}}
3131
</el-button>
3232
</div>
3333
</div>
@@ -46,19 +46,19 @@ export default {
4646
title: {
4747
type: String
4848
},
49-
okText: {
49+
confirmButtonText: {
5050
type: String,
51-
default: t('el.popconfirm.okText')
51+
default: t('el.popconfirm.confirmButtonText')
5252
},
53-
cancelText: {
53+
cancelButtonText: {
5454
type: String,
55-
default: t('el.popconfirm.cancelText')
55+
default: t('el.popconfirm.cancelButtonText')
5656
},
57-
okType: {
57+
confirmButtonType: {
5858
type: String,
5959
default: 'primary'
6060
},
61-
cancelType: {
61+
cancelButtonType: {
6262
type: String,
6363
default: 'text'
6464
},

src/locale/lang/af-ZA.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ export default {
113113
title: 'Back' // to be translated
114114
},
115115
popconfirm: {
116-
okText: 'Yes', // to be translated
117-
cancelText: 'No' // to be translated
116+
confirmButtonText: 'Yes', // to be translated
117+
cancelButtonText: 'No' // to be translated
118118
}
119119
}
120120
};

src/locale/lang/ar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ export default {
112112
title: 'عودة'
113113
},
114114
popconfirm: {
115-
okText: 'Yes', // to be translated
116-
cancelText: 'No' // to be translated
115+
confirmButtonText: 'Yes', // to be translated
116+
cancelButtonText: 'No' // to be translated
117117
}
118118
}
119119
};

src/locale/lang/bg.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ export default {
113113
title: 'Back' // to be translated
114114
},
115115
popconfirm: {
116-
okText: 'Yes', // to be translated
117-
cancelText: 'No' // to be translated
116+
confirmButtonText: 'Yes', // to be translated
117+
cancelButtonText: 'No' // to be translated
118118
}
119119
}
120120
};

src/locale/lang/ca.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ export default {
112112
title: 'Back' // to be translated
113113
},
114114
popconfirm: {
115-
okText: 'Yes', // to be translated
116-
cancelText: 'No' // to be translated
115+
confirmButtonText: 'Yes', // to be translated
116+
cancelButtonText: 'No' // to be translated
117117
}
118118
}
119119
};

src/locale/lang/cs-CZ.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ export default {
115115
title: 'Back' // to be translated
116116
},
117117
popconfirm: {
118-
okText: 'Yes', // to be translated
119-
cancelText: 'No' // to be translated
118+
confirmButtonText: 'Yes', // to be translated
119+
cancelButtonText: 'No' // to be translated
120120
}
121121
}
122122
};

0 commit comments

Comments
 (0)