Skip to content

Commit a7f0c20

Browse files
committed
Update docs & cleanup
1 parent becaf18 commit a7f0c20

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ stateDiagram-v2
127127
- `keyValueSeparator` Key-value separator. Default is `@@`
128128
- `rewriteRoutes` Rewrite routes as specified in Vite config for `qwikCity` plugin
129129
- `domainBasedRouting` Domain-based routing options
130+
- `showDebugMessagesLocally` Whether to enable local debugging mode. Default is true
130131

131132
### SpeakLocale
132133
The `SpeakLocale` object contains the `lang`, in the format `language[-script][-region]`, where:

packages/qwik-speak/src/use-qwik-speak.tsx

+14-12
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ export const useQwikSpeak = (props: QwikSpeakProps) => {
5858
};
5959

6060
// Resolve locale
61-
let resolvedLocale = props.config.supportedLocales.find(value => value.lang === lang);
61+
let resolvedLocale = resolvedConfig.supportedLocales.find(value => value.lang === lang);
6262
if (!resolvedLocale) {
63-
resolvedLocale = props.config.defaultLocale;
63+
resolvedLocale = resolvedConfig.defaultLocale;
6464

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}`);
6666
} else if (isDev) {
6767
logDebug(resolvedConfig.showDebugMessagesLocally, `Resolved locale: ${resolvedLocale.lang}`);
6868
}
@@ -116,9 +116,10 @@ export const useQwikSpeak = (props: QwikSpeakProps) => {
116116

117117
// In dev mode, send lang from client to the server
118118
if (isDev) {
119-
logDebugInline(resolvedConfig.showDebugMessagesLocally, 'Ready')
120119
if (import.meta.hot) {
121120
import.meta.hot.send('qwik-speak:lang', { msg: locale.lang });
121+
122+
logDebugInline(resolvedConfig.showDebugMessagesLocally, 'Ready')
122123
}
123124
}
124125
});
@@ -133,12 +134,6 @@ export const useQwikSpeak = (props: QwikSpeakProps) => {
133134
export const QwikSpeakMockProvider = component$<QwikSpeakMockProps>(props => {
134135
const lang = props.locale?.lang;
135136

136-
// Resolve locale
137-
let resolvedLocale = props.config.supportedLocales.find(value => value.lang === lang);
138-
if (!resolvedLocale) {
139-
resolvedLocale = props.config.defaultLocale;
140-
}
141-
142137
// Resolve config
143138
const resolvedConfig: SpeakConfig = {
144139
rewriteRoutes: props.config.rewriteRoutes,
@@ -148,9 +143,16 @@ export const QwikSpeakMockProvider = component$<QwikSpeakMockProps>(props => {
148143
runtimeAssets: props.config.runtimeAssets,
149144
keySeparator: props.config.keySeparator || '.',
150145
keyValueSeparator: props.config.keyValueSeparator || '@@',
151-
domainBasedRouting: props.config.domainBasedRouting
146+
domainBasedRouting: props.config.domainBasedRouting,
147+
showDebugMessagesLocally: props.config.showDebugMessagesLocally ?? true
152148
};
153149

150+
// Resolve locale
151+
let resolvedLocale = resolvedConfig.supportedLocales.find(value => value.lang === lang);
152+
if (!resolvedLocale) {
153+
resolvedLocale = resolvedConfig.defaultLocale;
154+
}
155+
154156
// Resolve functions
155157
const resolvedTranslationFn: TranslationFn = {
156158
loadTranslation$: props.translationFn?.loadTranslation$ ?? $(() => null)
@@ -159,7 +161,7 @@ export const QwikSpeakMockProvider = component$<QwikSpeakMockProps>(props => {
159161
// Set initial state as object (no reactive)
160162
const state: SpeakState = {
161163
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, {}])),
163165
config: Object.assign({}, resolvedConfig),
164166
translationFn: resolvedTranslationFn
165167
};

0 commit comments

Comments
 (0)