Skip to content

Commit

Permalink
chore: fix examples merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
yujingali committed Aug 24, 2023
2 parents d466e44 + 290e68e commit c0eeea1
Show file tree
Hide file tree
Showing 15 changed files with 212 additions and 9 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
## Changelog

### 2.15.14

*2023-08-24*

#### Bug fixes
- Img
- Delete referrerpolicy prop (#22651 by @xinguanhua)
#### Optimization
- Docs
- Update readme and website example links (#22642 by @lyfeyaj)
- Update popper links (#22539 by @brizer)
- I18n
- Update translation of Spanish (#22430 by @jcardus)
- Add sr-Latn translation (#22567 by @N-M)
- Update Uzbek translation (#22390 by @akahon)
- Statistics
- Fix doc; Optimized code (#22384 by @webvs2)
- Table
- Add highlight selection row (#22382 by @wangdaodao)

### 2.15.13

*2023-02-12*
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.es.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
## Changelog

### 2.15.14

*2023-08-24*

#### Bug fixes
- Img
- Delete referrerpolicy prop (#22651 by @xinguanhua)
#### Optimization
- Docs
- Update readme and website example links (#22642 by @lyfeyaj)
- Update popper links (#22539 by @brizer)
- I18n
- Update translation of Spanish (#22430 by @jcardus)
- Add sr-Latn translation (#22567 by @N-M)
- Update Uzbek translation (#22390 by @akahon)
- Statistics
- Fix doc; Optimized code (#22384 by @webvs2)
- Table
- Add highlight selection row (#22382 by @wangdaodao)

### 2.15.13

*2023-02-12*
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.fr-FR.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
## Changelog

### 2.15.14

*2023-08-24*

#### Bug fixes
- Img
- Delete referrerpolicy prop (#22651 by @xinguanhua)
#### Optimization
- Docs
- Update readme and website example links (#22642 by @lyfeyaj)
- Update popper links (#22539 by @brizer)
- I18n
- Update translation of Spanish (#22430 by @jcardus)
- Add sr-Latn translation (#22567 by @N-M)
- Update Uzbek translation (#22390 by @akahon)
- Statistics
- Fix doc; Optimized code (#22384 by @webvs2)
- Table
- Add highlight selection row (#22382 by @wangdaodao)

### 2.15.13

*2023-02-12*
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
## 更新日志

### 2.15.14

*2023-08-24*

#### Bug 修复
- Img
- 删除 referrerpolicy 属性 (#22651 by @xinguanhua)
#### 优化
- Docs
- 更新 readme and website example links (#22642 by @lyfeyaj)
- 更新 popper 官方文档链接 (#22539 by @brizer)
- I18n
- 更新 西班牙语 翻译 (#22430 by @jcardus)
- 新增 塞尔维亚语(拉丁) 翻译 (#22567 by @N-M)
- 更新 乌兹别克语 翻译 (#22390 by @akahon)
- Statistics
- 文档更新; 代码优化 (#22384 by @webvs2)
- Table
- 增加高亮选中行属性 (#22382 by @wangdaodao)

### 2.15.13

*2023-02-12*
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/en-US/tooltip.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ Disabled form elements are not supported for Tooltip, more information can be fo
| offset | offset of the Tooltip | number || 0 |
| transition | animation name | string || el-fade-in-linear |
| visible-arrow | whether an arrow is displayed. For more information, check [Vue-popper](https://github.com/element-component/vue-popper) page | boolean || true |
| popper-options | [popper.js](https://popper.js.org/documentation.html) parameters | Object | refer to [popper.js](https://popper.js.org/documentation.html) doc | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| popper-options | [popper.js](https://popper.js.org/docs/v2/) parameters | Object | refer to [popper.js](https://popper.js.org/docs/v2/) doc | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| open-delay | delay of appearance, in millisecond | number || 0 |
| manual | whether to control Tooltip manually. `mouseenter` and `mouseleave` won't have effects if set to `true` | boolean || false |
| popper-class | custom class name for Tooltip's popper | string |||
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/es/tooltip.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ Es necesario envolver los elementos de forma deshabilitados en un elemento conte
| offset | offset del Tooltip | number || 0 |
| transition | nombre de animación | string || el-fade-in-linear |
| visible-arrow | si una flecha es mostrada. Para mayor información, revisar la página de [Vue-popper](https://github.com/element-component/vue-popper) | boolean || true |
| popper-options | parámetros de [popper.js](https://popper.js.org/documentation.html) | Object | referirse a la documentación de [popper.js](https://popper.js.org/documentation.html) | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| popper-options | parámetros de [popper.js](https://popper.js.org/docs/v2/) | Object | referirse a la documentación de [popper.js](https://popper.js.org/docs/v2/) | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| open-delay | retraso de la apariencia, en mili segundos | number || 0 |
| manual | si el Tooltipo será controlado de forma manual. `mouseenter` y `mouseleave` no tendrán efecto si fue establecido como `true` | boolean || false |
| popper-class | nombre de clase personalizada para el popper del Tooltip | string |||
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/fr-FR/tooltip.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ Les éléments de formulaire désactivés ne sont pas supportés par Tooltip, pl
| offset | Décalage du Tooltip. | number || 0 |
| transition | Animation de transition. | string || el-fade-in-linear |
| visible-arrow | Si une flèche doit être affichée. Pour plus d'information, voir [Vue-popper](https://github.com/element-component/vue-popper). | boolean || true |
| popper-options | Paramètres [popper.js](https://popper.js.org/documentation.html). | Object | Se référer à [popper.js](https://popper.js.org/documentation.html). | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| popper-options | Paramètres [popper.js](https://popper.js.org/docs/v2/). | Object | Se référer à [popper.js](https://popper.js.org/docs/v2/). | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| open-delay | Délai avant l'apparition en millisecondes. | number || 0 |
| manual | Si le contrôle du Tooltip doit être manuel. `mouseenter` et `mouseleave` n'auront pas d'effet si `true`. | boolean || false |
| popper-class | Classe du popper de Tooltip. | string |||
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/zh-CN/tooltip.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ tooltip 内不支持 disabled form 元素,参考[MDN](https://developer.mozill
| offset | 出现位置的偏移量 | Number || 0 |
| transition | 定义渐变动画 | String || el-fade-in-linear |
| visible-arrow | 是否显示 Tooltip 箭头,更多参数可见[Vue-popper](https://github.com/element-component/vue-popper) | Boolean || true |
| popper-options | [popper.js](https://popper.js.org/documentation.html) 的参数 | Object | 参考 [popper.js](https://popper.js.org/documentation.html) 文档 | { boundariesElement: 'body', gpuAcceleration: false } |
| popper-options | [popper.js](https://popper.js.org/docs/v2/) 的参数 | Object | 参考 [popper.js](https://popper.js.org/docs/v2/) 文档 | { boundariesElement: 'body', gpuAcceleration: false } |
| open-delay | 延迟出现,单位毫秒 | Number || 0 |
| manual | 手动控制模式,设置为 true 后,mouseenter 和 mouseleave 事件将不会生效 | Boolean || false |
| popper-class | 为 Tooltip 的 popper 添加类名 | String |||
Expand Down
2 changes: 1 addition & 1 deletion examples/versions.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","2.13.2":"2.13","2.14.1":"2.14","2.15.13":"2.15"}
{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","2.13.2":"2.13","2.14.1":"2.14","2.15.14":"2.15"}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "element-ui",
"version": "2.15.13",
"version": "2.15.14",
"description": "A Component Library for Vue.js.",
"main": "lib/element-ui.common.js",
"files": [
Expand Down
1 change: 0 additions & 1 deletion packages/image/src/image-viewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
:key="url"
:src="currentImg"
:style="imgStyle"
referrerpolicy='no-referrer'
@load="handleImgLoad"
@error="handleImgError"
@mousedown="handleMouseDown">
Expand Down
2 changes: 1 addition & 1 deletion packages/theme-chalk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "element-theme-chalk",
"version": "2.15.13",
"version": "2.15.14",
"description": "Element component chalk theme.",
"main": "lib/index.css",
"style": "lib/index.css",
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ if (typeof window !== 'undefined' && window.Vue) {
}

export default {
version: '2.15.13',
version: '2.15.14',
locale: locale.use,
i18n: locale.i18n,
install,
Expand Down
123 changes: 123 additions & 0 deletions src/locale/lang/sr-Latn.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
export default {
el: {
colorpicker: {
confirm: 'OK',
clear: 'Poništi'
},
datepicker: {
now: 'Sad',
today: 'Danas',
cancel: 'Otkaži',
clear: 'Briši',
confirm: 'OK',
selectDate: 'Izaberi datum',
selectTime: 'Izaberi vreme',
startDate: 'Datum početka',
startTime: 'Vreme početka',
endDate: 'Datum završetka',
endTime: 'Vreme završetka',
prevYear: 'Prethodna godina',
nextYear: 'Sledeća godina',
prevMonth: 'Prethodni mesec',
nextMonth: 'Sledeći mesec',
year: 'godina',
month1: 'januar',
month2: 'februar',
month3: 'mart',
month4: 'april',
month5: 'maj',
month6: 'jun',
month7: 'jul',
month8: 'avgust',
month9: 'septembar',
month10: 'oktobar',
month11: 'novembar',
month12: 'decembar',
week: 'sedmica',
weeks: {
sun: 'Ned',
mon: 'Pon',
tue: 'Uto',
wed: 'Sre',
thu: 'Čet',
fri: 'Pet',
sat: 'Sub'
},
months: {
jan: 'jan',
feb: 'feb',
mar: 'mar',
apr: 'apr',
may: 'maj',
jun: 'jun',
jul: 'jul',
aug: 'avg',
sep: 'sep',
oct: 'okt',
nov: 'nov',
dec: 'dev'
}
},
select: {
loading: 'Učitavanje',
noMatch: 'Nema rezultata',
noData: 'Nema podataka',
placeholder: 'Izaberi'
},
cascader: {
noMatch: 'Nema rezultata',
loading: 'Učitavanje',
placeholder: 'Izaberi',
noData: 'Nema podataka'
},
pagination: {
goto: 'Idi na',
pagesize: '/strani',
total: 'Ukupno {total}',
pageClassifier: ''
},
messagebox: {
title: 'Poruka',
confirm: 'OK',
cancel: 'Otkaži',
error: 'Neisravan unos'
},
upload: {
deleteTip: 'pritisni BRIŠI da obrišeš',
delete: 'Briši',
preview: 'Vidi',
continue: 'Nastavi'
},
table: {
emptyText: 'Nema podataka',
confirmFilter: 'Potvrdi',
resetFilter: 'Resetuj',
clearFilter: 'Sve',
sumText: 'Zbir'
},
tree: {
emptyText: 'Nema podataka'
},
transfer: {
noMatch: 'Nema rezultata',
noData: 'Nema podataka',
titles: ['Lista 1', 'Lista 2'],
filterPlaceholder: 'Unesi ključnu reč',
noCheckedFormat: '{total} stavki',
hasCheckedFormat: '{checked}/{total} obeleženih'
},
image: {
error: 'NEUSPEŠNO'
},
pageHeader: {
title: 'Nazad'
},
popconfirm: {
confirmButtonText: 'Da',
cancelButtonText: 'Ne'
},
empty: {
description: 'Nema podataka'
}
}
};
1 change: 1 addition & 0 deletions temp_web/element
Submodule element added at 2a8ac9

0 comments on commit c0eeea1

Please sign in to comment.