September 2009 - cal10n-dev

branch, master, updated. v0.7-1-g0804ea1
by git-noreply＠pixie.qos.ch 04 Sep '09

04 Sep '09

The branch, master has been updated via 0804ea1089c17dc9e4dd7c9d9dedb0d06be4ba98 (commit) from a7f1dfd77a48705970218a389982c95eeb11810f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=0804ea1089c17dc9e4dd7c9d9… http://github.com/ceki/cal10n/commit/0804ea1089c17dc9e4dd7c9d9dedb0d06be4ba… commit 0804ea1089c17dc9e4dd7c9d9dedb0d06be4ba98 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 4 18:03:42 2009 +0200 text about colors being an example diff --git a/cal10n-site/src/site/pages/manual.html b/cal10n-site/src/site/pages/manual.html index 0fc3ef3..26f3c85 100644 --- a/cal10n-site/src/site/pages/manual.html +++ b/cal10n-site/src/site/pages/manual.html @@ -82,9 +82,12 @@ message, CAL10N uses <code>enums</code>.</p> <p>For example, let us assume that you wanted to internationalize - color names. In CAL10N you could start by writing an enum type, - named Colors. You can choose any name for the enum type. Colors is - just the name this particular author picked.</p> + color names. No one in their right minds would just want to + internationalize three color names but probably a much larger set + of items. We are using color names just as an example. In CAL10N + you could start by writing an enum type, named Colors. You can + choose any name for the enum type. Colors is just the name this + particular author picked.</p> <pre class="prettyprint source">package com.foo.somePackage; ----------------------------------------------------------------------- Summary of changes: cal10n-site/src/site/pages/manual.html | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- Compiler assisted localization library

1 0

Release of CAL10N 0.7
by Ceki Gulcu 04 Sep '09

04 Sep '09

4th of September 2009 - Release of CAL10N 0.7 Just one day after the previous release, I am happy to announce the immediate availability of CAL10N version 0.7. This release makes the native2ascii tool superfluous. Please refer to the the news page for precise details. http://cal10n.qos.ch/news.html You can download cal10n, including full source code, class files and documentation on our download page, shown below. http://cal10n.qos.ch/download.html You can receive cal10n related announcements by subscribing to the cal10n announce mailing list. To subscribe to cal10n-announce list, please visit the following URL. http://www.qos.ch/mailman/listinfo/cal10n-announce Best regards, -- Ceki Gülcü Logback: The reliable, generic, fast and flexible logging framework for Java. http://logback.qos.ch

1 0

annotated tag, v0.7, created. v0.7
by git-noreply＠pixie.qos.ch 04 Sep '09

04 Sep '09

The annotated tag, v0.7 has been created at 29ebbb55f35a959b16f8c355207d0998365c942e (tag) tagging a7f1dfd77a48705970218a389982c95eeb11810f (commit) replaces v0.6.5 tagged by Ceki Gulcu on Fri Sep 4 15:56:29 2009 +0200 - Log ----------------------------------------------------------------- tagging v0.7 Ceki Gulcu (9): Adding support for Reader based ResourceBunder population instead of InputStream - adding encoding tests - Renaming files Testing UTF8 encodings as well - adding encoding/charset support in Annotations documenting removal of native2ascii from the translation procedure Documenting changes in annotations, charset support, new tests - improved docs preparing release 0.7 ----------------------------------------------------------------------- hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6.5-9-ga7f1dfd
by git-noreply＠pixie.qos.ch 04 Sep '09

04 Sep '09

The branch, master has been updated via a7f1dfd77a48705970218a389982c95eeb11810f (commit) from bbe225290e7073d10a0cd87140002c4e422c6ac3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=a7f1dfd77a48705970218a389… http://github.com/ceki/cal10n/commit/a7f1dfd77a48705970218a389982c95eeb1181… commit a7f1dfd77a48705970218a389982c95eeb11810f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 4 15:48:52 2009 +0200 preparing release 0.7 diff --git a/cal10n-api/pom.xml b/cal10n-api/pom.xml index 34f8ee8..772d985 100644 --- a/cal10n-api/pom.xml +++ b/cal10n-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.cal10n</groupId> <artifactId>cal10n-parent</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/cal10n-site/pom.xml b/cal10n-site/pom.xml index 055e6f8..b561d1a 100644 --- a/cal10n-site/pom.xml +++ b/cal10n-site/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.cal10n</groupId> <artifactId>cal10n-parent</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/cal10n-site/src/site/pages/manual.html b/cal10n-site/src/site/pages/manual.html index e415bd0..0fc3ef3 100644 --- a/cal10n-site/src/site/pages/manual.html +++ b/cal10n-site/src/site/pages/manual.html @@ -155,7 +155,25 @@ String blue = mc.getMessage(Colors.BLUE); </pre> <a href="#mavenPlugin">maven plugin</a>. </p> + <h2><a name="requirements" href="#requirements">Requirements / Installation</a> + </h2> + + <p>CAL10N requires JDK version 1.5.</p> + <p>In order to use CAL10N in a project, all you need is to add + <em>cal10n-api-${project.version}.jar</em> onto your project's class + path.</p> + + <p>For Maven users, this is done by adding the following + dependency in a project's <em>pom.xml</em> file:</p> + + <pre class="prettyprint source"><dependency> + <groupId>ch.qos.cal10n</groupId> + <artifactId>cal10n-api</artifactId> + <version>${project.version}</version> +</dependency></pre> + + <h2><a name="simplifiedLookup" href="#simplifiedLookup">Simplified bundle look-up procedure</a></h2> @@ -164,9 +182,10 @@ String blue = mc.getMessage(Colors.BLUE); </pre> <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/ResourceBundle.html#getBu…">look-up procedure</a> for finding resource bundles. While formally this - procedure is deterministic, it is too error-prone for our taste. In - CAL10N, we thus took the bold initiative to define a simplified bundle look - up procedure. + procedure is deterministic, it is too error-prone. Moreover, it + clashes with CAL10N's philosophy of verifiability. We thus took the + bold initiative to define a simplified bundle look up procedure, + described below. </p> <p>Given a locale, the simplified look up procedure only takes into @@ -205,8 +224,8 @@ colors_fr_FR.properties</pre> less surprise</a>.</p> - <h2><a name="charset" href="#charset">Pick your charset, per - locale</a></h2> + <h2><a name="charset" href="#charset">Pick your charset, per locale + (no <em>native2ascii</em>) </a></h2> <p>CAL10N allows you to encode the resource bundle for a given locale in the charset of your choice. The set of supported charsets diff --git a/cal10n-site/src/site/pages/news.html b/cal10n-site/src/site/pages/news.html index c0637e2..38c6e9a 100644 --- a/cal10n-site/src/site/pages/news.html +++ b/cal10n-site/src/site/pages/news.html @@ -25,7 +25,7 @@ <p>You can receive cal10n-related announcements by subscribing to the <a href="http://www.qos.ch/mailman/listinfo/cal10n-announce">cal10n-announce</a> - mailing list.</p> + mailing list. </p> <hr width="80%" align="center" /> @@ -33,7 +33,10 @@ <h3>4th of September 2009 - Release of CAL10N version 0.7</h3> <p>Added capability for reading bundles in any JVM supported - charset, rendering <em>native2ascii</em> superfluous.</p> + charset, rendering <em>native2ascii</em> + superfluous. Unfortunately, the annotations to specify locales + became more complicated. However, the price is probably well worth + the cost.</p> <hr width="80%" align="center" /> diff --git a/maven-cal10n-plugin-smoke/pom.xml b/maven-cal10n-plugin-smoke/pom.xml index 7e58cb0..bf3250f 100644 --- a/maven-cal10n-plugin-smoke/pom.xml +++ b/maven-cal10n-plugin-smoke/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>ch.qos.cal10n</groupId> <artifactId>cal10n-parent</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/maven-cal10n-plugin/pom.xml b/maven-cal10n-plugin/pom.xml index d01ce41..4a73aca 100644 --- a/maven-cal10n-plugin/pom.xml +++ b/maven-cal10n-plugin/pom.xml @@ -8,7 +8,7 @@ <parent> <artifactId>cal10n-parent</artifactId> <groupId>ch.qos.cal10n</groupId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>ch.qos.cal10n.plugins</groupId> diff --git a/pom.xml b/pom.xml index a024491..fb1aac4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.cal10n</groupId> <artifactId>cal10n-parent</artifactId> <packaging>pom</packaging> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> <name>Compiler assisted localization library (CAL10N) - Parent</name> <url>http://cal10n.qos.ch</url> ----------------------------------------------------------------------- Summary of changes: cal10n-api/pom.xml | 2 +- cal10n-site/pom.xml | 2 +- cal10n-site/src/site/pages/manual.html | 29 ++++++++++++++++++++++++----- cal10n-site/src/site/pages/news.html | 7 +++++-- maven-cal10n-plugin-smoke/pom.xml | 2 +- maven-cal10n-plugin/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 34 insertions(+), 12 deletions(-) hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6.5-8-gbbe2252
by git-noreply＠pixie.qos.ch 04 Sep '09

