diff --git a/CHANGELOG.md b/CHANGELOG.md index 2efd527a..8d19c14f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,35 @@ # CHANGELOG +Contrast-Finder 0.9.0, 2018-04-24 +--------------------------------- + +Upgrade-o-meter: just replace the .war file and restart Tomcat + +Thanks to: +- @ffoodd - Feature request #148 +- @ArnaudDelafosse - Issue #136 and PR #143 +- @davidjr82 - PR #157 + +### New Feature +- [#157 - i18n: added Spanish](https://github.com/Asqatasun/Contrast-Finder/issues/157) +- [#148 - Contrast calculation is visible without scrolling)](https://github.com/Asqatasun/Contrast-Finder/issues/148) + +### Bug +- [#136 - Webapp: fixed pt => px conversion ("Help" > "Text size understanding")](https://github.com/Asqatasun/Contrast-Finder/issues/136) + +### Documentation +- [#136 - Fixed pt => px conversion ("Help" > "Text size understanding")](https://github.com/Asqatasun/Contrast-Finder/issues/136) + + Contrast-Finder 0.8.6, 2018-04-14 --------------------------------- Upgrade-o-meter: just replace the .war file and restart Tomcat Thanks to: -- @ArnaudDelafosse for PR #142 -- @Kaths31 for PR #147 -- @miname for PR #144 and PR #145 +- @ArnaudDelafosse - PR #142 +- @Kaths31 - PR #147 +- @miname - PR #144 and #145 ### Outdated dependencies - [#156 - Upgraded native2ascii-maven-plugin (2.0.1 instead of 2.0.0)](https://github.com/Asqatasun/Contrast-Finder/issues/156) @@ -30,7 +51,6 @@ Thanks to: - [#142 - Howto-use.md improvements (syntax corrections, match titles to application labels)](https://github.com/Asqatasun/Contrast-Finder/issues/142) - Contrast-Finder 0.8.5, 2018-02-21 --------------------------------- diff --git a/docker/RELEASE/README.md b/docker/RELEASE/README.md index 5f4f0a5b..6796aaad 100644 --- a/docker/RELEASE/README.md +++ b/docker/RELEASE/README.md @@ -13,9 +13,9 @@ Supported tags and respective `Dockerfile` links : * [pre-requisites_Alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile) ### Releases -* [latest, v0.8.6, ubuntu-16.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile) -* [alpine, v0.8.6_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile) -* [v0.8.5](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.5/docker/RELEASE/Dockerfile), [v0.8.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.4/docker/RELEASE/Dockerfile), [v0.8.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.3/docker/RELEASE/Dockerfile), [v0.8.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.2/docker/RELEASE/Dockerfile), [v0.8.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.1/docker/RELEASE/Dockerfile), [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile) +* [latest, v0.9.0, ubuntu-16.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile) +* [alpine, v0.9.0_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile) +* [v0.8.6](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.6/docker/RELEASE/Dockerfile), [v0.8.5](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.5/docker/RELEASE/Dockerfile), [v0.8.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.4/docker/RELEASE/Dockerfile), [v0.8.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.3/docker/RELEASE/Dockerfile), [v0.8.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.2/docker/RELEASE/Dockerfile), [v0.8.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.1/docker/RELEASE/Dockerfile), [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile) * [v0.7.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.7.0/docker/RELEASE/Dockerfile), [v0.6.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.6.0/docker/RELEASE/Dockerfile), [v0.5.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.2/docker/RELEASE/Dockerfile) ## How to use this image diff --git a/docker/RELEASE/alpine_tomcat-7/Dockerfile b/docker/RELEASE/alpine_tomcat-7/Dockerfile index bca72726..5b89ac67 100644 --- a/docker/RELEASE/alpine_tomcat-7/Dockerfile +++ b/docker/RELEASE/alpine_tomcat-7/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (tomcat7 < jdk7 < alpine 3.7)" \ - org.label-schema.version = "0.8.6" \ + org.label-schema.version = "0.9.0" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder:alpine" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.6 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.6/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.6/contrast-finder-webapp_0.8.6.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.0 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -39,7 +39,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.8.6" +ARG CONTRAST_FINDER_RELEASE="0.9.0" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/alpine_tomcat-8.5/Dockerfile b/docker/RELEASE/alpine_tomcat-8.5/Dockerfile index e910b0fb..92948a19 100644 --- a/docker/RELEASE/alpine_tomcat-8.5/Dockerfile +++ b/docker/RELEASE/alpine_tomcat-8.5/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (tomcat 8.5 < jdk 8 < alpine 3.7)" \ - org.label-schema.version = "0.8.6" \ + org.label-schema.version = "0.9.0" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder:alpine" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.6 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.6/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.6/contrast-finder-webapp_0.8.6.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.0 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -39,7 +39,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.8.6" +ARG CONTRAST_FINDER_RELEASE="0.9.0" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile b/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile index 93d800d0..5432cad9 100644 --- a/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile +++ b/docker/RELEASE/ubuntu-14.04_tomcat-7/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (Ubuntu 14.04 - Tomcat 7)" \ - org.label-schema.version = "0.8.6" \ + org.label-schema.version = "0.9.0" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.6 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.6/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.6/contrast-finder-webapp_0.8.6.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.0 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -37,7 +37,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.8.6" +ARG CONTRAST_FINDER_RELEASE="0.9.0" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile b/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile index 3ca48528..4ec27beb 100644 --- a/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile +++ b/docker/RELEASE/ubuntu-16.04_tomcat-7/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp (Ubuntu 16.04 - Tomcat 7)" \ - org.label-schema.version = "0.8.6" \ + org.label-schema.version = "0.9.0" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.6 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.6/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.6/contrast-finder-webapp_0.8.6.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.0 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -37,7 +37,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.8.6" +ARG CONTRAST_FINDER_RELEASE="0.9.0" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz" diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile index 066f659c..0044394f 100644 --- a/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-7/Dockerfile @@ -21,7 +21,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile index bcb83c3d..6a1fa0ac 100644 --- a/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-8.5/Dockerfile @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-8.5 # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile b/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile index 5c245aa2..2fcb6f10 100644 --- a/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/alpine_tomcat-9/Dockerfile @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-9 # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile index a79027a2..fa91237d 100644 --- a/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/debian-9_tomcat-8.5/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian-9_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile b/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile index b1661443..c41b9dc2 100644 --- a/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/debian_tomcat-9_jre9/Dockerfile @@ -22,7 +22,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Debian_tomcat-9_jre9 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" ENV CONF_ENV="debug" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile index ce8bcbd8..d60fa6fb 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-14.04_tomcat-7/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-14.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile index 67a13c11..16574099 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-7/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile index ef8aa592..cc65c285 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-16.04_tomcat-8.0/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-8.0 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile b/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile index 60e03c34..605d0fcc 100644 --- a/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile +++ b/docker/SNAPSHOT-local/distrib/ubuntu-18.04_tomcat-8.5/Dockerfile @@ -20,7 +20,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-18.04_tomcat-8.5 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile b/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile index 6425063b..b9fbd351 100644 --- a/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/01.no.config.file/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile b/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile index 2548baae..650d2b56 100644 --- a/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/10.default.algo/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="HSV" diff --git a/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile b/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile index a4dac6de..9de5781c 100644 --- a/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/20.debug.env/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" ENV CONF_ENV="debug" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile b/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile index 25707e5b..951048e8 100644 --- a/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/30.piwik/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" ENV PIWIK_KEY="9" ENV PIWIK_URL="http://localhost/piwik/" diff --git a/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile b/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile index f7883430..7d323701 100644 --- a/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile +++ b/docker/SNAPSHOT-local/test_config-file/40.searchEngineIndex/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_Ubuntu-16.04_tomcat-7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" ENV SEARCH_ENGINGE="yes" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile index ac2f578f..c295dbba 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_14.04_tomcat7_full/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 14.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile index e7d1d754..7167391f 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat7_full/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/Dockerfile index 419a690e..e06d3fc3 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_16.04_tomcat8_full/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 8)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/Dockerfile index dbafebed..ebaad7ca 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Archive_with_libspring-instrument-java/Ubuntu_18.04_tomcat8_full/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 18.04 - Tomcat 8)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -79,7 +79,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile index 93d268d3..a6e70744 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_14.04_tomcat7_full/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 14.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -76,7 +76,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/Dockerfile index a5205e47..177d1927 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat7_full/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -76,7 +76,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/Dockerfile index 39d15546..523841b5 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_16.04_tomcat8_full/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 8)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -76,7 +76,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/Dockerfile b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/Dockerfile index d7cd8eb1..0f7a40c9 100644 --- a/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/Dockerfile +++ b/docker/SNAPSHOT-local/test_tomcat-7-8/Ubuntu_18.04_tomcat8_full/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 18.04 - Tomcat 8)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### @@ -76,7 +76,7 @@ HEALTHCHECK --timeout=3s \ ###################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.6" +ENV CONTRAST_FINDER_RELEASE="0.9.0" # Add contrast-finder .war ADD contrast-finder-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz /root diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile index 1973130b..c97328ba 100644 --- a/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-7/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat7 < jdk7 < alpine 3.7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile index d5f3c463..cc3b05f8 100644 --- a/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat 8.5 < jdk 8 < alpine 3.7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile index 55ebeb24..34ce1c57 100644 --- a/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Alpine_tomcat-9/Dockerfile @@ -4,7 +4,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat 9 < jdk 8 < alpine 3.7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile index 3c7d1a52..bc3cca13 100644 --- a/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Debian-9_tomcat-8.5/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Debian 9 - Tomcat 8.5)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile b/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile index 323580e0..898a7155 100644 --- a/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Debian_tomcat-9_jre9/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (tomcat 9 < jdk 9 < debian SID)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile index 3042fa53..416a0795 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-14.04_tomcat-7/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 14.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile index ce9e603e..92582d03 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-7/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 7)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile index 770cb37b..c9ff0f93 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-16.04_tomcat-8.0/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 16.04 - Tomcat 8.0)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile b/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile index 1ae8f50b..66313b36 100644 --- a/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile +++ b/docker/pre-requisites/pre-requisites_Ubuntu-18.04_tomcat-8.5/Dockerfile @@ -3,7 +3,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" org.label-schema.name = "Contrast-Finder - WebApp pre-requisites (Ubuntu 18.04 - Tomcat 8.5)" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ - org.label-schema.version = "0.8.6" + org.label-schema.version = "0.9.0" # ----> documentation http://label-schema.org/ # #### usage ###################################################### diff --git a/documentation/en/10_Install_doc/webapp_Installation.md b/documentation/en/10_Install_doc/webapp_Installation.md index 1be0b09c..451ddefc 100644 --- a/documentation/en/10_Install_doc/webapp_Installation.md +++ b/documentation/en/10_Install_doc/webapp_Installation.md @@ -14,7 +14,7 @@ You just need to replace `tomcat7` with `tomcat8` in the following command lines ```bash cd /tmp -wget https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.6/contrast-finder-webapp_0.8.6.tar.gz +wget https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.0/contrast-finder-webapp_0.9.0.tar.gz tar -xzvf contrast-finder-webapp_*.tar.gz cd contrast-finder-webapp_*/ mv -v install/contrast-finder-webapp_*.war contrast-finder.war diff --git a/documentation/en/30_Contributor_doc/QA-tools.md b/documentation/en/30_Contributor_doc/QA-tools.md index ee7672bd..13455f90 100644 --- a/documentation/en/30_Contributor_doc/QA-tools.md +++ b/documentation/en/30_Contributor_doc/QA-tools.md @@ -72,6 +72,14 @@ ## Audit history +### 0.8.6 +* Web perf + * https://www.webpagetest.org/result/180416_FA_7dffb8d4b1e9b1b8c5db99750de7248f/ + * https://yellowlab.tools/result/f06nkun2pi +* Global tools (webperf, accessibility, security, ...) + * https://www.dareboost.com/fr/report/5ad52ff9e967904471360c33 + * https://sonarwhal.com/scanner/ac55dafe-b7b2-46bb-8ee0-5195a61b363b + ### 0.8.5 * Web perf * https://www.webpagetest.org/result/180305_9F_e7fa800ea2820421a603b7991262d1e2/ diff --git a/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md b/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md index ad12cd94..81313f34 100644 --- a/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md +++ b/documentation/en/30_Contributor_doc/bookmarks-for-potential-features.md @@ -10,7 +10,12 @@ * src: http://kevingutowski.github.io/color.html ## schema.org +- https://www.w3.org/wiki/WebSchemas/Accessibility - http://schema.org/accessibilityAPI +- http://schema.org/accessibilityHazard +- http://schema.org/accessibilityControl +- http://schema.org/accessMode +- http://schema.org/accessModeSufficient ## Ansible diff --git a/documentation/en/Howto-use.md b/documentation/en/Howto-use.md index de3051ff..7a324b6b 100644 --- a/documentation/en/Howto-use.md +++ b/documentation/en/Howto-use.md @@ -36,12 +36,12 @@ How to choose a ratio? It depends on the following elements: ### Level AA -Two elements (size and bold) gives four combinations: +Contrast ratios should be at least: + +* 4.5 for body copy, +* 3 for text in bold with a font-size of at least (equivalent to) 18.5px or 120% of body copy, +* 3 for large text with a font-size of at least (equivalent to) 24px or 150% of body copy. -* Text not bold + text size < 18px => ratio = 4.5 -* Text bold + text size < 14px => ratio = 4.5 -* Text not bold + text size > 18px => ratio = 3 -* Text bold + text size > 14px => ratio = 3 ### Level AAA @@ -50,19 +50,28 @@ For level AAA the logic is the same, only the ratios increase in the the followi * 4.5 ratio becomes 7 * 3 ratio becomes 4.5 -Which gives extensively the following: +Which means contrast ratios should be at least: -* Text not bold + text size < 18px => ratio = 7 -* Text bold + text size < 14px => ratio = 7 -* Text not bold + text size > 18px => ratio = 4.5 -* Text bold + text size > 14px => ratio = 4.5 +* 7 for body copy, +* 4.5 for text in bold with a font-size of at least (equivalent to) 18.5px or 120% of body copy, +* 4.5 for large text with a font-size of at least (equivalent to) 24px or 150% of body copy. ### Text size understanding -* The 14px criteria can be understood as equivalent of 14pt or 120% or 1.2em -* The 18px criteria can be understood as equivalent of 18pt or 150% or 1.5em +According to the W3C, +> The ratio between sizes in points and CSS pixels is 1pt = 1.333px, therefore 14pt and 18pt are equivalent to approximately 18.5px and 24px. + +Source: "Note 1" section in [Contrast (Minimum) Understanding SC 1.4.3](https://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html) + +So for a given default font-size of (equivalent to) 16px with the following CSS rules +``` +body { font-size: 100%; } +p { font-size: 1rem; } +``` +* the 14pt criteria can be understood as (equivalent to) 18.5px ...or 1.2em or 120% of the default size for body text, +* and the 18pt criteria can be understood as (equivalent to) 24px ...or 1.5em or 150% of the default size for body text. -For a full and exhaustive understanding of how to interpret text size, one should read the [defintion of large-scale text from WCAG](https://www.w3.org/TR/WCAG20/#larger-scaledef) +**Please note** that these are pixel equivalences. In order to let users resize your text content, you should **never use fixed px unit** but relative units like **rem, em or %** to set your font sizes. Use your browser's Inspector/DevTools to check the calculated font size. ### Other info diff --git a/documentation/en/The-algorithms.md b/documentation/en/The-algorithms.md index 4120d6b4..92aa65ea 100644 --- a/documentation/en/The-algorithms.md +++ b/documentation/en/The-algorithms.md @@ -67,9 +67,9 @@ The red, green and blue values must be between 0 and 255. For this algorithm, the principle is similar to the first one. After many tests, we have identified the following constraints : * The component's step in one loop. We have decided to step the component values one by one. * The max shift for one component. We have decided to limit the maximum shift : - - to 60 when the gap between initial contrast ratio and the choosen contrast ratio is between 0 and 1 - - to 80 when the gap between initial contrast ratio and the choosen contrast ratio is between 1 and 2 - - to 110 when the gap between initial contrast ratio and the choosen contrast ratio is between 2 and 3 + - to 60 when the gap between initial contrast ratio and the chosen contrast ratio is between 0 and 1 + - to 80 when the gap between initial contrast ratio and the chosen contrast ratio is between 1 and 2 + - to 110 when the gap between initial contrast ratio and the chosen contrast ratio is between 2 and 3 * The hue bounder, set to 5%. Its aim is to limit the hue. If the initial color (to modify) is blue, we don't want to suggest a green, so we stay close to the initial hue. * The maximum coefficient. Its target is to limit the contrast ratio. For instance, if the selected ratio is 4.5, we want color that are 4.5 + this maximum coefficient. The value we chose is 0.001 (thus a color must have a ratio between 4.5 and 4.501, which is very very closed, but also what we want). diff --git a/documentation/pom.xml b/documentation/pom.xml index b9ae9101..2942c4b1 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.8.6 + 0.9.0 documentation pom - 0.8.6 + 0.9.0 contrast-finder-documentation diff --git a/engine/api/pom.xml b/engine/api/pom.xml index f1207664..95343fc9 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.6 + 0.9.0 contrast-finder-api - 0.8.6 + 0.9.0 jar api diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml index 59b8624b..d77112ed 100644 --- a/engine/hsv/pom.xml +++ b/engine/hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.6 + 0.9.0 contrast-finder-hsv - 0.8.6 + 0.9.0 jar hsv diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml index 68625225..9eda934c 100644 --- a/engine/impl/pom.xml +++ b/engine/impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.6 + 0.9.0 contrast-finder-impl - 0.8.6 + 0.9.0 jar impl diff --git a/engine/pom.xml b/engine/pom.xml index 8e61670b..4e49ebd5 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.8.6 + 0.9.0 engine - 0.8.6 + 0.9.0 pom contrast-finder-engine diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml index 842c4628..91b504dd 100644 --- a/engine/utils/pom.xml +++ b/engine/utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.6 + 0.9.0 contrast-finder-utils - 0.8.6 + 0.9.0 jar utils diff --git a/engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java b/engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java index 55ad2c23..883c54c3 100644 --- a/engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java +++ b/engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java @@ -49,6 +49,8 @@ public final class ContrastChecker { private static final double LUMINANCE_EXP = 2.4; /* */ private static final int ROUND_VALUE = 100000; + /* */ + private static final int ROUND_VALUE_2DIGIT = 100; /** * @@ -114,6 +116,21 @@ public static double getConstrastRatio5DigitRound(final Color fgColor, final Col } } + /** + * @param fgColor + * @param bgColor + * @return the contrast ratio between the 2 colors, rounded to 2 digits + */ + public static double getConstrastRatio2DigitRound(final Color fgColor, final Color bgColor) { + double fgLuminosity = getLuminosity(fgColor); + double bgLuminosity = getLuminosity(bgColor); + if (fgLuminosity > bgLuminosity) { + return (double) Math.round(computeContrast(fgLuminosity, bgLuminosity) * ROUND_VALUE_2DIGIT) / ROUND_VALUE_2DIGIT; + } else { + return (double) Math.round(computeContrast(bgLuminosity, fgLuminosity) * ROUND_VALUE_2DIGIT) / ROUND_VALUE_2DIGIT; + } + } + /** * @param lighter * @param darker diff --git a/engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java b/engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java index d5622502..31fef87e 100644 --- a/engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java +++ b/engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java @@ -78,6 +78,8 @@ public void testisContrastValidTwoGreenPass() { public void testgetConstrastRatio5DigitRound() { Color colorA = new Color(70, 136, 71); // #468847 Color colorB = new Color(223, 240, 216); // #DFF0D8 + Color colorC = new Color(138, 157, 138); // #8A9D8A + Color colorD = new Color(156, 239, 123); // #9CEF7B double result = ContrastChecker.getConstrastRatio5DigitRound(colorA, colorB); System.out.println("getConstrastRatio5DigitRound : [#468847] and [#DFF0D8] = ["+ result +"] "); assertEquals(3.61029, result, 0.00000001); @@ -85,6 +87,39 @@ public void testgetConstrastRatio5DigitRound() { result = ContrastChecker.getConstrastRatio5DigitRound(colorB, colorA); System.out.println("getConstrastRatio5DigitRound : [#DFF0D8] and [#468847] = ["+ result +"] "); assertEquals(3.61029, result, 0.00000001); + + result = ContrastChecker.getConstrastRatio5DigitRound(colorC, colorD); + System.out.println("getConstrastRatio5DigitRound : [#8A9D8A] and [#9CEF7B] = ["+ result +"] "); + assertEquals(2.0695, result, 0.00000001); // 2.0695032962424893 + + result = ContrastChecker.getConstrastRatio5DigitRound(colorD, colorC); + System.out.println("getConstrastRatio5DigitRound : [#9CEF7B] and [#8A9D8A] = ["+ result +"] "); + assertEquals(2.06950, result, 0.00000001); // 2.0695032962424893 + } + + @Test + public void testgetConstrastRatio2DigitRound() { + Color colorA = new Color(70, 136, 71); // #468847 + Color colorB = new Color(223, 240, 216); // #DFF0D8 + Color colorC = new Color(138, 157, 138); // #8A9D8A + Color colorD = new Color(156, 239, 123); // #9CEF7B + double result = ContrastChecker.getConstrastRatio2DigitRound(colorA, colorB); + System.out.println("getConstrastRatio2DigitRound : [#468847] and [#DFF0D8] = ["+ result +"] "); + assertEquals(3.61, result, 0.00000001); + + result = ContrastChecker.getConstrastRatio2DigitRound(colorB, colorA); + System.out.println("getConstrastRatio2DigitRound : [#DFF0D8] and [#468847] = ["+ result +"] "); + assertEquals(3.61, result, 0.00000001); + + result = ContrastChecker.getConstrastRatio2DigitRound(colorC, colorD); + System.out.println("getConstrastRatio2DigitRound : [#8A9D8A] and [#9CEF7B] = ["+ result +"] "); + assertEquals(2.07, result, 0.00000001); // 2.0695032962424893 + + result = ContrastChecker.getConstrastRatio2DigitRound(colorD, colorC); + System.out.println("getConstrastRatio2DigitRound : [#9CEF7B] and [#8A9D8A] = ["+ result +"] "); + assertEquals(2.07, result, 0.00000001); // 2.0695032962424893 + + } /////////////////////////////////////////////////////////////////// @Test diff --git a/pom.xml b/pom.xml index 4fef6f8b..93d92750 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.asqatasun contrast-finder pom - 0.8.6 + 0.9.0 Contrast-Finder diff --git a/webapp/pom.xml b/webapp/pom.xml index 06d8005f..3d7b123c 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.8.6 + 0.9.0 webapp - 0.8.6 + 0.9.0 war contrast-finder-webapp diff --git a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java index f350ef51..09616b90 100644 --- a/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java +++ b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java @@ -151,6 +151,9 @@ else if ("HSV".equals(defaultAlgorithm) || "Rgb".equals(defaultAlgorithm)) { Color backgroundColor = ColorConverter.colorFromStr(colorModel.getBackground()); /* Preparing the data and populating the model before returning the view */ + model.addAttribute("formCurrrentRatio", ""); + model.addAttribute("formCurrentMinRatio", ""); + model.addAttribute("formCurrentIsValidContrast",false); model.addAttribute("backgroundHEX", ColorConverter.rgb2Hex(backgroundColor)); model.addAttribute("foregroundHEX", ColorConverter.rgb2Hex(foregroundColor)); model.addAttribute("defaultAlgorithm", defaultAlgorithm); @@ -225,6 +228,14 @@ public String getPageResultFromGet( final Model model, ColorConverter.rgb2Hsl(foregroundColor)); model.addAttribute("resultNumber", colorResult.getNumberOfSuggestedColors()); + model.addAttribute("formCurrentMinRatio", + colorModel.getRatio()); + model.addAttribute("formCurrentIsValidContrast", + ContrastChecker.isContrastValid(foregroundColor, + backgroundColor, + Float.parseFloat(colorModel.getRatio()))); + model.addAttribute("formCurrrentRatio", + ContrastChecker.getConstrastRatio2DigitRound(foregroundColor, backgroundColor)); model.addAttribute("oldContrast", ContrastChecker.getConstrastRatio5DigitRound(foregroundColor, backgroundColor)); model.addAttribute("oldDistance", diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8.properties index c92d3dc9..6d11b637 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8.properties @@ -8,7 +8,9 @@ home.metaDescription=Contrast-Finder finds correct color contrasts for web acces Contrast-Finder is designed to be used by webdesigners, web developers \ or web accessibility professionals to improve the readability of HTML pages and websites. logo.link.title=Back to the homepage -nav.language-switch.aria-label=Languages +nav.language=english +nav.language-switching=Switch to english +nav.language-switching.aria-label=Languages result.title.colors=colors result.title.foregroundColor=text result.title.backgroundColor=background @@ -23,6 +25,9 @@ form.component=Color to edit form.componentForeground=Edit the text color form.componentBackground=Edit the background color form.ratio=Minimum ratio +form.currentRatio=Current ratio: +form.currentRatio.alt.valid=The contrast of your colours is sufficient. +form.currentRatio.alt.fail=The contrast of your colours is insufficient. form.contrastOld=Old contrast form.contrastNew=New contrast form.validate=Find valid colors @@ -69,25 +74,43 @@ footer.poweredBy=Powered by footer.availableUnder=available under footer.link-twitter=Follow Contrast-Finder on Twitter footer.link-git=Contributing to Contrast-Finder on GitHub -home.noResultTxt=

