Skip to content

Commit c0bea27

Browse files
committed
[Ui] Add VertigoLocaleResolver by default
1 parent 12b6d54 commit c0bea27

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

vertigo-ui/src/main/java/io/vertigo/ui/impl/springmvc/config/VSpringWebConfig.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
4242
import org.springframework.web.multipart.support.StandardServletMultipartResolver;
4343
import org.springframework.web.servlet.DispatcherServlet;
44+
import org.springframework.web.servlet.LocaleResolver;
4445
import org.springframework.web.servlet.RequestToViewNameTranslator;
4546
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
4647
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -335,7 +336,12 @@ public void addResourceHandlers(final ResourceHandlerRegistry registry) {
335336
registry.addResourceHandler("/vertigo-ui/static/**")
336337
.addResourceLocations("classpath:/io/vertigo/ui/static/")
337338
.setCacheControl(CacheControl.maxAge(2, TimeUnit.HOURS).cachePublic());
339+
}
338340

341+
@Bean
342+
public LocaleResolver localeResolver() {
343+
// project can override this method or provide a LocaleResolver bean marked with @Primary
344+
return new VertigoLocaleResolver();
339345
}
340346

341347
protected boolean isDevMode() {

vertigo-ui/src/test/java/io/vertigo/ui/TestVSpringWebConfig.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,12 @@
1717
*/
1818
package io.vertigo.ui;
1919

20-
import org.springframework.context.annotation.Bean;
2120
import org.springframework.context.annotation.ComponentScan;
22-
import org.springframework.web.servlet.LocaleResolver;
2321

2422
import io.vertigo.ui.impl.springmvc.config.VSpringWebConfig;
25-
import io.vertigo.ui.impl.springmvc.config.VertigoLocaleResolver;
2623

2724
@ComponentScan("io.vertigo.ui.data.controllers")
2825
public class TestVSpringWebConfig extends VSpringWebConfig {
2926
// nothing basic config is enough
3027

31-
@Bean
32-
public LocaleResolver localeResolver() {
33-
return new VertigoLocaleResolver();
34-
}
3528
}

0 commit comments

Comments
 (0)