04 Sep '09

The branch, master has been updated via bbe225290e7073d10a0cd87140002c4e422c6ac3 (commit) from bdbdcf62a24bef203a59f9c7db0715c0d550d9f1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=bbe225290e7073d10a0cd8714… http://github.com/ceki/cal10n/commit/bbe225290e7073d10a0cd87140002c4e422c6a… commit bbe225290e7073d10a0cd87140002c4e422c6ac3 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 4 15:27:06 2009 +0200 - improved docs diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/Cal10nConstants.java b/cal10n-api/src/main/java/ch/qos/cal10n/Cal10nConstants.java index 87d5c27..a940f1d 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/Cal10nConstants.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/Cal10nConstants.java @@ -5,12 +5,24 @@ package ch.qos.cal10n; * This class defines the shared constants in CAL10N. * * @author Ceki Gülcü - * + * */ public class Cal10nConstants { + final public static String MessageKeyVerifier_FQCN = "ch.qos.cal10n.verifier.MessageKeyVerifier"; + final public static String CODE_URL_PREFIX = "http://cal10n.qos.ch/codes.html"; - final public static String MISSING_BN_ANNOTATION_URL = Cal10nConstants.CODE_URL_PREFIX+"#missingBaseNameAnnotation"; + final public static String MISSING_BN_ANNOTATION_URL = Cal10nConstants.CODE_URL_PREFIX + + "#missingBaseNameAnnotation"; - final public static String MessageKeyVerifier_FQCN = "ch.qos.cal10n.verifier.MessageKeyVerifier"; + final public static String MISSING_LD_ANNOTATION_URL = Cal10nConstants.CODE_URL_PREFIX + + "#missingLDAnnotation"; + final public static String MISSING_LD_ANNOTATION_MESSAGE = "Missing @LocaleData annotation in enum type [{0}]. Please see " + + MISSING_LD_ANNOTATION_URL; + + final public static String MISSING_ENUM_TYPES_URL = Cal10nConstants.CODE_URL_PREFIX + + "#missingEnumType"; + + final public static String MISSING_ENUM_TYPES_MSG = "Missing <enumTypes> element. Please see " + + MISSING_ENUM_TYPES_URL; } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java index 8db124a..ab0978e 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java @@ -22,6 +22,7 @@ package ch.qos.cal10n.verifier; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashSet; @@ -30,6 +31,7 @@ import java.util.Locale; import java.util.ResourceBundle; import java.util.Set; +import ch.qos.cal10n.Cal10nConstants; import ch.qos.cal10n.util.AnnotationExtractor; import ch.qos.cal10n.util.CAL10NResourceBundleFinder; import ch.qos.cal10n.util.MiscUtil; @@ -153,8 +155,7 @@ public class MessageKeyVerifier implements IMessageKeyVerifier { String[] localeNameArray = getLocaleNames(); if (localeNameArray == null || localeNameArray.length == 0) { - String errMsg = "Missing @LocaleData annotation in enum type [" - + enumTypeAsStr + "]"; + String errMsg = MessageFormat.format(Cal10nConstants.MISSING_LD_ANNOTATION_MESSAGE, enumTypeAsStr); throw new IllegalStateException(errMsg); } for (String localeName : localeNameArray) { diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MessageKeyVerifierTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MessageKeyVerifierTest.java index 13288bc..c8ab126 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MessageKeyVerifierTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MessageKeyVerifierTest.java @@ -23,6 +23,7 @@ package ch.qos.cal10n.verifier; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.util.List; import java.util.Locale; @@ -31,6 +32,7 @@ import org.junit.Test; import ch.qos.cal10n.sample.Colors; import ch.qos.cal10n.sample.Countries; +import ch.qos.cal10n.sample.Minimal; /** * @@ -38,14 +40,13 @@ import ch.qos.cal10n.sample.Countries; */ public class MessageKeyVerifierTest { - @Test public void smoke() { IMessageKeyVerifier miv = new MessageKeyVerifier(Colors.class); List<Cal10nError> errorList = miv.verify(Locale.UK); assertEquals(0, errorList.size()); } - + @Test public void withErrors_UK() { IMessageKeyVerifier miv = new MessageKeyVerifier(Countries.class); @@ -55,7 +56,6 @@ public class MessageKeyVerifierTest { assertEquals("BR", errorList.get(1).getKey()); } - @Test public void withErrors_FR() { IMessageKeyVerifier miv = new MessageKeyVerifier(Countries.class); @@ -65,4 +65,14 @@ public class MessageKeyVerifierTest { assertEquals("CN", errorList.get(1).getKey()); assertEquals("BR", errorList.get(2).getKey()); } + + @Test + public void all() { + IMessageKeyVerifier mcv = new MessageKeyVerifier(Minimal.class); + try { + mcv.verifyAllLocales(); + fail("an emum without LocaleData cannot be verifiied in one step"); + } catch (IllegalStateException e) { + } + } } diff --git a/cal10n-site/src/site/pages/codes.html b/cal10n-site/src/site/pages/codes.html index 21dd972..c8a3d2b 100644 --- a/cal10n-site/src/site/pages/codes.html +++ b/cal10n-site/src/site/pages/codes.html @@ -41,6 +41,16 @@ <hr/> + <h3><a name="missingLDAnnotation" href="#missingLDAnnotation">Missing + @LocaleData annotation in enum type [...].</a> </h3> + + <p>If an enum type and its associated bundles are to be verified + via the <em>maven-cal10n-plugin</em> or via a <a href="manual.html#singleTest">single unit test</a>, + then the enum type needs to be annotated with <a + href="apidocs/ch/qos/cal10n/LocaleData.html">LocaleData</a>. + </p> + <hr/> + <h3><a name="missingEnumType" href="#missingEnumType">Missing <code><enumTypes></code> element.</a> </h3> @@ -52,16 +62,7 @@ </p> - <hr/> - - <h3><a name="missingLocale" href="#missingLocale">Missing - @LocaleData annotation in enum type [...].</a> </h3> - - <p>If an enum type and its associated bundles are to be verified - via the <em>maven-cal10n-plugin</em>, then the enum type needs to - be annotated with <a - href="apidocs/ch/qos/cal10n/LocaleData.html">LocaleData</a>. - </p> + <script src="templates/footer.js" type="text/javascript"></script> </div> diff --git a/cal10n-site/src/site/pages/index.html b/cal10n-site/src/site/pages/index.html index 67b0c97..fadc31d 100644 --- a/cal10n-site/src/site/pages/index.html +++ b/cal10n-site/src/site/pages/index.html @@ -32,23 +32,23 @@ <ul> <li> - <p>Java compiler verifies message keys used in source code</p> + <p>java compiler verifies message keys used in source code</p> </li> <li> - <p>Tooling to detect errors in message keys</p> + <p>tooling to detect errors in message keys</p> </li> - <li>The <em>native2ascii</em> tool becomes unnecessary. With CAL10N, - you can directly encode bundles in the most convenient charset, - per locale.</li> + <li><em>native2ascii</em> tool made superfluous, as you can + directly encode bundles in the most convenient charset, per + locale.</li> <li> - <p>Good performance (300 nanoseconds per key lookup)</p> + <p>good performance (300 nanoseconds per key look-up)</p> </li> - + <li> - <p>Automatic reloading of resource bundles upon change</p> + <p>automatic reloading of resource bundles upon change</p> </li> </ul> diff --git a/cal10n-site/src/site/pages/manual.html b/cal10n-site/src/site/pages/manual.html index 3e8ce36..e415bd0 100644 --- a/cal10n-site/src/site/pages/manual.html +++ b/cal10n-site/src/site/pages/manual.html @@ -215,11 +215,31 @@ colors_fr_FR.properties</pre> encoding and charset list</a> for more details. </p> + <p>Assume you have four resource bundles, for the English, French, Turkish and Greek languages. You decide to encode all of them in - UTF-8 except for the Turkish bundle which is already encoded in - ISO8859_3. To tell CAL10N that those are the encodings, you would - write:</p> + UTF-8. To tell CAL10N that UTF-8 is the default encoding for all + locales, one would write:</p> + +<pre class="prettyprint"> +@BaseName("colors") +@LocaleData( + <b>defaultCharset="UTF8",</b> + value = { @Locale("en_UK"), + @Locale("fr_FR"), + @Locale("tr_TR"), + @Locale("el_GR") + } + ) +public enum Colors { + BLUE, + RED, + GREEN; +} +</pre> + + <p>If for some reason the Turkish bundle was encoded in ISO8859_3, + but the others locales in UTF8, you would write:</p> <pre class="prettyprint"> @BaseName("colors") @@ -227,7 +247,7 @@ colors_fr_FR.properties</pre> defaultCharset="UTF8", value = { @Locale("en_UK"), @Locale("fr_FR"), - @Locale(value="tr_TR", charset="ISO8859_3"), + <b>@Locale(value="tr_TR", charset="ISO8859_3"),</b> @Locale("el_GR") } ) @@ -251,7 +271,7 @@ public enum Colors { <p>If both <code>charset</code> and <code>defaultCharset</code> are empty, CAL10N will use the <a href="http://mindprod.com/jgloss/encoding.html">default encoding</a> - for your Java platform to read a resource bundle.</p> + for your Java platform to read resource bundles.</p> @@ -364,7 +384,8 @@ public class MyColorVerificationTest { Key [BLEU] present in resource bundle named [colors] for locale [fr_FR] but absent \ in enum type [ch.qos.cal10n.sample.Colors]</pre> - <h3>One test to rule them all</h3> + <h3><a name="singleTest" href="#ingleTest">One test to rule them + all</a></h3> <p>Instead of a separate unit test case for each locale, assuming you declared the locales in the enum type via the @LocaleData and diff --git a/cal10n-site/src/site/pages/news.html b/cal10n-site/src/site/pages/news.html index 6d7c640..c0637e2 100644 --- a/cal10n-site/src/site/pages/news.html +++ b/cal10n-site/src/site/pages/news.html @@ -27,6 +27,15 @@ href="http://www.qos.ch/mailman/listinfo/cal10n-announce">cal10n-announce</a> mailing list.</p> + + <hr width="80%" align="center" /> + + <h3>4th of September 2009 - Release of CAL10N version 0.7</h3> + + <p>Added capability for reading bundles in any JVM supported + charset, rendering <em>native2ascii</em> superfluous.</p> + + <hr width="80%" align="center" /> <h3>3rd of September 2009 - Release of CAL10N version 0.6.5</h3> diff --git a/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java b/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java index dd13ef2..0dd07a9 100644 --- a/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java +++ b/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java @@ -25,6 +25,7 @@ import java.io.File; import java.lang.reflect.Constructor; import java.net.MalformedURLException; import java.net.URL; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -48,11 +49,6 @@ import ch.qos.cal10n.verifier.IMessageKeyVerifier; */ public class VerifyMojo extends AbstractMojo { - final static String MISSING_LOCALE = Cal10nConstants.CODE_URL_PREFIX - + "#missingLocale"; - final static String MISSING_ENUM_TYPES = Cal10nConstants.CODE_URL_PREFIX - + "#missingEnumType"; - /** * @parameter * @required @@ -88,8 +84,7 @@ public class VerifyMojo extends AbstractMojo { public void execute() throws MojoExecutionException, MojoFailureException { if (enumTypes == null) { - throw new MojoFailureException("Missing <enumTypes> element. Please see " - + MISSING_ENUM_TYPES); + throw new MojoFailureException(Cal10nConstants.MISSING_ENUM_TYPES_MSG); } for (String enumTypeAsStr : enumTypes) { IMessageKeyVerifier imcv = getMessageKeyVerifierInstance(enumTypeAsStr); @@ -109,8 +104,8 @@ public class VerifyMojo extends AbstractMojo { String[] localeNameArray = mcv.getLocaleNames(); if (localeNameArray == null || localeNameArray.length == 0) { - String errMsg = "Missing @LocaleData annotation in enum type [" - + enumClassAsStr + "]. Please see "+MISSING_LOCALE; + String errMsg = MessageFormat.format( + Cal10nConstants.MISSING_LD_ANNOTATION_MESSAGE, enumClassAsStr); getLog().error(errMsg); throw new MojoFailureException(errMsg); } @@ -145,8 +140,8 @@ public class VerifyMojo extends AbstractMojo { String errMsg = "Failed to instantiate MessageKeyVerifier class"; try { ThisFirstClassLoader thisFirstClassLoader = (ThisFirstClassLoader) buildClassLoader(); - Class<?> mkvClass = Class.forName(Cal10nConstants.MessageKeyVerifier_FQCN, - true, thisFirstClassLoader); + Class<?> mkvClass = Class.forName( + Cal10nConstants.MessageKeyVerifier_FQCN, true, thisFirstClassLoader); Constructor<?> mkvCons = mkvClass.getConstructor(String.class); IMessageKeyVerifier imcv = (IMessageKeyVerifier) mkvCons .newInstance(enumClassAsStr); ----------------------------------------------------------------------- Summary of changes: .../main/java/ch/qos/cal10n/Cal10nConstants.java | 18 +++++++++-- .../ch/qos/cal10n/verifier/MessageKeyVerifier.java | 5 ++- .../cal10n/verifier/MessageKeyVerifierTest.java | 16 ++++++++-- cal10n-site/src/site/pages/codes.html | 21 ++++++------ cal10n-site/src/site/pages/index.html | 16 +++++----- cal10n-site/src/site/pages/manual.html | 33 ++++++++++++++++--- cal10n-site/src/site/pages/news.html | 9 +++++ .../java/ch/qos/cal10n/plugins/VerifyMojo.java | 17 +++------ 8 files changed, 92 insertions(+), 43 deletions(-) hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6.5-7-gbdbdcf6
by git-noreply＠pixie.qos.ch 04 Sep '09

