Skip to content

Commit aeebac7

Browse files
committed
Fix locale handling for search
1 parent 170ec3f commit aeebac7

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Diff for: src/main/java/it/garambo/retrosearch/configuration/BeanConfig.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.List;
44
import java.util.Locale;
5+
6+
import lombok.extern.slf4j.Slf4j;
57
import org.apache.commons.validator.routines.UrlValidator;
68
import org.springframework.beans.factory.annotation.Autowired;
79
import org.springframework.beans.factory.annotation.Value;
@@ -13,6 +15,7 @@
1315
import org.thymeleaf.spring6.SpringTemplateEngine;
1416
import org.thymeleaf.spring6.view.ThymeleafViewResolver;
1517

18+
@Slf4j
1619
@Configuration
1720
@EnableScheduling
1821
public class BeanConfig {
@@ -39,8 +42,9 @@ public ApplicationSettings applicationSettings(
3942

4043
@Bean
4144
public SearchSettings searchSettings(
42-
@Value("${retrosearch.search.locales:}") List<String> localeList) {
45+
@Value("${retrosearch.search.locales}") List<String> localeList) {
4346
List<Locale> locales = localeList.stream().map(StringUtils::parseLocaleString).toList();
47+
log.info("Initialising search locales: {}", locales);
4448
return new SearchSettings(locales);
4549
}
4650

Diff for: src/main/resources/application.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ server.compression.enabled=true
33
server.error.whitelabel.enabled=false
44
retrosearch.encoding=UTF-8
55
retrosearch.html.version=3.2
6-
retrosearch.search.locales=${SEARCH_LOCALES:en_US,en_GB,it_IT,de_DE}
6+
retrosearch.search.locales=${SEARCH_LOCALES:en_US,en_GB,it_IT,de_DE,fr_FR,es_ES}
77
retrosearch.news.enable=${NEWS_ACTIVE:false}
88
retrosearch.news.api.key=${NEWS_API_KEY:}
99
retrosearch.news.api.rate.limiter=${NEWS_API_RATE_LIMITER:3000}

Diff for: src/main/resources/templates/fragments/header.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ <h4>
2323
Search Query:
2424
<input type="text" th:value="${searchResults?.query}" name="query">
2525

26-
<th:block th:unless="${#lists.isEmpty(@newsSettings.getLocales())}">
26+
<th:block th:unless="${#lists.isEmpty(@searchSettings.getLocales())}">
2727
<select name="locale">
28-
<option th:each="locale: ${@newsSettings.getLocales()}"
28+
<option th:each="locale: ${@searchSettings.getLocales()}"
2929
th:text="${locale.getDisplayCountry()}"
3030
th:value="${locale.toString()}"
3131
th:selected="${searchResults?.locale == locale.toString()}">

0 commit comments

Comments
 (0)