locales utf-16 -> utf-8

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@148 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index dd0797dff4c5a0fba1b9ceca0741be00205d0345..faf0d4665e3f96a4ba9cd2115cb6419c515bbeef 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-19  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * sogod.m, */Locale: converted to UTF-8 for better editability (v0.9.3)
+
 2004-07-19  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.2
@@ -13,4 +17,4 @@
 
        * SOGoRootPage.wox: some debug code (for locales).
 
-       * created ChangeLog.
\ No newline at end of file
+       * created ChangeLog.

diff --git a/SOGo/Main/English.lproj/Locale b/SOGo/Main/English.lproj/Locale
index 09b1125a8b5b46ec6ab73d89631dfb916e649431..ac087fc26af4549431b482e94ea136868578040f 100644 (file)
Binary files a/SOGo/Main/English.lproj/Locale and b/SOGo/Main/English.lproj/Locale differ

diff --git a/SOGo/Main/French.lproj/Locale b/SOGo/Main/French.lproj/Locale
index 147c098aa965b6ce938a659568b3a6d3b1740a9b..af3faccc31e38972ff7f1bbd55c1f65a03f3ed38 100644 (file)
Binary files a/SOGo/Main/French.lproj/Locale and b/SOGo/Main/French.lproj/Locale differ

diff --git a/SOGo/Main/SOGoRootPage.wox b/SOGo/Main/SOGoRootPage.wox
index af5e8e3806674dca3d588f0bf3825c2197f1216b..5cf9a093f390baad9e43f002f0a6626fab89ebf5 100644 (file)
--- a/SOGo/Main/SOGoRootPage.wox
+++ b/SOGo/Main/SOGoRootPage.wox
@@ -18,7 +18,7 @@
     </form>
        <!--
        <hr />
-       Current locale: <var:string value="context.locale" />
+       Current locale: <pre><var:string value="context.locale" /></pre>
        -->
   </body>
 </html>

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index 46fb72d5e95d907a452528b42257b0abeb2f5925..fc795f55c1387b14d99ba68f17adc4f527276f1f 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,3 @@
-# $Id: Version,v 1.1 2003/11/24 01:24:40 helge Exp $
+# $Id$
 
-SUBMINOR_VERSION:=2
+SUBMINOR_VERSION:=3

diff --git a/SOGo/Main/sogod.m b/SOGo/Main/sogod.m
index b4643267a6913e30a59e3d305a475486b925eb03..84d2a7fe7ed147bea949d7e523491c2206588b93 100644 (file)
--- a/SOGo/Main/sogod.m
+++ b/SOGo/Main/sogod.m
@@ -224,22 +224,32 @@ static BOOL doCrashOnSessionCreate = NO;
 }
 
 - (NSDictionary *)localeForLanguageNamed:(NSString *)_name {
-  NSString     *lpath;
+  NSString *lpath;
+  id data;
   NSDictionary *locale;
-    
+
   NSAssert(_name != nil, @"_name MUST NOT be nil!");
-  if ((locale = [self->localeLUT objectForKey:_name]) != nil)
+  if((locale = [self->localeLUT objectForKey:_name]) != nil)
     return locale;
-
   lpath = [[self resourceManager]
-           pathForResourceNamed:@"Locale"
-           inFramework:nil
-           languages:[NSArray arrayWithObject:_name]];
-  locale = [[NSString stringWithContentsOfFile:lpath] propertyList];
-  if (locale == nil) {
+    pathForResourceNamed:@"Locale"
+    inFramework:nil
+    languages:[NSArray arrayWithObject:_name]];
+
+  data = [NSData dataWithContentsOfFile:lpath];
+  if(data == nil) {
     NSLog(@"%s didn't find locale with name:%@",
-         __PRETTY_FUNCTION__,
-         _name);
+      __PRETTY_FUNCTION__,
+      _name);
+    return nil;
+  }
+  data = [[[NSString alloc] initWithData:data
+                            encoding:NSUTF8StringEncoding] autorelease];
+  locale = [data propertyList];
+  if(locale == nil) {
+    NSLog(@"%s couldn't load locale with name:%@",
+      __PRETTY_FUNCTION__,
+      _name);
     return nil;
   }
   [self->localeLUT setObject:locale forKey:_name];