gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://github.com/gnustep/libs-base

Browse source 
Conflicts:
	ChangeLog
This commit is contained in:
Richard Frith-Macdonald 2018-06-28 15:37:38 +01:00
commit ea95ff1f59
6 changed files with 83 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -14,6 +14,11 @@
(like the GNUSTEP_STACK_TRACE environment variable). Useful for
diagnostic logs of a long running server process.
2018-04-30 Graham Lee <graham@iamleeg.com>
* Source/NSCalendar.m (calendarWithIdentifier:):
New convenience method implemented by Cocoa.
2018-05-29 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSObject.m: avoid static initialisation macro for allocation

1
Headers/Foundation/NSCalendar.h
View file

@ -259,6 +259,7 @@ enum
}
+ (id) currentCalendar;
+ (id) calendarWithIdentifier: (NSString *) string;
- (id) initWithCalendarIdentifier: (NSString *) string;
- (NSString *) calendarIdentifier;

5
Resources/GNUmakefile
View file

@ -55,7 +55,7 @@ base-resources_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-base/Versions/
endif
base-resources_LANGUAGES = English German French Italian TraditionalChinese \
Spanish Esperanto Korean
Spanish Esperanto Korean Japanese
base-resources_LOCALIZED_RESOURCE_FILES = Localizable.strings
base-resources_RESOURCE_DIRS = Languages GSTLS
base-resources_RESOURCE_FILES = \
@ -75,7 +75,8 @@ Languages/TraditionalChinese \
Languages/Slovak \
Languages/Ukrainian \
Languages/Esperanto \
Languages/Korean
Languages/Korean \
Languages/Japanese
LANGUAGE_INSTALL_FILES = $(LANGUAGE_FILES) Languages/Locale.aliases \
Languages/Locale.encodings Languages/Locale.canonical

34
Resources/Japanese.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,34 @@
/* Japanese string encodings */
GSUndefinedEncoding = "Unknown";
NSProprietaryStringEncoding = "Installation-specific";
NSASCIIStringEncoding = "7 bit ASCII";
NSNonLossyASCIIStringEncoding = "Non-lossy ASCII (7 bit)";
NSMacOSRomanStringEncoding = "MacOS Roman";
NSNEXTSTEPStringEncoding = "NEXTSTEP";
NSSymbolStringEncoding = "Adobe Symbol";
NSWindowsCP1251StringEncoding = "Windows \u30ad\u30ea\u30eb\u8a9e (CP1251)";
NSWindowsCP1252StringEncoding = "Windows Latin-1 (CP1252)";
NSWindowsCP1253StringEncoding = "Windows \u30ae\u30ea\u30b7\u30a2\u8a9e (CP1253)";
NSWindowsCP1254StringEncoding = "Windows \u30c8\u30eb\u30b3\u8a9e (CP1254)";
NSWindowsCP1250StringEncoding = "Windows Latin-2 (CP1250)";
NSISOLatin1StringEncoding = "ISO Latin-1 \u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u8a00\u8a9e (ISO-8859-1)";
NSISOLatin2StringEncoding = "ISO Latin-2 \u4e2d\u592e\u30e8\u30fc\u30ed\u30c3\u30d1\u8a00\u8a9e (ISO-8859-2)";
NSISOLatin3StringEncoding = "ISO Latin-3 \u5357\u30e8\u30fc\u30ed\u30c3\u30d1\u8a00\u8a9e (ISO-8859-3)";
NSISOLatin4StringEncoding = "ISO Latin-4 \u5317\u30e8\u30fc\u30ed\u30c3\u30d1\u8a00\u8a9e (ISO-8859-4)";
NSISOLatin5StringEncoding = "ISO Latin-5 \u30c8\u30eb\u30b3\u8a9e (ISO-8859-9)";
NSISOLatin6StringEncoding = "ISO Latin-6 \u5317\u6b27 (ISO-8859-10)";
NSISOLatin7StringEncoding = "ISO Latin-7 \u30d0\u30eb\u30c8\u8a9e (ISO-8859-13)";
NSISOLatin8StringEncoding = "ISO Latin-8 \u30b1\u30eb\u30c8\u8a9e (ISO-8859-14)";
NSISOLatin9StringEncoding = "ISO Latin-9 West European (new) (ISO-8859-15)";
NSISOCyrillicStringEncoding = "\u30ad\u30ea\u30eb\u8a9e (ISO-8859-5)";
NSISOArabicStringEncoding = "\u30a2\u30e9\u30d3\u30a2\u8a9e (ISO-8859-6)";
NSISOGreekStringEncoding = "\u30ae\u30ea\u30b7\u30a2\u8a9e (ISO-8859-7)";
NSISOHebrewStringEncoding = "\u30d8\u30d6\u30e9\u30a4\u8a9e (ISO-8859-8)";
NSUTF7StringEncoding = "Unicode UTF-7 (RFC 2152)";
NSUTF8StringEncoding = "Unicode UTF-8";
NSUnicodeStringEncoding = "Unicode UTF-16";
NSKOI8RStringEncoding = "\u30b1\u30eb\u30c8\u8a9e KOI8-R (\u30ed\u30b7\u30a2\u8a9e)";
NSJapaneseEUCStringEncoding = "\u65e5\u672c\u8a9e EUC";
NSShiftJISStringEncoding = "\u65e5\u672c\u8a9e Shift-JIS";
NSISO2022JPStringEncoding = "\u65e5\u672c\u8a9e JIS (7 bits) (ISO 2022)";
NSGB2312StringEncoding = "\u7c21\u4f53\u4e2d\u56fd\u8a9e GB2312";

