From: znek Date: Thu, 6 Jan 2005 23:24:36 +0000 (+0000) Subject: changed strings file encoding from ISO-Latin-1 to UFT-8 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69747be68475826e0bf5d4bf5c71e29ea18a56eb;p=sope changed strings file encoding from ISO-Latin-1 to UFT-8 git-svn-id: http://svn.opengroupware.org/SOPE/trunk@499 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 5c1e8327..0f890f7a 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,10 @@ +2005-01-07 Marcus Mueller + + * _WOStringTable.m: changed strings file encoding from ISO-Latin-1 + to UTF-8, so this is now en par with libFoundation, gnustep-base + and Mac OS X 10.3. Fixed a minor bug that affected gnustep-base + only. (v4.5.108) + 2005-01-06 Marcus Mueller * SoObjects/SoProductResourceManager.m: changed resource lookup to use diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj index 4c5dd8fd..ff7b0dc5 100644 --- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcode/project.pbxproj @@ -453,7 +453,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.107; + DYLIB_CURRENT_VERSION = 4.5.108; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj index 828ed11b..33cf107b 100644 --- a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj @@ -1589,7 +1589,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.107; + DYLIB_CURRENT_VERSION = 4.5.108; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj index bea1eeea..e79119c7 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj +++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcode/project.pbxproj @@ -281,7 +281,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.107; + DYLIB_CURRENT_VERSION = 4.5.108; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 38a0037c..3f3a7d2c 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=107 +SUBMINOR_VERSION:=108 # v4.5.91 requires libNGExtensions v4.5.134 # v4.5.84 requires libNGExtensions v4.5.127 diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj index da676b04..e30c5f72 100644 --- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj +++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcode/project.pbxproj @@ -226,7 +226,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.5.107; + DYLIB_CURRENT_VERSION = 4.5.108; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = NO; diff --git a/sope-appserver/NGObjWeb/_WOStringTable.m b/sope-appserver/NGObjWeb/_WOStringTable.m index 70414c35..2602ef74 100644 --- a/sope-appserver/NGObjWeb/_WOStringTable.m +++ b/sope-appserver/NGObjWeb/_WOStringTable.m @@ -24,7 +24,7 @@ @implementation _WOStringTable -static NSStringEncoding stringFilesEncoding = NSISOLatin1StringEncoding; +static NSStringEncoding stringFilesEncoding = NSUTF8StringEncoding; - (id)initWithPath:(NSString *)_path { if ((self = [super init])) { @@ -60,7 +60,8 @@ static NSStringEncoding stringFilesEncoding = NSISOLatin1StringEncoding; if (self->data != nil) return; -#if !LIB_FOUNDATION_LIBRARY /* potentially effects OGo ;-) */ +#if 0 +#if Cocoa_FOUNDATION_LIBRARY /* potentially effects OGo ;-) */ /* For WO4.5 compatibility, we need first to try to open .strings file as a dictionary @@ -74,7 +75,8 @@ static NSStringEncoding stringFilesEncoding = NSISOLatin1StringEncoding; return; } #endif - +#endif + /* If file was not a dictionary, then it's a standard strings file */ if ((sdata = [[NSData alloc] initWithContentsOfFile:self->path]) == nil) {