Parcourir la source

zh-CN更改为zh-cn

npzzwq99 il y a 2 semaines
Parent
commit
473984913f

+ 1 - 1
bootstrap/i18n-factory.js

@@ -29,7 +29,7 @@ function resolveInitialLocale() {
 
 const i18nOptions = {
 	locale: resolveInitialLocale(),
-	fallbackLocale: 'zh-CN',
+	fallbackLocale: 'zh-cn',
 	silentFallbackWarn: true,
 	messages: repairLocaleBundles(messages)
 }

+ 7 - 7
components/app-tabbar/app-tabbar.vue

@@ -72,7 +72,7 @@ const TAB_DEFS = [
 ]
 
 const LANGUAGE_MAP = {
-	'zh-CN': {
+	'zh-cn': {
 		home: '首页',
 		video: '视频',
 		live: '直播',
@@ -98,15 +98,15 @@ const LANGUAGE_MAP = {
 function resolveLangCode(raw) {
 	let code = raw
 	if (!code || code === 'auto') {
-		code = uni.getLocale() || 'zh-CN'
+		code = uni.getLocale() || 'zh-cn'
 	}
 	if (LANGUAGE_MAP[code]) return code
 	if (code === 'zh-HK' || code === 'zh-TW' || String(code).indexOf('Hant') >= 0) {
 		return 'zh-Hant'
 	}
-	if (String(code).indexOf('zh') === 0) return 'zh-CN'
+	if (String(code).indexOf('zh') === 0) return 'zh-cn'
 	if (String(code).indexOf('en') === 0) return 'en'
-	return 'zh-CN'
+	return 'zh-cn'
 }
 
 export default {
@@ -123,7 +123,7 @@ export default {
 	},
 	computed: {
 		tabs() {
-			const L = this.labels || LANGUAGE_MAP['zh-CN']
+			const L = this.labels || LANGUAGE_MAP['zh-cn']
 			return TAB_DEFS.map((tab) => ({
 				...tab,
 				label: L[tab.labelId] || ''
@@ -146,10 +146,10 @@ export default {
 	},
 	methods: {
 		initLanguageStrings() {
-			const locale = uni.getLocale() || 'zh-CN'
+			const locale = uni.getLocale() || 'zh-cn'
 			const savedLanguage = uni.getStorageSync(STORAGE.language)
 			const currentLang = resolveLangCode(savedLanguage || locale)
-			this.labels = LANGUAGE_MAP[currentLang] || LANGUAGE_MAP['zh-CN']
+			this.labels = LANGUAGE_MAP[currentLang] || LANGUAGE_MAP['zh-cn']
 		},
 		onTap(tab) {
 			if (this.switching) return

+ 6 - 6
components/feed-reel/vertical-reel.vue

@@ -384,7 +384,7 @@ const PREFETCH_TAIL = 2
 
 /** nvue 内嵌子 webview 常无 vue-i18n,文案走本地表兜底 */
 const REEL_COPY = {
-	'zh-CN': {
+	'zh-cn': {
 		loading: '加载中…',
 		empty: '暂无视频',
 		needLogin: '请先登录',
@@ -482,16 +482,16 @@ function resolveReelLang() {
 	}
 	if (!code || code === 'auto') {
 		try {
-			code = uni.getLocale() || 'zh-CN'
+			code = uni.getLocale() || 'zh-cn'
 		} catch (_) {
-			code = 'zh-CN'
+			code = 'zh-cn'
 		}
 	}
 	if (REEL_COPY[code]) return code
 	if (code === 'zh-HK' || code === 'zh-TW' || String(code).indexOf('Hant') >= 0) return 'zh-Hant'
-	if (String(code).indexOf('zh') === 0) return 'zh-CN'
+	if (String(code).indexOf('zh') === 0) return 'zh-cn'
 	if (String(code).indexOf('en') === 0) return 'en'
-	return 'zh-CN'
+	return 'zh-cn'
 }
 
 export default {
@@ -570,7 +570,7 @@ export default {
 	computed: {
 		copy() {
 			// nvue 内嵌子 webview 常无 vue-i18n,禁止触碰 this.$t / $t.bind
-			return REEL_COPY[resolveReelLang()] || REEL_COPY['zh-CN']
+			return REEL_COPY[resolveReelLang()] || REEL_COPY['zh-cn']
 		},
 		showBottomBarLikeCount() {
 			return !!appSettings.showBottomBarLikeCount

+ 3 - 3
components/live-room/gift-panel.vue

@@ -127,13 +127,13 @@ export default {
 	methods: {
 		// 初始化语言文本
 		initLanguageStrings() {
-			const locale = uni.getLocale() || 'zh-CN';
+			const locale = uni.getLocale() || 'zh-cn';
 			const savedLanguage = uni.getStorageSync('language');
 			const currentLang = savedLanguage || locale;
 			
 			// 语言文本映射
 			const languageMap = {
-				'zh-CN': {
+				'zh-cn': {
 					selectGift: '选择礼物',
 					loading: '加载中...',
 					noGifts: '暂无礼物',
@@ -224,7 +224,7 @@ export default {
 			};
 			
 			// 根据当前语言设置文本,如果不存在则使用简体中文
-			const texts = languageMap[currentLang] || languageMap['zh-CN'];
+			const texts = languageMap[currentLang] || languageMap['zh-cn'];
 			this.langTexts = {
 				selectGift: texts.selectGift,
 				loading: texts.loading,

+ 3 - 3
components/live-room/header.vue

@@ -87,11 +87,11 @@
 			 * uni.getStorageSync('language') || uni.getLocale(),再按 languageMap 取值。
 			 */
 			headerLangTexts() {
-				const locale = uni.getLocale() || 'zh-CN';
+				const locale = uni.getLocale() || 'zh-cn';
 				const savedLanguage = uni.getStorageSync('language');
 				const currentLang = savedLanguage || locale;
 				const languageMap = {
-					'zh-CN': {
+					'zh-cn': {
 						follow: '关注',
 						followed: '已关注',
 						watching: '在看'
@@ -122,7 +122,7 @@
 						watching: '視聴中'
 					}
 				};
-				return languageMap[currentLang] || languageMap['zh-CN'];
+				return languageMap[currentLang] || languageMap['zh-cn'];
 			},
 			/** 与接口一致:0 未关注,大于 0(含多种枚举值)已关注 */
 			isFollowing() {

+ 1 - 1
core/time/date-utils.js

@@ -70,7 +70,7 @@ export function chatBubbleTime(ts, i18n) {
 		return ['日', '一', '二', '三', '四', '五', '六']
 	})()
 
-	const locale = i18n ? i18n.locale : 'zh-CN'
+	const locale = i18n ? i18n.locale : 'zh-cn'
 	const chineseStyle = locale.startsWith('zh') || locale === 'ja'
 	const clock = formatTimestamp(ts, 'hh:MM')
 	const when = new Date(normalizeTimestamp(ts))

+ 1 - 1
features/account/locale-settings.js

@@ -12,7 +12,7 @@ export function buildLocaleOptions(t) {
 		{ code: 'en', text: t('locale.en') },
 		{ code: 'en-SG', text: t('locale.en-sg') },
 		{ code: 'en-MY', text: t('locale.en-my') },
-		{ code: 'zh-CN', text: t('locale.zh-hans') },
+		{ code: 'zh-cn', text: t('locale.zh-hans') },
 		{ code: 'zh-Hant', text: t('locale.zh-hant') }
 	]
 }

+ 2 - 2
features/tab-center-publish.js

@@ -2,7 +2,7 @@ const LOGIN_PAGE = '/pages/passport/lobby'
 
 const LABELS = {
 	'zh-Hant': ['發動態', '發視頻', '開始直播'],
-	'zh-CN': ['发圈子', '上传视频', '开始直播'],
+	'zh-cn': ['发圈子', '上传视频', '开始直播'],
 	default: ['Send Mood', 'Send Video', 'Send Live']
 }
 
@@ -13,7 +13,7 @@ const ROUTES = [
 ]
 
 function resolveLabels(locale) {
-	if (locale === 'zh-Hant' || locale === 'zh-CN') return LABELS[locale]
+	if (locale === 'zh-Hant' || locale === 'zh-cn') return LABELS[locale]
 	return LABELS.default
 }
 

+ 1 - 1
locale/index.js

@@ -4,7 +4,7 @@ import zhHant from './zh-Hant.json'
 import ja from './ja.json'
 export default {
 	en,
-	'zh-CN': zhCN,
+	'zh-cn': zhCN,
 	'zh-Hant': zhHant,
 	ja
 }

+ 4 - 4
pages/live/broadcast.nvue

@@ -247,7 +247,7 @@ export default {
 		showExitLiveConfirm() {
 			const lang = uni.getLocale();
 			let modalTitle, modalContent;
-			if (lang === 'zh-CN') {
+			if (lang === 'zh-cn') {
 				modalTitle = '提示';
 				modalContent = '确定要结束直播吗?';
 			} else if (lang === 'zh-Hant') {
@@ -320,7 +320,7 @@ export default {
 						const lang = uni.getLocale();
 						// 根据语言设置文本
 						let toastTitle;
-						if (lang === 'zh-CN') {
+						if (lang === 'zh-cn') {
 							// 简体中文
 							toastTitle = '网络连接不佳';
 						} else if (lang === 'zh-Hant') {
@@ -473,7 +473,7 @@ export default {
 				case 'start': {
 					const lang = uni.getLocale();
 					let loadingTitle = 'Live starting';
-					if (lang === 'zh-CN') loadingTitle = '启动中';
+					if (lang === 'zh-cn') loadingTitle = '启动中';
 					else if (lang === 'zh-Hant') loadingTitle = '啟動中';
 					const clearStartTimer = () => {
 						if (this.startTimer) {
@@ -706,7 +706,7 @@ export default {
 			// 获取当前语言
 			const lang = uni.getLocale();
 			let toastTitle;
-			if (lang === 'zh-CN') {
+			if (lang === 'zh-cn') {
 				toastTitle = '正在恢复推流...';
 			} else if (lang === 'zh-Hant') {
 				toastTitle = '正在恢復推流...';

+ 7 - 7
pages/live/watch.nvue

@@ -785,9 +785,9 @@ export default {
 		initLanguageStrings() {
 			let locale = ''
 			try {
-				locale = uni.getLocale() || 'zh-CN'
+				locale = uni.getLocale() || 'zh-cn'
 			} catch (_) {
-				locale = 'zh-CN'
+				locale = 'zh-cn'
 			}
 			let savedLanguage = ''
 			try {
@@ -795,18 +795,18 @@ export default {
 			} catch (_) {
 				savedLanguage = ''
 			}
-			let currentLang = savedLanguage || locale || 'zh-CN'
-			if (currentLang === 'auto') currentLang = locale || 'zh-CN'
+			let currentLang = savedLanguage || locale || 'zh-cn'
+			if (currentLang === 'auto') currentLang = locale || 'zh-cn'
 			if (currentLang === 'zh-HK' || currentLang === 'zh-TW' || String(currentLang).indexOf('Hant') >= 0) {
 				currentLang = 'zh-Hant'
 			} else if (String(currentLang).indexOf('zh') === 0) {
-				currentLang = 'zh-CN'
+				currentLang = 'zh-cn'
 			} else if (String(currentLang).indexOf('en') === 0) {
 				currentLang = currentLang === 'en-SG' || currentLang === 'en-MY' ? currentLang : 'en'
 			}
 
 			const languageMap = {
-				'zh-CN': {
+				'zh-cn': {
 					paidLivePleasePay: '付费直播,请先付费',
 					loading: '加载中...',
 					transcoding: '转码中...',
@@ -984,7 +984,7 @@ export default {
 			languageMap['en-SG'] = languageMap.en
 			languageMap['en-MY'] = languageMap.en
 
-			const texts = languageMap[currentLang] || languageMap['zh-CN']
+			const texts = languageMap[currentLang] || languageMap['zh-cn']
 			this.copy = { ...texts }
 		},
 		async bootstrapFeed() {