35
Resources/Languages/Japanese Normal file
View file

@ -0,0 +1,35 @@
/* Japanese */
{
NSLanguageName = "Japanese";
NSLanguageCode = JPN;
NSFormalName = "\u65e5\u672c\u8a9e";
NSCurrencySymbol = "\u5186";
NSPositiveCurrencyFormatString = "9,999.00\u5186";
NSNegativeCurrencyFormatString = "-9,999.00\u5186";
NSInternationalCurrencyString = "JPY";
NSDecimalDigits = ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
NSDecimalSeparator = ".";
NSThousandsSeparator = ",";
NSAMPMDesignation = ("\u5348\u524d", "\u5348\u5f8c");
NSDateFormatString = "%Y\u5e74%B%d\u65e5 %A";
NSDateTimeOrdering = YMDH;
NSEarlierTimeDesignations = (prior, last, past, ago);
NSHourNameDesignations = ((0, "\u771f\u591c\u4e2d"), (12, "\u6b63\u5348", "\u663c\u98df"), (10, "\u671d"), (14, "\u5348\u5f8c"), (19, "\u5915\u98df"));
NSLaterTimeDesignations = ("\u5148");
NSMonthNameArray = ("1\u6708", "2\u6708", "3\u6708", "4\u6708", "5\u6708", "6\u6708", "7\u6708", "8\u6708", "9\u6708", "10\u6708", "11\u6708", "12\u6708");
NSNextDayDesignations = ("\u660e\u65e5");
NSNextNextDayDesignations = ("\u660e\u5f8c\u65e5");
NSPriorDayDesignations = ("\u6628\u65e5");
NSShortDateFormatString = "%Y/%m/%d";
NSShortMonthNameArray = ("1\u6708", "2\u6708", "3\u6708", "4\u6708", "5\u6708", "6\u6708", "7\u6708", "8\u6708", "9\u6708", "10\u6708", "11\u6708", "12\u6708");
NSShortTimeDateFormatString = "%Y %b %d %H:%M";
NSShortWeekDayNameArray = ("\u65e5", "\u6708", "\u706b", "\u6c34", "\u6728", "\u91d1", "\u571f");
NSThisDayDesignations = ("\u4eca\u65e5");
NSTimeDateFormatString = "%Y\u5e74%b%d\u65e5(%a) %H:%M:%S %z";
NSTimeFormatString = "%H:%M:%S";
NSWeekDayNameArray = ("\u65e5\u66dc\u65e5", "\u6708\u66dc\u65e5", "\u706b\u66dc\u65e5", "\u6c34\u66dc\u65e5", "\u6728\u66dc\u65e5", "\u91d1\u66dc\u65e5", "\u571f\u66dc\u65e5");
NSYearMonthWeekDesignations = ("\u5e74", "\u6708", "\u9031");
}

5
Source/NSCalendar.m
View file

@ -252,6 +252,11 @@ static NSRecursiveLock *classLock = nil;
return self;
}
+ (id) calendarWithIdentifier: (NSString *) string
{
return [[[self alloc] initWithCalendarIdentifier: string] autorelease];
}
- (id) initWithCalendarIdentifier: (NSString *) string
{
NSAssert(0 == _NSCalendarInternal, NSInvalidArgumentException);