Contrast-Finder v0.8.1

----------------------

  set version to 0.8.1
  Fixed #90 Webapp - Used <link rel="alternate" hreflang="">
  Fixed #88 Webapp - Added missing Korean translations
  set version to 0.8.1-dev

CHANGELOG.md

@@ -1,7 +1,17 @@
 # CHANGELOG
 
-Contrast-Finder 0.8.0, 2017-08-xx
---------------------------------------
+Contrast-Finder 0.8.1, 2017-08-05
+---------------------------------
+
+Upgrade-o-meter: just replace the .war file and restart Tomcat
+
+### Improvement 
+- [#90 - Added <link rel="alternate" hreflang=""> ](https://github.com/Asqatasun/Contrast-Finder/issues/90)
+- [#88 - Added missing Korean translations](https://github.com/Asqatasun/Contrast-Finder/issues/88)
+
+
+Contrast-Finder 0.8.0, 2017-08-03
+---------------------------------
 
 Upgrade-o-meter: just replace the .war file and restart Tomcat
 

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.8.0"                                             \
+      org.label-schema.version        = "0.8.1"                                             \
       org.label-schema.url            = "https://contrast-finder.org"                           \
       org.label-schema.vcs-url        = "https://github.com/Asqatasun/Contrast-Finder"          \
       org.label-schema.docker.cmd     = "docker run -p 8087:8080 -d asqatasun/contrast-finder"  \
@@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
 #
 #   --- Building this docker image
 #   docker build -t asqatasun/contrast-finder  .
-#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.8.0  .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.0/   .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.0/contrast-finder_0.8.0.i386.tar.gz   .
+#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.8.1  .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1/   .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1/contrast-finder_0.8.1.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.8.0"
+ARG CONTRAST_FINDER_RELEASE="0.8.1"
 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"
 

docker/RELEASE/README.md

@@ -7,7 +7,8 @@ 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.8.0, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
+* [v0.8.1, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
+* [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile)
 * [v0.7.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.7.0/docker/RELEASE/Dockerfile)
 * [v0.6.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.6.0/docker/RELEASE/Dockerfile)
 * [v0.5.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.2/docker/RELEASE/Dockerfile)

docker/SNAPSHOT-local_from-Tomcat/Dockerfile

@@ -25,7 +25,7 @@ FROM tomcat:7.0-jre7
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.8.0"
+ENV CONTRAST_FINDER_RELEASE="0.8.1"
 ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps"
 
 # Prepare Contrast-Finder

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.8.0"
+ENV CONTRAST_FINDER_RELEASE="0.8.1"
 
 # Add contrast-finder .war
 ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz  /root

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.8.0"
+ENV CONTRAST_FINDER_RELEASE="0.8.1"
 ENV CONF_DEFAULT_ALGO="Rgb"
     # ENV CONF_DEFAULT_ALGO="Rgb"
     # ENV CONF_DEFAULT_ALGO="HSV"

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.8.0"
+ENV CONTRAST_FINDER_RELEASE="0.8.1"
 ENV CONF_ENV="debug"
 
 # Add contrast-finder .war

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.8.0"
+ENV CONTRAST_FINDER_RELEASE="0.8.1"
 ENV PIWIK_KEY="9"
 ENV PIWIK_URL="http://localhost/piwik/"
 

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.8.0"                                             \
+      org.label-schema.version        = "0.8.1"                                             \
       org.label-schema.url            = "https://contrast-finder.org"                           \
       org.label-schema.vcs-url        = "https://github.com/Asqatasun/Contrast-Finder"
           # ----> documentation  http://label-schema.org/

documentation/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.8.0</version>
+        <version>0.8.1</version>
     </parent>
     <artifactId>documentation</artifactId>
     <packaging>pom</packaging>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
     <name>contrast-finder-documentation</name>
     <licenses>
         <license>

engine/api/pom.xml

@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.8.0</version>
+        <version>0.8.1</version>
     </parent>
     <artifactId>contrast-finder-api</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
     <packaging>jar</packaging>
     <name>api</name>
     <licenses>

engine/hsv/pom.xml

@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.8.0</version>
+        <version>0.8.1</version>
     </parent>
     <artifactId>contrast-finder-hsv</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
     <packaging>jar</packaging>
     <name>hsv</name>
     <licenses>

engine/impl/pom.xml

@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.8.0</version>
+        <version>0.8.1</version>
     </parent>
     <artifactId>contrast-finder-impl</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
     <packaging>jar</packaging>
     <name>impl</name>
     <licenses>

engine/pom.xml

@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.8.0</version>
+        <version>0.8.1</version>
     </parent>
     <artifactId>engine</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
     <packaging>pom</packaging>
     <name>contrast-finder-engine</name>
     <licenses>

engine/utils/pom.xml

@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.8.0</version>
+        <version>0.8.1</version>
     </parent>
     <artifactId>contrast-finder-utils</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
     <packaging>jar</packaging>
     <name>utils</name>
     <licenses>

pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.asqatasun</groupId>
     <artifactId>contrast-finder</artifactId>
     <packaging>pom</packaging>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
     <name>Contrast-Finder</name>
     <licenses>
         <license>

webapp/pom.xml

@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.8.0</version>
+        <version>0.8.1</version>
     </parent>
     <artifactId>webapp</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
     <packaging>war</packaging>
     <name>contrast-finder-webapp</name>
     <licenses>

webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties

@@ -50,13 +50,13 @@ form.objectifs=검색 범위
 form.algoHSV= 확장된 색 범위 속 기준에 적합한 대비 색
 form.algoRGB=처음 지정한 색과 아주 비슷하면서도 기준에 적합한 대비 색
 form.invalidColor=올바르지 않은 색
-form.changeComponent=try again changing the
+form.changeComponent=교정 색의 조건을 다음과 같이 바꿔서 다시 시도해 봅시다. →
 form.invalidAlgo=알고리듬값이 올바르지 않습니다.
 form.tryHsv=좀 더 <em>넓은 색 범위</em> 안에서 대비 색 찾아보기
 form.tryRgb=처음 지정한 색과 <em>아주 비슷</em>하면서도 기준에 적합한 대비 색 찾아보기
 form.testedColors=개의 색이 검토됨
 form.notSatisfied=만족스럽지 않으세요?
-form.anyResult=Let's
+form.anyResult=그럼
 form.oppositeComponentForeground=배경 색
 form.oppositeComponentBackground=본문 글자 색
 message.addon=저기요! 혹시 저희 <a class="alert-link" href="{0}"><span lang="en"><em>Contrast-Finder</em> Firefox</span> 부가 기능</a>을 써보셨나요?
@@ -67,10 +67,10 @@ footer.link-git=GitHub에 있는 Contrast-Finder에 기여하기
 home.noResultTxt=<h2 id="user-help-contrast-finder">도움말</h2> \
 <h3>본문 글자 색</h3> \
 <p> \
-    본문에 써진 <strong>글자</strong>에 칠해지는 <strong>색</strong>입니다. \
+    본문에 쓰인 <strong>글자</strong>에 입히는 <strong>색</strong>입니다. \
     이 항목에는 <em>CSS 컬러 키워드</em>, <em>16진법</em>, 혹은 \
     <em lang="en"><abbr title="Red Green Blue">RGB</abbr></em> 값을 입력하실 수 있습니다. \
-    입력한 값이 실제 색으로 변환된 모습은 항목 오른쪽에서 확인하실 수 있습니다. \
+    실제 변환된 색은 항목 오른쪽에서 미리 확인하실 수 있습니다. \
 </p> \
 <h4>컬러 <strong>키워드</strong> </h4> \
 <p> 보기: <code>Black</code>, <code>Silver</code>, <code>YellowGreen</code>, <code>MediumPurple</code>. <br> \
@@ -134,8 +134,8 @@ home.noResultTxt=<h2 id="user-help-contrast-finder">도움말</h2> \
 <li><a lang="en" href=" http://www.w3.org/TR/WCAG20/relative-luminance.xml">WCAG 2.0 - MathML 버전의 상대 휘도 정의</a></li> \
 </ul> \
 <h3>교정하려는 색 </h3> \
-<p> 본문 글자 색 아니면 배경색을 선택하실 수 있습니다. 기본은 본문 글자 색.</p> \
-<p> 선택하신 색은 나중에 기준에 적합한 색을 찾을 때까지 수정되며, 다른 색은 변하지 않습니다. </p> \
+<p> 본문 글자 색 또는 배경색을 선택하실 수 있습니다. 기본은 본문 글자 색.</p> \
+<p> 선택하신 색은 나중에 기준에 적합한 색을 찾을 때까지 수정되며, 나머지 색은 변하지 않습니다. </p> \
 <h3>알고리듬</h3> \
 <h4>“처음 지정한 색과 아주 비슷하면서도 기준에 적합한 대비 색”</h4> \
 <p> \
@@ -153,15 +153,15 @@ home.noResultTxt=<h2 id="user-help-contrast-finder">도움말</h2> \
     하지만, 산출되는 색은 최초 지정 색과 (많이) 다를 수 있습니다. \
 </p> \
 <h2> 사용자 건의 </h2> \
-<p><em lang="en">Contrast-Finder</em>를 사용하시면서 문제가 있거나 다른 문의 사항이 있으시다면, 연락해주시기 바랍니다: </p> \
+<p><em lang="en">Contrast-Finder</em>를 사용하시면서 문제가 있거나 다른 문의 사항이 있으시면, 연락해주시기 바랍니다: </p> \
 <ul> \
     <li> <a href="https://forum.asqatasun.org/c/contrast-finder">Asqatasun 포럼</a>    </li> \
     <li> <a title="Contrast-Finder의 트위터" href="https://twitter.com/contrast_finder">트위터 @Contrast_Finder</a> </li> \
     <li> <a href="https://github.com/Asqatasun/Contrast-Finder"><span lang="en">Contrast-Finder</span>의 Github 저장소</a> </li> \
 </ul> \
 <h2> <em lang="en">Contrast-Finder</em>의 기능 개선 및 제안 </h2> \
 <p> \
-    모든 제안을 열렬히 환영합니다!  \
+    어떠한 제안이든 모두 환영합니다!  \
     번역, 문제 수정, 오류 보고, 새로운 기능… <br> \
     부담없이 \
         <a href="https://github.com/Asqatasun/Contrast-Finder/blob/develop/CONTRIBUTING.md">소스 코드</a>를 가지고 놀아보시고, \

webapp/src/main/webapp/WEB-INF/template/head.jspf

@@ -27,9 +27,14 @@
     <meta name="application-name"           content="Contrast Finder">
 
 
-    <!--  Description / Canonical URL   -->
+    <!--  Description / Canonical URL / alternate  -->
     <meta name="description" content="${metaDescription}">
     <link rel="canonical"    href="${canonicalURL}" />
+    <link rel="alternate" hreflang="x-default" href="${prefixURL}" />
+    <link rel="alternate" hreflang="en" href="${prefixURL}?lang=en" />
+    <link rel="alternate" hreflang="fr" href="${prefixURL}?lang=fr" />
+    <link rel="alternate" hreflang="pt" href="${prefixURL}?lang=pt" />
+    <link rel="alternate" hreflang="ko" href="${prefixURL}?lang=ko" />
 
     <!-- Social network - Facebook -->
     <meta property="author"         content="Contrast-finder.org" />

webapp/src/main/webapp/WEB-INF/template/header.jspf

@@ -79,7 +79,7 @@
                 <strong>한국어</strong>
             </c:when>
             <c:otherwise>
-                <a href="${koUrl}" title="한국어" lang="ko">한국어</a>
+                <a href="${koUrl}" title="한국어로 전환" lang="ko">한국어</a>
             </c:otherwise>
         </c:choose>
     </nav>

webapp/src/main/webapp/WEB-INF/template/template_variables.jspf

@@ -2,7 +2,7 @@
 <%@ page pageEncoding="UTF-8" %>
 
     <%-- APP version --%>
-    <c:set var="appVersion"    value="0.8.0"/>
+    <c:set var="appVersion"    value="0.8.1"/>
 
     <%-- APP Name --%>
     <c:set var="appName"    value="Contrast-Finder"/>
@@ -22,14 +22,15 @@
 
     <%-- Canonical URL --%>
     <c:set var="prefixURL" value="https://app.contrast-finder.org/"/>
-    <c:choose>
-        <c:when test="${lang == 'en'}">
-            <c:set var="canonicalURL" value="${prefixURL}"/>
-        </c:when>
-        <c:otherwise>
-            <c:set var="canonicalURL" value="${prefixURL}?lang=${lang}"/>
-        </c:otherwise>
-    </c:choose>
+    <c:set var="canonicalURL" value="${prefixURL}?lang=${lang}"/>
+        <%-- <c:choose>
+                <c:when test="${lang == 'en'}">
+                    <c:set var="canonicalURL" value="${prefixURL}"/>
+                </c:when>
+                <c:otherwise>
+                    <c:set var="canonicalURL" value="${prefixURL}?lang=${lang}"/>
+                </c:otherwise>
+            </c:choose> --%>
 
     <%-- TITLE tag --%>
     <c:choose>