Merge branch 'development'

src/locale/bn.json

@@ -389,6 +389,17 @@
   "productDetail.favoriteSuccess": "পছন্দে যোগ করা হয়েছে",
   "productDetail.unfavoriteSuccess": "পছন্দ থেকে সরানো হয়েছে",
   "productDetail.favoriteError": "অপারেশন ব্যর্থ, অনুগ্রহ করে আবার চেষ্টা করুন",
+  "upgrade.title": "আপডেট লগ",
+  "upgrade.newVersion": "নতুন সংস্করণ উপলব্ধ",
+  "upgrade.version": "সংস্করণ {version}",
+  "upgrade.download": "এখনই আপডেট ডাউনলোড করুন",
+  "upgrade.downloading": "প্যাকেজ ডাউনলোড হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন...",
+  "upgrade.downloadProgress": "{downloaded}M/{total}M",
+  "upgrade.install": "ডাউনলোড সম্পূর্ণ, এখনই ইনস্টল করুন",
+  "upgrade.installing": "ইনস্টল করা হচ্ছে...",
+  "upgrade.installIncomplete": "ইনস্টলেশন অসম্পূর্ণ, ইনস্টল করতে ক্লিক করুন",
+  "upgrade.restart": "ইনস্টলেশন সম্পূর্ণ, রিস্টার্ট করতে ক্লিক করুন",
+  "upgrade.goToStore": "এখনই স্টোরে যান",
   "productDetail.openGroup": "গ্রুপ খুলুন",
   "productDetail.quantity": "পরিমাণ",
   "topChampions.title": "শীর্ষ চ্যাম্পিয়ন",

src/locale/en.json

@@ -387,8 +387,32 @@
   "productDetail.home": "Home",
   "productDetail.favorite": "Favorite",
   "productDetail.favoriteSuccess": "Added to favorites",
-  "productDetail.unfavoriteSuccess": "Removed from favorites",
+  "productDetail.unfavoriteSuccess": "Unfavorited successfully",
   "productDetail.favoriteError": "Operation failed, please try again",
+  "upgrade": {
+    "title": "Update Available",
+    "newVersion": "New Version",
+    "version": "Version: {version}",
+    "download": "Download",
+    "installing": "Installing...",
+    "install": "Install",
+    "restart": "Restart App",
+    "goToStore": "Go to Store",
+    "downloading": "Downloading...",
+    "downloadProgress": "{downloaded}MB/{total}MB",
+    "installIncomplete": "Installation Incomplete"
+  },
+  "upgrade.title": "Update Log",
+  "upgrade.newVersion": "New Version Available",
+  "upgrade.version": "Version {version}",
+  "upgrade.download": "Download Update Now",
+  "upgrade.downloading": "Downloading package, please wait...",
+  "upgrade.downloadProgress": "{downloaded}M/{total}M",
+  "upgrade.install": "Download complete, install now",
+  "upgrade.installing": "Installing...",
+  "upgrade.installIncomplete": "Installation incomplete, click to install",
+  "upgrade.restart": "Installation complete, click to restart",
+  "upgrade.goToStore": "Go to Store Now",
   "productDetail.openGroup": "Open Group",
   "productDetail.quantity": "Quantity",
   "topChampions.title": "Top Champions",

src/locale/zh-Hans.json

@@ -389,6 +389,30 @@
   "productDetail.favoriteSuccess": "收藏成功",
   "productDetail.unfavoriteSuccess": "已取消收藏",
   "productDetail.favoriteError": "操作失败，请重试",
