From 8fb5dad74b3207570eae6461a109e781eb715139 Mon Sep 17 00:00:00 2001 From: qiang Date: Fri, 5 Mar 2021 20:12:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(App):=20uni.chooseImage=E3=80=81uni.choose?= =?UTF-8?q?Video=20i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/helpers/i18n/en.json | 6 ++++++ src/core/helpers/i18n/es.json | 6 ++++++ src/core/helpers/i18n/fr.json | 6 ++++++ src/core/helpers/i18n/zh-Hans.json | 6 ++++++ src/core/helpers/i18n/zh-Hant.json | 6 ++++++ .../app-plus/service/api/media/choose-image.js | 10 +++++++--- .../app-plus/service/api/media/choose-video.js | 10 +++++++--- 7 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/core/helpers/i18n/en.json b/src/core/helpers/i18n/en.json index 17d8839fc..a77a6e162 100644 --- a/src/core/helpers/i18n/en.json +++ b/src/core/helpers/i18n/en.json @@ -5,6 +5,12 @@ "uni.showLoading.unpaired": "Please note showLoading must be paired with hideLoading", "uni.showModal.cancel": "cancel", "uni.showModal.confirm": "confirm", + "uni.chooseImage.cancel": "Cancel", + "uni.chooseImage.sourceType.album": "Album", + "uni.chooseImage.sourceType.camera": "Camera", + "uni.chooseVideo.cancel": "Cancel", + "uni.chooseVideo.sourceType.album": "Album", + "uni.chooseVideo.sourceType.camera": "Camera", "uni.picker.done": "Done", "uni.picker.cancel": "Cancel", "uni.video.danmu": "Danmu", diff --git a/src/core/helpers/i18n/es.json b/src/core/helpers/i18n/es.json index 495803c39..4ed96a9e8 100644 --- a/src/core/helpers/i18n/es.json +++ b/src/core/helpers/i18n/es.json @@ -5,6 +5,12 @@ "uni.showLoading.unpaired": "Tenga en cuenta que showLoading debe estar emparejado con hideLoading", "uni.showModal.cancel": "cancelar", "uni.showModal.confirm": "confirmar", + "uni.chooseImage.cancel": "Cancelar", + "uni.chooseImage.sourceType.album": "Álbum", + "uni.chooseImage.sourceType.camera": "Cámara", + "uni.chooseVideo.cancel": "Cancelar", + "uni.chooseVideo.sourceType.album": "Álbum", + "uni.chooseVideo.sourceType.camera": "Cámara", "uni.picker.done": "OK", "uni.picker.cancel": "Cancelar", "uni.video.danmu": "Danmu", diff --git a/src/core/helpers/i18n/fr.json b/src/core/helpers/i18n/fr.json index 5c0dcb7d8..ac608d8c5 100644 --- a/src/core/helpers/i18n/fr.json +++ b/src/core/helpers/i18n/fr.json @@ -5,6 +5,12 @@ "uni.showLoading.unpaired": "Veuillez noter que showLoading doit être associé à hideLoading", "uni.showModal.cancel": "Annuler", "uni.showModal.confirm": "confirmer", + "uni.chooseImage.cancel": "Annuler", + "uni.chooseImage.sourceType.album": "Album", + "uni.chooseImage.sourceType.camera": "Caméra", + "uni.chooseVideo.cancel": "Annuler", + "uni.chooseVideo.sourceType.album": "Album", + "uni.chooseVideo.sourceType.camera": "Caméra", "uni.picker.done": "OK", "uni.picker.cancel": "Annuler", "uni.video.danmu": "Danmu", diff --git a/src/core/helpers/i18n/zh-Hans.json b/src/core/helpers/i18n/zh-Hans.json index 160c32529..aae303df4 100644 --- a/src/core/helpers/i18n/zh-Hans.json +++ b/src/core/helpers/i18n/zh-Hans.json @@ -5,6 +5,12 @@ "uni.showLoading.unpaired": "请注意 showLoading 与 hideLoading 必须配对使用", "uni.showModal.cancel": "取消", "uni.showModal.confirm": "确认", + "uni.chooseImage.cancel": "取消", + "uni.chooseImage.sourceType.album": "从相册选择", + "uni.chooseImage.sourceType.camera": "拍摄", + "uni.chooseVideo.cancel": "取消", + "uni.chooseVideo.sourceType.album": "从相册选择", + "uni.chooseVideo.sourceType.camera": "拍摄", "uni.picker.done": "完成", "uni.picker.cancel": "取消", "uni.video.danmu": "弹幕", diff --git a/src/core/helpers/i18n/zh-Hant.json b/src/core/helpers/i18n/zh-Hant.json index 48a148e47..d452b3e98 100644 --- a/src/core/helpers/i18n/zh-Hant.json +++ b/src/core/helpers/i18n/zh-Hant.json @@ -5,6 +5,12 @@ "uni.showLoading.unpaired": "請注意 showLoading 與 hideLoading 必須配對使用", "uni.showModal.cancel": "取消", "uni.showModal.confirm": "確認", + "uni.chooseImage.cancel": "取消", + "uni.chooseImage.sourceType.album": "從相冊選擇", + "uni.chooseImage.sourceType.camera": "拍攝", + "uni.chooseVideo.cancel": "取消", + "uni.chooseVideo.sourceType.album": "從相冊選擇", + "uni.chooseVideo.sourceType.camera": "拍攝", "uni.picker.done": "完成", "uni.picker.cancel": "取消", "uni.video.danmu": "彈幕", diff --git a/src/platforms/app-plus/service/api/media/choose-image.js b/src/platforms/app-plus/service/api/media/choose-image.js index 1e1b0bdb6..fe724ce14 100644 --- a/src/platforms/app-plus/service/api/media/choose-image.js +++ b/src/platforms/app-plus/service/api/media/choose-image.js @@ -11,6 +11,10 @@ import { getFileName } from '../util' +import { + t +} from 'uni-core/helpers/i18n' + /** * 获取文件信息 * @param {string} filePath 文件路径 @@ -113,11 +117,11 @@ export function chooseImage ({ } } plus.nativeUI.actionSheet({ - cancel: '取消', + cancel: t('uni.chooseImage.cancel'), buttons: [{ - title: '拍摄' + title: t('uni.chooseImage.sourceType.camera') }, { - title: '从手机相册选择' + title: t('uni.chooseImage.sourceType.album') }] }, (e) => { switch (e.index) { diff --git a/src/platforms/app-plus/service/api/media/choose-video.js b/src/platforms/app-plus/service/api/media/choose-video.js index 643ae0cc4..43e1094a6 100644 --- a/src/platforms/app-plus/service/api/media/choose-video.js +++ b/src/platforms/app-plus/service/api/media/choose-video.js @@ -10,6 +10,10 @@ import { warpPlusErrorCallback } from '../util' +import { + t +} from 'uni-core/helpers/i18n' + export function chooseVideo ({ sourceType, maxDuration, @@ -66,11 +70,11 @@ export function chooseVideo ({ } } plus.nativeUI.actionSheet({ - cancel: '取消', + cancel: t('uni.chooseVideo.cancel'), buttons: [{ - title: '拍摄' + title: t('uni.chooseVideo.sourceType.camera') }, { - title: '从手机相册选择' + title: t('uni.chooseVideo.sourceType.album') }] }, e => { switch (e.index) { -- GitLab