What is Contrast Finder?

\ -

Contrast-Finder is a tool which computes the contrast between \ +info.about.title=What is Contrast Finder? +info.about=

\ + Contrast-Finder is a tool which computes the contrast between \ two colors (background, foreground) and checks if the contrast is valid. \ When the contrast is not valid, the main target is to suggest some correct colors contrasts. \

\

Contrast-Finder is designed to be used by webdesigners, web developers \ or web accessibility professionals to improve the readability of HTML pages and websites. \ -

\ -

Help / How to use this tool?

\ -

The Contrast-Finder interface is a form with five mandatory fields.

\ +

+info.feedback.title=User Feedback +info.feedback=

\ + If you have any problems with or questions about Contrast-Finder, please contact us: \ +

\ + +info.contribute.title=Contribute to Contrast-Finder +info.contribute=

\ + All contributions are warmly welcome ! \ + Translation, correction, bug report, new feature…
\ + Feel free to play with \ + source code, \ + or discuss in the forum. \ +

+help.title=Help / How to use this tool? +help.head=

The Contrast-Finder interface is a form with five mandatory fields.

\ \ -

Text color / Foreground

\ -

\ + +help.txt-color.title=Text color / Foreground +help.txt-color=

\ This is the color of the text. \ You can fill in this field with color keyword, an hexadecimal value, \ or an RGB value. \ @@ -107,17 +130,42 @@ home.noResultTxt=

