mirror of
https://github.com/Frooodle/Stirling-PDF.git
synced 2025-11-01 01:21:18 +01:00
# Description This pull request includes several changes aimed at improving the code structure and removing redundant code. The most significant changes involve reordering methods, removing unnecessary annotations, and refactoring constructors to use dependency injection. Autowired now comes via constructor (which also doesn't need autowired annotation as its done by default for configuration) ## Checklist - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ ] I have performed a self-review of my own code - [ ] I have attached images of the change if it is UI based - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] If my code has heavily changed functionality I have updated relevant docs on [Stirling-PDFs doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) - [ ] My changes generate no new warnings - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only)
63 lines
2.4 KiB
Java
63 lines
2.4 KiB
Java
package stirling.software.SPDF.config;
|
|
|
|
import java.util.Locale;
|
|
|
|
import org.springframework.context.annotation.Bean;
|
|
import org.springframework.context.annotation.Configuration;
|
|
import org.springframework.web.servlet.LocaleResolver;
|
|
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
|
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
|
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
|
|
import org.springframework.web.servlet.i18n.SessionLocaleResolver;
|
|
|
|
import stirling.software.SPDF.model.ApplicationProperties;
|
|
|
|
@Configuration
|
|
public class LocaleConfiguration implements WebMvcConfigurer {
|
|
|
|
private final ApplicationProperties applicationProperties;
|
|
|
|
public LocaleConfiguration(ApplicationProperties applicationProperties) {
|
|
this.applicationProperties = applicationProperties;
|
|
}
|
|
|
|
@Override
|
|
public void addInterceptors(InterceptorRegistry registry) {
|
|
registry.addInterceptor(localeChangeInterceptor());
|
|
registry.addInterceptor(new CleanUrlInterceptor());
|
|
}
|
|
|
|
@Bean
|
|
public LocaleChangeInterceptor localeChangeInterceptor() {
|
|
LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
|
|
lci.setParamName("lang");
|
|
return lci;
|
|
}
|
|
|
|
@Bean
|
|
public LocaleResolver localeResolver() {
|
|
SessionLocaleResolver slr = new SessionLocaleResolver();
|
|
String appLocaleEnv = applicationProperties.getSystem().getDefaultLocale();
|
|
Locale defaultLocale = // Fallback to UK locale if environment variable is not set
|
|
Locale.UK;
|
|
if (appLocaleEnv != null && !appLocaleEnv.isEmpty()) {
|
|
Locale tempLocale = Locale.forLanguageTag(appLocaleEnv);
|
|
String tempLanguageTag = tempLocale.toLanguageTag();
|
|
if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
|
|
defaultLocale = tempLocale;
|
|
} else {
|
|
tempLocale = Locale.forLanguageTag(appLocaleEnv.replace("_", "-"));
|
|
tempLanguageTag = tempLocale.toLanguageTag();
|
|
if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
|
|
defaultLocale = tempLocale;
|
|
} else {
|
|
System.err.println(
|
|
"Invalid APP_LOCALE environment variable value. Falling back to default Locale.UK.");
|
|
}
|
|
}
|
|
}
|
|
slr.setDefaultLocale(defaultLocale);
|
|
return slr;
|
|
}
|
|
}
|