04 Sep '09

The branch, master has been updated via bdbdcf62a24bef203a59f9c7db0715c0d550d9f1 (commit) from 57cfb3ec63a9637602e4d70396acc2517967c41b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=bdbdcf62a24bef203a59f9c7d… http://github.com/ceki/cal10n/commit/bdbdcf62a24bef203a59f9c7db0715c0d550d9… commit bdbdcf62a24bef203a59f9c7db0715c0d550d9f1 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 4 14:31:31 2009 +0200 Documenting changes in annotations, charset support, new tests diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/BaseName.java b/cal10n-api/src/main/java/ch/qos/cal10n/BaseName.java index 46fa24c..eb78246 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/BaseName.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/BaseName.java @@ -22,7 +22,6 @@ package ch.qos.cal10n; import java.lang.annotation.ElementType; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -37,8 +36,8 @@ import ch.qos.cal10n.verifier.MessageKeyVerifier; * Typical usage is: * * <pre> - * @LocaleNames({"en", "jp"}) * @BaseName("colors"); + * @LocaleData( { @Locale("en"), @Locale("jp") } ) * public class enum Colors { * RED, WHITE, BLUE; * } @@ -47,8 +46,9 @@ import ch.qos.cal10n.verifier.MessageKeyVerifier; * <p> * In the above example, @BaseName("colors") means that there exists a family of * resource bundle files with the base name "colors". In conjunction with the - * information provided in the @LocaleNames annotation, we can assume that the - * files <em>colors_en.properties</em> and <em>colors_jp.properties</em> exist. + * information provided in the @{@link LocaleData} annotation, we can assume + * that the files <em>colors_en.properties</em> and + * <em>colors_jp.properties</em> exist. * * <p> * Verification tools such as {@link MessageKeyVerifier} can then proceed to diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/Locale.java b/cal10n-api/src/main/java/ch/qos/cal10n/Locale.java index f655d39..cd9da5d 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/Locale.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/Locale.java @@ -26,33 +26,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import ch.qos.cal10n.verifier.MessageKeyVerifier; - /** - * This annotation serves to designate a list of locale names for which resource - * bundles exist. - * - * <p> - * Typical usage is: - * - * <pre> - * @LocaleNames({"en", "jp"}) - * @BaseName("colors"); - * public class enum Colors { - * RED, WHITE, BLUE; - * } - * </pre> * - * <p> - * In the above example, @LocaleNames({"en", "jp"}) means that there are English - * (en) and Japanese translations for the message keys found in the Colors enum. - * The name of the corresponding resource bundle is named "colors". + * See {@link LocaleData} annotation. * - * <p> - * Verification tools such {@link MessageKeyVerifier} can thus conclude that the - * resource bundle files <em>colors_en.properties</em> and - * <em>colors_jp.properties</em> should exist and checked against the keys - * defined in the Colors enum. + * @see LocaleData * * @author Ceki Gülcü * diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/LocaleData.java b/cal10n-api/src/main/java/ch/qos/cal10n/LocaleData.java index c4912f0..605979d 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/LocaleData.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/LocaleData.java @@ -26,33 +26,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import ch.qos.cal10n.verifier.MessageKeyVerifier; - /** - * This annotation serves to designate a list of locale names for which resource - * bundles exist. - * - * <p> - * Typical usage is: - * - * <pre> - * @LocaleNames({"en", "jp"}) - * @BaseName("colors"); - * public class enum Colors { - * RED, WHITE, BLUE; - * } - * </pre> - * - * <p> - * In the above example, @LocaleNames({"en", "jp"}) means that there are English - * (en) and Japanese translations for the message keys found in the Colors enum. - * The name of the corresponding resource bundle is named "colors". - * - * <p> - * Verification tools such {@link MessageKeyVerifier} can thus conclude that the - * resource bundle files <em>colors_en.properties</em> and - * <em>colors_jp.properties</em> should exist and checked against the keys - * defined in the Colors enum. + * In conjunction with the @Locale annotation, the @LocaleData annotation serves + * to designate a list of locale names for which resource bundles exist. In + * addition, you can specify a default charset for all locales. See the <a + * href="http://cal10n.qos.ch/manual.html#charset">section on charsets<a> in the + * manual for an explanation. * * @author Ceki Gülcü * @@ -61,5 +40,6 @@ import ch.qos.cal10n.verifier.MessageKeyVerifier; @Target(ElementType.TYPE) public @interface LocaleData { Locale[] value(); + String defaultCharset() default ""; } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/Cal10nError.java b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/Cal10nError.java index be8e7c2..14ff09a 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/Cal10nError.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/Cal10nError.java @@ -77,10 +77,6 @@ public class Cal10nError { case MISSING_BN_ANNOTATION: return "Missing @BaseName annotation in enum type [" + enumClassName + "]"; - // case MISSING_LOCALE_NAMES_ANNOTATION: - // return "Missing @LocaleNames annotation in enum class [" + - // enumClassName - // + "]"; case FAILED_TO_FIND_RB: return "Failed to locate resource bundle [" + baseName + "] for locale [" + locale + "] for enum type [" + enumClassName diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/IMessageKeyVerifier.java b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/IMessageKeyVerifier.java index 14cf610..bb960c9 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/IMessageKeyVerifier.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/IMessageKeyVerifier.java @@ -46,7 +46,7 @@ public interface IMessageKeyVerifier { /** * Verify that the keys defined in the enumClass match those found in the * corresponding resource bundle for all locales declared in the enum type - * via the {@link @LocaleNames} annotation. + * via the @{@link LocaleData} annotation. * * @param locale * @return diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java index deec78f..8db124a 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java @@ -153,7 +153,7 @@ public class MessageKeyVerifier implements IMessageKeyVerifier { String[] localeNameArray = getLocaleNames(); if (localeNameArray == null || localeNameArray.length == 0) { - String errMsg = "Missing @LocaleNames annotation in enum type [" + String errMsg = "Missing @LocaleData annotation in enum type [" + enumTypeAsStr + "]"; throw new IllegalStateException(errMsg); } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java index 5726920..f135751 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java @@ -30,6 +30,7 @@ import java.util.Locale; import org.junit.Test; import ch.qos.cal10n.sample.Colors; +import ch.qos.cal10n.sample.Minimal; import ch.qos.cal10n.sample.Host.OtherColors; public class MessageConveyorTest { @@ -105,4 +106,11 @@ public class MessageConveyorTest { } } + + @Test + public void minimal() { + MessageConveyor mc = new MessageConveyor(Locale.ENGLISH); + assertEquals("A", mc.getMessage(Minimal.A)); + } + } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/Colors.java b/cal10n-api/src/test/java/ch/qos/cal10n/sample/Colors.java index 33f9060..a620261 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/Colors.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/sample/Colors.java @@ -27,15 +27,11 @@ import ch.qos.cal10n.Locale; import ch.qos.cal10n.LocaleData; @BaseName("colors") -@LocaleData({ - @Locale("en_UK"), - @Locale("fr") - }) +@LocaleData( { @Locale("en_UK"), @Locale("fr") }) public enum Colors { // sub-class for testing purposes RED { - + }, - BLUE, - GREEN; + BLUE, GREEN; } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/Colors.java b/cal10n-api/src/test/java/ch/qos/cal10n/sample/Minimal.java similarity index 81% copy from cal10n-api/src/test/java/ch/qos/cal10n/sample/Colors.java copy to cal10n-api/src/test/java/ch/qos/cal10n/sample/Minimal.java index 33f9060..a17911b 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/Colors.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/sample/Minimal.java @@ -19,23 +19,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - package ch.qos.cal10n.sample; import ch.qos.cal10n.BaseName; -import ch.qos.cal10n.Locale; -import ch.qos.cal10n.LocaleData; -@BaseName("colors") -@LocaleData({ - @Locale("en_UK"), - @Locale("fr") - }) -public enum Colors { - // sub-class for testing purposes - RED { - - }, - BLUE, - GREEN; +/** + * The most minimal enum that CAL10N supports. + + * @author Ceki Gülcü + * + */ + +@BaseName("minimal") +public enum Minimal { + A; } diff --git a/cal10n-api/src/test/resources/minimal_en.properties b/cal10n-api/src/test/resources/minimal_en.properties new file mode 100644 index 0000000..18718bf --- /dev/null +++ b/cal10n-api/src/test/resources/minimal_en.properties @@ -0,0 +1 @@ +A=A \ No newline at end of file diff --git a/cal10n-site/src/site/pages/codes.html b/cal10n-site/src/site/pages/codes.html index b6e38e4..21dd972 100644 --- a/cal10n-site/src/site/pages/codes.html +++ b/cal10n-site/src/site/pages/codes.html @@ -55,13 +55,12 @@ <hr/> <h3><a name="missingLocale" href="#missingLocale">Missing - @LocaleNames annotation in enum type [...].</a> - </h3> + @LocaleData annotation in enum type [...].</a> </h3> <p>If an enum type and its associated bundles are to be verified via the <em>maven-cal10n-plugin</em>, then the enum type needs to be annotated with <a - href="apidocs/ch/qos/cal10n/LocaleNames.html">LocaleNames</a>. + href="apidocs/ch/qos/cal10n/LocaleData.html">LocaleData</a>. </p> <script src="templates/footer.js" type="text/javascript"></script> diff --git a/cal10n-site/src/site/pages/index.html b/cal10n-site/src/site/pages/index.html index 3e5d777..67b0c97 100644 --- a/cal10n-site/src/site/pages/index.html +++ b/cal10n-site/src/site/pages/index.html @@ -39,7 +39,7 @@ <p>Tooling to detect errors in message keys</p> </li> - <li>The <em>native2ascii</em> no longer necessary. With CAL10N, + <li>The <em>native2ascii</em> tool becomes unnecessary. With CAL10N, you can directly encode bundles in the most convenient charset, per locale.</li> diff --git a/cal10n-site/src/site/pages/manual.html b/cal10n-site/src/site/pages/manual.html index 5699e42..3e8ce36 100644 --- a/cal10n-site/src/site/pages/manual.html +++ b/cal10n-site/src/site/pages/manual.html @@ -88,12 +88,13 @@ <pre class="prettyprint source">package com.foo.somePackage; -import ch.qos.cal10n.LocaleNames; + +import ch.qos.cal10n.LocaleData; +import ch.qos.cal10n.Locale; import ch.qos.cal10n.BaseName; -@BaseName("colors") // mandatory annotation -@LocaleNames({"en_UK", "fr"}) // list of locale names used by - // verification tools +@BaseName("colors") +@LocaleData( { @Locale("en_UK"), @Locale("fr") }) public enum Colors { BLUE, RED, @@ -203,6 +204,58 @@ colors_fr_FR.properties</pre> href="http://en.wikipedia.org/wiki/Principle_of_least_astonishment"> less surprise</a>.</p> + + <h2><a name="charset" href="#charset">Pick your charset, per + locale</a></h2> + + <p>CAL10N allows you to encode the resource bundle for a given + locale in the charset of your choice. The set of supported charsets + depends on your Java platform. See this <a + href="http://www.websina.com/bugzero/kb/java-encoding-charset.html">java + encoding and charset list</a> for more details. + </p> + + <p>Assume you have four resource bundles, for the English, French, + Turkish and Greek languages. You decide to encode all of them in + UTF-8 except for the Turkish bundle which is already encoded in + ISO8859_3. To tell CAL10N that those are the encodings, you would + write:</p> + +<pre class="prettyprint"> +@BaseName("colors") +@LocaleData( + defaultCharset="UTF8", + value = { @Locale("en_UK"), + @Locale("fr_FR"), + @Locale(value="tr_TR", charset="ISO8859_3"), + @Locale("el_GR") + } + ) +public enum Colors { + BLUE, + RED, + GREEN; +} +</pre> + + <p>The <code>defaultCharset</code> directive specified in the + <code>@LocaleDat</code>a annotation applies to all nested @Locale + annotations, unless the value is overriden by a <code>charset</code> + directive (as in the "tr_TR" locale in the example above). If not + specified, the default value for <code>defaultCharset</code> is the + empty string. In the absence of a <code>defaultCharset</code> + directive, the default value for the <code>charset</code> directive + is also the empty String. + </p> + + <p>If both <code>charset</code> and <code>defaultCharset</code> are + empty, CAL10N will use the <a + href="http://mindprod.com/jgloss/encoding.html">default encoding</a> + for your Java platform to read a resource bundle.</p> + + + + <h2><a name="reload" href="#reload">Automatic reloading of resource bundles upon change</a></h2> @@ -214,7 +267,7 @@ colors_fr_FR.properties</pre> <p>Automatic reloading applies if the resource bundle is a regular file but not if nested within a jar file. </p> - + <h2><a name="deferred" href="#deferred">Deferred localization</a></h2> @@ -314,8 +367,9 @@ Key [BLEU] present in resource bundle named [colors] for locale [fr_FR] but abse <h3>One test to rule them all</h3> <p>Instead of a separate unit test case for each locale, assuming - you declared the locales in the enum type via the @LocaleNames - annotation, you can verify all locales in one fell swoop.</p> + you declared the locales in the enum type via the @LocaleData and + nested @Locale annotations, you can verify all locales in one fell + swoop.</p> <pre class="prettyprint source"> package foo.aPackage; @@ -394,8 +448,8 @@ public class MyAllInOneColorVerificationTest { </p> <p>The plugin will iterate through every resource bundle for every - locale listed in the enum type via the <code>@LocaleNames</code> - annotation. + locale listed in the enum type via the <code>@LocaleData</code> and + <code>@Locale</code> annotations. </p> <h2><a name="eclipsePlugin" href="#eclipsePlugin">Eclipse plug-in</a></h2> diff --git a/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java b/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java index 32f41b0..dd13ef2 100644 --- a/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java +++ b/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java @@ -109,7 +109,7 @@ public class VerifyMojo extends AbstractMojo { String[] localeNameArray = mcv.getLocaleNames(); if (localeNameArray == null || localeNameArray.length == 0) { - String errMsg = "Missing @LocaleNames annotation in enum type [" + String errMsg = "Missing @LocaleData annotation in enum type [" + enumClassAsStr + "]. Please see "+MISSING_LOCALE; getLog().error(errMsg); throw new MojoFailureException(errMsg); ----------------------------------------------------------------------- Summary of changes: .../src/main/java/ch/qos/cal10n/BaseName.java | 8 +- cal10n-api/src/main/java/ch/qos/cal10n/Locale.java | 26 +------- .../src/main/java/ch/qos/cal10n/LocaleData.java | 32 ++------- .../java/ch/qos/cal10n/verifier/Cal10nError.java | 4 - .../qos/cal10n/verifier/IMessageKeyVerifier.java | 2 +- .../ch/qos/cal10n/verifier/MessageKeyVerifier.java | 2 +- .../java/ch/qos/cal10n/MessageConveyorTest.java | 8 ++ .../src/test/java/ch/qos/cal10n/sample/Colors.java | 10 +-- .../sample/{Furnitures.java => Minimal.java} | 21 +++--- .../src/test/resources/minimal_en.properties | 1 + cal10n-site/src/site/pages/codes.html | 5 +- cal10n-site/src/site/pages/index.html | 2 +- cal10n-site/src/site/pages/manual.html | 72 +++++++++++++++++--- .../java/ch/qos/cal10n/plugins/VerifyMojo.java | 2 +- 14 files changed, 103 insertions(+), 92 deletions(-) copy cal10n-api/src/test/java/ch/qos/cal10n/sample/{Furnitures.java => Minimal.java} (83%) create mode 100644 cal10n-api/src/test/resources/minimal_en.properties hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6.5-6-g57cfb3e
by git-noreply＠pixie.qos.ch 03 Sep '09

