@@ -90,32 +90,13 @@ public override LocalizedString this[string name]
9090 return ret ;
9191 }
9292
93+ private readonly ConcurrentDictionary < string , object ? > _missingManifestCache = [ ] ;
9394 private string ? GetStringSafelyFromJson ( string name )
9495 {
9596 // get string from json localization file
9697 var localizerStrings = MegerResolveLocalizers ( CacheManager . GetAllStringsByTypeName ( Assembly , typeName ) ) ;
97- return GetValueFromCache ( localizerStrings , name ) ;
98- }
99-
100- private List < LocalizedString > MegerResolveLocalizers ( IEnumerable < LocalizedString > ? localizerStrings )
101- {
102- var localizers = new List < LocalizedString > ( ) ;
103- var resolveLocalizers = CacheManager . GetTypeStringsFromResolve ( typeName ) ;
104- localizers . AddRange ( resolveLocalizers ) ;
105-
106- if ( localizerStrings != null )
107- {
108- localizers . AddRange ( localizerStrings ) ;
109- }
110- return localizers ;
111- }
112-
113- private readonly ConcurrentDictionary < string , object ? > _missingManifestCache = [ ] ;
114-
115- private string ? GetValueFromCache ( List < LocalizedString > localizerStrings , string name )
116- {
117- string ? ret = null ;
11898 var cacheKey = $ "name={ name } &culture={ CultureInfo . CurrentUICulture . Name } ";
99+ string ? ret = null ;
119100 if ( ! _missingManifestCache . ContainsKey ( cacheKey ) )
120101 {
121102 var l = localizerStrings . Find ( i => i . Name == name ) ;
@@ -131,6 +112,20 @@ private List<LocalizedString> MegerResolveLocalizers(IEnumerable<LocalizedString
131112 return ret ;
132113 }
133114
115+ private List < LocalizedString > MegerResolveLocalizers ( IEnumerable < LocalizedString > ? localizerStrings )
116+ {
117+ var localizers = new List < LocalizedString > ( ) ;
118+ var resolveLocalizers = CacheManager . GetTypeStringsFromResolve ( typeName ) ;
119+ localizers . AddRange ( resolveLocalizers ) ;
120+
121+ if ( localizerStrings != null )
122+ {
123+ localizers . AddRange ( localizerStrings ) ;
124+ }
125+ return localizers ;
126+ }
127+
128+
134129 private void HandleMissingResourceItem ( string name )
135130 {
136131 localizationMissingItemHandler . HandleMissingItem ( name , typeName , CultureInfo . CurrentUICulture . Name ) ;
0 commit comments