What is Contrast FinderFFF or FFFFFF works perfectly. \

\

Color with RGB values

\ -

Example: rgb(255,255,255).
\ +

Example: rgb(255,255,255).
\ You can also use a short syntax like 255,255,255, \ which be interpreted as rgb(255,255,255). \ -

\ -

Background color

\ -

\ +

+help.bg-color.title=Background color +help.bg-color=

\ This is the color of the background.
\ This field works just like the text color field.\ -

\ -

Minimum ratio

\ -

Three possible values 3, 4.5 and 7.

\ +

+help.color-to-edit.title=Color to edit +help.color-to-edit=

It is either the text or background color. Default is text color.

\ +

The color you choose will be modified until we find a valid color. \ + The other color won't change.

+help.algo.title=Gimme / The algorithms +help.algo=

“Valid colors and very close to initial color”

\ +

\ + This is the default algorithm. \ + It offers color options really close to the initial color. \ + (Color distance is computed on on a mathematical basis, which may vary from a designer point of view.) \ +

\ +

\ + For some color combinations, the algorithm may not give any result ; \ + in such a case, use the other algorithm.\ +

\ +

“A range of valid colors”

\ +

\ + This is the backup algorithm, in case the first one gives no result. \ + Nevertheless, color options may be (strongly) different from the initial color. \ +