+  "upgrade": {
+    "title": "发现新版本",
+    "newVersion": "新版本",
+    "version": "版本号：{version}",
+    "download": "下载",
+    "installing": "安装中...",
+    "install": "安装",
+    "restart": "重启应用",
+    "goToStore": "前往应用商店",
+    "downloading": "下载中...",
+    "downloadProgress": "已下载{downloaded}MB，共{total}MB",
+    "installIncomplete": "安装未完成"
+  },
+  "upgrade.title": "更新日志",
+  "upgrade.newVersion": "发现新版本",
+  "upgrade.version": "版本 {version}",
+  "upgrade.download": "立即下载更新",
+  "upgrade.downloading": "安装包下载中，请稍后",
+  "upgrade.downloadProgress": "{downloaded}M/{total}M",
+  "upgrade.install": "下载完成，立即安装",
+  "upgrade.installing": "正在安装...",
+  "upgrade.installIncomplete": "安装未完成，点击安装",
+  "upgrade.restart": "安装完毕，点击重启",
+  "upgrade.goToStore": "立即跳转更新",
   "productDetail.openGroup": "开团",
   "productDetail.quantity": "数量",
   "topChampions.title": "冠军榜",

src/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue

@@ -2,14 +2,14 @@
 	<view class="mask flex-center" v-if="shown">
 		<view class="content botton-radius">
 			<view class="content-top">
-				<text class="content-top-text">{{ title }}</text>
+				<text class="content-top-text">{{ $t('upgrade.title') }}</text>
 				<image class="content-top" style="top: 0" width="100%" height="100%" src="/uni_modules/uni-upgrade-center-app/static/app/bg_top.png"></image>
 			</view>
 			<view class="content-header"></view>
 			<view class="content-body">
 				<view class="title">
-					<text>{{ subTitle }}</text>
-					<text class="content-body-version">{{ version }}</text>
+					<text>{{ $t('upgrade.newVersion') }}</text>
+					<text class="content-body-version">{{ $t('upgrade.version').replace('{version}', version) }}</text>
 				</view>
 				<view class="body">
 					<scroll-view class="box-des-scroll" scroll-y="true">
@@ -21,7 +21,7 @@
 				<view class="footer flex-center">
 					<template v-if="isApplicationStore">
 						<button class="content-button" style="border: none; color: #fff" plain @click="jumpToApplicationStore">
-							{{ downLoadBtnTextiOS }}
+							{{ $t('upgrade.goToStore') }}
 						</button>
 					</template>
 					<template v-else>
@@ -29,13 +29,13 @@
 							<view class="progress-box flex-column" v-if="downloading">
 								<progress class="progress" :percent="downLoadPercent" activeColor="#3DA7FF" show-info stroke-width="10" />
 								<view style="width: 100%; font-size: 28rpx; display: flex; justify-content: space-around">
-									<text>{{ downLoadingText }}</text>
-									<text>({{ downloadedSize }}/{{ packageFileSize }}M)</text>
+									<text>{{ $t('upgrade.downloading') }}</text>
+									<text>{{ $t('upgrade.downloadProgress', { downloaded: downloadedSize, total: packageFileSize }) }}</text>
 								</view>
 							</view>
 
 							<button v-else class="content-button" style="border: none; color: #fff" plain @click="updateApp">
-								{{ downLoadBtnText }}
+								{{ $t('upgrade.download') }}
 							</button>
 						</template>
 						<button
@@ -47,7 +47,7 @@
 							:disabled="installing"
 							@click="installPackage"
 						>
-							{{ installing ? '正在安装……' : '下载完成，立即安装' }}
+							{{ installing ? $t('upgrade.installing') : $t('upgrade.install') }}
 						</button>
 						<button
 							v-else-if="installed && !isWGT"
@@ -58,10 +58,10 @@
 							:disabled="installing"
 							@click="installPackage"
 						>
-							安装未完成，点击安装
+							$t('upgrade.installIncomplete')
 						</button>
 
-						<button v-else-if="installed && isWGT" class="content-button" style="border: none; color: #fff" plain @click="restart">安装完毕，点击重启</button>
+						<button v-else-if="installed && isWGT" class="content-button" style="border: none; color: #fff" plain @click="restart">$t('upgrade.restart')</button>
 					</template>
 				</view>
 			</view>