From f7a3145ed573beab123306d256f0ac814b1f2fcc Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Tue, 4 Jul 2017 02:41:52 +0200 Subject: [PATCH 01/18] set version to 0.5.3-dev --- CHANGELOG.md | 30 +++++++++++++++++++ docker/RELEASE/Dockerfile | 10 +++---- docker/RELEASE/README.md | 6 ++-- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 2 +- docker/SNAPSHOT-local_from-Ubuntu/Dockerfile | 2 +- .../test_conf-default-algo/Dockerfile | 2 +- .../test_conf-env_debug/Dockerfile | 2 +- .../test_conf-piwik/Dockerfile | 2 +- .../pre-requisites_from-Ubuntu/Dockerfile | 2 +- documentation/pom.xml | 4 +-- engine/api/pom.xml | 4 +-- engine/hsv/pom.xml | 4 +-- engine/impl/pom.xml | 4 +-- engine/pom.xml | 4 +-- engine/utils/pom.xml | 4 +-- pom.xml | 2 +- webapp/pom.xml | 4 +-- .../WEB-INF/template/template_variables.jspf | 2 +- 18 files changed, 60 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d877fc8..44bfef5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,35 @@ # CHANGELOG +Contrast-Finder 0.5.3, 2017-07-xx +--------------------------------- + +Upgrade-o-meter: just replace the .war file and restart Tomcat + +### New Feature +none + +### Security +none + +### Bug +none + +### Improvement +none + +### Refactoring +none + +### Configuration +none + +### Documentation +none + +### Task +none + + Contrast-Finder 0.5.2, 2017-07-04 --------------------------------- diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile index 7674bbe2..e29ba82a 100644 --- a/docker/RELEASE/Dockerfile +++ b/docker/RELEASE/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp" \ - org.label-schema.version = "0.5.2" \ + org.label-schema.version = "0.5.3-dev" \ 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.5.2 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.2/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.2/contrast-finder_0.5.2.i386.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.5.3-dev . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.3-dev/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.3-dev/contrast-finder_0.5.3-dev.i386.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -36,7 +36,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.5.2" +ARG CONTRAST_FINDER_RELEASE="0.5.3-dev" ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}" ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz" diff --git a/docker/RELEASE/README.md b/docker/RELEASE/README.md index 514b131e..237fb332 100644 --- a/docker/RELEASE/README.md +++ b/docker/RELEASE/README.md @@ -7,11 +7,11 @@ Tool to provide color combination for a good (accessible, WCAG-compliant) contra Supported tags and respective `Dockerfile` links : * [pre-requisites_from-Ubuntu](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile) -* [v0.5.2, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile) +* [v0.5.3-dev, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile) +* [v0.5.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.2/docker/RELEASE/Dockerfile) * [v0.5.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.1/docker/RELEASE/Dockerfile) * [v0.5.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.0/docker/RELEASE/Dockerfile) * [v0.4.7](https://github.com/Asqatasun/Contrast-Finder/blob/v0.4.7/docker/RELEASE/Dockerfile) -* [v0.4.6](https://github.com/Asqatasun/Contrast-Finder/blob/v0.4.6/docker/RELEASE/Dockerfile) ## How to use this image `docker pull asqatasun/contrast-finder` @@ -28,7 +28,7 @@ In your browser, go to `http://localhost:8080/contrast-finder/` * More information on the website [Contrast-Finder.org](https://contrast-finder.org) * Demo : https://app.contrast-finder.org -![Screenshot - Contrast-Finder v0.5.2](https://raw.githubusercontent.com/Asqatasun/Contrast-Finder/develop/documentation/en/images/screenshot/screenshot.EN_contrast-finder.v0.5.2_2017-07-27_grey_kraken.io-lossy.png) +![Screenshot - Contrast-Finder v0.5.3-dev](https://raw.githubusercontent.com/Asqatasun/Contrast-Finder/develop/documentation/en/images/screenshot/screenshot.EN_contrast-finder.v0.5.3-dev_2017-07-27_grey_kraken.io-lossy.png) ## Tips and tricks ### Container available only on 127.0.0.1 (Linux users) #### diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile index 184a6d38..1e62ad06 100644 --- a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile +++ b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile @@ -25,7 +25,7 @@ FROM tomcat:7.0-jre7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.2" +ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps" # Prepare Contrast-Finder diff --git a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile index 5c85d6e7..71f21175 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.2" +ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" # Add contrast-finder .war ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile index 5d4b0608..115aa471 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.2" +ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="HSV" diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile index 23b0601c..81d12273 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.2" +ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" ENV CONF_ENV="debug" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile index 19c7edb6..ece74e82 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.2" +ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" ENV PIWIK_KEY="9" ENV PIWIK_URL="http://localhost/piwik/" diff --git a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile index 43bbd084..f27e9003 100644 --- a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile +++ b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:14.04 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp pre-requisites" \ - org.label-schema.version = "0.5.2" \ + org.label-schema.version = "0.5.3-dev" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" # ----> documentation http://label-schema.org/ diff --git a/documentation/pom.xml b/documentation/pom.xml index 579418a3..61aa788c 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.5.2 + 0.5.3-dev documentation pom - 0.5.2 + 0.5.3-dev contrast-finder-documentation diff --git a/engine/api/pom.xml b/engine/api/pom.xml index ef5fe9b1..b2d223ff 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.5.2 + 0.5.3-dev contrast-finder-api - 0.5.2 + 0.5.3-dev jar api diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml index f6414dca..fdfc9735 100644 --- a/engine/hsv/pom.xml +++ b/engine/hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.5.2 + 0.5.3-dev contrast-finder-hsv - 0.5.2 + 0.5.3-dev jar hsv diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml index c341990c..0005c3f7 100644 --- a/engine/impl/pom.xml +++ b/engine/impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.5.2 + 0.5.3-dev contrast-finder-impl - 0.5.2 + 0.5.3-dev jar impl diff --git a/engine/pom.xml b/engine/pom.xml index cdf5844a..13d1f3af 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.5.2 + 0.5.3-dev engine - 0.5.2 + 0.5.3-dev pom contrast-finder-engine diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml index 0d4b6789..ac137ef2 100644 --- a/engine/utils/pom.xml +++ b/engine/utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.5.2 + 0.5.3-dev contrast-finder-utils - 0.5.2 + 0.5.3-dev jar utils diff --git a/pom.xml b/pom.xml index 60e76a45..2bf82d57 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.asqatasun contrast-finder pom - 0.5.2 + 0.5.3-dev Contrast-Finder diff --git a/webapp/pom.xml b/webapp/pom.xml index ee112a0b..717c7522 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.5.2 + 0.5.3-dev webapp - 0.5.2 + 0.5.3-dev war contrast-finder-webapp diff --git a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf index e743ba5d..a2dc525d 100644 --- a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf @@ -2,7 +2,7 @@ <%@ page pageEncoding="UTF-8" %> <%-- APP version --%> - + <%-- APP Name --%> From c914901f1cbb64c0394af3d109302b86c612a3a4 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sat, 8 Jul 2017 17:25:07 +0200 Subject: [PATCH 02/18] Updated Contributor_doc --- .../en/30_Contributor_doc/i18n/README.md | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 documentation/en/30_Contributor_doc/i18n/README.md diff --git a/documentation/en/30_Contributor_doc/i18n/README.md b/documentation/en/30_Contributor_doc/i18n/README.md new file mode 100644 index 00000000..a043637b --- /dev/null +++ b/documentation/en/30_Contributor_doc/i18n/README.md @@ -0,0 +1,24 @@ +# i18n + +Java i18n files however must be ISO-8859-1. + +## Convert a single file + +### UTF8 to ISO-8859-1 with Unicode escapes +Converts a file encoded in UTF8 to a file in in ISO-8859-1 with Unicode escapes. +```bash +native2ascii -encoding utf8 example.utf8.txt example.propertie +``` + +### ISO-8859-1 with Unicode escapes to UTF8 +Converts a file encoded in ISO-8859-1 with Unicode escapes to a file in UTF8 character encoding. +```bash +native2ascii -encoding utf8 -reverse example.propertie example.reverse.utf8.txt +``` + +## native2ascii-maven-plugin + +- https://davidsimpson.me/2015/03/04/automated-native2ascii-character-conversion-internationalization-atlassian-add-ons/ +- https://blog.crafting-labs.fr/2010/09/25/fichiers-properties-java-en-utf-8-avec-maven/ +- https://stackoverflow.com/questions/7105039/maven-how-to-configure-native2ascii-maven-plugin?rq=1 + - http://grepcode.com/project/repo1.maven.org/maven2/org.codehaus.mojo/native2ascii-maven-plugin/ From 6d784027fc838f1d5b95a47f1f02ce93ba4d8543 Mon Sep 17 00:00:00 2001 From: Rui20 Date: Sat, 8 Jul 2017 19:55:55 +0200 Subject: [PATCH 03/18] Create contrast-finder_pt.properties --- .../i18n/contrast-finder_pt.properties | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 webapp/src/main/resources/i18n/contrast-finder_pt.properties diff --git a/webapp/src/main/resources/i18n/contrast-finder_pt.properties b/webapp/src/main/resources/i18n/contrast-finder_pt.properties new file mode 100644 index 00000000..97b8a8f9 --- /dev/null +++ b/webapp/src/main/resources/i18n/contrast-finder_pt.properties @@ -0,0 +1,138 @@ +NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF +NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio +home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) +home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. +logo.link.title=Back to the homepage +result.title.colors=colors +result.title.foregroundColor=text +result.title.backgroundColor=background +result.title.minRation=min ratio +form.fillInFields=Please fill in the following fields : +form.description=Contrast-Finder finds correct color contrasts for web accessibility +form.help=The color should be between #000000 and #FFFFFF \ +
or between rgb(0,0,0) and rgb(255,255,255) +form.foregroundColor=Text color +form.backgroundColor=Background color +form.component=Color to edit +form.componentForeground=Edit the text color +form.componentBackground=Edit the background color +form.ratio=Minimum ratio +form.contrastOld=Old contrast +form.contrastNew=New contrast +form.validate=Check contrast and find valid colors +form.validContrast=Valid Contrast : +form.validContrastDesc=The choosen colors are already good +form.resultNumber={0} {0,choice,1#result|1Contrast-Finder?
Try Asqatasun, the opensource website analyser for accessibility +form.contrastSolutionDistance=Distance +form.contrastSolutionDistanceEx=Distance from initial color +form.objectifs=Gimme +form.algoHSV=a range of valid colors +form.algoRGB=valid colors and very close to initial color +form.invalidColor=Invalid color +form.changeComponent=try again changing the +form.invalidAlgo=The algorithm value is not valid. +form.tryHsv=Gimme a range of colors +form.tryRgb=Gimme valid colors and very close to initial color +form.testedColors=colors tested +form.notSatisfied=Not satisfied? +form.anyResult=Let's +form.oppositeComponentForeground=background color +form.oppositeComponentBackground=foreground color +message.addon=Hey! Have you tried the new Contrast-Finder Firefox addon? +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=

Help

\ +

Text color / Foreground

\ +

\ + It is the text color. You can fill in this field with an hexadecimal value. \ + i.e. #AABBCC color. Note that #ABC works also, \ + we automatically complete the field with #AABBCC. \ + You can also use this field without the # character, so FFF or FFFFFF works perfectly. \ + The input value is then previewed on the right of the field.\ +

\ +

Background

\ +

It is the background color. This field works as the text color fields.\ +

Minimum ratio

\ +

Three possible values 3, 4.5 and 7.

\ +

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

\ +
    \ +
  • Level of accessibility wanted: AA or AAA.
    • \ +
  • Size of the text.
    • \ +
  • Is the text bold or not.
    • \ +
\ +

Level AA

\ +

Two elements (size and bold) gives four combinations:

\ +
    \ +
  • Text not bold + text size < 18px: ratio = 4.5
    • \ +
  • Text not bold + text size > 18px: ratio = 3
    • \ +
  • Text bold + text size < 14px: ratio = 4.5
    • \ +
  • Text bold + text size > 14px: ratio = 3
    • \ +
\ +

Level AAA

\ +

For level AAA the logic is the same one, only the ratio increases in the the following way:

\ +
    \ +
  • 4.5 ratio become 7
    • \ +
  • 3 ratio become 4.5
    • \ +
\ +

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.
    • \ +
\ +

For a full and exhaustive understanding of how to interpret text size, one should read the \ + defintion of large-scale text from WCAG.

\ +

All details about the contrast ratio

\ +\ +

Color to edit

\ +

It is either the foreground or the background. Default is foreground.

\ +

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

\ +

The algorithms

\ +

A range of valid colors

\ +

The result is a wide range of colors.
\ + This algorithm is very helpful if you are not sure about the hue of your initial color.

\ +

Valid colors and very close to initial color

\ +

The result is a list of colors close to the original color.
\ + The aim is to have a valid color with a contrast as close to the selected ratio as possible (At the 0.001 range).

\ +

User Feedback

\ +

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

\ + \ +

Contributing

\ +

\ +You are invited to contribute new features, fixes, or updates, large or small; \ +we are always thrilled to receive pull requests, and do our best to process them as fast as we can. \ +

+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: From 40c29312b09dcb6fe3581807f3899575449ac0c5 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sat, 8 Jul 2017 20:45:34 +0200 Subject: [PATCH 04/18] #76 Converted i18n properties files in UTF8 --- .../i18n_utf8/contrast-finder.properties.utf8 | 138 ++++++++++++++++ .../contrast-finder_en.properties.utf8 | 138 ++++++++++++++++ .../contrast-finder_fr.properties.utf8 | 154 ++++++++++++++++++ .../contrast-finder_pt.properties.utf8 | 138 ++++++++++++++++ 4 files changed, 568 insertions(+) create mode 100644 webapp/src/main/resources/i18n_utf8/contrast-finder.properties.utf8 create mode 100644 webapp/src/main/resources/i18n_utf8/contrast-finder_en.properties.utf8 create mode 100644 webapp/src/main/resources/i18n_utf8/contrast-finder_fr.properties.utf8 create mode 100644 webapp/src/main/resources/i18n_utf8/contrast-finder_pt.properties.utf8 diff --git a/webapp/src/main/resources/i18n_utf8/contrast-finder.properties.utf8 b/webapp/src/main/resources/i18n_utf8/contrast-finder.properties.utf8 new file mode 100644 index 00000000..97b8a8f9 --- /dev/null +++ b/webapp/src/main/resources/i18n_utf8/contrast-finder.properties.utf8 @@ -0,0 +1,138 @@ +NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF +NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio +home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) +home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. +logo.link.title=Back to the homepage +result.title.colors=colors +result.title.foregroundColor=text +result.title.backgroundColor=background +result.title.minRation=min ratio +form.fillInFields=Please fill in the following fields : +form.description=Contrast-Finder finds correct color contrasts for web accessibility +form.help=The color should be between #000000 and #FFFFFF \ +
or between rgb(0,0,0) and rgb(255,255,255) +form.foregroundColor=Text color +form.backgroundColor=Background color +form.component=Color to edit +form.componentForeground=Edit the text color +form.componentBackground=Edit the background color +form.ratio=Minimum ratio +form.contrastOld=Old contrast +form.contrastNew=New contrast +form.validate=Check contrast and find valid colors +form.validContrast=Valid Contrast : +form.validContrastDesc=The choosen colors are already good +form.resultNumber={0} {0,choice,1#result|1Contrast-Finder?
Try Asqatasun, the opensource website analyser for accessibility +form.contrastSolutionDistance=Distance +form.contrastSolutionDistanceEx=Distance from initial color +form.objectifs=Gimme +form.algoHSV=a range of valid colors +form.algoRGB=valid colors and very close to initial color +form.invalidColor=Invalid color +form.changeComponent=try again changing the +form.invalidAlgo=The algorithm value is not valid. +form.tryHsv=Gimme a range of colors +form.tryRgb=Gimme valid colors and very close to initial color +form.testedColors=colors tested +form.notSatisfied=Not satisfied? +form.anyResult=Let's +form.oppositeComponentForeground=background color +form.oppositeComponentBackground=foreground color +message.addon=Hey! Have you tried the new Contrast-Finder Firefox addon? +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=

Help

\ +

Text color / Foreground

\ +

\ + It is the text color. You can fill in this field with an hexadecimal value. \ + i.e. #AABBCC color. Note that #ABC works also, \ + we automatically complete the field with #AABBCC. \ + You can also use this field without the # character, so FFF or FFFFFF works perfectly. \ + The input value is then previewed on the right of the field.\ +

\ +

Background

\ +

It is the background color. This field works as the text color fields.\ +

Minimum ratio

\ +

Three possible values 3, 4.5 and 7.

\ +

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

\ +
    \ +
  • Level of accessibility wanted: AA or AAA.
    • \ +
  • Size of the text.
    • \ +
  • Is the text bold or not.
    • \ +
\ +

Level AA

\ +

Two elements (size and bold) gives four combinations:

\ +
    \ +
  • Text not bold + text size < 18px: ratio = 4.5
    • \ +
  • Text not bold + text size > 18px: ratio = 3
    • \ +
  • Text bold + text size < 14px: ratio = 4.5
    • \ +
  • Text bold + text size > 14px: ratio = 3
    • \ +
\ +

Level AAA

\ +

For level AAA the logic is the same one, only the ratio increases in the the following way:

\ +
    \ +
  • 4.5 ratio become 7
    • \ +
  • 3 ratio become 4.5
    • \ +
\ +

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.
    • \ +
\ +

For a full and exhaustive understanding of how to interpret text size, one should read the \ + defintion of large-scale text from WCAG.

\ +

All details about the contrast ratio

\ +\ +

Color to edit

\ +

It is either the foreground or the background. Default is foreground.

\ +

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

\ +

The algorithms

\ +

A range of valid colors

\ +

The result is a wide range of colors.
\ + This algorithm is very helpful if you are not sure about the hue of your initial color.

\ +

Valid colors and very close to initial color

\ +

The result is a list of colors close to the original color.
\ + The aim is to have a valid color with a contrast as close to the selected ratio as possible (At the 0.001 range).

\ +

User Feedback

\ +

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

\ + \ +

Contributing

\ +

\ +You are invited to contribute new features, fixes, or updates, large or small; \ +we are always thrilled to receive pull requests, and do our best to process them as fast as we can. \ +

+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_utf8/contrast-finder_en.properties.utf8 b/webapp/src/main/resources/i18n_utf8/contrast-finder_en.properties.utf8 new file mode 100644 index 00000000..97b8a8f9 --- /dev/null +++ b/webapp/src/main/resources/i18n_utf8/contrast-finder_en.properties.utf8 @@ -0,0 +1,138 @@ +NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF +NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio +home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) +home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. +logo.link.title=Back to the homepage +result.title.colors=colors +result.title.foregroundColor=text +result.title.backgroundColor=background +result.title.minRation=min ratio +form.fillInFields=Please fill in the following fields : +form.description=Contrast-Finder finds correct color contrasts for web accessibility +form.help=The color should be between #000000 and #FFFFFF \ +
or between rgb(0,0,0) and rgb(255,255,255) +form.foregroundColor=Text color +form.backgroundColor=Background color +form.component=Color to edit +form.componentForeground=Edit the text color +form.componentBackground=Edit the background color +form.ratio=Minimum ratio +form.contrastOld=Old contrast +form.contrastNew=New contrast +form.validate=Check contrast and find valid colors +form.validContrast=Valid Contrast : +form.validContrastDesc=The choosen colors are already good +form.resultNumber={0} {0,choice,1#result|1Contrast-Finder?
Try Asqatasun, the opensource website analyser for accessibility +form.contrastSolutionDistance=Distance +form.contrastSolutionDistanceEx=Distance from initial color +form.objectifs=Gimme +form.algoHSV=a range of valid colors +form.algoRGB=valid colors and very close to initial color +form.invalidColor=Invalid color +form.changeComponent=try again changing the +form.invalidAlgo=The algorithm value is not valid. +form.tryHsv=Gimme a range of colors +form.tryRgb=Gimme valid colors and very close to initial color +form.testedColors=colors tested +form.notSatisfied=Not satisfied? +form.anyResult=Let's +form.oppositeComponentForeground=background color +form.oppositeComponentBackground=foreground color +message.addon=Hey! Have you tried the new Contrast-Finder Firefox addon? +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=

Help

\ +

Text color / Foreground

\ +

\ + It is the text color. You can fill in this field with an hexadecimal value. \ + i.e. #AABBCC color. Note that #ABC works also, \ + we automatically complete the field with #AABBCC. \ + You can also use this field without the # character, so FFF or FFFFFF works perfectly. \ + The input value is then previewed on the right of the field.\ +

\ +

Background

\ +

It is the background color. This field works as the text color fields.\ +

Minimum ratio

\ +

Three possible values 3, 4.5 and 7.

\ +

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

\ +
    \ +
  • Level of accessibility wanted: AA or AAA.
    • \ +
  • Size of the text.
    • \ +
  • Is the text bold or not.
    • \ +
\ +

Level AA

\ +

Two elements (size and bold) gives four combinations:

\ +
    \ +
  • Text not bold + text size < 18px: ratio = 4.5
    • \ +
  • Text not bold + text size > 18px: ratio = 3
    • \ +
  • Text bold + text size < 14px: ratio = 4.5
    • \ +
  • Text bold + text size > 14px: ratio = 3
    • \ +
\ +

Level AAA

\ +

For level AAA the logic is the same one, only the ratio increases in the the following way:

\ +
    \ +
  • 4.5 ratio become 7
    • \ +
  • 3 ratio become 4.5
    • \ +
\ +

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.
    • \ +
\ +

For a full and exhaustive understanding of how to interpret text size, one should read the \ + defintion of large-scale text from WCAG.

\ +

All details about the contrast ratio

\ +\ +

Color to edit

\ +

It is either the foreground or the background. Default is foreground.

\ +

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

\ +

The algorithms

\ +

A range of valid colors

\ +

The result is a wide range of colors.
\ + This algorithm is very helpful if you are not sure about the hue of your initial color.

\ +

Valid colors and very close to initial color

\ +

The result is a list of colors close to the original color.
\ + The aim is to have a valid color with a contrast as close to the selected ratio as possible (At the 0.001 range).

\ +

User Feedback

\ +

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

\ + \ +

Contributing

\ +

\ +You are invited to contribute new features, fixes, or updates, large or small; \ +we are always thrilled to receive pull requests, and do our best to process them as fast as we can. \ +

+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_utf8/contrast-finder_fr.properties.utf8 b/webapp/src/main/resources/i18n_utf8/contrast-finder_fr.properties.utf8 new file mode 100644 index 00000000..ae8073a2 --- /dev/null +++ b/webapp/src/main/resources/i18n_utf8/contrast-finder_fr.properties.utf8 @@ -0,0 +1,154 @@ +NOT_A_VALID_COLOR=La couleur doit être comprise entre #000000 et #FFFFFF +NOT_A_VALID_RATIO.colorModel.ratio=Le ratio n'est pas valide +home.titleTag=Contrast Finder, trouvez le bon contraste pour vos couleurs, accessibilité web (WCAG / RGAA) +home.metaDescription=Outil en ligne pour vérifier si le contraste de vos couleurs est accessible. Contrast-Finder propose des jeux de couleurs accessibles proches de celles que vous venez de tester. Accessibilité web (WCAG / RGAA) +logo.link.title=Retour à la page d'accueil +result.title.colors=couleurs +result.title.foregroundColor=texte +result.title.backgroundColor=fond +result.title.minRation=ratio min +form.fillInFields=Renseignez les champs suivants : +form.description=Contrast-Finder trouve les bons contrastes de couleurs pour l'accessibilité web +form.help=La couleur doit être comprise entre #000000 et #FFFFFF \ +
ou entre rgb(0,0,0) et rgb(255,255,255) +form.foregroundColor=Couleur du texte +form.backgroundColor=Couleur du fond +form.component=Couleur à modifier +form.componentForeground=Modifier la couleur du texte +form.componentBackground=Modifier la couleur du fond +form.ratio=Ratio minimum +form.contrastOld=Ancien contraste +form.contrastNew=Nouveau contraste +form.validate=Vérifier le contraste et trouver des couleurs valides +form.validContrast=Contraste Valide : +form.validContrastDesc=Les couleurs que vous avez choisi sont valides +form.resultNumber={0} {0,choice,1#résultat|1Contrast-Finder ?
Essaye Asqatasun, le logiciel libre de mesure de l'accessibilité +form.contrastSolutionDistance=Distance +form.contrastSolutionDistanceEx=Distance de la couleur d'origine +form.objectifs=Propose-moi +form.algoHSV=une palette de couleurs valides +form.algoRGB=des couleurs valides et proches de la couleur initiale +form.invalidColor=Couleur invalide +form.changeComponent=Essayez encore en changeant la +form.invalidAlgo=La valeur de l'algorithme est invalide. +form.tryHsv=Propose moi une palette de couleurs valides +form.tryRgb=Propose moi des couleurs valides et très proches de la couleur initiale +form.testedColors=couleurs testées +form.notSatisfied=Pas satisfait ? +form.anyResult= +form.oppositeComponentForeground=couleur du fond +form.oppositeComponentBackground=couleur du texte +message.addon=Hey ! Avez-vous testé la nouvelle \nextension Firefox de Contrast-Finder ? +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=

Aide

\ +

Premier plan : couleur du texte

\ +

\ + 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. \ + 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 3. \ +

\ +

Couleur en hexadécimale

\ +

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. \ +

\ +

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). \ +

\ +

Arrière-plan : couleur du fond

\ +

\ + 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.

\ +

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

\ +
    \ +
  • Niveau d'accessibilité souhaité : AA ou AAA.
    • \ +
  • Le texte est-il en gras ?
    • \ +
  • Taille du texte.
    • \ +
\ +

Niveau AA

\ +

Deux éléments (la taille et la graisse du texte) donnent 4 combinaisons :

\ +
    \ +
  • Texte non gras + taille du texte < 18px : ratio = 4.5
    • \ +
  • Texte non gras + taille du texte > 18px : ratio = 3
    • \ +
  • Texte en gras + taille du texte < 14px : ratio = 4.5
    • \ +
  • Texte en gras + taille du texte > 14px : ratio = 3
    • \ +
\ +

Niveau AAA

\ +

Pour le niveau AAA, la logique est la même avec une augmentation de la valeur des ratios :

\ +
    \ +
  • Le ratio 4.5 devient 7
    • \ +
  • Le ratio 3 devient 4.5
    • \ +
\ +

Informations complémentaires sur le contraste pour l'accessibilité

\ +

\ + En complément, toutes les informations détaillées (en français et en anglais) \ + sur le rapport de contraste entre le texte et son arrière-plan : \ +

\ +\ +

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.

\ +

Les 2 algorithmes

\ +
    \ +
  • une palette de couleurs valides,
    • \ +
  • des couleurs valides et très proches de la couleur initiale.
    • \ +
\ +

Une question ?

\ +

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

\ + +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) diff --git a/webapp/src/main/resources/i18n_utf8/contrast-finder_pt.properties.utf8 b/webapp/src/main/resources/i18n_utf8/contrast-finder_pt.properties.utf8 new file mode 100644 index 00000000..97b8a8f9 --- /dev/null +++ b/webapp/src/main/resources/i18n_utf8/contrast-finder_pt.properties.utf8 @@ -0,0 +1,138 @@ +NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF +NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio +home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) +home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. +logo.link.title=Back to the homepage +result.title.colors=colors +result.title.foregroundColor=text +result.title.backgroundColor=background +result.title.minRation=min ratio +form.fillInFields=Please fill in the following fields : +form.description=Contrast-Finder finds correct color contrasts for web accessibility +form.help=The color should be between #000000 and #FFFFFF \ +
or between rgb(0,0,0) and rgb(255,255,255) +form.foregroundColor=Text color +form.backgroundColor=Background color +form.component=Color to edit +form.componentForeground=Edit the text color +form.componentBackground=Edit the background color +form.ratio=Minimum ratio +form.contrastOld=Old contrast +form.contrastNew=New contrast +form.validate=Check contrast and find valid colors +form.validContrast=Valid Contrast : +form.validContrastDesc=The choosen colors are already good +form.resultNumber={0} {0,choice,1#result|1Contrast-Finder?
Try Asqatasun, the opensource website analyser for accessibility +form.contrastSolutionDistance=Distance +form.contrastSolutionDistanceEx=Distance from initial color +form.objectifs=Gimme +form.algoHSV=a range of valid colors +form.algoRGB=valid colors and very close to initial color +form.invalidColor=Invalid color +form.changeComponent=try again changing the +form.invalidAlgo=The algorithm value is not valid. +form.tryHsv=Gimme a range of colors +form.tryRgb=Gimme valid colors and very close to initial color +form.testedColors=colors tested +form.notSatisfied=Not satisfied? +form.anyResult=Let's +form.oppositeComponentForeground=background color +form.oppositeComponentBackground=foreground color +message.addon=Hey! Have you tried the new Contrast-Finder Firefox addon? +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=

Help

\ +

Text color / Foreground

\ +

\ + It is the text color. You can fill in this field with an hexadecimal value. \ + i.e. #AABBCC color. Note that #ABC works also, \ + we automatically complete the field with #AABBCC. \ + You can also use this field without the # character, so FFF or FFFFFF works perfectly. \ + The input value is then previewed on the right of the field.\ +

\ +

Background

\ +

It is the background color. This field works as the text color fields.\ +

Minimum ratio

\ +

Three possible values 3, 4.5 and 7.

\ +

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

\ +
    \ +
  • Level of accessibility wanted: AA or AAA.
    • \ +
  • Size of the text.
    • \ +
  • Is the text bold or not.
    • \ +
\ +

Level AA

\ +

Two elements (size and bold) gives four combinations:

\ +
    \ +
  • Text not bold + text size < 18px: ratio = 4.5
    • \ +
  • Text not bold + text size > 18px: ratio = 3
    • \ +
  • Text bold + text size < 14px: ratio = 4.5
    • \ +
  • Text bold + text size > 14px: ratio = 3
    • \ +
\ +

Level AAA

\ +

For level AAA the logic is the same one, only the ratio increases in the the following way:

\ +
    \ +
  • 4.5 ratio become 7
    • \ +
  • 3 ratio become 4.5
    • \ +
\ +

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.
    • \ +
\ +

For a full and exhaustive understanding of how to interpret text size, one should read the \ + defintion of large-scale text from WCAG.

\ +

All details about the contrast ratio

\ +\ +

Color to edit

\ +

It is either the foreground or the background. Default is foreground.

\ +

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

\ +

The algorithms

\ +

A range of valid colors

\ +

The result is a wide range of colors.
\ + This algorithm is very helpful if you are not sure about the hue of your initial color.

\ +

Valid colors and very close to initial color

\ +

The result is a list of colors close to the original color.
\ + The aim is to have a valid color with a contrast as close to the selected ratio as possible (At the 0.001 range).

\ +

User Feedback

\ +

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

\ + \ +

Contributing

\ +

\ +You are invited to contribute new features, fixes, or updates, large or small; \ +we are always thrilled to receive pull requests, and do our best to process them as fast as we can. \ +

+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: From 65a460244b520bf0b52e998afdc9a8fe3f7f3487 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sat, 8 Jul 2017 23:57:40 +0200 Subject: [PATCH 05/18] Fixed #76 i18n files in UTF8 character encoding --- webapp/pom.xml | 17 ++ .../i18n/contrast-finder_fr.properties | 154 ------------------ ...erties => contrast-finder_utf8.properties} | 0 ...ies => contrast-finder_utf8_en.properties} | 0 .../contrast-finder_utf8_fr.properties} | 0 ...ies => contrast-finder_utf8_pt.properties} | 0 .../i18n_utf8/contrast-finder.properties.utf8 | 138 ---------------- .../contrast-finder_en.properties.utf8 | 138 ---------------- .../contrast-finder_pt.properties.utf8 | 138 ---------------- .../webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml | 2 +- 10 files changed, 18 insertions(+), 569 deletions(-) delete mode 100644 webapp/src/main/resources/i18n/contrast-finder_fr.properties rename webapp/src/main/resources/i18n/{contrast-finder.properties => contrast-finder_utf8.properties} (100%) rename webapp/src/main/resources/i18n/{contrast-finder_en.properties => contrast-finder_utf8_en.properties} (100%) rename webapp/src/main/resources/{i18n_utf8/contrast-finder_fr.properties.utf8 => i18n/contrast-finder_utf8_fr.properties} (100%) rename webapp/src/main/resources/i18n/{contrast-finder_pt.properties => contrast-finder_utf8_pt.properties} (100%) delete mode 100644 webapp/src/main/resources/i18n_utf8/contrast-finder.properties.utf8 delete mode 100644 webapp/src/main/resources/i18n_utf8/contrast-finder_en.properties.utf8 delete mode 100644 webapp/src/main/resources/i18n_utf8/contrast-finder_pt.properties.utf8 diff --git a/webapp/pom.xml b/webapp/pom.xml index 717c7522..7b323d1e 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -170,6 +170,23 @@ + + org.codehaus.mojo + native2ascii-maven-plugin + 1.0-beta-1 + + + native2ascii-utf8-properties + + native2ascii + + + UTF8 + **/*_utf8*.properties + + + + net.alchim31.maven yuicompressor-maven-plugin diff --git a/webapp/src/main/resources/i18n/contrast-finder_fr.properties b/webapp/src/main/resources/i18n/contrast-finder_fr.properties deleted file mode 100644 index c22ca1c7..00000000 --- a/webapp/src/main/resources/i18n/contrast-finder_fr.properties +++ /dev/null @@ -1,154 +0,0 @@ -NOT_A_VALID_COLOR=La couleur doit \u00eatre comprise entre #000000 et #FFFFFF -NOT_A_VALID_RATIO.colorModel.ratio=Le ratio n'est pas valide -home.titleTag=Contrast Finder, trouvez le bon contraste pour vos couleurs, accessibilit\u00e9 web (WCAG / RGAA) -home.metaDescription=Outil en ligne pour v\u00e9rifier si le contraste de vos couleurs est accessible. Contrast-Finder propose des jeux de couleurs accessibles proches de celles que vous venez de tester. Accessibilit\u00e9 web (WCAG / RGAA) -logo.link.title=Retour \u00e0 la page d'accueil -result.title.colors=couleurs -result.title.foregroundColor=texte -result.title.backgroundColor=fond -result.title.minRation=ratio min -form.fillInFields=Renseignez les champs suivants : -form.description=Contrast-Finder trouve les bons contrastes de couleurs pour l'accessibilit\u00e9 web -form.help=La couleur doit \u00eatre comprise entre #000000 et #FFFFFF \ -
ou entre rgb(0,0,0) et rgb(255,255,255) -form.foregroundColor=Couleur du texte -form.backgroundColor=Couleur du fond -form.component=Couleur \u00e0 modifier -form.componentForeground=Modifier la couleur du texte -form.componentBackground=Modifier la couleur du fond -form.ratio=Ratio minimum -form.contrastOld=Ancien contraste -form.contrastNew=Nouveau contraste -form.validate=V\u00e9rifier le contraste et trouver des couleurs valides -form.validContrast=Contraste Valide : -form.validContrastDesc=Les couleurs que vous avez choisi sont valides -form.resultNumber={0} {0,choice,1#r\u00e9sultat|1Contrast-Finder ?
Essaye Asqatasun, le logiciel libre de mesure de l'accessibilit\u00e9 -form.contrastSolutionDistance=Distance -form.contrastSolutionDistanceEx=Distance de la couleur d'origine -form.objectifs=Propose-moi -form.algoHSV=une palette de couleurs valides -form.algoRGB=des couleurs valides et proches de la couleur initiale -form.invalidColor=Couleur invalide -form.changeComponent=Essayez encore en changeant la -form.invalidAlgo=La valeur de l'algorithme est invalide. -form.tryHsv=Propose moi une palette de couleurs valides -form.tryRgb=Propose moi des couleurs valides et tr\u00e8s proches de la couleur initiale -form.testedColors=couleurs test\u00e9es -form.notSatisfied=Pas satisfait ? -form.anyResult= -form.oppositeComponentForeground=couleur du fond -form.oppositeComponentBackground=couleur du texte -message.addon=Hey ! Avez-vous test\u00e9 la nouvelle \nextension Firefox de Contrast-Finder ? -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=

Aide

\ -

Premier plan : couleur du texte

\ -

\ - C'est la couleur du texte. \ - Vous pouvez remplir ce champ avec un nom de couleur CSS, une valeur hexad\u00e9cimale, \ - ou une valeur RGB. \ - La valeur saisie est alors pr\u00e9visualis\u00e9e \u00e0 droite du champ. \ -

\ -

Couleur par mots-cl\u00e9s

\ -

Exemple : Black, Silver, YellowGreen, MediumPurple.
\ -Les valeurs autoris\u00e9es sont les noms des couleurs utilisables en CSS 3. \ -

\ -

Couleur en hexad\u00e9cimale

\ -

Exemple : #AABBCC. \ - Notez que #ABC fonctionne \u00e9galement, \ - nous compl\u00e9tons automatiquement le champ avec #AABBCC. \ - Vous pouvez \u00e9galement utiliser ce champ sans le caract\u00e8re #, \ - ainsi FFF ou FFFFFF fonctionnent parfaitement. \ -

\ -

Couleur en RGB

\ -

Exemple : rgb(255,255,255).
\ - De la m\u00eame mani\u00e8re, 255,255,255 fonctionne \u00e9galement, \ - nous remplaçons la valeur de ce champ par rgb(255,255,255). \ -

\ -

Arri\u00e8re-plan : couleur du fond

\ -

\ - C'est la couleur d'arri\u00e8re-plan.
\ - Ce champ fonctionne comme le champ couleur du texte.\ -

\ -

Ratio minimum

\ -

Trois valeurs possibles : 3, 4.5 et 7.

\ -

Comment choisir un ratio ? Cela d\u00e9pend des \u00e9l\u00e9ments suivants :

\ -
    \ -
  • Niveau d'accessibilit\u00e9 souhait\u00e9 : AA ou AAA.
    • \ -
  • Le texte est-il en gras ?
    • \ -
  • Taille du texte.
    • \ -
\ -

Niveau AA

\ -

Deux \u00e9l\u00e9ments (la taille et la graisse du texte) donnent 4 combinaisons :

\ -
    \ -
  • Texte non gras + taille du texte < 18px : ratio = 4.5
    • \ -
  • Texte non gras + taille du texte > 18px : ratio = 3
    • \ -
  • Texte en gras + taille du texte < 14px : ratio = 4.5
    • \ -
  • Texte en gras + taille du texte > 14px : ratio = 3
    • \ -
\ -

Niveau AAA

\ -

Pour le niveau AAA, la logique est la m\u00eame avec une augmentation de la valeur des ratios :

\ -
    \ -
  • Le ratio 4.5 devient 7
    • \ -
  • Le ratio 3 devient 4.5
    • \ -
\ -

Informations compl\u00e9mentaires sur le contraste pour l'accessibilit\u00e9

\ -

\ - En compl\u00e9ment, toutes les informations d\u00e9taill\u00e9es (en français et en anglais) \ - sur le rapport de contraste entre le texte et son arri\u00e8re-plan : \ -

\ -\ -

Couleur \u00e0 modifier

\ -

Il s'agit de la couleur du texte ou de la couleur du fond. Par d\u00e9faut, c'est la couleur du texte.

\ -

La couleur que vous choisissez sera modifi\u00e9e jusqu'\u00e0 ce que l'outil trouve une couleur valide. L'autre couleur ne changera pas.

\ -

Les 2 algorithmes

\ -
    \ -
  • une palette de couleurs valides,
    • \ -
  • des couleurs valides et tr\u00e8s proches de la couleur initiale.
    • \ -
\ -

Une question ?

\ -

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

\ - -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) \ No newline at end of file diff --git a/webapp/src/main/resources/i18n/contrast-finder.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8.properties similarity index 100% rename from webapp/src/main/resources/i18n/contrast-finder.properties rename to webapp/src/main/resources/i18n/contrast-finder_utf8.properties diff --git a/webapp/src/main/resources/i18n/contrast-finder_en.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties similarity index 100% rename from webapp/src/main/resources/i18n/contrast-finder_en.properties rename to webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties diff --git a/webapp/src/main/resources/i18n_utf8/contrast-finder_fr.properties.utf8 b/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties similarity index 100% rename from webapp/src/main/resources/i18n_utf8/contrast-finder_fr.properties.utf8 rename to webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties diff --git a/webapp/src/main/resources/i18n/contrast-finder_pt.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties similarity index 100% rename from webapp/src/main/resources/i18n/contrast-finder_pt.properties rename to webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties diff --git a/webapp/src/main/resources/i18n_utf8/contrast-finder.properties.utf8 b/webapp/src/main/resources/i18n_utf8/contrast-finder.properties.utf8 deleted file mode 100644 index 97b8a8f9..00000000 --- a/webapp/src/main/resources/i18n_utf8/contrast-finder.properties.utf8 +++ /dev/null @@ -1,138 +0,0 @@ -NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF -NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio -home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) -home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. -logo.link.title=Back to the homepage -result.title.colors=colors -result.title.foregroundColor=text -result.title.backgroundColor=background -result.title.minRation=min ratio -form.fillInFields=Please fill in the following fields : -form.description=Contrast-Finder finds correct color contrasts for web accessibility -form.help=The color should be between #000000 and #FFFFFF \ -
or between rgb(0,0,0) and rgb(255,255,255) -form.foregroundColor=Text color -form.backgroundColor=Background color -form.component=Color to edit -form.componentForeground=Edit the text color -form.componentBackground=Edit the background color -form.ratio=Minimum ratio -form.contrastOld=Old contrast -form.contrastNew=New contrast -form.validate=Check contrast and find valid colors -form.validContrast=Valid Contrast : -form.validContrastDesc=The choosen colors are already good -form.resultNumber={0} {0,choice,1#result|1Contrast-Finder?
Try Asqatasun, the opensource website analyser for accessibility -form.contrastSolutionDistance=Distance -form.contrastSolutionDistanceEx=Distance from initial color -form.objectifs=Gimme -form.algoHSV=a range of valid colors -form.algoRGB=valid colors and very close to initial color -form.invalidColor=Invalid color -form.changeComponent=try again changing the -form.invalidAlgo=The algorithm value is not valid. -form.tryHsv=Gimme a range of colors -form.tryRgb=Gimme valid colors and very close to initial color -form.testedColors=colors tested -form.notSatisfied=Not satisfied? -form.anyResult=Let's -form.oppositeComponentForeground=background color -form.oppositeComponentBackground=foreground color -message.addon=Hey! Have you tried the new Contrast-Finder Firefox addon? -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=

Help

\ -

Text color / Foreground

\ -

\ - It is the text color. You can fill in this field with an hexadecimal value. \ - i.e. #AABBCC color. Note that #ABC works also, \ - we automatically complete the field with #AABBCC. \ - You can also use this field without the # character, so FFF or FFFFFF works perfectly. \ - The input value is then previewed on the right of the field.\ -

\ -

Background

\ -

It is the background color. This field works as the text color fields.\ -

Minimum ratio

\ -

Three possible values 3, 4.5 and 7.

\ -

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

\ -
    \ -
  • Level of accessibility wanted: AA or AAA.
    • \ -
  • Size of the text.
    • \ -
  • Is the text bold or not.
    • \ -
\ -

Level AA

\ -

Two elements (size and bold) gives four combinations:

\ -
    \ -
  • Text not bold + text size < 18px: ratio = 4.5
    • \ -
  • Text not bold + text size > 18px: ratio = 3
    • \ -
  • Text bold + text size < 14px: ratio = 4.5
    • \ -
  • Text bold + text size > 14px: ratio = 3
    • \ -
\ -

Level AAA

\ -

For level AAA the logic is the same one, only the ratio increases in the the following way:

\ -
    \ -
  • 4.5 ratio become 7
    • \ -
  • 3 ratio become 4.5
    • \ -
\ -

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.
    • \ -
\ -

For a full and exhaustive understanding of how to interpret text size, one should read the \ - defintion of large-scale text from WCAG.

\ -

All details about the contrast ratio

\ -\ -

Color to edit

\ -

It is either the foreground or the background. Default is foreground.

\ -

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

\ -

The algorithms

\ -

A range of valid colors

\ -

The result is a wide range of colors.
\ - This algorithm is very helpful if you are not sure about the hue of your initial color.

\ -

Valid colors and very close to initial color

\ -

The result is a list of colors close to the original color.
\ - The aim is to have a valid color with a contrast as close to the selected ratio as possible (At the 0.001 range).

\ -

User Feedback

\ -

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

\ - \ -

Contributing

\ -

\ -You are invited to contribute new features, fixes, or updates, large or small; \ -we are always thrilled to receive pull requests, and do our best to process them as fast as we can. \ -

-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_utf8/contrast-finder_en.properties.utf8 b/webapp/src/main/resources/i18n_utf8/contrast-finder_en.properties.utf8 deleted file mode 100644 index 97b8a8f9..00000000 --- a/webapp/src/main/resources/i18n_utf8/contrast-finder_en.properties.utf8 +++ /dev/null @@ -1,138 +0,0 @@ -NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF -NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio -home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) -home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. -logo.link.title=Back to the homepage -result.title.colors=colors -result.title.foregroundColor=text -result.title.backgroundColor=background -result.title.minRation=min ratio -form.fillInFields=Please fill in the following fields : -form.description=Contrast-Finder finds correct color contrasts for web accessibility -form.help=The color should be between #000000 and #FFFFFF \ -
or between rgb(0,0,0) and rgb(255,255,255) -form.foregroundColor=Text color -form.backgroundColor=Background color -form.component=Color to edit -form.componentForeground=Edit the text color -form.componentBackground=Edit the background color -form.ratio=Minimum ratio -form.contrastOld=Old contrast -form.contrastNew=New contrast -form.validate=Check contrast and find valid colors -form.validContrast=Valid Contrast : -form.validContrastDesc=The choosen colors are already good -form.resultNumber={0} {0,choice,1#result|1Contrast-Finder?
Try Asqatasun, the opensource website analyser for accessibility -form.contrastSolutionDistance=Distance -form.contrastSolutionDistanceEx=Distance from initial color -form.objectifs=Gimme -form.algoHSV=a range of valid colors -form.algoRGB=valid colors and very close to initial color -form.invalidColor=Invalid color -form.changeComponent=try again changing the -form.invalidAlgo=The algorithm value is not valid. -form.tryHsv=Gimme a range of colors -form.tryRgb=Gimme valid colors and very close to initial color -form.testedColors=colors tested -form.notSatisfied=Not satisfied? -form.anyResult=Let's -form.oppositeComponentForeground=background color -form.oppositeComponentBackground=foreground color -message.addon=Hey! Have you tried the new Contrast-Finder Firefox addon? -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=

Help

\ -

Text color / Foreground

\ -

\ - It is the text color. You can fill in this field with an hexadecimal value. \ - i.e. #AABBCC color. Note that #ABC works also, \ - we automatically complete the field with #AABBCC. \ - You can also use this field without the # character, so FFF or FFFFFF works perfectly. \ - The input value is then previewed on the right of the field.\ -

\ -

Background

\ -

It is the background color. This field works as the text color fields.\ -

Minimum ratio

\ -

Three possible values 3, 4.5 and 7.

\ -

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

\ -
    \ -
  • Level of accessibility wanted: AA or AAA.
    • \ -
  • Size of the text.
    • \ -
  • Is the text bold or not.
    • \ -
\ -

Level AA

\ -

Two elements (size and bold) gives four combinations:

\ -
    \ -
  • Text not bold + text size < 18px: ratio = 4.5
    • \ -
  • Text not bold + text size > 18px: ratio = 3
    • \ -
  • Text bold + text size < 14px: ratio = 4.5
    • \ -
  • Text bold + text size > 14px: ratio = 3
    • \ -
\ -

Level AAA

\ -

For level AAA the logic is the same one, only the ratio increases in the the following way:

\ -
    \ -
  • 4.5 ratio become 7
    • \ -
  • 3 ratio become 4.5
    • \ -
\ -

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.
    • \ -
\ -

For a full and exhaustive understanding of how to interpret text size, one should read the \ - defintion of large-scale text from WCAG.

\ -

All details about the contrast ratio

\ -\ -

Color to edit

\ -

It is either the foreground or the background. Default is foreground.

\ -

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

\ -

The algorithms

\ -

A range of valid colors

\ -

The result is a wide range of colors.
\ - This algorithm is very helpful if you are not sure about the hue of your initial color.

\ -

Valid colors and very close to initial color

\ -

The result is a list of colors close to the original color.
\ - The aim is to have a valid color with a contrast as close to the selected ratio as possible (At the 0.001 range).

\ -

User Feedback

\ -

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

\ - \ -

Contributing

\ -

\ -You are invited to contribute new features, fixes, or updates, large or small; \ -we are always thrilled to receive pull requests, and do our best to process them as fast as we can. \ -

-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_utf8/contrast-finder_pt.properties.utf8 b/webapp/src/main/resources/i18n_utf8/contrast-finder_pt.properties.utf8 deleted file mode 100644 index 97b8a8f9..00000000 --- a/webapp/src/main/resources/i18n_utf8/contrast-finder_pt.properties.utf8 +++ /dev/null @@ -1,138 +0,0 @@ -NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF -NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio -home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) -home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. -logo.link.title=Back to the homepage -result.title.colors=colors -result.title.foregroundColor=text -result.title.backgroundColor=background -result.title.minRation=min ratio -form.fillInFields=Please fill in the following fields : -form.description=Contrast-Finder finds correct color contrasts for web accessibility -form.help=The color should be between #000000 and #FFFFFF \ -
or between rgb(0,0,0) and rgb(255,255,255) -form.foregroundColor=Text color -form.backgroundColor=Background color -form.component=Color to edit -form.componentForeground=Edit the text color -form.componentBackground=Edit the background color -form.ratio=Minimum ratio -form.contrastOld=Old contrast -form.contrastNew=New contrast -form.validate=Check contrast and find valid colors -form.validContrast=Valid Contrast : -form.validContrastDesc=The choosen colors are already good -form.resultNumber={0} {0,choice,1#result|1Contrast-Finder?
Try Asqatasun, the opensource website analyser for accessibility -form.contrastSolutionDistance=Distance -form.contrastSolutionDistanceEx=Distance from initial color -form.objectifs=Gimme -form.algoHSV=a range of valid colors -form.algoRGB=valid colors and very close to initial color -form.invalidColor=Invalid color -form.changeComponent=try again changing the -form.invalidAlgo=The algorithm value is not valid. -form.tryHsv=Gimme a range of colors -form.tryRgb=Gimme valid colors and very close to initial color -form.testedColors=colors tested -form.notSatisfied=Not satisfied? -form.anyResult=Let's -form.oppositeComponentForeground=background color -form.oppositeComponentBackground=foreground color -message.addon=Hey! Have you tried the new Contrast-Finder Firefox addon? -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=

Help

\ -

Text color / Foreground

\ -

\ - It is the text color. You can fill in this field with an hexadecimal value. \ - i.e. #AABBCC color. Note that #ABC works also, \ - we automatically complete the field with #AABBCC. \ - You can also use this field without the # character, so FFF or FFFFFF works perfectly. \ - The input value is then previewed on the right of the field.\ -

\ -

Background

\ -

It is the background color. This field works as the text color fields.\ -

Minimum ratio

\ -

Three possible values 3, 4.5 and 7.

\ -

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

\ -
    \ -
  • Level of accessibility wanted: AA or AAA.
    • \ -
  • Size of the text.
    • \ -
  • Is the text bold or not.
    • \ -
\ -

Level AA

\ -

Two elements (size and bold) gives four combinations:

\ -
    \ -
  • Text not bold + text size < 18px: ratio = 4.5
    • \ -
  • Text not bold + text size > 18px: ratio = 3
    • \ -
  • Text bold + text size < 14px: ratio = 4.5
    • \ -
  • Text bold + text size > 14px: ratio = 3
    • \ -
\ -

Level AAA

\ -

For level AAA the logic is the same one, only the ratio increases in the the following way:

\ -
    \ -
  • 4.5 ratio become 7
    • \ -
  • 3 ratio become 4.5
    • \ -
\ -

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.
    • \ -
\ -

For a full and exhaustive understanding of how to interpret text size, one should read the \ - defintion of large-scale text from WCAG.

\ -

All details about the contrast ratio

\ -\ -

Color to edit

\ -

It is either the foreground or the background. Default is foreground.

\ -

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

\ -

The algorithms

\ -

A range of valid colors

\ -

The result is a wide range of colors.
\ - This algorithm is very helpful if you are not sure about the hue of your initial color.

\ -

Valid colors and very close to initial color

\ -

The result is a list of colors close to the original color.
\ - The aim is to have a valid color with a contrast as close to the selected ratio as possible (At the 0.001 range).

\ -

User Feedback

\ -

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

\ - \ -

Contributing

\ -

\ -You are invited to contribute new features, fixes, or updates, large or small; \ -we are always thrilled to receive pull requests, and do our best to process them as fast as we can. \ -

-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/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml b/webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml index bf198506..6d547bc9 100644 --- a/webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml +++ b/webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml @@ -8,7 +8,7 @@ - i18n/contrast-finder + i18n/contrast-finder_utf8 From 78f165d3953faec5a4522e49b71a775728c2e269 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 9 Jul 2017 00:42:09 +0200 Subject: [PATCH 06/18] fixed webapp/pom.xml --- webapp/pom.xml | 5 ++++- .../src/main/resources/i18n/contrast-finder_utf8.properties | 1 + .../main/resources/i18n/contrast-finder_utf8_en.properties | 1 + .../main/resources/i18n/contrast-finder_utf8_fr.properties | 1 + .../main/resources/i18n/contrast-finder_utf8_pt.properties | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/webapp/pom.xml b/webapp/pom.xml index 7b323d1e..9e3c5a0f 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -182,7 +182,10 @@ UTF8 - **/*_utf8*.properties + src/main/resources + + **/*_utf8*.properties + diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8.properties index 97b8a8f9..a5ba5084 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8.properties @@ -1,3 +1,4 @@ +###### i18n file in UTF-8 character encoding ####################### NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) 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 97b8a8f9..a5ba5084 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_en.properties @@ -1,3 +1,4 @@ +###### i18n file in UTF-8 character encoding ####################### NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) 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 ae8073a2..759eeba7 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_fr.properties @@ -1,3 +1,4 @@ +###### i18n file in UTF-8 character encoding ####################### NOT_A_VALID_COLOR=La couleur doit être comprise entre #000000 et #FFFFFF NOT_A_VALID_RATIO.colorModel.ratio=Le ratio n'est pas valide home.titleTag=Contrast Finder, trouvez le bon contraste pour vos couleurs, accessibilité web (WCAG / RGAA) 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 97b8a8f9..a5ba5084 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_pt.properties @@ -1,3 +1,4 @@ +###### i18n file in UTF-8 character encoding ####################### NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) From fce50d90ec1c4a5d6a1603c67c7f3b2495a7031f Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 9 Jul 2017 03:43:13 +0200 Subject: [PATCH 07/18] typo --- CHANGELOG.md | 2 +- .../main/webapp/WEB-INF/template/header.jspf | 156 ++++++++++-------- 2 files changed, 87 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44bfef5f..25b675e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ none none ### Refactoring -none +- [#76 - i18n files in UTF8 character encoding](https://github.com/Asqatasun/Contrast-Finder/issues/76) ### Configuration none diff --git a/webapp/src/main/webapp/WEB-INF/template/header.jspf b/webapp/src/main/webapp/WEB-INF/template/header.jspf index e6edcd88..e4bfa953 100644 --- a/webapp/src/main/webapp/WEB-INF/template/header.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/header.jspf @@ -2,76 +2,92 @@ <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@page pageEncoding="UTF-8"%> -
- - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + -
-

${appName_v2}

-

-

- "> - WCAG 1.4.3 - - -

-
-
\ No newline at end of file +
+

${appName_v2}

+

+

+ "> + WCAG 1.4.3 + + +

+
+
\ No newline at end of file From ba1eaa4b4b8fa6e602358fa3799766851fe2420e Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Tue, 11 Jul 2017 00:04:27 +0200 Subject: [PATCH 08/18] DOC - Updated Other-contrast-tools.md added accessible-colors.com --- documentation/en/Other-contrast-tools.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/documentation/en/Other-contrast-tools.md b/documentation/en/Other-contrast-tools.md index eeab7594..b8a9b945 100644 --- a/documentation/en/Other-contrast-tools.md +++ b/documentation/en/Other-contrast-tools.md @@ -5,16 +5,18 @@ * [Contrast-A](http://www.dasplankton.de/ContrastA/) * [WCAG Contrast Checker (firefox addon) v1.2](https://addons.mozilla.org/fr/firefox/addon/wcag-contrast-checker/versions/?page=1#version-1.2) Especially v1.2 because you can select a given text (functionnality has disappeared in further versions) * [Color Contrast Tool (snook.ca)](http://snook.ca/technical/colour_contrast/colour.html) +* [Accessible-colors.com](http://accessible-colors.com/) + * src: https://github.com/moroshko/accessible-colors ## Other contrast tools (which are actually good, but it appears we don't them) * http://webaim.org/resources/contrastchecker/ * http://contrastchecker.com/ * http://leaverou.github.io/contrast-ratio/ - * src: https://github.com/LeaVerou/contrast-ratio + * src: https://github.com/LeaVerou/contrast-ratio * http://juicystudio.com/services/luminositycontrastratio.php * http://vanisoft.pl/~lopuszanski/public/colors/ * http://www.brandwood.com/a11y/ - * src: https://github.com/andrewbrandwood/a11y-image-text + * src: https://github.com/andrewbrandwood/a11y-image-text ### Other contrast tools * http://www.visionaustralia.org/digital-access-determinator @@ -25,26 +27,26 @@ * https://www.joedolson.com/tools/color-contrast-tester.php * https://www.joedolson.com/tools/color-contrast.php * https://github.com/toolness/accessible-color-matrix - * https://toolness.github.io/accessible-color-matrix/ + * https://toolness.github.io/accessible-color-matrix/ * https://addons.mozilla.org/fr/firefox/addon/wcag-contrast-checker/ * https://hexnaw.com/ * http://jxnblk.com/colorable/ - * https://colorable.jxnblk.com/ - * http://jxnblk.com/hello-color/ - * http://jxnblk.com/colorable/demos/text/ - * http://jxnblk.com/colorable/demos/matrix/ - * http://www.aremycoloursaccessible.com/ + * https://colorable.jxnblk.com/ + * http://jxnblk.com/hello-color/ + * http://jxnblk.com/colorable/demos/text/ + * http://jxnblk.com/colorable/demos/matrix/ + * http://www.aremycoloursaccessible.com/ * [Sass Contrast Functions](https://codepen.io/giana/project/full/ZWbGzD) ### Color scheme generation * [Palat](https://dobtco.github.io/palat/) generate accessible color scheme - * Ruby gem - https://github.com/dobtco/palat/ + * Ruby gem - https://github.com/dobtco/palat/ ### Vision simulation * http://paletton.com/ very popular but n real option for accessibility (as of 2016), and not opensource * http://www.getstark.co/ - * https://github.com/stark-contrast/stark-sketch-plugin + * https://github.com/stark-contrast/stark-sketch-plugin From 7c87b8738a0f47984a321faa0373a83f2b1aabab Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Tue, 11 Jul 2017 03:15:42 +0200 Subject: [PATCH 09/18] Fixed #79 - Added maven-checkstyle-plugin --- CHANGELOG.md | 4 +- documentation/en/30_Contributor_doc/README.md | 113 +++++++++++++----- pom.xml | 45 ++++++- 3 files changed, 127 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25b675e1..a6c5fbd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,9 @@ none none ### Task -none +- [#79 - Pom.xml: added maven-checkstyle-plugin](https://github.com/Asqatasun/Contrast-Finder/issues/79) + + Contrast-Finder 0.5.2, 2017-07-04 diff --git a/documentation/en/30_Contributor_doc/README.md b/documentation/en/30_Contributor_doc/README.md index b9dd4b62..5c8344a1 100644 --- a/documentation/en/30_Contributor_doc/README.md +++ b/documentation/en/30_Contributor_doc/README.md @@ -4,38 +4,28 @@ * [Release a version of Contrast-Finder](Release/README.md) ----- - -* JavaDoc -* OWASP Dependency-Check * Checking for new dependency / plugin updates +* OWASP Dependency-Check +* Checkstyle +* JavaDoc -## JavaDoc +## Checking for new dependency / plugin updates ```bash -git clone https://github.com/Asqatasun/Contrast-Finder -cd Contrast-finder -``` +# Checking for new dependency updates +mvn versions:display-dependency-updates -One of the following command lines: -```bash -mvn javadoc:javadoc -mvn javadoc:aggregate -mvn javadoc:test-javadoc -mvn javadoc:test-aggregate -mvn site -``` +# Checking for new plugin updates +mvn versions:display-plugin-updates -JavaDoc is available in the following directories: -```bash -target/site/apidocs -target/site/testapidocs +# Checking for new property-linked updates +mvn versions:display-property-updates ``` ### Documentation -* [Apache Maven Javadoc Plugin](https://maven.apache.org/plugins/maven-javadoc-plugin/) -* [Generate Javadocs](https://maven.apache.org/plugins/maven-javadoc-plugin/usage.html) -* [Javadoc Plugin Documentation](https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html) - +* http://www.mojohaus.org/versions-maven-plugin/examples/display-dependency-updates.html +* http://www.mojohaus.org/versions-maven-plugin/examples/display-plugin-updates.html +* http://www.mojohaus.org/versions-maven-plugin/examples/display-property-updates.html ## OWASP Dependency-Check @@ -69,18 +59,75 @@ mvn dependency-check:help -Ddetail=true -Dgoal=aggregate * http://jeremylong.github.io/DependencyCheck/ * http://jeremylong.github.io/DependencyCheck/dependency-check-maven/ -## Checking for new dependency / plugin updates + +## Checkstyle +Scan Contrast-Finder to check the violations of a coding standard. + +### Documentation +* http://checkstyle.sourceforge.net/ +* http://maven.apache.org/plugins/maven-checkstyle-plugin/ + +### maven-checkstyle-plugin ```bash -# Checking for new dependency updates -mvn versions:display-dependency-updates +git clone https://github.com/Asqatasun/Contrast-Finder +cd Contrast-finder -# Checking for new plugin updates -mvn versions:display-plugin-updates +# Performs Checkstyle analysis and outputs violations or a count of violations +# to the console, potentially failing the build. +mvn checkstyle:check -# Checking for new property-linked updates -mvn versions:display-property-updates +# A reporting task that performs Checkstyle analysis +# and generates an HTML report for each module +mvn checkstyle:checkstyle + +# a reporting task that performs Checkstyle analysis +# and generates an aggregate HTML report +mvn checkstyle:checkstyle-aggregate +mvn site + +# Checking for violations as part of the Build +mvn clean install + # Before, remove comments + # around check in pom.xml file +``` + +### checkstyle CLI +```bash +apt-get install checkstyle +git clone https://github.com/Asqatasun/Contrast-Finder +checkstyle -c checkstyle.xml Contrast-Finder/**/*.java +``` + + +### CI (Travis, Gitlab, Jenkins) +... + + + +## JavaDoc + +```bash +git clone https://github.com/Asqatasun/Contrast-Finder +cd Contrast-finder +``` + +One of the following command lines: +```bash +mvn javadoc:javadoc +mvn javadoc:aggregate +mvn javadoc:test-javadoc +mvn javadoc:test-aggregate +mvn site +``` + +JavaDoc is available in the following directories: +```bash +target/site/apidocs +target/site/testapidocs ``` + ### Documentation -* http://www.mojohaus.org/versions-maven-plugin/examples/display-dependency-updates.html -* http://www.mojohaus.org/versions-maven-plugin/examples/display-plugin-updates.html -* http://www.mojohaus.org/versions-maven-plugin/examples/display-property-updates.html +* [Apache Maven Javadoc Plugin](https://maven.apache.org/plugins/maven-javadoc-plugin/) +* [Generate Javadocs](https://maven.apache.org/plugins/maven-javadoc-plugin/usage.html) +* [Javadoc Plugin Documentation](https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html) + diff --git a/pom.xml b/pom.xml index 2bf82d57..4564b576 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,35 @@ + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + validate + validate + + + UTF-8 + true + true + false + + + + + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 From 12631cb540e7b4b2e389f09d69f04a8aeb4e60cd Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 20 Jul 2017 21:07:25 +0200 Subject: [PATCH 16/18] fixed #59 - Upgraded outdated dependencies: SpringFramework 4.3.10 SpringFramework 4.3.10 instead of 4.3.9 --- CHANGELOG.md | 18 +++--------------- .../en/30_Contributor_doc/Release/README.md | 3 +++ webapp/pom.xml | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6c5fbd6..0e3e588c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -Contrast-Finder 0.5.3, 2017-07-xx +Contrast-Finder 0.5.3, 2017-07-2x --------------------------------- Upgrade-o-meter: just replace the .war file and restart Tomcat @@ -8,24 +8,12 @@ Upgrade-o-meter: just replace the .war file and restart Tomcat ### New Feature none -### Security -none - -### Bug -none - -### Improvement -none +### Outdated dependencies +- [#59 - Upgraded SpringFramework to v4.3.10](https://github.com/Asqatasun/Contrast-Finder/issues/59) ### Refactoring - [#76 - i18n files in UTF8 character encoding](https://github.com/Asqatasun/Contrast-Finder/issues/76) -### Configuration -none - -### Documentation -none - ### Task - [#79 - Pom.xml: added maven-checkstyle-plugin](https://github.com/Asqatasun/Contrast-Finder/issues/79) diff --git a/documentation/en/30_Contributor_doc/Release/README.md b/documentation/en/30_Contributor_doc/Release/README.md index 4b00100b..0b2d2eab 100644 --- a/documentation/en/30_Contributor_doc/Release/README.md +++ b/documentation/en/30_Contributor_doc/Release/README.md @@ -80,6 +80,9 @@ none ### Security none +### Outdated dependencies +none + ### Bug none diff --git a/webapp/pom.xml b/webapp/pom.xml index 9e3c5a0f..ec02eb87 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -26,7 +26,7 @@ ${project.build.directory}/endorsed UTF-8 - 4.3.9.RELEASE + 4.3.10.RELEASE 4.2.3.RELEASE From 84802b9b05cb272482f8cad5ceb5761888a200eb Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 20 Jul 2017 21:14:45 +0200 Subject: [PATCH 17/18] DOC - Updated Other-contrast-tools.md --- CHANGELOG.md | 4 ++-- documentation/en/Other-contrast-tools.md | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e3e588c..e2b57cf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # CHANGELOG -Contrast-Finder 0.5.3, 2017-07-2x +Contrast-Finder 0.6.0, 2017-07-21 --------------------------------- Upgrade-o-meter: just replace the .war file and restart Tomcat ### New Feature -none +- [#80 - i18n: added portuguese](https://github.com/Asqatasun/Contrast-Finder/issues/80) ### Outdated dependencies - [#59 - Upgraded SpringFramework to v4.3.10](https://github.com/Asqatasun/Contrast-Finder/issues/59) diff --git a/documentation/en/Other-contrast-tools.md b/documentation/en/Other-contrast-tools.md index b8a9b945..e8665b95 100644 --- a/documentation/en/Other-contrast-tools.md +++ b/documentation/en/Other-contrast-tools.md @@ -30,6 +30,7 @@ * https://toolness.github.io/accessible-color-matrix/ * https://addons.mozilla.org/fr/firefox/addon/wcag-contrast-checker/ * https://hexnaw.com/ + * http://jxnblk.com/colorable/ * https://colorable.jxnblk.com/ * http://jxnblk.com/hello-color/ @@ -46,6 +47,7 @@ ### Vision simulation * http://paletton.com/ very popular but n real option for accessibility (as of 2016), and not opensource +* http://carlosrafaelgn.com.br/Aula/Cores.html (not opensource, in Portuguese) * http://www.getstark.co/ * https://github.com/stark-contrast/stark-sketch-plugin From 9beaa92c408b7cb5adbe4b22b79ac2bfaa74caff Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Fri, 21 Jul 2017 00:04:07 +0200 Subject: [PATCH 18/18] set version to 0.6.0 --- docker/RELEASE/Dockerfile | 10 +++++----- docker/RELEASE/README.md | 4 ++-- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 2 +- docker/SNAPSHOT-local_from-Ubuntu/Dockerfile | 2 +- .../test_conf-default-algo/Dockerfile | 2 +- .../test_conf-env_debug/Dockerfile | 2 +- .../test_conf-piwik/Dockerfile | 2 +- .../pre-requisites_from-Ubuntu/Dockerfile | 2 +- documentation/pom.xml | 4 ++-- engine/api/pom.xml | 4 ++-- engine/hsv/pom.xml | 4 ++-- engine/impl/pom.xml | 4 ++-- engine/pom.xml | 4 ++-- engine/utils/pom.xml | 4 ++-- pom.xml | 2 +- webapp/pom.xml | 4 ++-- .../webapp/WEB-INF/template/template_variables.jspf | 2 +- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile index e29ba82a..5ea5ec31 100644 --- a/docker/RELEASE/Dockerfile +++ b/docker/RELEASE/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp" \ - org.label-schema.version = "0.5.3-dev" \ + org.label-schema.version = "0.6.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.5.3-dev . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.3-dev/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.3-dev/contrast-finder_0.5.3-dev.i386.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.6.0 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.6.0/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.6.0/contrast-finder_0.6.0.i386.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -36,7 +36,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.5.3-dev" +ARG CONTRAST_FINDER_RELEASE="0.6.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_${CONTRAST_FINDER_RELEASE}.i386.tar.gz" diff --git a/docker/RELEASE/README.md b/docker/RELEASE/README.md index 237fb332..3da78b30 100644 --- a/docker/RELEASE/README.md +++ b/docker/RELEASE/README.md @@ -7,7 +7,7 @@ Tool to provide color combination for a good (accessible, WCAG-compliant) contra Supported tags and respective `Dockerfile` links : * [pre-requisites_from-Ubuntu](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile) -* [v0.5.3-dev, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile) +* [v0.6.0, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile) * [v0.5.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.2/docker/RELEASE/Dockerfile) * [v0.5.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.1/docker/RELEASE/Dockerfile) * [v0.5.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.0/docker/RELEASE/Dockerfile) @@ -28,7 +28,7 @@ In your browser, go to `http://localhost:8080/contrast-finder/` * More information on the website [Contrast-Finder.org](https://contrast-finder.org) * Demo : https://app.contrast-finder.org -![Screenshot - Contrast-Finder v0.5.3-dev](https://raw.githubusercontent.com/Asqatasun/Contrast-Finder/develop/documentation/en/images/screenshot/screenshot.EN_contrast-finder.v0.5.3-dev_2017-07-27_grey_kraken.io-lossy.png) +![Screenshot - Contrast-Finder v0.5.2](https://raw.githubusercontent.com/Asqatasun/Contrast-Finder/develop/documentation/en/images/screenshot/screenshot.EN_contrast-finder.v0.5.2_2017-07-27_grey_kraken.io-lossy.png) ## Tips and tricks ### Container available only on 127.0.0.1 (Linux users) #### diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile index 1e62ad06..0b39cdeb 100644 --- a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile +++ b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile @@ -25,7 +25,7 @@ FROM tomcat:7.0-jre7 ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" +ENV CONTRAST_FINDER_RELEASE="0.6.0" ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps" # Prepare Contrast-Finder diff --git a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile index 71f21175..d36d1bb7 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" +ENV CONTRAST_FINDER_RELEASE="0.6.0" # Add contrast-finder .war ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile index 115aa471..35554f05 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" +ENV CONTRAST_FINDER_RELEASE="0.6.0" ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="HSV" diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile index 81d12273..1dd1f9cf 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" +ENV CONTRAST_FINDER_RELEASE="0.6.0" ENV CONF_ENV="debug" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile index ece74e82..70d42f7a 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.5.3-dev" +ENV CONTRAST_FINDER_RELEASE="0.6.0" ENV PIWIK_KEY="9" ENV PIWIK_URL="http://localhost/piwik/" diff --git a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile index f27e9003..55f72478 100644 --- a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile +++ b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:14.04 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp pre-requisites" \ - org.label-schema.version = "0.5.3-dev" \ + org.label-schema.version = "0.6.0" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" # ----> documentation http://label-schema.org/ diff --git a/documentation/pom.xml b/documentation/pom.xml index 61aa788c..2b8dcea5 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.5.3-dev + 0.6.0 documentation pom - 0.5.3-dev + 0.6.0 contrast-finder-documentation diff --git a/engine/api/pom.xml b/engine/api/pom.xml index b2d223ff..f1391e14 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.5.3-dev + 0.6.0 contrast-finder-api - 0.5.3-dev + 0.6.0 jar api diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml index fdfc9735..b90b3904 100644 --- a/engine/hsv/pom.xml +++ b/engine/hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.5.3-dev + 0.6.0 contrast-finder-hsv - 0.5.3-dev + 0.6.0 jar hsv diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml index 0005c3f7..9c1af3a9 100644 --- a/engine/impl/pom.xml +++ b/engine/impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.5.3-dev + 0.6.0 contrast-finder-impl - 0.5.3-dev + 0.6.0 jar impl diff --git a/engine/pom.xml b/engine/pom.xml index 13d1f3af..99312a26 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.5.3-dev + 0.6.0 engine - 0.5.3-dev + 0.6.0 pom contrast-finder-engine diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml index ac137ef2..32a1f9d8 100644 --- a/engine/utils/pom.xml +++ b/engine/utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.5.3-dev + 0.6.0 contrast-finder-utils - 0.5.3-dev + 0.6.0 jar utils diff --git a/pom.xml b/pom.xml index 4564b576..b953bd3e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.asqatasun contrast-finder pom - 0.5.3-dev + 0.6.0 Contrast-Finder diff --git a/webapp/pom.xml b/webapp/pom.xml index ec02eb87..750f5d14 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.5.3-dev + 0.6.0 webapp - 0.5.3-dev + 0.6.0 war contrast-finder-webapp diff --git a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf index a2dc525d..5d77710c 100644 --- a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf @@ -2,7 +2,7 @@ <%@ page pageEncoding="UTF-8" %> <%-- APP version --%> - + <%-- APP Name --%>