Localization fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4119 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 1999-04-23 02:54:45 +00:00
parent d34e1da08c
commit 4595d34ead
9 changed files with 197 additions and 168 deletions

View file

@ -1,3 +1,20 @@
1999-04-22 Adam Fedor <fedor@gnu.org>
* configure.in: Don't abort if nested functions don't work. Not
sure we even have any.
* Source/NSBundle.m (-localizedStringForKey:value:table:): Log a
message if no localized key found (per OpenStep specs).
* Source/include/NSBundle.h
(NSLocalizedStringFromTableInFramework): New GNUstep specific
macro.
* NSCharacterSets/GNUmakefile: Install in Resources rather than
Resources/gnustep.
* NSTimeZones/GNUmakefile: Likewise.
* Source/NSCharacterSet.m: Look in new location.
* Source/NSTimeZone.m: Likewise.
Thu Apr 22 21:50:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSBundle.m: Improved localisation - added stuff for internal

View file

@ -113,6 +113,12 @@ extern NSString* NSLoadedClasses;
#define NSLocalizedStringFromTableInBundle(key, tbl, bundle, comment) \
[bundle localizedStringForKey:(key) value:@"" table:(tbl)]
#ifndef NO_GNUSTEP
#define NSLocalizedStringFromTableInFramework(key, tbl, fpth, comment) \
[[NSBundle mainBundle] localizedStringForKey:(key) value:@"" \
table: [bundle pathForGNUstepResource:(tbl) ofType: nil inDirectory: (fpth)]
#endif
#endif /* __NSBundle_h_GNUSTEP_BASE_INCLUDE */

View file

@ -30,7 +30,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
include ../config.mak
charsetdir = $(GNUSTEP_RESOURCES)/gnustep/NSCharacterSets
charsetdir = $(GNUSTEP_RESOURCES)/NSCharacterSets
CHARSET_FILES = \
alphanumericCharSet.dat \

View file

@ -30,7 +30,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
include ../config.mak
resourcedir = $(GNUSTEP_RESOURCES)/gnustep
resourcedir = $(GNUSTEP_RESOURCES)
TIMEZONE_ARCHIVE = \
NSTimeZones.tar

View file

@ -833,7 +833,11 @@ _bundle_load_callback(Class theClass, Category *theCategory)
NSString *show = [[NSUserDefaults standardUserDefaults]
objectForKey: NSShowNonLocalizedStrings];
if (!show || [show isEqual: @"YES"])
newString = [key uppercaseString];
{
/* It would be bad to localize this string! */
NSLog(@"Non-localized string: %@\n", newString);
newString = [key uppercaseString];
}
else
{
newString = value;

View file

@ -30,7 +30,7 @@
#include <Foundation/NSProcessInfo.h>
#include <Foundation/NSDictionary.h>
static NSString* NSCharacterSet_PATH = @"gnustep/NSCharacterSets";
static NSString* NSCharacterSet_PATH = @"NSCharacterSets";
/* A simple array for caching standard bitmap sets */
#define MAX_STANDARD_SETS 15

View file

@ -69,7 +69,7 @@
#define LOCALDBKEY @"Local Time Zone"
/* Directory that contains the time zone data. */
#define TIME_ZONE_DIR @"gnustep/NSTimeZones"
#define TIME_ZONE_DIR @"NSTimeZones"
/* Location of time zone abbreviation dictionary. It is a text file
with each line comprised of the abbreviation, a whitespace, and the

321
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -66,17 +66,18 @@ if test $NeXTCC = 0; then
gcc_nested=1, gcc_nested=0,
gcc_nested=1)
if test $gcc_nested = 0; then
echo "aborting"
AC_MSG_RESULT(no)
echo
echo "The GCC 'nested functions' feature does not seem to be working on"
echo "this machine. gstep-base makes extensive use of nested functions."
echo "this machine. "
echo "Read the bug-report instructions in the GCC texinfo manual"
echo "and submit a bug report."
echo "I'm not even sure gstep-base uses nested functions anymore"
echo "but if it does, gstep-base will not compile. Try it"
echo "The program this configure script used to test nested functions"
echo "can be found in the file 'config/config.nested.c' in this"
echo "distribution. Under sparc-sun-sunos4.1.3 with gcc-2.6.1 the"
echo "file compiles, runs and returns exit status 0."
exit
else
AC_MSG_RESULT(yes)
fi