03 Sep '09

The branch, master has been updated via 57cfb3ec63a9637602e4d70396acc2517967c41b (commit) from ae58838ee39924f8a587778d6745d6c7f33845ff (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=57cfb3ec63a9637602e4d7039… http://github.com/ceki/cal10n/commit/57cfb3ec63a9637602e4d70396acc2517967c4… commit 57cfb3ec63a9637602e4d70396acc2517967c41b Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 4 00:03:59 2009 +0200 documenting removal of native2ascii from the translation procedure diff --git a/cal10n-site/src/site/pages/index.html b/cal10n-site/src/site/pages/index.html index 5c1ebe0..3e5d777 100644 --- a/cal10n-site/src/site/pages/index.html +++ b/cal10n-site/src/site/pages/index.html @@ -39,6 +39,10 @@ <p>Tooling to detect errors in message keys</p> </li> + <li>The <em>native2ascii</em> no longer necessary. With CAL10N, + you can directly encode bundles in the most convenient charset, + per locale.</li> + <li> <p>Good performance (300 nanoseconds per key lookup)</p> </li> ----------------------------------------------------------------------- Summary of changes: cal10n-site/src/site/pages/index.html | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6.5-5-gae58838
by git-noreply＠pixie.qos.ch 03 Sep '09

03 Sep '09

The branch, master has been updated via ae58838ee39924f8a587778d6745d6c7f33845ff (commit) from 975f8f73e55bf77415329423c298c164ab611c87 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=ae58838ee39924f8a587778d6… http://github.com/ceki/cal10n/commit/ae58838ee39924f8a587778d6745d6c7f33845… commit ae58838ee39924f8a587778d6745d6c7f33845ff Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Sep 3 23:52:22 2009 +0200 - adding encoding/charset support in Annotations - relevant testing diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/Locale.java b/cal10n-api/src/main/java/ch/qos/cal10n/Locale.java index 46eb612..f655d39 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/Locale.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/Locale.java @@ -61,5 +61,5 @@ import ch.qos.cal10n.verifier.MessageKeyVerifier; @Target(ElementType.TYPE) public @interface Locale { String value(); - String encoding() default "UTF-8"; + String charset() default ""; } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/LocaleData.java b/cal10n-api/src/main/java/ch/qos/cal10n/LocaleData.java index 1aeb2a3..c4912f0 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/LocaleData.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/LocaleData.java @@ -61,4 +61,5 @@ import ch.qos.cal10n.verifier.MessageKeyVerifier; @Target(ElementType.TYPE) public @interface LocaleData { Locale[] value(); + String defaultCharset() default ""; } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java b/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java index fbf25d9..11395c9 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; import ch.qos.cal10n.util.AnnotationExtractor; import ch.qos.cal10n.util.CAL10NResourceBundle; -import ch.qos.cal10n.util.PropertyResourceBundleFinder; +import ch.qos.cal10n.util.CAL10NResourceBundleFinder; /** * The default implementation for {@link IMessageConveyor} based on resource @@ -68,10 +68,11 @@ public class MessageConveyor implements IMessageConveyor { * an enum instance used as message key * */ - public <E extends Enum<?>> String getMessage(E key, Object... args) throws MessageConveyorException { + public <E extends Enum<?>> String getMessage(E key, Object... args) + throws MessageConveyorException { String declararingClassName = key.getDeclaringClass().getName(); - CAL10NResourceBundle rb = cache.get(declararingClassName); + CAL10NResourceBundle rb = cache.get(declararingClassName); if (rb == null || rb.hasChanged()) { rb = lookup(key); cache.put(declararingClassName, rb); @@ -90,7 +91,10 @@ public class MessageConveyor implements IMessageConveyor { } } - private <E extends Enum<?>> CAL10NResourceBundle lookup(E key) throws MessageConveyorException { + private <E extends Enum<?>> CAL10NResourceBundle lookup(E key) + throws MessageConveyorException { + Class<?> declaringClass = key.getDeclaringClass(); + String baseName = AnnotationExtractor.getBaseName(key.getDeclaringClass()); if (baseName == null) { throw new MessageConveyorException( @@ -98,18 +102,21 @@ public class MessageConveyor implements IMessageConveyor { + key.getClass().getName() + "]. See also " + Cal10nConstants.MISSING_BN_ANNOTATION_URL); } - CAL10NResourceBundle rb = PropertyResourceBundleFinder.getBundle(this.getClass() - .getClassLoader(), baseName, locale); - if(rb == null) { - throw new MessageConveyorException("Failed to locate resource bundle [" + baseName - + "] for locale [" + locale + "] for enum type [" + key.getDeclaringClass().getName() - + "]"); + String charset = AnnotationExtractor.getCharset(declaringClass, locale); + CAL10NResourceBundle rb = CAL10NResourceBundleFinder.getBundle(this + .getClass().getClassLoader(), baseName, locale, charset); + + if (rb == null) { + throw new MessageConveyorException("Failed to locate resource bundle [" + + baseName + "] for locale [" + locale + "] for enum type [" + + key.getDeclaringClass().getName() + "]"); } return rb; } - public String getMessage(MessageParameterObj mpo) throws MessageConveyorException { + public String getMessage(MessageParameterObj mpo) + throws MessageConveyorException { if (mpo == null) { throw new IllegalArgumentException( "MessageParameterObj argumument cannot be null"); diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/util/AnnotationExtractor.java b/cal10n-api/src/main/java/ch/qos/cal10n/util/AnnotationExtractor.java index 6244c63..0601594 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/util/AnnotationExtractor.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/util/AnnotationExtractor.java @@ -28,14 +28,12 @@ import ch.qos.cal10n.LocaleData; /** * * @author Ceki Gülcü - * + * */ public class AnnotationExtractor { - static public <E extends Enum<?>> String getBaseName( - Class<E> enumClass) { - BaseName rbnAnnotation = (BaseName) enumClass - .getAnnotation(BaseName.class); + static public <E extends Enum<?>> String getBaseName(Class<E> enumClass) { + BaseName rbnAnnotation = (BaseName) enumClass.getAnnotation(BaseName.class); if (rbnAnnotation == null) { return null; } @@ -43,20 +41,19 @@ public class AnnotationExtractor { } static public <E extends Enum<?>> String[] getLocaleNames(Class<E> enumClass) { - Locale[] localeDataArray = getLocaleData(enumClass); - - if(localeDataArray == null) { + Locale[] localeDataArray = getLocaleData(enumClass); + + if (localeDataArray == null) { return null; } - + String[] names = new String[localeDataArray.length]; - for(int i = 0; i < localeDataArray.length; i++) { + for (int i = 0; i < localeDataArray.length; i++) { names[i] = localeDataArray[i].value(); } return names; } - static public <E extends Enum<?>> Locale[] getLocaleData(Class<E> enumClass) { LocaleData localeDataArrayAnnotation = (LocaleData) enumClass .getAnnotation(LocaleData.class); @@ -66,4 +63,43 @@ public class AnnotationExtractor { return localeDataArrayAnnotation.value(); } + public static String getCharset(Class<?> enumClass, + java.util.Locale juLocale) { + LocaleData localeDataArrayAnnotation = (LocaleData) enumClass + .getAnnotation(LocaleData.class); + if (localeDataArrayAnnotation == null) { + return ""; + } + + String defaultCharset = localeDataArrayAnnotation.defaultCharset(); + + Locale la = findLocaleAnnotation(juLocale, localeDataArrayAnnotation); + String localeCharset = null; + if(la != null) { + localeCharset = la.charset(); + } + if(!isEmttyString(localeCharset)) { + return localeCharset; + } + + return defaultCharset; + } + + static Locale findLocaleAnnotation(java.util.Locale julocale, LocaleData localeDataArrayAnnotation) { + Locale[] localeAnnotationArray = localeDataArrayAnnotation.value(); + if(localeAnnotationArray == null) { + return null; + } + for(Locale la: localeAnnotationArray) { + if(la.value().equals(julocale.toString())) { + return la; + } + } + + return null; + } + + static boolean isEmttyString(String s) { + return s == null || s.length() == 0; + } } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java b/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NResourceBundleFinder.java similarity index 75% rename from cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java rename to cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NResourceBundleFinder.java index 3c767ce..031efc7 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NResourceBundleFinder.java @@ -25,20 +25,22 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLConnection; import java.util.Locale; -public class PropertyResourceBundleFinder { +public class CAL10NResourceBundleFinder { - public static CAL10NResourceBundle getBundle(ClassLoader classLoader, String baseName, - Locale locale) { + public static CAL10NResourceBundle getBundle(ClassLoader classLoader, + String baseName, Locale locale, String charset) { // same as the JDK convention // - // It generates a path name from the candidate bundle name by replacing all "." + // It generates a path name from the candidate bundle name by replacing all + // "." // characters with "/" and appending the string ".properties". - /// see also http: // tinyurl.com/ldgej8 + // / see also http: // tinyurl.com/ldgej8 baseName = baseName.replace('.', '/'); String languageAndCountryCandidate = computeLanguageAndCountryCandidate( @@ -47,12 +49,12 @@ public class PropertyResourceBundleFinder { locale); CAL10NResourceBundle cprbLanguageOnly = makePropertyResourceBundle( - classLoader, languageOnlyCandidate); + classLoader, languageOnlyCandidate, charset); CAL10NResourceBundle cprbLanguageAndCountry = null; if (languageAndCountryCandidate != null) { cprbLanguageAndCountry = makePropertyResourceBundle(classLoader, - languageAndCountryCandidate); + languageAndCountryCandidate, charset); } if (cprbLanguageAndCountry != null) { @@ -63,7 +65,7 @@ public class PropertyResourceBundleFinder { } private static CAL10NResourceBundle makePropertyResourceBundle( - ClassLoader classLoader, String resourceCandiate) { + ClassLoader classLoader, String resourceCandiate, String charset) { CAL10NResourceBundle prb = null; @@ -71,7 +73,13 @@ public class PropertyResourceBundleFinder { if (url != null) { try { InputStream in = openConnectionForUrl(url); - Reader reader = new InputStreamReader(in); + + Reader reader = toReader(in, charset); + if (charset == null || charset.length() == 0) + reader = new InputStreamReader(in); + else + reader = new InputStreamReader(in, charset); + prb = new CAL10NResourceBundle(reader, MiscUtil.urlToFile(url)); in.close(); } catch (IOException e) { @@ -80,6 +88,18 @@ public class PropertyResourceBundleFinder { return prb; } + static Reader toReader(InputStream in, String charset) { + if (charset == null || charset.length() == 0) + return new InputStreamReader(in); + else { + try { + return new InputStreamReader(in, charset); + } catch (UnsupportedEncodingException e) { + throw new IllegalArgumentException("Failed to open reader", e); + } + } + } + private static String computeLanguageAndCountryCandidate(String baseName, Locale locale) { String language = locale.getLanguage(); @@ -91,7 +111,8 @@ public class PropertyResourceBundleFinder { } } - private static String computeLanguageOnlyCandidate(String baseName, Locale locale) { + private static String computeLanguageOnlyCandidate(String baseName, + Locale locale) { String language = locale.getLanguage(); return baseName + "_" + language + ".properties"; } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java index c72e09d..deec78f 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java @@ -31,7 +31,7 @@ import java.util.ResourceBundle; import java.util.Set; import ch.qos.cal10n.util.AnnotationExtractor; -import ch.qos.cal10n.util.PropertyResourceBundleFinder; +import ch.qos.cal10n.util.CAL10NResourceBundleFinder; import ch.qos.cal10n.util.MiscUtil; import ch.qos.cal10n.verifier.Cal10nError.ErrorType; @@ -84,8 +84,9 @@ public class MessageKeyVerifier implements IMessageKeyVerifier { return errorList; } - ResourceBundle rb = PropertyResourceBundleFinder.getBundle(this.getClass() - .getClassLoader(), baseName, locale); + String charset = AnnotationExtractor.getCharset(enumType, Locale.FRENCH); + ResourceBundle rb = CAL10NResourceBundleFinder.getBundle(this.getClass() + .getClassLoader(), baseName, locale, charset); ErrorFactory errorFactory = new ErrorFactory(enumType, locale, baseName); diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/util/Fruit.java b/cal10n-api/src/test/java/ch/qos/cal10n/util/Fruit.java index c48082b..f2515fb 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/util/Fruit.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/util/Fruit.java @@ -26,11 +26,7 @@ import ch.qos.cal10n.BaseName; import ch.qos.cal10n.LocaleData; @BaseName("fruits") -@LocaleData({ - @Locale("fr"), - @Locale("en") - }) +@LocaleData(defaultCharset="", value = { @Locale("fr"), @Locale(value = "en", charset = "UTF8") }) public enum Fruit { - APPLE, - ORANGE; + APPLE, ORANGE; } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java index 628f096..478e5b5 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java @@ -29,35 +29,43 @@ import java.util.ResourceBundle; import org.junit.Test; +import ch.qos.cal10n.sample.Colors; + public class PropertyResourceBundleFinderTest { ResourceBundle rb; - + String encoding; + + Class<?> enumTyoe = Colors.BLUE.getDeclaringClass(); + @Test public void smoke() throws IOException { - rb = PropertyResourceBundleFinder.getBundle(this.getClass().getClassLoader(), - "colors", Locale.FRENCH); + encoding = AnnotationExtractor.getCharset(enumTyoe, Locale.FRENCH); + rb = CAL10NResourceBundleFinder.getBundle(this.getClass().getClassLoader(), + "colors", Locale.FRENCH, encoding); assertEquals("les roses sont rouges", rb.getString("RED")); } @Test public void withCountry() throws IOException { - rb = PropertyResourceBundleFinder.getBundle(this.getClass().getClassLoader(), - "colors", Locale.FRENCH); + encoding = AnnotationExtractor.getCharset(enumTyoe, Locale.FRENCH); + rb = CAL10NResourceBundleFinder.getBundle(this.getClass().getClassLoader(), + "colors", Locale.FRENCH, encoding); assertEquals("les roses sont rouges", rb.getString("RED")); - rb = PropertyResourceBundleFinder.getBundle(this.getClass().getClassLoader(), - "colors", Locale.FRANCE); + rb = CAL10NResourceBundleFinder.getBundle(this.getClass().getClassLoader(), + "colors", Locale.FRANCE, encoding); assertEquals("les roses sont rouges, et alors?", rb.getString("RED")); } @Test public void inDirectory() throws IOException { - rb = PropertyResourceBundleFinder.getBundle(this.getClass().getClassLoader(), - "foobar/sample", Locale.ENGLISH); + encoding = AnnotationExtractor.getCharset(enumTyoe, Locale.ENGLISH); + rb = CAL10NResourceBundleFinder.getBundle(this.getClass().getClassLoader(), + "foobar/sample", Locale.ENGLISH, encoding); assertEquals("A is the first letter of the alphabet", rb.getString("A")); - rb = PropertyResourceBundleFinder.getBundle(this.getClass().getClassLoader(), - "foobar.sample", Locale.ENGLISH); + rb = CAL10NResourceBundleFinder.getBundle(this.getClass().getClassLoader(), + "foobar.sample", Locale.ENGLISH, encoding); assertEquals("A is the first letter of the alphabet", rb.getString("A")); } ----------------------------------------------------------------------- Summary of changes: cal10n-api/src/main/java/ch/qos/cal10n/Locale.java | 2 +- .../src/main/java/ch/qos/cal10n/LocaleData.java | 1 + .../main/java/ch/qos/cal10n/MessageConveyor.java | 29 ++++++---- .../ch/qos/cal10n/util/AnnotationExtractor.java | 58 ++++++++++++++++---- ...Finder.java => CAL10NResourceBundleFinder.java} | 41 +++++++++++---- .../ch/qos/cal10n/verifier/MessageKeyVerifier.java | 7 ++- .../src/test/java/ch/qos/cal10n/util/Fruit.java | 8 +-- .../util/PropertyResourceBundleFinderTest.java | 30 +++++++---- 8 files changed, 123 insertions(+), 53 deletions(-) rename cal10n-api/src/main/java/ch/qos/cal10n/util/{PropertyResourceBundleFinder.java => CAL10NResourceBundleFinder.java} (75%) hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6.5-4-g975f8f7
by git-noreply＠pixie.qos.ch 03 Sep '09

03 Sep '09

The branch, master has been updated via 975f8f73e55bf77415329423c298c164ab611c87 (commit) from f16af567f71512382ea7d4a64be94949552cf7e4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=975f8f73e55bf77415329423c… http://github.com/ceki/cal10n/commit/975f8f73e55bf77415329423c298c164ab611c… commit 975f8f73e55bf77415329423c298c164ab611c87 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Sep 3 21:58:22 2009 +0200 Testing UTF8 encodings as well diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/util/ResourceBundleEncodingTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/util/ResourceBundleEncodingTest.java index 98d3f0c..9975cae 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/util/ResourceBundleEncodingTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/util/ResourceBundleEncodingTest.java @@ -41,17 +41,16 @@ import ch.qos.cal10n.Cal10nTestConstants; */ public class ResourceBundleEncodingTest { - // Useful links: - + // http://www.terena.org/activities/multiling/ml-docs/iso-8859.html - + Map<String, String> map = new HashMap<String, String>(); Map<String, String> witness = new HashMap<String, String>(); // encoding for Greek "ISO8859_7" @Test - public void greek() throws IOException { + public void greek_ISO8859_7() throws IOException { FileInputStream fis = new FileInputStream(Cal10nTestConstants.TEST_CLASSES + "/encodingsISO8859/a_el_GR.properties"); Reader reader = new InputStreamReader(fis, "ISO8859_7"); @@ -69,25 +68,59 @@ public class ResourceBundleEncodingTest { assertEquals(witness, map); } - - + // encoding for Turkish "ISO8859_3" @Test - public void turkish() throws IOException { - FileInputStream fis = new FileInputStream(Cal10nTestConstants.TEST_CLASSES+"/encodingsISO8859/a_tr_TR.properties"); + public void turkishISO8859_3() throws IOException { + FileInputStream fis = new FileInputStream(Cal10nTestConstants.TEST_CLASSES + + "/encodingsISO8859/a_tr_TR.properties"); Reader reader = new InputStreamReader(fis, "ISO8859_3"); - Parser parser = new Parser(reader, map); + Parser parser = new Parser(reader, map); + parser.parseAndPopulate(); + + // 0xBA 0x015F # LATIN SMALL LETTER S WITH CEDILLA + char sCedilla = '\u015F'; + + // 0xB9 0x0131 # LATIN SMALL LETTER DOTLESS I + char iDotless = '\u0131'; + + // nisan pronounced (nIshan) + String witnessValue = "n" + iDotless + sCedilla + "an"; + witness.put("A", witnessValue); + assertEquals(witness, map); + } + + @Test + public void greek_UTF8() throws IOException { + FileInputStream fis = new FileInputStream(Cal10nTestConstants.TEST_CLASSES + + "/encodingsUTF8/a_el_GR.properties"); + Reader reader = new InputStreamReader(fis, "UTF8"); + Parser parser = new Parser(reader, map); parser.parseAndPopulate(); + + String alpha = "\u03b1"; + witness.put("A", alpha); + + assertEquals(witness, map); + } - // 0xBA 0x015F # LATIN SMALL LETTER S WITH CEDILLA + @Test + public void turkishUTF8() throws IOException { + FileInputStream fis = new FileInputStream(Cal10nTestConstants.TEST_CLASSES + + "/encodingsUTF8/a_tr_TR.properties"); + Reader reader = new InputStreamReader(fis, "UTF8"); + Parser parser = new Parser(reader, map); + parser.parseAndPopulate(); + + // 0xBA 0x015F # LATIN SMALL LETTER S WITH CEDILLA char sCedilla = '\u015F'; - - // 0xB9 0x0131 # LATIN SMALL LETTER DOTLESS I + + // 0xB9 0x0131 # LATIN SMALL LETTER DOTLESS I char iDotless = '\u0131'; - - // nisan pronounced (nIshan) - String witnessValue = "n"+iDotless+sCedilla+"an"; + + // nisan pronounced (nIshan) + String witnessValue = "n" + iDotless + sCedilla + "an"; witness.put("A", witnessValue); assertEquals(witness, map); - } + } } diff --git a/cal10n-api/src/test/resources/encodingsUTF8/a_el_GR.properties b/cal10n-api/src/test/resources/encodingsUTF8/a_el_GR.properties new file mode 100644 index 0000000..432c470 --- /dev/null +++ b/cal10n-api/src/test/resources/encodingsUTF8/a_el_GR.properties @@ -0,0 +1 @@ +A=α \ No newline at end of file diff --git a/cal10n-api/src/test/resources/encodingsUTF8/a_tr_TR.properties b/cal10n-api/src/test/resources/encodingsUTF8/a_tr_TR.properties new file mode 100644 index 0000000..f2eb98c --- /dev/null +++ b/cal10n-api/src/test/resources/encodingsUTF8/a_tr_TR.properties @@ -0,0 +1 @@ +A=nışan ----------------------------------------------------------------------- Summary of changes: .../cal10n/util/ResourceBundleEncodingTest.java | 65 +++++++++++++++----- .../resources/encodingsUTF8/a_el_GR.properties | 1 + .../resources/encodingsUTF8/a_tr_TR.properties | 1 + 3 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 cal10n-api/src/test/resources/encodingsUTF8/a_el_GR.properties create mode 100644 cal10n-api/src/test/resources/encodingsUTF8/a_tr_TR.properties hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6.5-3-gf16af56
by git-noreply＠pixie.qos.ch 03 Sep '09

03 Sep '09

The branch, master has been updated via f16af567f71512382ea7d4a64be94949552cf7e4 (commit) from 5419731c7a921a181da5dcd2ccaf7f13e80dbd19 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=f16af567f71512382ea7d4a64… http://github.com/ceki/cal10n/commit/f16af567f71512382ea7d4a64be94949552cf7… commit f16af567f71512382ea7d4a64be94949552cf7e4 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Sep 3 21:48:19 2009 +0200 - Renaming files diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/util/ResourceBundleEncodingTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/util/ResourceBundleEncodingTest.java index eda9155..98d3f0c 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/util/ResourceBundleEncodingTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/util/ResourceBundleEncodingTest.java @@ -53,7 +53,7 @@ public class ResourceBundleEncodingTest { @Test public void greek() throws IOException { FileInputStream fis = new FileInputStream(Cal10nTestConstants.TEST_CLASSES - + "/encodings/a_el_GR.properties"); + + "/encodingsISO8859/a_el_GR.properties"); Reader reader = new InputStreamReader(fis, "ISO8859_7"); Parser parser = new Parser(reader, map); parser.parseAndPopulate(); @@ -74,7 +74,7 @@ public class ResourceBundleEncodingTest { // encoding for Turkish "ISO8859_3" @Test public void turkish() throws IOException { - FileInputStream fis = new FileInputStream(Cal10nTestConstants.TEST_CLASSES+"/encodings/a_tr_TR.properties"); + FileInputStream fis = new FileInputStream(Cal10nTestConstants.TEST_CLASSES+"/encodingsISO8859/a_tr_TR.properties"); Reader reader = new InputStreamReader(fis, "ISO8859_3"); Parser parser = new Parser(reader, map); parser.parseAndPopulate(); diff --git a/cal10n-api/src/test/resources/encodings/#a_tr_TR.properties# b/cal10n-api/src/test/resources/encodings/#a_tr_TR.properties# deleted file mode 100644 index e4dec3d..0000000 --- a/cal10n-api/src/test/resources/encodings/#a_tr_TR.properties# +++ /dev/null @@ -1 +0,0 @@ -A=nýsan \ No newline at end of file diff --git a/cal10n-api/src/test/resources/encodings/a_el_GR.properties b/cal10n-api/src/test/resources/encodingsISO8859/a_el_GR.properties similarity index 100% rename from cal10n-api/src/test/resources/encodings/a_el_GR.properties rename to cal10n-api/src/test/resources/encodingsISO8859/a_el_GR.properties diff --git a/cal10n-api/src/test/resources/encodings/a_tr_TR.properties b/cal10n-api/src/test/resources/encodingsISO8859/a_tr_TR.properties similarity index 100% rename from cal10n-api/src/test/resources/encodings/a_tr_TR.properties rename to cal10n-api/src/test/resources/encodingsISO8859/a_tr_TR.properties ----------------------------------------------------------------------- Summary of changes: .../cal10n/util/ResourceBundleEncodingTest.java | 4 ++-- .../test/resources/encodings/#a_tr_TR.properties# | 1 - .../a_el_GR.properties | 0 .../a_tr_TR.properties | 0 4 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 cal10n-api/src/test/resources/encodings/#a_tr_TR.properties# rename cal10n-api/src/test/resources/{encodings => encodingsISO8859}/a_el_GR.properties (100%) rename cal10n-api/src/test/resources/{encodings => encodingsISO8859}/a_tr_TR.properties (100%) hooks/post-receive -- Compiler assisted localization library

1 0