Commit ccc3be36 authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

utf8 resources

parent 52650947
Pipeline #123472 passed with stages
in 10 minutes and 11 seconds
......@@ -13,10 +13,13 @@ import info.textgrid.rep.i18n.I18NService;
@Controller
public class AdvancedSearchController {
@Autowired
private static final Log log = LogFactory.getLog(AdvancedSearchController.class);
private I18NService i18nService;
private static final Log log = LogFactory.getLog(AdvancedSearchController.class);
@Autowired
public AdvancedSearchController(I18NService i18nService) {
this.i18nService = i18nService;
}
@GetMapping("/advanced-search")
public String render(
......@@ -30,8 +33,4 @@ public class AdvancedSearchController {
return "advancedsearch";
}
public void setI18nService(I18NService i18nService) {
this.i18nService = i18nService;
}
}
......@@ -42,11 +42,15 @@ public class BrowseController {
private I18NService i18nService;
@Autowired
public BrowseController(TgsearchClientService tgsearchClientService,
AggregatorClientService aggregatorClient, TgrepConfigurationService tgrepConfig) {
public BrowseController(
TgsearchClientService tgsearchClientService,
AggregatorClientService aggregatorClient,
TgrepConfigurationService tgrepConfig,
I18NService i18nService) {
this.tgsearchClientService = tgsearchClientService;
this.aggregatorClient = aggregatorClient;
this.tgrepConfig = tgrepConfig;
this.i18nService = i18nService;
}
@GetMapping("/browse/{id}")
......@@ -253,8 +257,4 @@ public class BrowseController {
return token;
}
public void setI18nService(I18NService i18nService) {
this.i18nService = i18nService;
}
}
......@@ -30,7 +30,7 @@ public class BrowseFacetController {
private I18NService i18nService;
@Autowired
public BrowseFacetController(TgsearchClientService tgsearchClientService) {
public BrowseFacetController(TgsearchClientService tgsearchClientService, I18NService i18nService) {
this.tgsearchClientService = tgsearchClientService;
}
......@@ -60,8 +60,4 @@ public class BrowseFacetController {
return "browsefacet";
}
public void setI18nService(I18NService i18nService) {
this.i18nService = i18nService;
}
}
......@@ -12,9 +12,13 @@ import info.textgrid.rep.i18n.I18NService;
@Controller
public class DocController {
@Autowired
private I18NService i18nService;
@Autowired
public DocController(I18NService i18nService) {
this.i18nService = i18nService;
}
@GetMapping("/")
public String renderIndex(
Model model,
......@@ -22,7 +26,6 @@ public class DocController {
) {
return renderMarkdown(model, "index", locale);
}
@GetMapping("/doc/{doc}")
......@@ -46,8 +49,4 @@ public class DocController {
}
public void setI18nService(I18NService i18nService) {
this.i18nService = i18nService;
}
}
......@@ -25,16 +25,18 @@ public class SearchController {
private TgsearchClientService tgsearchClientService;
private TgrepConfigurationService tgrepConfig;
@Autowired
private I18NService i18nService;
private static final Logger logger = LoggerFactory.getLogger(SearchController.class);
@Autowired
public SearchController(TgsearchClientService tgsearchClientService, TgrepConfigurationService tgrepConfig) {
this.tgsearchClientService = tgsearchClientService;
this.tgrepConfig = tgrepConfig;
public SearchController(
TgsearchClientService tgsearchClientService,
TgrepConfigurationService tgrepConfig,
I18NService i18nService) {
this.tgsearchClientService = tgsearchClientService;
this.tgrepConfig = tgrepConfig;
this.i18nService = i18nService;
}
@GetMapping("/search")
......@@ -114,11 +116,7 @@ public class SearchController {
// which .jsp to render
return "search";
}
public void setI18nService(I18NService i18nService) {
this.i18nService = i18nService;
}
}
......@@ -117,5 +117,5 @@ search-term=Suchbegriff
settings=Einstellungen
shelf=Regal
imprint=Impressum
privpol=Datenschutzerklrung
help=Hilfe
\ No newline at end of file
privpol=Datenschutzerklärung
help=Hilfe
......@@ -4,10 +4,10 @@
<div class="tg footer_left">
<ul>
<li>
<a class="tg footer_contact" href="https://textgrid.de/en/kontakt/">Contact</a>
<a class="tg footer_contact" href="https://textgrid.de/en/kontakt/">${i18n['contact']}</a>
</li>
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
<li><a href="https://de.dariah.eu/impressum">${i18n['imprint']}</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">${i18n['privpol']}</a></li>
<li><a href="https://creativecommons.org/licenses/by/4.0/deed.de">CC BY 4.0</a></li>
</ul>
<ul>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment