[Schmitzm-commits] r1802 - in trunk: schmitzm-adresses/src/main/java/de/schmitzm/adresses schmitzm-adresses/src/test/java/de/schmitzm/adresses schmitzm-core/src/main/resources/de/schmitzm/swing/resource/locales

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2011-12-02 23:00:38 +0100 (Fri, 02 Dec 2011)
New Revision: 1802

Modified:
   trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java
   trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java
   trunk/schmitzm-core/src/main/resources/de/schmitzm/swing/resource/locales/SwingResourceBundle_es.properties
Log:
fixed one trnaslation

Modified: trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java
===================================================================
--- trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java	2011-12-02 11:58:28 UTC (rev 1801)
+++ trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java	2011-12-02 22:00:38 UTC (rev 1802)
@@ -497,6 +497,12 @@
 
 		ort = ort.toLowerCase();
 
+		// ein in kammern stehender zusatz " (main)" wird in "am ..." umgewandelt
+		ort = ort.replaceAll("\\((.*)\\)", "am$1"); //neu
+		
+		ort = ort.replaceAll("(?i)freiburg.+(i\\.?.?b(\\.||reisgau))[^r]", "freiburgimbreisgau"); //neu
+		
+		
 		ort = ort.replaceAll("\\brbge\\.?\\b", "ruebenberge");
 
 		ort = ort
@@ -520,12 +526,12 @@
 
 		ort = ort.replaceAll("^maria(-|\\s).", "");
 
-		ort = ort.replaceAll("\\bi(\\.|\\s)Sa(\\.|\\s)", "insachsen");
+		ort = ort.replaceAll("\\bi(\\.?\\s|\\s)Sa(\\.|\\s)", "insachsen"); //neu
 
-		ort = ort.replaceAll("\\ba(\\.|\\s)d(\\.|\\s)", "an der");
-		ort = ort.replaceAll("\\bi(\\.|\\s)", "im");
-		ort = ort.replaceAll("\\ba(\\.|\\s)", "am");
-		ort = ort.replaceAll("\\bb(\\.|\\s)", "bei");
+		ort = ort.replaceAll("\\ba(\\.|\\s)d(\\.|\\s)", "an der"); //neu
+		ort = ort.replaceAll("\\bi(\\.?\\s|\\s)", "im"); //neu
+		ort = ort.replaceAll("\\ba(\\.?\\s|\\s)", "am"); //neu
+		ort = ort.replaceAll("\\bb(\\.?\\s|\\s)", "bei"); //neu
 
 		ort = ort.replaceAll("ü", "ue");
 		ort = ort.replaceAll("ö", "oe");

Modified: trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java
===================================================================
--- trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java	2011-12-02 11:58:28 UTC (rev 1801)
+++ trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java	2011-12-02 22:00:38 UTC (rev 1802)
@@ -246,9 +246,17 @@
 
 	@Test
 	public void testNormalizeOrt() {
+		assertEquals("hattersheimammain", AddrStringUtil.normalizeOrt("Hattersheim am Main"));
+		assertEquals("hattersheimammain", AddrStringUtil.normalizeOrt("Hattersheim a Main"));
+		assertEquals("hattersheimammain", AddrStringUtil.normalizeOrt("Hattersheim a. Main"));
+		assertEquals("hattersheimammain", AddrStringUtil.normalizeOrt("Hattersheim (Main)"));
+		
+		
 		assertEquals("sanktaugustin", AddrStringUtil.normalizeOrt("St. Augustin"));
-		assertEquals("freiburgimb", AddrStringUtil.normalizeOrt("Freiburg im Breisgau"));
-		assertEquals("freiburgimb", AddrStringUtil.normalizeOrt("Freiburg i. B."));
+		assertEquals("freiburgimbreisgau", AddrStringUtil.normalizeOrt("Freiburg im Breisgau"));
+		assertEquals("freiburgimbreisgau", AddrStringUtil.normalizeOrt("Freiburg i. Breisgau"));
+		assertEquals("freiburgimbreisgau", AddrStringUtil.normalizeOrt("Freiburg i. B."));
+		assertEquals("freiburgimbreisgau", AddrStringUtil.normalizeOrt("Freiburg i Breisgau"));
 		assertEquals("idarobarstein", AddrStringUtil.normalizeOrt("Idar-Obarstein"));
 		assertEquals("hamburg", AddrStringUtil.normalizeOrt("Hamburg, Hansestadt"));
 	}

Modified: trunk/schmitzm-core/src/main/resources/de/schmitzm/swing/resource/locales/SwingResourceBundle_es.properties
===================================================================
--- trunk/schmitzm-core/src/main/resources/de/schmitzm/swing/resource/locales/SwingResourceBundle_es.properties	2011-12-02 11:58:28 UTC (rev 1801)
+++ trunk/schmitzm-core/src/main/resources/de/schmitzm/swing/resource/locales/SwingResourceBundle_es.properties	2011-12-02 22:00:38 UTC (rev 1802)
@@ -1,4 +1,4 @@
-\ufeffApply=Aplicar
+Apply=Aplicar
 AtlasStatusDialog.jnlp.downloadFailed=Descarga fallida: ${0} ${1}
 AtlasStatusDialog.jnlp.generalDownload.Desc=Descargando datos...
 AtlasStatusDialog.jnlp.generalDownload.Title=Descargando