@@ -58,11 +58,11 @@ export const useQwikSpeak = (props: QwikSpeakProps) => {
58
58
} ;
59
59
60
60
// Resolve locale
61
- let resolvedLocale = props . config . supportedLocales . find ( value => value . lang === lang ) ;
61
+ let resolvedLocale = resolvedConfig . supportedLocales . find ( value => value . lang === lang ) ;
62
62
if ( ! resolvedLocale ) {
63
- resolvedLocale = props . config . defaultLocale ;
63
+ resolvedLocale = resolvedConfig . defaultLocale ;
64
64
65
- if ( isDev ) logWarn ( `Locale not resolved. Fallback to default locale: ${ props . config . defaultLocale . lang } ` ) ;
65
+ if ( isDev ) logWarn ( `Locale not resolved. Fallback to default locale: ${ resolvedConfig . defaultLocale . lang } ` ) ;
66
66
} else if ( isDev ) {
67
67
logDebug ( resolvedConfig . showDebugMessagesLocally , `Resolved locale: ${ resolvedLocale . lang } ` ) ;
68
68
}
@@ -116,9 +116,10 @@ export const useQwikSpeak = (props: QwikSpeakProps) => {
116
116
117
117
// In dev mode, send lang from client to the server
118
118
if ( isDev ) {
119
- logDebugInline ( resolvedConfig . showDebugMessagesLocally , 'Ready' )
120
119
if ( import . meta. hot ) {
121
120
import . meta. hot . send ( 'qwik-speak:lang' , { msg : locale . lang } ) ;
121
+
122
+ logDebugInline ( resolvedConfig . showDebugMessagesLocally , 'Ready' )
122
123
}
123
124
}
124
125
} ) ;
@@ -133,12 +134,6 @@ export const useQwikSpeak = (props: QwikSpeakProps) => {
133
134
export const QwikSpeakMockProvider = component$ < QwikSpeakMockProps > ( props => {
134
135
const lang = props . locale ?. lang ;
135
136
136
- // Resolve locale
137
- let resolvedLocale = props . config . supportedLocales . find ( value => value . lang === lang ) ;
138
- if ( ! resolvedLocale ) {
139
- resolvedLocale = props . config . defaultLocale ;
140
- }
141
-
142
137
// Resolve config
143
138
const resolvedConfig : SpeakConfig = {
144
139
rewriteRoutes : props . config . rewriteRoutes ,
@@ -148,9 +143,16 @@ export const QwikSpeakMockProvider = component$<QwikSpeakMockProps>(props => {
148
143
runtimeAssets : props . config . runtimeAssets ,
149
144
keySeparator : props . config . keySeparator || '.' ,
150
145
keyValueSeparator : props . config . keyValueSeparator || '@@' ,
151
- domainBasedRouting : props . config . domainBasedRouting
146
+ domainBasedRouting : props . config . domainBasedRouting ,
147
+ showDebugMessagesLocally : props . config . showDebugMessagesLocally ?? true
152
148
} ;
153
149
150
+ // Resolve locale
151
+ let resolvedLocale = resolvedConfig . supportedLocales . find ( value => value . lang === lang ) ;
152
+ if ( ! resolvedLocale ) {
153
+ resolvedLocale = resolvedConfig . defaultLocale ;
154
+ }
155
+
154
156
// Resolve functions
155
157
const resolvedTranslationFn : TranslationFn = {
156
158
loadTranslation$ : props . translationFn ?. loadTranslation$ ?? $ ( ( ) => null )
@@ -159,7 +161,7 @@ export const QwikSpeakMockProvider = component$<QwikSpeakMockProps>(props => {
159
161
// Set initial state as object (no reactive)
160
162
const state : SpeakState = {
161
163
locale : Object . assign ( { } , resolvedLocale ) ,
162
- translation : Object . fromEntries ( props . config . supportedLocales . map ( value => [ value . lang , { } ] ) ) ,
164
+ translation : Object . fromEntries ( resolvedConfig . supportedLocales . map ( value => [ value . lang , { } ] ) ) ,
163
165
config : Object . assign ( { } , resolvedConfig ) ,
164
166
translationFn : resolvedTranslationFn
165
167
} ;
0 commit comments