+help.ratio.title=Minimum ratio +################################################################################## +# "help.ratio" will certainly evolve. +# ----> See issue #136 "Text size understanding : comments on pt => px conversion" +# https://github.com/Asqatasun/Contrast-Finder/issues/136 +################################################################################## +help.ratio=

Three possible values 3, 4.5 and 7.

\

How to choose a ratio? It depends on the following elements:

\ +######### unused i18n entries ############################################## # form.results=Results # form.usage=Usage: # form.ratioMedium=Small text (size < 18px, Level AA) # form.ratioShort=Big text (size ≥ 18px, Level AA) -# form.ratioHigh=Strenghten contrast (Level AAA) -# form.description_v2=Find me the good constrasts, for web accessibility, between these two colors: +# form.ratioHigh=Strengthen contrast (Level AAA) +# form.description_v2=Find me the good contrasts, for web accessibility, between these two colors: diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties index c92d3dc9..6d11b637 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties @@ -8,7 +8,9 @@ home.metaDescription=Contrast-Finder finds correct color contrasts for web acces Contrast-Finder is designed to be used by webdesigners, web developers \ or web accessibility professionals to improve the readability of HTML pages and websites. logo.link.title=Back to the homepage -nav.language-switch.aria-label=Languages +nav.language=english +nav.language-switching=Switch to english +nav.language-switching.aria-label=Languages result.title.colors=colors result.title.foregroundColor=text result.title.backgroundColor=background @@ -23,6 +25,9 @@ form.component=Color to edit form.componentForeground=Edit the text color form.componentBackground=Edit the background color form.ratio=Minimum ratio +form.currentRatio=Current ratio: +form.currentRatio.alt.valid=The contrast of your colours is sufficient. +form.currentRatio.alt.fail=The contrast of your colours is insufficient. form.contrastOld=Old contrast form.contrastNew=New contrast form.validate=Find valid colors @@ -69,25 +74,43 @@ footer.poweredBy=Powered by footer.availableUnder=available under footer.link-twitter=Follow Contrast-Finder on Twitter footer.link-git=Contributing to Contrast-Finder on GitHub -home.noResultTxt=

What is Contrast Finder?

\ -

Contrast-Finder is a tool which computes the contrast between \ +info.about.title=What is Contrast Finder? +info.about=

\ + Contrast-Finder is a tool which computes the contrast between \ two colors (background, foreground) and checks if the contrast is valid. \ When the contrast is not valid, the main target is to suggest some correct colors contrasts. \

\

Contrast-Finder is designed to be used by webdesigners, web developers \ or web accessibility professionals to improve the readability of HTML pages and websites. \ -

\ -

Help / How to use this tool?

\ -

The Contrast-Finder interface is a form with five mandatory fields.

\ +

+info.feedback.title=User Feedback +info.feedback=

\ + If you have any problems with or questions about Contrast-Finder, please contact us: \ +

\ + +info.contribute.title=Contribute to Contrast-Finder +info.contribute=

\ + All contributions are warmly welcome ! \ + Translation, correction, bug report, new feature…
\ + Feel free to play with \ + source code, \ + or discuss in the forum. \ +

+help.title=Help / How to use this tool? +help.head=

The Contrast-Finder interface is a form with five mandatory fields.

\ \ -

Text color / Foreground

\ -

\ + +help.txt-color.title=Text color / Foreground +help.txt-color=

\ This is the color of the text. \ You can fill in this field with color keyword, an hexadecimal value, \ or an RGB value. \ @@ -107,17 +130,42 @@ home.noResultTxt=

What is Contrast FinderFFF or FFFFFF works perfectly. \

\

Color with RGB values

\ -

Example: rgb(255,255,255).
\ +

Example: rgb(255,255,255).
\ You can also use a short syntax like 255,255,255, \ which be interpreted as rgb(255,255,255). \ -

\ -

Background color

\ -

\ +

+help.bg-color.title=Background color +help.bg-color=

\ This is the color of the background.
\ This field works just like the text color field.\ -

\ -

Minimum ratio

\ -

Three possible values 3, 4.5 and 7.

\ +

+help.color-to-edit.title=Color to edit +help.color-to-edit=

It is either the text or background color. Default is text color.

\ +

The color you choose will be modified until we find a valid color. \ + The other color won't change.

+help.algo.title=Gimme / The algorithms +help.algo=

“Valid colors and very close to initial color”

\ +

\ + This is the default algorithm. \ + It offers color options really close to the initial color. \ + (Color distance is computed on on a mathematical basis, which may vary from a designer point of view.) \ +

\ +

\ + For some color combinations, the algorithm may not give any result ; \ + in such a case, use the other algorithm.\ +

\ +

“A range of valid colors”

\ +

\ + This is the backup algorithm, in case the first one gives no result. \ + Nevertheless, color options may be (strongly) different from the initial color. \ +

+help.ratio.title=Minimum ratio +################################################################################## +# "help.ratio" will certainly evolve. +# ----> See issue #136 "Text size understanding : comments on pt => px conversion" +# https://github.com/Asqatasun/Contrast-Finder/issues/136 +################################################################################## +help.ratio=

Three possible values 3, 4.5 and 7.

\

How to choose a ratio? It depends on the following elements:

