Skip to content

Commit

Permalink
Merge branch 'main' into type-experiment-467
Browse files Browse the repository at this point in the history
  • Loading branch information
mister-ben committed Dec 10, 2024
2 parents 705df44 + 19ca3f2 commit 9813b5c
Show file tree
Hide file tree
Showing 13 changed files with 12,177 additions and 7,256 deletions.
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
<a name="8.21.1"></a>
## [8.21.1](https://github.com/videojs/video.js/compare/v8.21.0...v8.21.1) (2024-12-05)

### Chores

* **lang:** update zh-TW translations ([#8929](https://github.com/videojs/video.js/issues/8929)) ([b6cec4f](https://github.com/videojs/video.js/commit/b6cec4f)), closes [1000#0](https://github.com/1000/issues/0)
* update Occitan locale file ([#8927](https://github.com/videojs/video.js/issues/8927)) ([a0ca168](https://github.com/videojs/video.js/commit/a0ca168))

<a name="8.21.0"></a>
# [8.21.0](https://github.com/videojs/video.js/compare/v8.20.0...v8.21.0) (2024-12-05)

### Features

* Add option to disable seeking while scrubbing on mobile ([#8903](https://github.com/videojs/video.js/issues/8903)) ([57d6ab6](https://github.com/videojs/video.js/commit/57d6ab6))

### Bug Fixes

* update vhs version ([#8930](https://github.com/videojs/video.js/issues/8930)) ([f87a699](https://github.com/videojs/video.js/commit/f87a699))

### Chores

* update VHS version ([#8933](https://github.com/videojs/video.js/issues/8933)) ([a7ba9f2](https://github.com/videojs/video.js/commit/a7ba9f2))

<a name="8.20.0"></a>
# [8.20.0](https://github.com/videojs/video.js/compare/v8.19.2...v8.20.0) (2024-11-19)

### Chores

* Correct changelog for 8.19.2 ([#8918](https://github.com/videojs/video.js/issues/8918)) ([964c40e](https://github.com/videojs/video.js/commit/964c40e))
* **package:** Update [@videojs](https://github.com/videojs)/http-streaming to 3.16.0 ([#8921](https://github.com/videojs/video.js/issues/8921)) ([7420467](https://github.com/videojs/video.js/commit/7420467)), closes [1000#0](https://github.com/1000/issues/0)

<a name="8.19.2"></a>
## [8.19.2](https://github.com/videojs/video.js/compare/v8.19.1...v8.19.2) (2024-11-14)

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Video.js was started in the middle of 2010 and is now used on over ~~50,000~~ ~~
Thanks to the awesome folks over at [Fastly][fastly], there's a free, CDN hosted version of Video.js that anyone can use. Add these tags to your document's `<head>`:

```html
<link href="//vjs.zencdn.net/8.19.2/video-js.min.css" rel="stylesheet">
<script src="//vjs.zencdn.net/8.19.2/video.min.js"></script>
<link href="//vjs.zencdn.net/8.21.1/video-js.min.css" rel="stylesheet">
<script src="//vjs.zencdn.net/8.21.1/video.min.js"></script>
```

Alternatively, you can include Video.js by getting it from [npm](https://videojs.com/getting-started/#install-via-npm), downloading it from [GitHub releases](https://github.com/videojs/video.js/releases) or by including it via [unpkg](https://unpkg.com) or another JavaScript CDN, like CDNjs.
Expand All @@ -34,12 +34,12 @@ Alternatively, you can include Video.js by getting it from [npm](https://videojs
<script src="https://unpkg.com/video.js/dist/video.min.js"></script>

<!-- unpkg : use a specific version of Video.js (change the version numbers as necessary) -->
<link href="https://unpkg.com/video.js@8.19.2/dist/video-js.min.css" rel="stylesheet">
<script src="https://unpkg.com/video.js@8.19.2/dist/video.min.js"></script>
<link href="https://unpkg.com/video.js@8.21.1/dist/video-js.min.css" rel="stylesheet">
<script src="https://unpkg.com/video.js@8.21.1/dist/video.min.js"></script>

<!-- cdnjs : use a specific version of Video.js (change the version numbers as necessary) -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.19.2/video-js.min.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.19.2/video.min.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.1/video-js.min.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.1/video.min.js"></script>
```

Next, using Video.js is as simple as creating a `<video>` element, but with an additional `data-setup` attribute. At a minimum, this attribute must have a value of `'{}'`, but it can include any Video.js [options][options] - just make sure it contains valid JSON!
Expand Down
14 changes: 3 additions & 11 deletions docs/translations-needed.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This default value is hardcoded as a default to the localize method in the SeekB

| Language file | Missing translations |
| ----------------------- | ----------------------------------------------------------------------------------- |
| ar.json (Complete) | |
| ar.json (Complete) | |
| az.json (Complete) | |
| ba.json (missing 71) | Audio Player |
| | Video Player |
Expand Down Expand Up @@ -506,6 +506,7 @@ This default value is hardcoded as a default to the localize method in the SeekB
| | Text Background |
| | Caption Area Background |
| | Playing in Picture-in-Picture |
| mr.json (Complete) | |
| nb.json (Complete) | |
| nl.json (missing 1) | Playing in Picture-in-Picture |
| nn.json (missing 10) | Exit Picture-in-Picture |
Expand All @@ -527,15 +528,6 @@ This default value is hardcoded as a default to the localize method in the SeekB
| | Playing in Picture-in-Picture |
| | Skip backward {1} seconds |
| | Skip forward {1} seconds |
| np.json (missing 9) | Drop shadow |
| | No content |
| | Color |
| | Opacity |
| | Text Background |
| | Caption Area Background |
| | Playing in Picture-in-Picture |
| | Skip backward {1} seconds |
| | Skip forward {1} seconds |
| oc.json (missing 7) | Color |
| | Opacity |
| | Text Background |
Expand Down Expand Up @@ -790,6 +782,6 @@ This default value is hardcoded as a default to the localize method in the SeekB
| | Skip forward {1} seconds |
| zh-CN.json (missing 2) | Drop shadow |
| | Playing in Picture-in-Picture |
| zh-TW.json (missing 1) | Playing in Picture-in-Picture |
| zh-TW.json (Complete) | |

<!-- END langtable -->
9 changes: 8 additions & 1 deletion lang/oc.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,12 @@
"{1} is loading.": "{1} es a cargar.",
"Exit Picture-in-Picture": "Sortir de la vidèo incrustada",
"Picture-in-Picture": "Vidèo incrustada",
"No content": "Cap de contengut"
"No content": "Cap de contengut",
"Color": "Color",
"Opacity": "Opacitat",
"Text Background": "Rèireplan del tèxte",
"Caption Area Background": "Rèireplan de la zòna de la legenda",
"Playing in Picture-in-Picture": "Lectura en vidèo incrustada",
"Skip backward {1} seconds": "Avançar de {1} segondas",
"Skip forward {1} seconds": "Recular de {1} segondas"
}
3 changes: 1 addition & 2 deletions lang/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
"Progress": "進度",
"Fullscreen": "全螢幕",
"Exit Fullscreen": "退出全螢幕",
"Picture-in-Picture": "子母畫面",
"Exit Picture-in-Picture": "退出子母畫面",
"Mute": "靜音",
"Unmute": "開啟音效",
"Playback Rate": " 播放速率",
Expand Down Expand Up @@ -87,6 +85,7 @@
"progress bar timing: currentTime={1} duration={2}": "{1}/{2}",
"{1} is loading.": "{1} 正在載入。",
"Exit Picture-in-Picture": "離開子母畫面",
"Playing in Picture-in-Picture": "在子母畫面中播放",
"Picture-in-Picture": "子母畫面",
"No content": "沒有內容",
"Color": "顏色",
Expand Down
Loading

0 comments on commit 9813b5c

Please sign in to comment.