Skip to content

Commit ca04d51

Browse files
committed
feat(@clayui/language-picker): LPD-45714 Rename labels to messages
1 parent 1ebff3b commit ca04d51

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

packages/clay-core/src/language-picker/__tests__/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ describe('ClayLanguagePicker', () => {
8989
it('renders with custom labels', () => {
9090
const {container} = render(
9191
<ClayLanguagePicker
92-
labels={{
92+
locales={locales}
93+
messages={{
9394
default: 'Default Label',
9495
option: 'Option Label',
9596
translated: 'Translated Label',
9697
translating: 'Translating Label',
9798
trigger: 'Trigger Label',
9899
untranslated: 'Untranslated Label',
99100
}}
100-
locales={locales}
101101
onSelectedLocaleChange={onSelectedLocaleChange}
102102
selectedLocale={locales[0]!}
103103
spritemap="/path/to/svg"

packages/clay-core/src/language-picker/index.tsx

+17-17
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type Item = {
2222
symbol: string;
2323
};
2424

25-
type Labels = {
25+
type Messages = {
2626
default: string;
2727
option: string;
2828
trigger: string;
@@ -61,9 +61,9 @@ type Props = {
6161
id?: string;
6262

6363
/**
64-
* Labels for the component
64+
* Messages for the component
6565
*/
66-
labels?: Labels;
66+
messages?: Messages;
6767

6868
/**
6969
* List of locales to allow localization for
@@ -103,37 +103,37 @@ type Props = {
103103

104104
const TranslationLabel = ({
105105
defaultLanguage,
106-
labels,
107106
locale,
107+
messages,
108108
translation,
109109
}: {
110110
defaultLanguage: Item;
111-
labels: Labels;
111+
messages: Messages;
112112
locale: Item;
113113
translation: Translation;
114114
}) => {
115115
let displayType: DisplayType = 'warning';
116-
let label = labels.untranslated;
116+
let label = messages.untranslated;
117117

118118
if (locale.label === defaultLanguage?.label) {
119119
displayType = 'info';
120-
label = labels.default;
120+
label = messages.default;
121121
} else if (translation) {
122122
const {total, translated} = translation;
123123

124124
if (total && total === translated) {
125125
displayType = 'success';
126-
label = labels.translated;
126+
label = messages.translated;
127127
} else {
128128
displayType = 'secondary';
129-
label = sub(labels.translating, [translated, total]);
129+
label = sub(messages.translating, [translated, total]);
130130
}
131131
}
132132

133133
return (
134134
<>
135135
<span className="sr-only">
136-
{sub(labels.option, [
136+
{sub(messages.option, [
137137
locale.displayName || locale.label,
138138
label,
139139
])}
@@ -195,18 +195,18 @@ const Trigger = React.forwardRef<HTMLButtonElement>(
195195
Trigger.displayName = 'Trigger';
196196

197197
const ClayLanguagePicker = ({
198-
labels = {
198+
active,
199+
classNamesTrigger,
200+
hideTriggerText,
201+
id,
202+
messages = {
199203
default: 'Default',
200204
option: '{0} language: {1}.',
201205
translated: 'Translated',
202206
translating: 'Translating {0}/{1}',
203207
trigger: 'Select a language, current language: {0}.',
204208
untranslated: 'Untranslated',
205209
},
206-
active,
207-
classNamesTrigger,
208-
hideTriggerText,
209-
id,
210210
locales,
211211
onActiveChange,
212212
onSelectedLocaleChange,
@@ -221,7 +221,7 @@ const ClayLanguagePicker = ({
221221
return (
222222
<Picker
223223
active={active}
224-
ariaLabelTrigger={sub(labels.trigger, [
224+
ariaLabelTrigger={sub(messages.trigger, [
225225
selectedLocale.displayName || selectedLocale.label,
226226
])}
227227
as={Trigger}
@@ -263,8 +263,8 @@ const ClayLanguagePicker = ({
263263
<ClayLayout.ContentSection>
264264
<TranslationLabel
265265
defaultLanguage={defaultLanguage!}
266-
labels={labels}
267266
locale={locale}
267+
messages={messages}
268268
translation={
269269
translations[locale.label]!
270270
}

0 commit comments

Comments
 (0)