Skip to content
Snippets Groups Projects
Commit 0a60f20e authored by Chris Lemaire's avatar Chris Lemaire
Browse files

Merge branch '13-fix-localization-messages' into 'development'

Fix issue of localization messages not being found

Closes #13

See merge request !11
parents 707cb971 7d878be6
No related branches found
No related tags found
2 merge requests!215Master 1.1.1 release,!11Fix issue of localization messages not being found
package nl.tudelft.ewi.walkytalky.configuration;
import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.web.servlet.LocaleResolver;
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
......@@ -15,6 +17,21 @@ import java.util.Locale;
*/
@Configuration
public class LocaleConfiguration {
/**
* Bean used to resolve the messages for the current locale.
*
* @return The {@link MessageSource} bean.
*/
@Bean(name = "messageSource")
public MessageSource messageSource() {
ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
messageSource.setBasename("messages");
messageSource.setFallbackToSystemLocale(false);
messageSource.setCacheSeconds(0);
messageSource.setDefaultEncoding("UTF-8");
return messageSource;
}
/**
* Bean used to resolve the locale for a certain request.
* This resolver currently uses a {@link SessionLocaleResolver} that
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment