feat(App): uni.scanCode i18n

packages/uni-app-plus/template/weex/__uniappscan.html

@@ -11,7 +11,7 @@
                 '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
                 (coverSupport ? ', viewport-fit=cover' : '') + '" />')
         </script>
-        <title>扫码</title>
+        <title>Scan code</title>
         <style>
             html,
             body,
@@ -61,8 +61,10 @@
                     'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABjklEQVRoQ+1ZbVHEQAx9TwE4ABTcOQAknANQAKcAUAAOAAXgAHAACsDCKQiTmbYDzJZtNt2bFrJ/m6+Xl2yyU2LmhzOPH/8PgIjcADirxNyapNoffMwMiMgzgMPBHmyCLySPLCoBwJKtAbJbYaBmD1yRvBwAtBMxl5DF+DZkiwCIyBLAzsgBbki+Wm2WAlCaL6zOMvKnJO+sNksB7ALQbO1ZHfbIv5FUVs2nCIB6EZETALdmj2mFY5I6X8ynGEADQllYmL1+VzBfnV/VvQB0aj45ARyQ/Ci14QLQsOBZLe5JaikWnzEA7AN4L4hgA2Dpyb76dANwsOCq/TZhASAYKGie0a7R1lDPI0ebtF0NUi+4yfdAtxr3PEMnD6BbD0QkNfACQO05EAwMuaBqDrIVycdmTpwDuP4R0OR7QFftVRP0g+49cwOQq4DJMxAAchmofY3m/EcJBQOZbTRKKJeBKKEoIePvpFRJ1VzmciUccyCa+C81cerBkuuB7sGTE/zt+yhN7AnAqxsAvBn06n8CkyPwMZKwm+UAAAAASUVORK5CYII=';
                 var onImg =
                     'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAB4klEQVRoQ+1ZQU7CUBCdaWVBLFETqUtxB7iQG4hH4AZ4AvUE4gnkBuoJ9AbiDXAhZadby4IQICaS9psqJBVLy5/fkhKHbefPzPvzZv6bgLDmP1zz/OH/ARjZpSYAniVSORQXRt5qyviWrsDQLrUQ8FgmyLK2AsRTzrSqy9p7dgxA5raibFdSgSR7QAi4yu11GlFA/d+lKSTjfBW2JAAj+7Cio7MVZ4KO0AeG+dKW9UkCMHwvNxDhUjZYuL17apjdW1mfJACiX9gef2bbgLgvG3CB/bNhdioUXyQAXqCRXawDaDeUoPNnBLonuXy3RfFFBvADouxx9ogSeHaGMjpjm0LDXrGKQntUAaBn3IPsTveN6kOpAl5QNWkh7gzTqlOTJ0mJ+WAf/WLBmWivskkIEIONjKio3H4sAKhVUOX+7MKUKcQAZLk3Z88VWEQhr0kRYCoN/m5wqe8BvzQOkuDpB+CTB0EPHgOYNnNiTewXaFyBkFGbWAVQE7XNXevhW7X2Sucg8NqfR+p7AADaesateUk7E+0eAH4tLOsAIPSNZQBJT6EoicMV4Ar4OEJZK5lCTCGmkPy/MUGjOTEtxO9A1A1wE3MTp6iJgxaWKAr7F54o27DvsUwhlQRUzzIA1RtUPf8FRKRYQOI+9hQAAAAASUVORK5CYII=';
-                var onText = '轻触照亮';
-                var offText = '轻触关闭';
+                var webview = plus.webview.currentWebview();
+                var en = webview.__uniapp_locale && webview.__uniapp_locale.indexOf('zh') < 0
+                var onText = en ? '' : '轻触照亮';
+                var offText = en ? '' : '轻触关闭';
                 var on = false;
                 var viewWidth = 48;
                 var fontSize = 10;
@@ -132,7 +134,7 @@
                         plus.webview.postMessageToUniNView({
                             type: 'scanCode',
                             args: {
-                                errMsg: error.message + '，错误码：' + error.code
+                                errMsg: error.message + ' error code:' + error.code
                             }
                         }, '__uniapp__service');
                     };

packages/uni-cli-shared/template/weex/__uniappscan.html

@@ -11,7 +11,7 @@
                 '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
                 (coverSupport ? ', viewport-fit=cover' : '') + '" />')
         </script>
-        <title>扫码</title>
+        <title>Scan code</title>
         <style>
             html,
             body,
