You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2008/09/30 21:10:31 UTC
svn commit: r700553 - in /labs/magma/trunk/foundation-i18n/src:
main/java/org/apache/magma/i18n/ContextMatrix.java
main/java/org/apache/magma/i18n/LocaleHolder.java
test/java/org/apache/magma/i18n/NormalizationTest.java
Author: simoneg
Date: Tue Sep 30 12:10:30 2008
New Revision: 700553
URL: http://svn.apache.org/viewvc?rev=700553&view=rev
Log:
LABS-188 : i18n keys are now simpler and not case sensitive
Modified:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
labs/magma/trunk/foundation-i18n/src/test/java/org/apache/magma/i18n/NormalizationTest.java
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java?rev=700553&r1=700552&r2=700553&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java Tue Sep 30 12:10:30 2008
@@ -1,8 +1,6 @@
package org.apache.magma.i18n;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -17,7 +15,7 @@
StringTokenizer stok = new StringTokenizer(key, ".");
List<String> parts = new ArrayList<String>();
while (stok.hasMoreElements()) {
- parts.add(stok.nextToken());
+ parts.add(stok.nextToken().toLowerCase());
}
this.parts = parts.toArray(new String[parts.size()]);
this.value = value;
@@ -34,7 +32,7 @@
int pos = 0;
for (String string : mc) {
pos++;
- if (parts[upto].equals(string)) {
+ if (parts[upto].equalsIgnoreCase(string)) {
upto++;
total += pos;
if (upto == parts.length) return total;
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java?rev=700553&r1=700552&r2=700553&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java Tue Sep 30 12:10:30 2008
@@ -118,8 +118,11 @@
sb.append(Integer.toString(add));
}
for (int i = 0; i < sb.length(); i++) {
- if (!Character.isJavaIdentifierPart(sb.charAt(i))) {
- sb.setCharAt(i, '_');
+ if (sb.charAt(i) == '{' || sb.charAt(i) == '}') {
+ sb.setCharAt(i, '_');
+ } else if (!Character.isJavaIdentifierPart(sb.charAt(i))) {
+ sb.deleteCharAt(i);
+ i--;
}
}
return sb.toString();
Modified: labs/magma/trunk/foundation-i18n/src/test/java/org/apache/magma/i18n/NormalizationTest.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/test/java/org/apache/magma/i18n/NormalizationTest.java?rev=700553&r1=700552&r2=700553&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/test/java/org/apache/magma/i18n/NormalizationTest.java (original)
+++ labs/magma/trunk/foundation-i18n/src/test/java/org/apache/magma/i18n/NormalizationTest.java Tue Sep 30 12:10:30 2008
@@ -14,9 +14,9 @@
public static String[]
SET1 = { "plain", "plain" },
SET2 = { "plain_admissible", "plain_admissible"},
- SET3 = { "plain with space", "plain_with_space"},
+ SET3 = { "plain with space", "plainwithspace"},
SET4 = { "numb3r5", "numb3r5"},
- SET5 = { "anything @#{0}.", "anything____0__"};
+ SET5 = { "anything @#{0}.", "anything_0_"};
@Theory
public void normalization(String[] set) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org