diff --git a/packages/vant/src/address-edit/AddressEditDetail.tsx b/packages/vant/src/address-edit/AddressEditDetail.tsx index 3d890aead..cef136696 100644 --- a/packages/vant/src/address-edit/AddressEditDetail.tsx +++ b/packages/vant/src/address-edit/AddressEditDetail.tsx @@ -11,7 +11,8 @@ import { Field } from '../field'; import type { AddressEditSearchItem } from './types'; import type { FieldRule, FieldInstance } from '../field/types'; -const [name, bem, t] = createNamespace('address-edit-detail'); +const [name, bem] = createNamespace('address-edit-detail'); +const t = createNamespace('address-edit')[2]; export default defineComponent({ name, @@ -89,11 +90,11 @@ export default defineComponent({ rows={props.rows} type="textarea" rules={props.rules} - label={t('label')} + label={t('addressDetail')} border={!showSearchResult()} maxlength={props.maxlength} modelValue={props.value} - placeholder={t('placeholder')} + placeholder={t('addressDetail')} onBlur={onBlur} onFocus={onFocus} onUpdate:modelValue={onInput} diff --git a/packages/vant/src/locale/lang/de-DE-formal.ts b/packages/vant/src/locale/lang/de-DE-formal.ts index 43ae97020..9db2a608d 100644 --- a/packages/vant/src/locale/lang/de-DE-formal.ts +++ b/packages/vant/src/locale/lang/de-DE-formal.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Bitte geben Sie Ihren Standort an', addressEmpty: 'Adresse darf nicht leer sein', postalEmpty: 'Falsche Postleitzahl', + addressDetail: 'Adresse', defaultAddress: 'Als Standardadresse festgelegen', }, - vanAddressEditDetail: { - label: 'Adresse', - placeholder: 'Adresse', - }, vanAddressList: { add: 'Neue Adresse hinzufügen', }, diff --git a/packages/vant/src/locale/lang/de-DE.ts b/packages/vant/src/locale/lang/de-DE.ts index 958d284d6..ea90cccae 100644 --- a/packages/vant/src/locale/lang/de-DE.ts +++ b/packages/vant/src/locale/lang/de-DE.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Bitte deinen Ort angeben', addressEmpty: 'Adresse darf nicht leer sein', postalEmpty: 'Falsche Postleitzahl', + addressDetail: 'Adresse', defaultAddress: 'Als Standardadresse festgelegen', }, - vanAddressEditDetail: { - label: 'Adresse', - placeholder: 'Adresse', - }, vanAddressList: { add: 'Neue Adresse hinzufügen', }, diff --git a/packages/vant/src/locale/lang/en-US.ts b/packages/vant/src/locale/lang/en-US.ts index 738b5fe85..0e47bb504 100644 --- a/packages/vant/src/locale/lang/en-US.ts +++ b/packages/vant/src/locale/lang/en-US.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Please select a receiving area', addressEmpty: 'Address can not be empty', postalEmpty: 'Wrong postal code', + addressDetail: 'Address', defaultAddress: 'Set as the default address', }, - vanAddressEditDetail: { - label: 'Address', - placeholder: 'Address', - }, vanAddressList: { add: 'Add new address', }, diff --git a/packages/vant/src/locale/lang/es-ES.ts b/packages/vant/src/locale/lang/es-ES.ts index 4834beb07..0d76d7d5a 100644 --- a/packages/vant/src/locale/lang/es-ES.ts +++ b/packages/vant/src/locale/lang/es-ES.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Por favor selecciona una área de recogida', addressEmpty: 'La dirección no puede estar vacia', postalEmpty: 'Código postal inválido', + addressDetail: 'Dirección', defaultAddress: 'Establecer como dirección por defecto', }, - vanAddressEditDetail: { - label: 'Dirección', - placeholder: 'Dirección', - }, vanAddressList: { add: 'Anadir dirección', }, diff --git a/packages/vant/src/locale/lang/fr-FR.ts b/packages/vant/src/locale/lang/fr-FR.ts index 3d803e909..4a2584968 100644 --- a/packages/vant/src/locale/lang/fr-FR.ts +++ b/packages/vant/src/locale/lang/fr-FR.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Veuillez sélectionner une zone de réception', addressEmpty: "L'adresse ne peut pas être vide", postalEmpty: 'Mauvais code postal', + addressDetail: 'Adresse', defaultAddress: 'Définir comme adresse par défaut', }, - vanAddressEditDetail: { - label: 'Adresse', - placeholder: 'Adresse', - }, vanAddressList: { add: 'Ajouter une nouvelle adresse', }, diff --git a/packages/vant/src/locale/lang/ja-JP.ts b/packages/vant/src/locale/lang/ja-JP.ts index faee5817d..786766423 100644 --- a/packages/vant/src/locale/lang/ja-JP.ts +++ b/packages/vant/src/locale/lang/ja-JP.ts @@ -14,7 +14,6 @@ export default { end: '終了', start: '開始', title: '日付選択', - confirm: '確認', weekdays: ['日', '月', '火', '水', '木', '金', '土'], monthTitle: (year: number, month: number) => `${year}年${month}月`, rangePrompt: (maxRange: number) => `${maxRange}日まで選択`, @@ -55,12 +54,9 @@ export default { areaEmpty: '地域を選択してください', addressEmpty: '詳しい住所を入力してください', postalEmpty: '間違った郵便番号', + addressDetail: '詳しい住所', defaultAddress: 'デフォルトの住所に設定', }, - vanAddressEditDetail: { - label: '詳しい住所', - placeholder: '番地、階の部屋番号など', - }, vanAddressList: { add: '住所を追加', }, diff --git a/packages/vant/src/locale/lang/ko-KR.ts b/packages/vant/src/locale/lang/ko-KR.ts index 154f85028..ca4937390 100644 --- a/packages/vant/src/locale/lang/ko-KR.ts +++ b/packages/vant/src/locale/lang/ko-KR.ts @@ -62,12 +62,9 @@ export default { areaEmpty: '접수지역을 선택해주세요', addressEmpty: '주소는 비워둘 수 없습니다', postalEmpty: '잘못된 우편번호', + addressDetail: '주소', defaultAddress: '기본 주소로 설정', }, - vanAddressEditDetail: { - label: '주소', - placeholder: '주소', - }, vanAddressList: { add: '새 주소 추가', }, diff --git a/packages/vant/src/locale/lang/nb-NO.ts b/packages/vant/src/locale/lang/nb-NO.ts index c5b7b2020..e1ce1c2e7 100644 --- a/packages/vant/src/locale/lang/nb-NO.ts +++ b/packages/vant/src/locale/lang/nb-NO.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Vennligst fyll inn område', addressEmpty: 'Addresse kan ikke være tomt', postalEmpty: 'Feil postkode', + addressDetail: 'Adresse', defaultAddress: 'Sett som standard adresse', }, - vanAddressEditDetail: { - label: 'Adresse', - placeholder: 'Adresse', - }, vanAddressList: { add: 'Legg til ny adresse', }, diff --git a/packages/vant/src/locale/lang/pt-BR.ts b/packages/vant/src/locale/lang/pt-BR.ts index 34122e211..251bf3e87 100644 --- a/packages/vant/src/locale/lang/pt-BR.ts +++ b/packages/vant/src/locale/lang/pt-BR.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Por favor, selecione uma área de recebimento', addressEmpty: 'Endereço não pode ser vazio', postalEmpty: 'CEP inválido', + addressDetail: 'Endereço', defaultAddress: 'Usar como endereço padrão', }, - vanAddressEditDetail: { - label: 'Endereço', - placeholder: 'Endereço', - }, vanAddressList: { add: 'Adicionar novo endereço', }, diff --git a/packages/vant/src/locale/lang/ro-RO.ts b/packages/vant/src/locale/lang/ro-RO.ts index 270d7d358..fd5bdb789 100644 --- a/packages/vant/src/locale/lang/ro-RO.ts +++ b/packages/vant/src/locale/lang/ro-RO.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Te rugăm sa selectezi o zona de primire', addressEmpty: 'Adresa nu poate fi goală', postalEmpty: 'Cod postal invalid', + addressDetail: 'Adresă', defaultAddress: 'Setează ca adresă de pornire', }, - vanAddressEditDetail: { - label: 'Adresă', - placeholder: 'Adresă', - }, vanAddressList: { add: 'Adaugă adresă nouă', }, diff --git a/packages/vant/src/locale/lang/ru-RU.ts b/packages/vant/src/locale/lang/ru-RU.ts index 41774dc0e..bc46b189b 100644 --- a/packages/vant/src/locale/lang/ru-RU.ts +++ b/packages/vant/src/locale/lang/ru-RU.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Укажите зону доставки', addressEmpty: 'Адрес не может быть пустым', postalEmpty: 'Некорректный индекс', + addressDetail: 'Адрес', defaultAddress: 'Сделать адресом по умолчанию', }, - vanAddressEditDetail: { - label: 'Адрес', - placeholder: 'Адрес', - }, vanAddressList: { add: 'Новый адрес', }, diff --git a/packages/vant/src/locale/lang/th-TH.ts b/packages/vant/src/locale/lang/th-TH.ts index 79203c935..0e852daca 100644 --- a/packages/vant/src/locale/lang/th-TH.ts +++ b/packages/vant/src/locale/lang/th-TH.ts @@ -14,7 +14,6 @@ export default { end: 'จบ', start: 'เริ่ม', title: 'การเลือกวันที่', - confirm: 'ตกลง', weekdays: ['อา', 'จ', 'อ', 'พ', 'พฤ', 'ศ', 'ส'], monthTitle: (year: number, month: number) => `${year}ปี${month}เดือน`, rangePrompt: (maxRange: number) => @@ -56,12 +55,9 @@ export default { areaEmpty: 'โปรดเลือกภูมิภาค', addressEmpty: 'กรุณากรอกที่อยู่โดยละเอียด', postalEmpty: 'รูปแบบรหัสไปรษณีย์ไม่ถูกต้อง', + addressDetail: 'ที่อยู่', defaultAddress: 'ตั้งเป็นที่อยู่จัดส่งเริ่มต้น', }, - vanAddressEditDetail: { - label: 'ที่อยู่', - placeholder: 'เลขที่บ้านเลขที่ห้องชั้นและข้อมูลอื่น ๆ', - }, vanAddressList: { add: 'เพิ่มที่อยู่', }, diff --git a/packages/vant/src/locale/lang/tr-TR.ts b/packages/vant/src/locale/lang/tr-TR.ts index ee2b52e0b..11ca5167f 100644 --- a/packages/vant/src/locale/lang/tr-TR.ts +++ b/packages/vant/src/locale/lang/tr-TR.ts @@ -54,12 +54,9 @@ export default { areaEmpty: 'Lütfen alıcı alanını seçin', addressEmpty: 'Adres boş olamaz!', postalEmpty: 'Yanlış posta kodu', + addressDetail: 'Adres', defaultAddress: 'Varsayılan adres olarak ayarla', }, - vanAddressEditDetail: { - label: 'Adres', - placeholder: 'Adres', - }, vanAddressList: { add: 'Yeni adres ekle', }, diff --git a/packages/vant/src/locale/lang/zh-CN.ts b/packages/vant/src/locale/lang/zh-CN.ts index d60914ccd..71db1f786 100644 --- a/packages/vant/src/locale/lang/zh-CN.ts +++ b/packages/vant/src/locale/lang/zh-CN.ts @@ -14,7 +14,6 @@ export default { end: '结束', start: '开始', title: '日期选择', - confirm: '确定', weekdays: ['日', '一', '二', '三', '四', '五', '六'], monthTitle: (year: number, month: number) => `${year}年${month}月`, rangePrompt: (maxRange: number) => `最多选择 ${maxRange} 天`, @@ -47,7 +46,7 @@ export default { close: '不使用', enable: '可用', disabled: '不可用', - placeholder: '请输入优惠码', + placeholder: '输入优惠码', }, vanAddressEdit: { area: '地区', @@ -55,12 +54,9 @@ export default { areaEmpty: '请选择地区', addressEmpty: '请填写详细地址', postalEmpty: '邮政编码不正确', + addressDetail: '详细地址', defaultAddress: '设为默认收货地址', }, - vanAddressEditDetail: { - label: '详细地址', - placeholder: '街道门牌信息', - }, vanAddressList: { add: '新增地址', }, diff --git a/packages/vant/src/locale/lang/zh-HK.ts b/packages/vant/src/locale/lang/zh-HK.ts index f8d021a65..cdbc18494 100644 --- a/packages/vant/src/locale/lang/zh-HK.ts +++ b/packages/vant/src/locale/lang/zh-HK.ts @@ -14,7 +14,6 @@ export default { end: '結束', start: '開始', title: '日期選擇', - confirm: '確定', weekdays: ['日', '一', '二', '三', '四', '五', '六'], monthTitle: (year: number, month: number) => `${year}年${month}月`, rangePrompt: (maxRange: number) => `最多選擇 ${maxRange} 天`, @@ -47,7 +46,7 @@ export default { close: '不使用', enable: '可使用優惠券', disabled: '不可使用優惠券', - placeholder: '請輸入優惠碼', + placeholder: '輸入優惠碼', }, vanAddressEdit: { area: '地區', @@ -55,12 +54,9 @@ export default { areaEmpty: '請選擇地區', addressEmpty: '請填寫詳細地址', postalEmpty: '郵政編碼不正確', + addressDetail: '詳細地址', defaultAddress: '設為默認收貨地址', }, - vanAddressEditDetail: { - label: '詳細地址', - placeholder: '街道門牌信息', - }, vanAddressList: { add: '新增地址', }, diff --git a/packages/vant/src/locale/lang/zh-TW.ts b/packages/vant/src/locale/lang/zh-TW.ts index b22b26005..b2d7f1579 100644 --- a/packages/vant/src/locale/lang/zh-TW.ts +++ b/packages/vant/src/locale/lang/zh-TW.ts @@ -14,7 +14,6 @@ export default { end: '結束', start: '開始', title: '日期選擇', - confirm: '確定', weekdays: ['日', '一', '二', '三', '四', '五', '六'], monthTitle: (year: number, month: number) => `${year}年${month}月`, rangePrompt: (maxRange: number) => `最多選擇 ${maxRange} 天`, @@ -47,7 +46,7 @@ export default { close: '不使用', enable: '可使用優惠券', disabled: '不可使用優惠券', - placeholder: '請輸入優惠代碼', + placeholder: '輸入優惠代碼', }, vanAddressEdit: { area: '地區', @@ -55,12 +54,9 @@ export default { areaEmpty: '請選擇地區', addressEmpty: '請填寫詳細地址', postalEmpty: '郵遞區號不正確', + addressDetail: '詳細地址', defaultAddress: '設為預設收貨地址', }, - vanAddressEditDetail: { - label: '詳細地址', - placeholder: '街道門牌資訊', - }, vanAddressList: { add: '新增地址', },