@@ -61,8 +61,10 @@
                     'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABjklEQVRoQ+1ZbVHEQAx9TwE4ABTcOQAknANQAKcAUAAOAAXgAHAACsDCKQiTmbYDzJZtNt2bFrJ/m6+Xl2yyU2LmhzOPH/8PgIjcADirxNyapNoffMwMiMgzgMPBHmyCLySPLCoBwJKtAbJbYaBmD1yRvBwAtBMxl5DF+DZkiwCIyBLAzsgBbki+Wm2WAlCaL6zOMvKnJO+sNksB7ALQbO1ZHfbIv5FUVs2nCIB6EZETALdmj2mFY5I6X8ynGEADQllYmL1+VzBfnV/VvQB0aj45ARyQ/Ci14QLQsOBZLe5JaikWnzEA7AN4L4hgA2Dpyb76dANwsOCq/TZhASAYKGie0a7R1lDPI0ebtF0NUi+4yfdAtxr3PEMnD6BbD0QkNfACQO05EAwMuaBqDrIVycdmTpwDuP4R0OR7QFftVRP0g+49cwOQq4DJMxAAchmofY3m/EcJBQOZbTRKKJeBKKEoIePvpFRJ1VzmciUccyCa+C81cerBkuuB7sGTE/zt+yhN7AnAqxsAvBn06n8CkyPwMZKwm+UAAAAASUVORK5CYII=';
                 var onImg =
                     'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAB4klEQVRoQ+1ZQU7CUBCdaWVBLFETqUtxB7iQG4hH4AZ4AvUE4gnkBuoJ9AbiDXAhZadby4IQICaS9psqJBVLy5/fkhKHbefPzPvzZv6bgLDmP1zz/OH/ARjZpSYAniVSORQXRt5qyviWrsDQLrUQ8FgmyLK2AsRTzrSqy9p7dgxA5raibFdSgSR7QAi4yu11GlFA/d+lKSTjfBW2JAAj+7Cio7MVZ4KO0AeG+dKW9UkCMHwvNxDhUjZYuL17apjdW1mfJACiX9gef2bbgLgvG3CB/bNhdioUXyQAXqCRXawDaDeUoPNnBLonuXy3RfFFBvADouxx9ogSeHaGMjpjm0LDXrGKQntUAaBn3IPsTveN6kOpAl5QNWkh7gzTqlOTJ0mJ+WAf/WLBmWivskkIEIONjKio3H4sAKhVUOX+7MKUKcQAZLk3Z88VWEQhr0kRYCoN/m5wqe8BvzQOkuDpB+CTB0EPHgOYNnNiTewXaFyBkFGbWAVQE7XNXevhW7X2Sucg8NqfR+p7AADaesateUk7E+0eAH4tLOsAIPSNZQBJT6EoicMV4Ar4OEJZK5lCTCGmkPy/MUGjOTEtxO9A1A1wE3MTp6iJgxaWKAr7F54o27DvsUwhlQRUzzIA1RtUPf8FRKRYQOI+9hQAAAAASUVORK5CYII=';
-                var onText = '轻触照亮';
-                var offText = '轻触关闭';
+                var webview = plus.webview.currentWebview();
+                var en = webview.__uniapp_locale && webview.__uniapp_locale.indexOf('zh') < 0
+                var onText = en ? '' : '轻触照亮';
+                var offText = en ? '' : '轻触关闭';
                 var on = false;
                 var viewWidth = 48;
                 var fontSize = 10;
@@ -132,7 +134,7 @@
                         plus.webview.postMessageToUniNView({
                             type: 'scanCode',
                             args: {
-                                errMsg: error.message + '，错误码：' + error.code
+                                errMsg: error.message + ' error code:' + error.code
                             }
                         }, '__uniapp__service');
                     };

src/core/helpers/i18n/en.json

@@ -16,6 +16,11 @@
   "uni.previewImage.save.success": "Saved successfully",
   "uni.previewImage.save.fail": "Save failed",
   "uni.setClipboardData.success": "Content copied",
+  "uni.scanCode.title": "Scan code",
+  "uni.scanCode.album": "Album",
+  "uni.scanCode.fail": "Recognition failure",
+  "uni.scanCode.flash.on": "Tap to turn light on",
+  "uni.scanCode.flash.off": "Tap to turn light off",
   "uni.picker.done": "Done",
   "uni.picker.cancel": "Cancel",
   "uni.video.danmu": "Danmu",

src/core/helpers/i18n/es.json

@@ -16,6 +16,11 @@
   "uni.previewImage.save.success": "Guardado exitosamente",
   "uni.previewImage.save.fail": "Error al guardar",
   "uni.setClipboardData.success": "Contenido copiado",
+  "uni.scanCode.title": "Código de escaneo",
+  "uni.scanCode.album": "Álbum",
+  "uni.scanCode.fail": "Échec de la reconnaissance",
+  "uni.scanCode.flash.on": "Toque para encender la luz",
+  "uni.scanCode.flash.off": "Toque para apagar la luz",
   "uni.picker.done": "OK",
   "uni.picker.cancel": "Cancelar",
   "uni.video.danmu": "Danmu",

src/core/helpers/i18n/fr.json

@@ -16,6 +16,11 @@
   "uni.previewImage.save.success": "Enregistré avec succès",
   "uni.previewImage.save.fail": "Échec de la sauvegarde",
   "uni.setClipboardData.success": "Contenu copié",
+  "uni.scanCode.title": "Code d’analyse",
+  "uni.scanCode.album": "Album",
+  "uni.scanCode.fail": "Fallo de reconocimiento",
+  "uni.scanCode.flash.on": "Appuyez pour activer l'éclairage",
+  "uni.scanCode.flash.off": "Appuyez pour désactiver l'éclairage",
   "uni.picker.done": "OK",
   "uni.picker.cancel": "Annuler",
   "uni.video.danmu": "Danmu",

