@@ -106,20 +106,60 @@ class PluginI18n {
106106 return null
107107 }
108108 for ( let i = 0 , len = resources . length ; i < len ; i ++ ) {
109- const ret = this . _interpolate ( locale , resources [ i ] , key , host , interpolateMode , params , [ key ] )
109+ let ret
110+ if ( global . isRpkCardMinPlatformVersionGEQ ( 2000 , host ) ) {
111+ console . warn (
112+ `### App Framework ### i18n:读取卡片多语言资源,key: ${ key } , locale: ${ locale } `
113+ )
114+ ret = this . _interpolateFlatten ( locale , resources [ i ] , key , host , interpolateMode , params , [
115+ key
116+ ] )
117+ } else {
118+ console . warn ( `### App Framework ### i18n:读取多语言资源,key: ${ key } , locale: ${ locale } ` )
119+ ret = this . _interpolate ( locale , resources [ i ] , key , host , interpolateMode , params , [ key ] )
120+ }
110121 if ( ! isNull ( ret ) ) {
111122 return ret
112123 }
113124 }
114125 return null
115126 }
116127
128+ _interpolateFlatten ( locale , jsonObject , key , host , interpolateMode , params , visitedLinkStack ) {
129+ if ( ! jsonObject ) {
130+ return null
131+ }
132+
133+ const keyRet = jsonObject [ key ]
134+ return this . _interpolateCore (
135+ locale ,
136+ key ,
137+ host ,
138+ interpolateMode ,
139+ params ,
140+ visitedLinkStack ,
141+ keyRet
142+ )
143+ }
144+
117145 _interpolate ( locale , jsonObject , key , host , interpolateMode , params , visitedLinkStack ) {
118146 if ( ! jsonObject ) {
119147 return null
120148 }
121149
122150 const keyRet = this . _path . getPathValue ( jsonObject , key )
151+ return this . _interpolateCore (
152+ locale ,
153+ key ,
154+ host ,
155+ interpolateMode ,
156+ params ,
157+ visitedLinkStack ,
158+ keyRet
159+ )
160+ }
161+
162+ _interpolateCore ( locale , key , host , interpolateMode , params , visitedLinkStack , keyRet ) {
123163 if ( isPlainObject ( keyRet ) || Array . isArray ( keyRet ) ) {
124164 return keyRet
125165 }
0 commit comments