\ +######### unused i18n entries ############################################## # form.results=Results # form.usage=Usage: # form.ratioMedium=Small text (size < 18px, Level AA) # form.ratioShort=Big text (size ≥ 18px, Level AA) -# form.ratioHigh=Strenghten contrast (Level AAA) -# form.description_v2=Find me the good constrasts, for web accessibility, between these two colors: +# form.ratioHigh=Strengthen contrast (Level AAA) +# form.description_v2=Find me the good contrasts, for web accessibility, between these two colors: diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_es.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_es.properties new file mode 100644 index 00000000..3e3cb929 --- /dev/null +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_es.properties @@ -0,0 +1,211 @@ +###### i18n file in UTF-8 character encoding ####################### +NOT_A_VALID_COLOR=El color debe estar comprendido entre #000000 y #FFFFFF +NOT_A_VALID_RATIO.colorModel.ratio=Ratio inválido +home.titleTag=Contrast Finder, encuentra los contrastes adecuados de color para crear webs accesibles (WCAG) +###### 330 characters max for "home.metaDescription" +home.metaDescription=Contrast-Finder encuentra los contrastes adecuados de color para crear webs accesibles (WCAG). \ + Esta herramienta ayuda a validar los tests de accesibilidad web (a11y) sobre contrastes de color. \ + Contrast-Finder está diseñada para ser utilizada por diseñadores web, desarrolladores web \ + o profesionales de la accesibilidad web para mejorar la facilidad de lectura de páginas HTML sitios web. +logo.link.title=Volver a página inicial +nav.language=español +#nav.language-switching=Switch to Español @@@TODO i18n +nav.language-switching.aria-label=Idiomas +result.title.colors=colores +result.title.foregroundColor=texto +result.title.backgroundColor=fondo +result.title.minRation=ratio mínimo +form.fillInFields=Por favor, rellena los siguientes campos: +form.description=Contrast-Finder encuentra los contrastes adecuados de color para crear webs accesibles +form.help=Color en hexadecimal, RGB o palabras clave de color CSS.
\ + Example: #FFFFFF, rgb(255,255,255) o white +form.foregroundColor=Color del texto +form.backgroundColor=Color del fondo +form.component=Color a editar +form.componentForeground=Editar el color del texto +form.componentBackground=Editar el color del fondo +form.ratio=Ratio mínimo +form.currentRatio=Ratio actual: +form.currentRatio.alt.valid=El contraste de tus colores es suficiente. +form.currentRatio.alt.fail=El contraste de tus colores no es suficiente. +form.contrastOld=Anterior contraste +form.contrastNew=Nuevo contraste +form.validate=Encuentra colores válidos +form.validContrast=Contraste válido: +form.validContrastDesc=Los colores escogidos ya son adecuados +##### For [form.resultNumber] +##### ---> Do not translate "choice", it is an internal ID +form.resultNumber={0} {0,choice,1#resultado|1 \ + Los criterios WCAG \ + de validez 1.4.3 \ + \ + requieren que el texto tenga un contraste mínimo \ + de 4.5 (y 3 para textos largos). +footer.LikedCf=¿Te gusta Contrast-Finder?
Prueba Asqatasun, la herramienta de código abierto para análisis de accesibilidad +form.contrastSolutionDistance=Distancia +form.contrastSolutionDistanceEx=Distancia desde el color inicial +form.objectifs=Dame +form.algoHSV=un rango válido de colores +form.algoRGB=colores válidos y muy cercanos al color inicial +form.invalidColor=Color inválido +form.changeComponent=prueba de nuevo cambiando el +form.invalidAlgo=El valor del algoritmo no es válido. +form.tryHsv=Dame un rango de colores +form.tryRgb=Dame colores válidos y muy cercanos al color inicial +form.testedColors=colores testados +form.notSatisfied=¿Insatisfecho? +form.anyResult=Vamos +form.oppositeComponentForeground=color de fondo +form.oppositeComponentBackground=color de primer plano +message.addon=Hey! Has probado el nuevo Contrast-Finder addon de Firefox? +footer.poweredBy=Creado por +footer.availableUnder=disponible bajo +footer.link-twitter=Sigue a Contrast-Finder en Twitter +footer.link-git=Contribuye a Contrast-Finder en GitHub +info.about.title=¿Qué es Contrast Finder? +info.about=

\ + Contrast-Finder es una herramienta que evalúa el contraste entre \ + dos colores (fondo, primer plano) y comprueba si el contraste es aceptable. \ + Cuando el contraste no es aceptable, el objetivo principal es sugerir alternativas de contraste de color válidas. \ +

\ +

Contrast-Finder está diseñada para ser utilizada por diseñadores web, desarrolladores web \ + o profesionales de la accesibilidad web para mejorar la facilidad de lectura de páginas HTML sitios web. \ +

+info.feedback.title=Comentarios del usuario +info.feedback=

\ + Si tienes problemas o presguntas sobre Contrast-Finder, por favor, contacta con nosotros: \ +

\ + +info.contribute.title=Contribuye a Contrast-Finder +info.contribute=

\ + Todas las contribuciones son bienvenidas ! \ + Traducciones, correciones, informes de errores, nuevas características…
\ + Siéntete libre de jugar con el \ + código fuente, \ + o de opinar en el foro. \ +

+help.title=Ayuda / ¿Cómo usar esta herramienta? +help.head=

La interfaz de Contrast-Finder es un formulario con cinco campos obligatorios.

\ + +help.txt-color.title=Color del texto / Primer plano +help.txt-color=

\ + Este es el color del texto. \ + Puedes rellenar este campo con palabras clave de color CSS, un valor hexadecimal, \ + o un valor RGB. \ + El valor proporcionado será previsualizado a la derecha del campo. \ +

\ +

Palabras clave de color CSS

\ +

Por ejemplo: Black, Silver, YellowGreen, MediumPurple.
\ + Los valores válidos se pueden encontrar en \ + palabras clave de color CSS \ + (desde CSS nivel 1 a CSS nivel 4). \ +

\ +

Color con valores hexadecimal

\ +

Por ejemplo: #AABBCC. \ + Los valores con formato #ABC también funcionan, \ + el sistema completará el campo automáticamente con el valor #AABBCC. \ + Este campo puede ser usado sin el carácter #, \ + de modo que FFF o FFFFFF funcionan sin problemas. \ +

\ +

Colores con valores RGB

\ +

Por ejemplo: rgb(255,255,255).
\ + Se puede utilizar la sintáxis abreviada 255,255,255, \ + que será interpretada como rgb(255,255,255). \ +

+help.bg-color.title=Color del fondo +help.bg-color=

\ + Este es el color del fondo.
\ + Este campo funciona exactamente como el campo de color de texto.\ +

+help.color-to-edit.title=Color a editar +help.color-to-edit=

Puede referirse tanto al color del texto como al color del fondo. Por defecto ese refiere al color del texto.

\ +

El color seleccionado será modificado hasta encontrar un color válido. \ + El otro color no cambiará.

+help.algo.title=Dámelo / Los algoritmos +help.algo=

“Colores va´lidos y muy cercanos al color inicial”

\ +

\ + Este es el algoritmo por defecto. \ + Ofrece opciones de colores muy cercanas al color inicial. \ + (La distancia de color es evaluada de forma matemática, que puede variar del punto de vista de un diseñador.) \ +

\ +

\ + Para algunas combinaciones de colores, el algoritmo no ofrece ningún resutado ; \ + en este caso, se recomienda usar el otro algoritmo.\ +

\ +

“Un rango de colores válidos”

\ +

\ + Este es el algoritmo alternativo, en caso de que el primero no ofrezca ningún resultado. \ + Sin embargo, los colores ofrecidos pueden diferir (significativamente) del color inicial. \ +

+help.ratio.title=Ratio mínimo +################################################################################## +# "help.ratio" will certainly evolve. +# ----> See issue #136 "Text size understanding : comments on pt => px conversion" +# https://github.com/Asqatasun/Contrast-Finder/issues/136 +################################################################################## +help.ratio=

Hay tres posibles valores: 3, 4.5 y 7.

\ +

¿Cómo escoger un ratio? Dependerá de los siguientes elementos:

\ +
    \ +
  • Nivel de accesibilidad deseado: AA o AAA.
  • \ +
  • Tamaño del texto.
  • \ +
  • ¿El texto está en negrita?
  • \ +
\ +

Nivel AA

\ +

Dos elementos (tamaño y negrita) nos dan cuatro combianciones:

\ +
    \ +
  • Texto sin negrita + tamaño de texto < 24px: ratio = 4.5
  • \ +
  • Texto sin negrita + tamaño de texto > 24px: ratio = 3
  • \ +
  • Texto con negrita + tamaño de texto < 19px: ratio = 4.5
  • \ +
  • Texto con negrita + tamaño de texto > 19px: ratio = 3
  • \ +