src/core/helpers/i18n/zh-Hans.json

@@ -16,6 +16,11 @@
   "uni.previewImage.save.success": "保存图像到相册成功",
   "uni.previewImage.save.fail": "保存图像到相册失败",
   "uni.setClipboardData.success": "内容已复制",
+  "uni.scanCode.title": "扫码",
+  "uni.scanCode.album": "相册",
+  "uni.scanCode.fail": "识别失败",
+  "uni.scanCode.flash.on": "轻触照亮",
+  "uni.scanCode.flash.off": "轻触关闭",
   "uni.picker.done": "完成",
   "uni.picker.cancel": "取消",
   "uni.video.danmu": "弹幕",

src/core/helpers/i18n/zh-Hant.json

@@ -16,6 +16,11 @@
   "uni.previewImage.save.success": "保存圖像到相冊成功",
   "uni.previewImage.save.fail": "保存圖像到相冊失敗",
   "uni.setClipboardData.success": "內容已復制",
+  "uni.scanCode.title": "掃碼",
+  "uni.scanCode.album": "相冊",
+  "uni.scanCode.fail": "識別失敗",
+  "uni.scanCode.flash.on": "輕觸照亮",
+  "uni.scanCode.flash.off": "輕觸關閉",
   "uni.picker.done": "完成",
   "uni.picker.cancel": "取消",
   "uni.video.danmu": "彈幕",

src/platforms/app-plus/service/api/device/scan-code-webview.js

@@ -20,6 +20,11 @@ import {
   consumePlusMessage
 } from '../../framework/plus-message'
 
+import {
+  t,
+  getLocale
+} from 'uni-core/helpers/i18n'
+
 export const SCAN_ID = '__UNIAPP_SCAN'
 export const SCAN_PATH = '_www/__uniappscan.html'
 
@@ -95,7 +100,7 @@ export function scanCode ({
   if (!onlyFromCamera) {
     buttons.push({
       float: 'right',
-      text: '相册',
+      text: t('uni.scanCode.album'),
       fontSize: '17px',
       width: '60px',
       onclick: function () {
@@ -111,11 +116,13 @@ export function scanCode ({
             }
             webview.close('auto')
           }, () => {
-            plus.nativeUI.toast('识别失败')
+            plus.nativeUI.toast(t('uni.scanCode.fail'))
           }, filters, autoDecodeCharSet)
         }, err => {
-          if (err.code !== 12) {
-            plus.nativeUI.toast('选择失败')
+          // iOS {"code":-2,"message":"用户取消,https://ask.dcloud.net.cn/article/282"}
+          // Android {"code":12,"message":"User cancelled"}
+          if (err.code !== (plus.os.name === 'Android' ? 12 : -2)) {
+            plus.nativeUI.toast(t('uni.scanCode.fail'))
           }
         }, {
           multiple: false,
@@ -133,7 +140,7 @@ export function scanCode ({
       type: 'float',
       backgroundColor: 'rgba(0,0,0,0)',
       titleColor: '#ffffff',
-      titleText: '扫码',
+      titleText: t('uni.scanCode.title'),
       titleSize: '17px',
       buttons
     },
@@ -144,6 +151,7 @@ export function scanCode ({
     __uniapp_dark: isDark,
     __uniapp_scan_type: filters,
     __uniapp_auto_decode_char_set: autoDecodeCharSet,
+    __uniapp_locale: getLocale(),
     'uni-app': 'none'
   })
   const waiting = plus.nativeUI.showWaiting()

src/platforms/app-plus/service/api/device/scan-code-weex.js

@@ -6,6 +6,10 @@ import {
   showPage
 } from '../page.js'
 
+import {
+  t
+} from 'uni-core/helpers/i18n'
+
 function getStatusBarStyle () {
   let style = plus.navigator.getStatusBarStyle()
   if (style === 'UIStatusBarStyleBlackTranslucent' || style === 'UIStatusBarStyleBlackOpaque' || style === 'null') {
@@ -23,17 +27,23 @@ export function scanCode (options, callbackId) {
   let result
   const page = showPage({
     url: '__uniappscan',
-    data: options,
+    data: Object.assign({}, options, {
+      messages: {
+        fail: t('uni.scanCode.fail'),
+        'flash.on': t('uni.scanCode.flash.on'),
+        'flash.off': t('uni.scanCode.flash.off')
+      }
+    }),
     style: {
       animationType: options.animationType || 'pop-in',
       titleNView: {
         autoBackButton: true,
         type: 'float',
-        titleText: options.titleText || '扫码',
+        titleText: options.titleText || t('uni.scanCode.title'),
         titleColor: '#ffffff',
         backgroundColor: 'rgba(0,0,0,0)',
         buttons: !options.onlyFromCamera ? [{
-          text: options.albumText || '相册',
+          text: options.albumText || t('uni.scanCode.album'),
           fontSize: '17px',
           width: '60px',
           onclick: () => {