Skip to content

Commit f10faae

Browse files
authored
Merge branch 'main' into fix/7821-sm-block-cards-same-height-issue
2 parents 30d0f53 + 33a61c7 commit f10faae

11 files changed

Lines changed: 75 additions & 19 deletions

File tree

packages/services/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.32.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-services@2.31.0...@carbon/ibmdotcom-services@2.32.0) (2025-09-18)
7+
8+
**Note:** Version bump only for package @carbon/ibmdotcom-services
9+
10+
11+
12+
13+
614
# [2.31.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-services@2.30.0...@carbon/ibmdotcom-services@2.31.0) (2025-09-04)
715

816
**Note:** Version bump only for package @carbon/ibmdotcom-services

packages/services/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/ibmdotcom-services",
33
"description": "Carbon for IBM.com Services",
4-
"version": "2.31.0",
4+
"version": "2.32.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -47,7 +47,7 @@
4747
},
4848
"dependencies": {
4949
"@babel/runtime": "^7.16.3",
50-
"@carbon/ibmdotcom-utilities": "2.31.0",
50+
"@carbon/ibmdotcom-utilities": "2.32.0",
5151
"@ibm/telemetry-js": "^1.5.0",
5252
"axios": "^1.6.8",
5353
"marked": "^4.0.10",

packages/styles/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.32.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-styles@2.31.0...@carbon/ibmdotcom-styles@2.32.0) (2025-09-18)
7+
8+
**Note:** Version bump only for package @carbon/ibmdotcom-styles
9+
10+
11+
12+
13+
614
# [2.31.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-styles@2.30.0...@carbon/ibmdotcom-styles@2.31.0) (2025-09-04)
715

816
**Note:** Version bump only for package @carbon/ibmdotcom-styles

packages/styles/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/ibmdotcom-styles",
33
"description": "Carbon for IBM.com Styles",
4-
"version": "2.31.0",
4+
"version": "2.32.0",
55
"license": "Apache-2.0",
66
"main": "dist/ibm-dotcom-styles.min.css",
77
"module": "src/scss",

packages/utilities/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.32.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-utilities@2.31.0...@carbon/ibmdotcom-utilities@2.32.0) (2025-09-18)
7+
8+
**Note:** Version bump only for package @carbon/ibmdotcom-utilities
9+
10+
11+
12+
13+
614
# [2.31.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-utilities@2.30.0...@carbon/ibmdotcom-utilities@2.31.0) (2025-09-04)
715

816
**Note:** Version bump only for package @carbon/ibmdotcom-utilities

packages/utilities/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/ibmdotcom-utilities",
33
"description": "Carbon for IBM.com Utilities",
4-
"version": "2.31.0",
4+
"version": "2.32.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",

packages/utilities/src/utilities/settings/settings.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
* @type {object} Settings object
1313
* @property {string} [stablePrefix=c4d] stable prefix
1414
* @property {string} [prefix=cds] core Carbon prefix
15-
* Carbon for IBM.com v2.31.0',
15+
* Carbon for IBM.com v2.32.0',
1616
*/
1717
const settings = {
18-
version: 'Carbon for IBM.com v2.31.0',
18+
version: 'Carbon for IBM.com v2.32.0',
1919
stablePrefix: 'c4d',
2020
prefix: 'cds',
2121
};

packages/web-components/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.32.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-web-components@2.31.0...@carbon/ibmdotcom-web-components@2.32.0) (2025-09-18)
7+
8+
9+
### Features
10+
11+
* **telemetry:** add wc scope ([#12303](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/12303)) ([7d1522f](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/7d1522f26ca5505edeafd8e9b222249f6deff7f1))
12+
13+
14+
15+
16+
617
# [2.31.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/ibmdotcom-web-components@2.30.0...@carbon/ibmdotcom-web-components@2.31.0) (2025-09-04)
718

819
**Note:** Version bump only for package @carbon/ibmdotcom-web-components

packages/web-components/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@carbon/ibmdotcom-web-components",
3-
"version": "2.31.0",
3+
"version": "2.32.0",
44
"description": "Carbon for IBM.com Web Components",
55
"license": "Apache-2.0",
66
"exports": {
@@ -93,9 +93,9 @@
9393
"cypress:verify": "cypress verify"
9494
},
9595
"dependencies": {
96-
"@carbon/ibmdotcom-services": "2.31.0",
97-
"@carbon/ibmdotcom-styles": "2.31.0",
98-
"@carbon/ibmdotcom-utilities": "2.31.0",
96+
"@carbon/ibmdotcom-services": "2.32.0",
97+
"@carbon/ibmdotcom-styles": "2.32.0",
98+
"@carbon/ibmdotcom-utilities": "2.32.0",
9999
"@carbon/layout": "11.27.0",
100100
"@carbon/motion": "11.24.0",
101101
"@carbon/styles": "1.65.0",

packages/web-components/src/components/video-player/video-player-container.ts

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import ConnectMixin from '../../globals/mixins/connect';
2929
import StableSelectorMixin from '../../globals/mixins/stable-selector';
3030
import C4DVideoPlayerComposite from './video-player-composite';
3131
import { carbonElement as customElement } from '@carbon/web-components/es/globals/decorators/carbon-element.js';
32+
import { LocaleAPI } from '@carbon/ibmdotcom-services/es/services/Locale/index';
3233

3334
const { stablePrefix: c4dPrefix } = settings;
3435

@@ -115,9 +116,18 @@ export const C4DVideoPlayerContainerMixin = <
115116
// Not using TypeScript `private` due to: microsoft/TypeScript#17744
116117
_requestsEmbedVideo: { [videoId: string]: Promise<any> } = {};
117118

119+
/**
120+
* Custom video name
121+
*/
118122
@property({ type: String, attribute: 'customvideoname' })
119123
customVideoName = '';
120124

125+
/**
126+
* Language code
127+
*/
128+
@property()
129+
lc = '';
130+
121131
/**
122132
* Sets the state that the API call for embedding the video for the given video ID is in progress.
123133
*
@@ -193,7 +203,14 @@ export const C4DVideoPlayerContainerMixin = <
193203
* <c4d-video-player-container customVideoName="overwritten media title here">...
194204
*
195205
*/
196-
const mediaTitle = this?.['customVideoName'] || this?.['caption'];
206+
207+
let mediaTitle: string;
208+
209+
if (this.lc.toLowerCase() === 'en') {
210+
mediaTitle = this?.['customVideoName'] || this?.['caption'];
211+
} else {
212+
mediaTitle = ' ';
213+
}
197214

198215
let playerOptions = {};
199216
const autoplayPreference = this._getAutoplayPreference();
@@ -324,7 +341,7 @@ export const C4DVideoPlayerContainerMixin = <
324341
/**
325342
* Calls the data-* attribute transpose function to target `c4d-video-player`'s button element.
326343
*/
327-
firstUpdated() {
344+
async firstUpdated() {
328345
window.requestAnimationFrame(() => {
329346
const button =
330347
this.querySelector('c4d-video-player')?.shadowRoot?.querySelector(
@@ -338,6 +355,10 @@ export const C4DVideoPlayerContainerMixin = <
338355
}
339356
this.transposeAttributes(button, ['href']);
340357
});
358+
359+
//get LC
360+
const { lc } = await LocaleAPI.getLocale();
361+
this.lc = lc;
341362
}
342363

343364
prefersAutoplayStorageKey = `${c4dPrefix}-background-video-prefers-autoplay`;

0 commit comments

Comments
 (0)