\ +

Nivel AAA

\ +

Para el nivel AAA la lógica es la misma, pero el ratio se incrementa de la siguiente manera:

\ +
    \ +
  • El ratio 4.5 se convierte en 7
  • \ +
  • El ratio 3 se convierte en 4.5
  • \ +
\ +

Entendiendo el tamaño de texto

\ +
    \ +
  • El criterio de 19px puede ser entendido como equivalente \ + a 14pt o 120% o 1.2em.
  • \ +
  • El criterio de 24px puede ser entendido como equivalente \ + a 18pt o 150% o 1.5em.
  • \ +
\ +

Para una compresión exhaustiva de cómo interpretar el tamaño de texto, se debe leer la \ + definición de texto de gran tamaño de la WCAG.

\ +

Todos los detalles sobre el ratio de contraste

\ + +######### unused i18n entries ############################################## +# form.results=Results +# form.usage=Usage: +# form.ratioMedium=Small text (size < 18px, Level AA) +# form.ratioShort=Big text (size ≥ 18px, Level AA) +# form.ratioHigh=Strenghten contrast (Level AAA) +# form.description_v2=Find me the good constrasts, for web accessibility, between these two colors: diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties index ea4896f7..73356a11 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties @@ -8,7 +8,9 @@ home.metaDescription=Outil en ligne pour vérifier si le contraste de vos couleu de celles que vous venez de tester. Utilisé par les webdesigners, les développeurs web \ ou les professionnels de l’accessibilité web afin d’améliorer la lisibilité des sites web. logo.link.title=Retour à la page d’accueil -nav.language-switch.aria-label=Langues +nav.language=français +nav.language-switching=Passer en français +nav.language-switching.aria-label=Langues result.title.colors=couleurs result.title.foregroundColor=texte result.title.backgroundColor=fond @@ -23,6 +25,9 @@ form.component=Couleur à modifier form.componentForeground=Modifier la couleur du texte form.componentBackground=Modifier la couleur du fond form.ratio=Ratio minimum +form.currentRatio=Ratio actuel : +form.currentRatio.alt.valid=Le contraste de vos couleurs est suffisant. +form.currentRatio.alt.fail=Le contraste de vos couleurs est insuffisant. form.contrastOld=Ancien contraste form.contrastNew=Nouveau contraste form.validate=Trouver des couleurs valides @@ -69,8 +74,8 @@ footer.poweredBy=Propulsé par footer.availableUnder=disponible sous licence footer.link-twitter = Suivez Contrast-Finder sur Twitter footer.link-git = Contribuer au logiciel Contrast-Finder sur GitHub -home.noResultTxt=

Contrast Finder, c’est quoi ?

\ -

Contrast-Finder est un outil qui calcule le contraste entre \ +info.about.title=Contrast Finder, c’est quoi ? +info.about=

Contrast-Finder est un outil qui calcule le contraste entre \ deux couleurs (arrière-plan et premier plan) et qui vérifie si il est suffisant. \ Si ce contraste n’est pas valide, l’outil suggère plusieurs propositions \ de couleurs alternatives ayant un contraste correct. \ @@ -78,47 +83,97 @@ home.noResultTxt=

Contrast Finder<

Contrast-Finder est conçu pour être utilisé par les webdesigners, \ les développeurs web ou les professionnels de l’accessibilité web \ afin d’améliorer la lisibilité des pages HTML et des sites web. \ +

+info.feedback.title=Une question ? +info.feedback=

\ + Si vous avez des questions ou des remarques sur Contrast-Finder, contactez-nous : \

\ -

Aide / Comment utiliser cet outil ?

\ -

L’interface de Contrast-Finder est un formulaire de cinq champs obligatoires.

\ + +info.contribute.title=Contribuer à Contrast-Finder +info.contribute=

\ + Toutes les contributions sont chaleureusement accueillies ! \ + Traduction, correction, rapport de bug, nouvelle fonctionnalité… \ + N’hésitez pas à jouer avec le \ + code source \ + ou à en discuter sur le forum. \ +

+help.title=Aide / Comment utiliser cet outil ? +help.head=

L’interface de Contrast-Finder est un formulaire de cinq champs obligatoires.

\ \ -

Premier plan : couleur du texte

\ -

\ + +help.txt-color.title=Premier plan : couleur du texte +help.txt-color=

\ C’est la couleur du texte. \ - Vous pouvez remplir ce champ avec un nom de couleur CSS, une valeur hexadécimale, \ - ou une valeur RGB. \ + Vous pouvez remplir ce champ avec un nom de couleur CSS, une valeur hexadécimale, \ + ou une valeur RGB. \ La valeur saisie est alors prévisualisée à droite du champ. \

\

Couleur par mots-clés

\

Exemple : Black, Silver, YellowGreen, MediumPurple.
\ -Les valeurs autorisées sont les noms des couleurs utilisables en CSS \ + Les valeurs autorisées sont les noms des couleurs utilisables en CSS \ (du niveau CSS 1 au niveau CSS 4). \

\

Couleur en hexadécimal

\

Exemple : #AABBCC. \ - Notez que #ABC fonctionne également, \ - nous complétons automatiquement le champ avec #AABBCC. \ - Vous pouvez également utiliser ce champ sans le caractère #, \ - ainsi FFF ou FFFFFF fonctionnent parfaitement. \ + Notez que #ABC fonctionne également, \ + nous complétons automatiquement le champ avec #AABBCC. \ + Vous pouvez également utiliser ce champ sans le caractère #, \ + ainsi FFF ou FFFFFF fonctionnent parfaitement. \

\

Couleur en RGB

\ -

Exemple : rgb(255,255,255).
\ - De la même manière, 255,255,255 fonctionne également, \ - nous remplaçons la valeur de ce champ par rgb(255,255,255). \ +

Exemple : rgb(255,255,255).
\ + De la même manière, 255,255,255 fonctionne également, \ + nous remplaçons la valeur de ce champ par rgb(255,255,255). \ +

+help.bg-color.title=Arrière-plan : couleur du fond +help.bg-color=

\ + C’est la couleur d’arrière-plan.
\ + Ce champ fonctionne comme le champ couleur du texte.\ +

+help.color-to-edit.title=Couleur à modifier +help.color-to-edit=

\ + Il s’agit de la couleur du texte ou de la couleur du fond. \ + Par défaut, c’est la couleur du texte.\ +

\ +

\ + La couleur que vous choisissez sera modifiée jusqu’à ce que l’outil trouve une couleur valide. \ + L’autre couleur ne changera pas. \ +

+help.algo.title=Propose-moi / Les algorithmes +help.algo=

“Couleurs valides et très proches de la couleur initiale”

\ +

\ + Ceci est l’algorithme par défaut. \ + Il propose des couleurs extrêmement proches de la couleur initiale. \ + (La proximité est calculée sur des critères mathématiques, qui peuvent être différents d’une vision graphique.) \ +

\ +

\ + L’algorithme dans certains cas ne renvoi aucun résultat ; \ + dans ce cas, choisissez l’autre algorithme. :) \

\ -

Arrière-plan : couleur du fond

\ +

“Palette de couleurs valides”

\

\ - C’est la couleur d’arrière-plan.
\ - Ce champ fonctionne comme le champ couleur du texte.\ -

\ -

Ratio minimum

\ -

Trois valeurs possibles : 3, 4.5 et 7.

\ + Ceci est l’algorithme “de secours”, au cas où le premier ne donne rien. \ + En revanche, les couleurs proposées peuvent être plus éloignées, \ + voire franchement distincte de la couleur initiale. \ +

+help.ratio.title=Ratio minimum +################################################################################## +# "help.ratio" will certainly evolve. +# ----> See issue #136 "Text size understanding : comments on pt => px conversion" +# https://github.com/Asqatasun/Contrast-Finder/issues/136 +################################################################################## +help.ratio=

\ + Trois valeurs possibles : 3, 4.5 et 7. \ +

\

Comment choisir un ratio ? Cela dépend des éléments suivants :

\ \ \ -\ -

Couleur à modifier

\ -

Il s’agit de la couleur du texte ou de la couleur du fond. Par défaut, c’est la couleur du texte.

\ -

La couleur que vous choisissez sera modifiée jusqu’à ce que l’outil trouve une couleur valide. L’autre couleur ne changera pas.

\ -

Propose-moi / Les algorithmes

\ -

“Couleurs valides et très proches de la couleur initiale”

\ -

