* GSWeb/GSWResourceManager.m

+ GSLanguageFromISOLanguage:
use 2 steps to find language, first supplied one 'ja-jp'
if that fails, use 'ja'



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30859 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,9 @@
+2010-06-25  David Wetzel <dave@turbocat.de>
+	* GSWeb/GSWResourceManager.m
+	+ GSLanguageFromISOLanguage:
+	use 2 steps to find language, first supplied one 'ja-jp'
+	if that fails, use 'ja'
+	
 2010-06-23  David Wetzel <dave@turbocat.de>
 	* GSWeb/GSWResourceManager.m
 	reformat statics, add TheStringsTableLock

GSWeb/GSWResourceManager.m

@@ -796,11 +796,32 @@ static NSString * _cachedStringForKey(GSWResourceManager * resmanager, NSString
 }
 
 //--------------------------------------------------------------------
-//NDFN
+
+/*
+ * more specific names like 'ja-jp' have priority over 'ja'
+ * that way, de-at could return a different language than 'de'
+ * As they have some different words...
+ */
+
 +(NSString*)GSLanguageFromISOLanguage:(NSString*)ISOLanguage
 {
-  return [localISO2GSLanguages objectForKey:[[ISOLanguage stringByTrimmingSpaces] lowercaseString]];
+  NSString * searchStr = [[ISOLanguage stringByTrimmingSpaces] lowercaseString];
-};
+  NSString * langName  = nil;
+  
+  langName = [localISO2GSLanguages objectForKey:searchStr];
+  
+  if (!langName) {
+    // try to get only the prefix of 'ja-jp'
+    NSRange  minusRange = [searchStr rangeOfString:@"-"];
+    if (minusRange.location != NSNotFound) {
+      searchStr = [searchStr substringToIndex:minusRange.location];
+
+      langName = [localISO2GSLanguages objectForKey:searchStr];
+    }
+
+  }
+  return langName;
+}
 
 //--------------------------------------------------------------------
 //NDFN