diff --git a/CHANGELOG.md b/CHANGELOG.md index d407956d..bdcd70ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,17 @@ # CHANGELOG -Contrast-Finder 0.9.6, 2020-0x-xx (unreleased) +Contrast-Finder 0.10.0, 2020-01-xx (unreleased) --------------------------------- Upgrade-o-meter: just replace the .war file and restart Tomcat Thanks to: -- @zwiastunsw - PR #220 +- @Quenty31 PR #220 Polish translation +- @zwiastunsw PR #223 Occitan translation ### New Feature - [#220 - i18n: add Polish](https://github.com/Asqatasun/Contrast-Finder/issues/220) +- [#223 - i18n: add Occitan](https://github.com/Asqatasun/Contrast-Finder/issues/223) ### Security none diff --git a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/AbstractController.java b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/AbstractController.java index d230ce9c..6c64bd4c 100644 --- a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/AbstractController.java +++ b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/AbstractController.java @@ -108,11 +108,11 @@ public abstract class AbstractController { * - comma-separated language codes (ISO 639-1: two-letter codes) * - order will be the same in the webapp menu * - * currently : "en,es,fr,pl,pt,ko" + * currently : "en,es,fr,pl,pt,oc,ko" * can be override in the following file: * /etc/contrast-finder/contrast-finder.conf */ - @Value("${languages:en,es,fr,pl,pt,ko}") + @Value("${languages:en,es,fr,pl,pt,oc,ko}") private String languages; /** @@ -261,6 +261,7 @@ public void setLoadAvailableLanguages(String loadAvailableLanguages) { switchLang.put("fr", "Passer en français"); switchLang.put("pl", "Przełącz na polski"); switchLang.put("pt", "em Português"); + switchLang.put("oc", "Passar a l’occitan"); switchLang.put("ko", "한국어로 전환"); this.textsOfSwitchLanguage = switchLang; diff --git a/webapp/src/main/resources/conf/contrast-finder.conf.dist b/webapp/src/main/resources/conf/contrast-finder.conf.dist index 5030c098..e65a40f4 100644 --- a/webapp/src/main/resources/conf/contrast-finder.conf.dist +++ b/webapp/src/main/resources/conf/contrast-finder.conf.dist @@ -34,4 +34,4 @@ # - comma-separated language codes (ISO 639-1: two-letter codes) # - order will be the same in the webapp menu ############################################### -# languages=en,es,fr,pl,pt,ko +# languages=en,es,fr,pl,pt,oc,ko