\ - Ceci est l’algorithme par défaut. \ - Il propose des couleurs extrêmement proches de la couleur initiale. \ - (La proximité est calculée sur des critères mathématiques, qui peuvent être différents d’une vision graphique.) \ -

\ -

\ - L’algorithme dans certains cas ne renvoi aucun résultat ; \ - dans ce cas, choisissez l’autre algorithme. :) \ -

\ -

“Palette de couleurs valides”

\ -

\ - Ceci est l’algorithme “de secours”, au cas où le premier ne donne rien. \ - En revanche, les couleurs proposées peuvent être plus éloignées, \ - voire franchement distincte de la couleur initiale. \ -

\ -

Une question ?

\ -

Si vous avez des questions ou des remarques sur Contrast-Finder, contactez-nous :

\ - \ -

Contribuer à Contrast-Finder

\ -

Toutes les contributions sont chaleureusement accueillies ! \ - Traduction, correction, rapport de bug, nouvelle fonctionnalité… \ - N’hésitez pas à jouer avec le \ - code source \ - ou à en discuter sur le forum.

+ ######### unused i18n entries # form.results=Resultats # form.usage=Utilisation : # form.ratioMedium=Texte petit (Taille < 18px, Niveau AA) # form.ratioShort=Grand texte (Taille ≥ 18px, Niveau AA) # form.ratioHigh=Renforcer le contraste (Niveau AAA) +# form.description_v2=Find me the good contrasts, for web accessibility, between these two colors: + diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties index 3f1150b6..d92bc862 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties @@ -8,7 +8,9 @@ home.metaDescription=Contrast-Finder는 웹 접근성 기준(WCAG)에 적합한 Contrast-Finder는 웹디자이너, 웹 개발자 혹은 웹 접근성 전문가가 \ HTML 페이지와 웹사이트의 가독성을 개선하는 데 사용할 수 있도록 디자인되었습니다. logo.link.title=홈페이지로 되돌아 가기 -nav.language-switch.aria-label=언어 +nav.language=한국어 +nav.language-switching=한국어로 전환 +nav.language-switching.aria-label=언어 result.title.colors=대비 색 result.title.foregroundColor=본문 글자 result.title.backgroundColor=배경 @@ -23,6 +25,9 @@ form.component=교정하려는 색 form.componentForeground=본문 글자 색을 교정 form.componentBackground=배경 색을 교정 form.ratio=최소 비율 +#form.currentRatio=@TODO +#form.currentRatio.alt.valid=@TODO +#form.currentRatio.alt.fail=@TODO form.contrastOld=원래의 색 대비 form.contrastNew=새로운 색 대비 form.validate=기준에 적합한 색 검색하기 @@ -69,25 +74,73 @@ footer.poweredBy=운용 기술: footer.availableUnder=사용 권한: footer.link-twitter=트위터에서 Contrast-Finder 팔로우하기 footer.link-git=GitHub에 있는 Contrast-Finder에 기여하기 -home.noResultTxt=

Contrast Finder가 무엇인가요?

\ -

Contrast-Finder는 두 가지 색(배경 색, 본문 글자 색)의 대비를 계산해서 \ +info.about.title=Contrast Finder가 무엇인가요? +info.about=

\ + Contrast-Finder는 두 가지 색(배경 색, 본문 글자 색)의 대비를 계산해서 \ 색 대비가 충분한지 알려주는 도구입니다. \ 색 대비가 충분하지 않다면, 몇 가지 충분히 대비되는 색의 조합을 제안해 드리는 것이 주요 목적입니다. \

\

Contrast-Finder는 웹디자이너, 웹 개발자 혹은 웹 접근성 전문가가 \ HTML 페이지와 웹사이트의 가독성을 개선하는 데 사용할 수 있도록 디자인되었습니다. \ -

\ -

도움말 / 이 도구는 어떻게 사용하나요?

\ -

Contrast-Finder 인터페이스 양식에는 다섯 개의 필수 입력 항목이 있습니다.

\ +

+info.feedback.title=사용자 건의 +info.feedback=

Contrast-Finder를 사용하시면서 문제가 있거나 다른 문의 사항이 있으시면, 아래에 있는 통로로 연락해주시기 바랍니다:

\ + +info.contribute.title=Contrast-Finder의 기능 개선 및 제안 +info.contribute=

\ + 어떠한 제안이든 모두 환영합니다! \ + 번역, 문제 수정, 오류 보고, 새로운 기능…
\ + 부담없이 \ + 소스 코드를 가지고 놀아보시고, \ + 포럼에서도 상의해 보세요. \ +

+help.title=도움말 / 이 도구는 어떻게 사용하나요? +help.head=

Contrast-Finder 인터페이스 양식에는 다섯 개의 필수 입력 항목이 있습니다.

\ \ -

본문 글자 색

\ + +help.txt-color.title= +help.txt-color= +help.bg-color.title= +help.bg-color= +help.color-to-edit.title=교정하려는 색 +help.color-to-edit=

\ + 본문 글자 색 또는 배경색을 선택하실 수 있습니다. 기본은 본문 글자 색.\ +

\ +

선택하신 색은 나중에 기준에 적합한 색을 찾을 때까지 수정됩니다. \ + 그리고 나머지 색은 바뀌지 않습니다. \ +

+help.algo.title=검색 범위 / 알고리듬 +help.algo=

“처음 지정한 색과 아주 비슷하면서도 기준에 적합한 대비 색”

\ +

\ + 이것이 기본으로 쓰이는 알고리듬입니다. \ + 처음 지정한 색과 아주 가까운 색만 골라서 보여줍니다. \ + (색의 편차는 수학적 방식으로 산출되며, 디자이너의 관점과는 다를 수 있습니다.) \ +

\

\ + 몇몇 색 조합에 따라선, 알고리듬은 아무런 결과도 추출하지 못할 수 있습니다 ; \ + 이 경우엔, 다른 알고리듬을 사용해 보십시오. \ +

\ +

“확장된 색 범위 속 기준에 적합한 대비 색”

\ +

\ + 차선책으로 쓰이는 알고리듬으로, 첫 번째 것이 아무런 결과도 보여주지 않을 때 사용합니다. \ + 하지만, 산출되는 색은 최초 지정 색과 (많이) 다를 수 있습니다. \ +

+help.ratio.title=본문 글자 색 +################################################################################## +# "help.ratio" will certainly evolve. +# ----> See issue #136 "Text size understanding : comments on pt => px conversion" +# https://github.com/Asqatasun/Contrast-Finder/issues/136 +################################################################################## +help.ratio=

\ 본문에 쓰인 글자에 입히는 입니다. \ 이 항목에는 CSS 컬러 키워드, 16진법, 혹은 \ RGB 값을 입력하실 수 있습니다. \ @@ -127,10 +180,10 @@ home.noResultTxt=

Contrast Finder<

레벨 AA

\

두 가지 요소(크기와 볼드 유무)에 따라 다음과 같은 네 가지 조합을 도출할 수 있습니다:

\
    \ -
  • 볼드체가 아닌 글자 + 글자 크기 < 18px: 비율 = 4.5
  • \ -
  • 볼드체가 아닌 글자 + 글자 크기 > 18px: 비율 = 3
  • \ -
  • 볼드체 글자 + 글자 크기 < 14px: 비율 = 4.5
  • \ -
  • 볼드체 글자 + 글자 크기 > 14px: 비율 = 3
  • \ +
  • 볼드체가 아닌 글자 + 글자 크기 < 24px: 비율 = 4.5
  • \ +
  • 볼드체가 아닌 글자 + 글자 크기 > 24px: 비율 = 3
  • \ +
  • 볼드체 글자 + 글자 크기 < 19px: 비율 = 4.5
  • \ +
  • 볼드체 글자 + 글자 크기 > 19px: 비율 = 3
  • \
\

레벨 AAA

\

레벨 AAA의 원리는 같으나, 비율만 다음과 같이 증가합니다:

\ @@ -140,55 +193,22 @@ home.noResultTxt=

Contrast Finder< \

글자 크기의 이해

\
    \ -
  • 14px 정도의 크기는 14pt 또는 \ +
  • 19px 정도의 크기는 14pt 또는 \ 120% 혹은 1.2em 크기와 같은 것으로 칩니다.
  • \ -
  • 18px 정도의 크기는 18pt 또는 \ +
  • 24px 정도의 크기는 18pt 또는 \ 150% 혹은 1.5em 크기와 같은 것으로 칩니다.
  • \
\ -

글자 크기를 해석하는 방식에 관해서 더 깊고 자세히 알고 싶으시면, \ - WCAG에 기술된 large-scale text의 정의를 읽어보십시오.

\ +

\ + 글자 크기를 해석하는 방식에 관해서 더 깊고 자세히 알고 싶으시면, \ + WCAG에 기술된 large-scale text의 정의를 읽어보십시오. \ +

\

대비 비율에 관한 자세한 설명

\ \ -

교정하려는 색

\ -

본문 글자 색 또는 배경색을 선택하실 수 있습니다. 기본은 본문 글자 색.

\ -

선택하신 색은 나중에 기준에 적합한 색을 찾을 때까지 수정됩니다. \ - 그리고 나머지 색은 바뀌지 않습니다.

\ -

검색 범위 / 알고리듬

\ -

“처음 지정한 색과 아주 비슷하면서도 기준에 적합한 대비 색”

\ -

\ - 이것이 기본으로 쓰이는 알고리듬입니다. \ - 처음 지정한 색과 아주 가까운 색만 골라서 보여줍니다. \ - (색의 편차는 수학적 방식으로 산출되며, 디자이너의 관점과는 다를 수 있습니다.) \ -

\ -

\ - 몇몇 색 조합에 따라선, 알고리듬은 아무런 결과도 추출하지 못할 수 있습니다 ; \ - 이 경우엔, 다른 알고리듬을 사용해 보십시오. \ -

\ -

“확장된 색 범위 속 기준에 적합한 대비 색”

\ -

\ - 차선책으로 쓰이는 알고리듬으로, 첫 번째 것이 아무런 결과도 보여주지 않을 때 사용합니다. \ - 하지만, 산출되는 색은 최초 지정 색과 (많이) 다를 수 있습니다. \ -

\ -

사용자 건의

\ -

Contrast-Finder를 사용하시면서 문제가 있거나 다른 문의 사항이 있으시면, 아래에 있는 통로로 연락해주시기 바랍니다:

\ - \ -

Contrast-Finder의 기능 개선 및 제안

\ -

\ - 어떠한 제안이든 모두 환영합니다! \ - 번역, 문제 수정, 오류 보고, 새로운 기능…
\ - 부담없이 \ - 소스 코드를 가지고 놀아보시고, \ - 포럼에서도 상의해 보세요. \ -

+ ######### unused i18n entries # form.results=개의 결과 # form.usage=사용: diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties index 14e2a176..6e0cee14 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties @@ -7,7 +7,9 @@ home.metaDescription=Ferramenta on-line para verificar se o contraste das cores Contrast-Finder oferece esquemas de cores disponíveis perto daquelas que acabaste de testar. \ Acessibilidade dos sítios Web (WCAG). logo.link.title=Voltar à pàgina inicial -nav.language-switch.aria-label=línguas +nav.language=português +nav.language-switching=em Português +nav.language-switching.aria-label=línguas result.title.colors=cores result.title.foregroundColor=texto result.title.backgroundColor=fundo @@ -23,6 +25,9 @@ form.component=Cor a alterar form.componentForeground=Alterar a cor do texto form.componentBackground=Alterar a cor de fundo form.ratio=Rácio minimo +#form.currentRatio=@TODO +#form.currentRatio.alt.valid=@TODO +#form.currentRatio.alt.fail=@TODO form.contrastOld=Contraste anterior form.contrastNew=Novo contraste form.validate=Encontrar cores válidas @@ -69,20 +74,41 @@ footer.poweredBy=Alimentado por footer.availableUnder=disponível sob licença footer.link-twitter=Segue Contrast-Finder no Twitter footer.link-git=Contribuir para o software Contrast-Finder no GitHub -home.noResultTxt=

Alguma dúvida?

\ -

Se tiveres perguntas ou observaçoes sobre Contrast-Finder, contacta-nos :

\ +info.about.title= +info.about= +info.feedback.title=Alguma dúvida? +info.feedback=

Se tiveres perguntas ou observaçoes sobre Contrast-Finder, contacta-nos :

\ \ -

Contribuir ao Contrast-Finder

\ -

Todas as contribuiçoes sao muito bem vindas! \ - Traduçoes, correcçoes, relatorios de erro, nova funcionalidade… \ -

-form.results=@@@TODO Results -form.usage=@@@TODO Usage: -form.ratioMedium=@@@TODO Small text (size < 18px, Level AA) -form.ratioShort=@@@TODO Big text (size ≥ 18px, Level AA) -form.ratioHigh=@@@TODO Strenghten contrast (Level AAA) -form.description_v2=@@@TODO Find me the good constrasts, for web accessibility, between these two colors: + +info.contribute.title=Contribuir ao Contrast-Finder +info.contribute=

\ + Todas as contribuiçoes sao muito bem vindas! \ + Traduçoes, correcçoes, relatorios de erro, nova funcionalidade… \ +

+help.title= +help.head= +help.txt-color.title= +help.txt-color= +help.bg-color.title= +help.bg-color= +help.color-to-edit.title= +help.color-to-edit= +help.algo.title= +help.algo= +help.ratio.title= +################################################################################## +# "help.ratio" will certainly evolve. +# ----> See issue #136 "Text size understanding : comments on pt => px conversion" +# https://github.com/Asqatasun/Contrast-Finder/issues/136 +################################################################################## +help.ratio= +######### unused i18n entries ############################################## +# form.results=Results +# form.usage=Usage: +# form.ratioMedium=Small text (size < 18px, Level AA) +# form.ratioShort=Big text (size ≥ 18px, Level AA) +# form.ratioHigh=Strengthen contrast (Level AAA) +# form.description_v2=Find me the good contrasts, for web accessibility, between these two colors: diff --git a/webapp/src/main/webapp/WEB-INF/pages/form.jsp b/webapp/src/main/webapp/WEB-INF/pages/form.jsp index 3a9e6b8c..ff478533 100644 --- a/webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -149,9 +149,52 @@ - - + + <%-- Current ratio (updated by Javascript) --%> + <%-- hidden for default page--%> + + +
+ <%-- https://www.w3.org/TR/wai-aria/#status + https://www.w3.org/TR/wai-aria/#marquee + http://ideance.net/publications/live-regions/explications.html + https://developer.paciellogroup.com/blog/2014/03/screen-reader-support-aria-live-regions/ + aria-live="off" ? + aria-live="polite" ? + role="status" ? + role="marquee" have an implicit aria-live value of off. --%> + + + + + + + + + + +
+ " + alt="" + class="${formCurrentIsValidContrastClass}"> + " + alt="" + class="${formCurrentIsNotValidContrastClass}"> +
+
+ + ${formCurrrentRatio} +
+
+ <%-- Component to modify --%>
@@ -427,7 +470,32 @@ <%-- ===== USER HELP ========================================================================================= --%>
<%-- only on HomePage --%> - +

+ + +

+ + +

+ + +

+ + +

+ + +

+ + +

+ + +

+ + +

+
diff --git a/webapp/src/main/webapp/WEB-INF/template/head.jspf b/webapp/src/main/webapp/WEB-INF/template/head.jspf index ee05cb83..02820ae7 100644 --- a/webapp/src/main/webapp/WEB-INF/template/head.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/head.jspf @@ -66,10 +66,21 @@ "@type": "WebApplication", "name": "Contrast Finder", "softwareVersion": "${appVersion}", - "license": "https://github.com/Asqatasun/Contrast-Finder/blob/master/LICENSE", + "license": "https://github.com/Asqatasun/Contrast-Finder/blob/master/LICENSE", "releaseNotes": "https://github.com/Asqatasun/Contrast-Finder/blob/master/CHANGELOG.md", + "downloadUrl": "https://github.com/Asqatasun/Contrast-Finder/releases", "screenshot": "https://contrast-finder.org/public/media/images/screenshot/screenshot.EN_contrast-finder.v0.5.2_2017-07-27_grey_kraken.io-lossy.png", - "applicationCategory": "BusinessApplication" + "applicationCategory": "BusinessApplication", + "applicationSubCategory": "WebApplication", + "operatingSystem": "any", + "availableLanguage": { + "@type": "Language", + "name": ["English","French","Korean","Portuguese","Spanish"] + }, + "aggregateRating": { + "@type": "AggregateRating", + "reviewCount": "0" + } } \ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/template/header.jspf b/webapp/src/main/webapp/WEB-INF/template/header.jspf index 56bb5ce5..f6db1646 100644 --- a/webapp/src/main/webapp/WEB-INF/template/header.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/header.jspf @@ -10,30 +10,42 @@ + + + + + + + + + + + + @@ -42,11 +54,12 @@ + -