Navigation

← Previous Changeset
Next Changeset →

Changeset 4960

Timestamp:

10/16/07 17:31:43 (1 year ago)

Author:

morris

Message:

Add +humanReadableStringForSizeInBits:, change the byte method signatures

Files:

WiredAdditions/trunk/English.lproj/Localizable.strings (modified) (1 diff)
WiredAdditions/trunk/French.lproj/Localizable.strings (modified) (1 diff)
WiredAdditions/trunk/German.lproj/Localizable.strings (modified) (1 diff)
WiredAdditions/trunk/Japanese.lproj/Localizable.strings (modified) (1 diff)
WiredAdditions/trunk/NSString-WIAdditions.h (modified) (2 diffs)
WiredAdditions/trunk/NSString-WIAdditions.m (modified) (10 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

WiredAdditions/trunk/English.lproj/Localizable.strings

r4847	r4960
11	11	"%@ ago" = "%@ ago";
12	12
13		/* NSString-WIAdditions: size strings */
	13	/* NSString-WIAdditions: byte size strings */
14	14	"%@ GB" = "%@ GB";
15	15
16		/* NSString-WIAdditions: size strings */
	16	/* NSString-WIAdditions: bit size strings */
	17	"%@ Gbit" = "%@ Gbit";
	18
	19	/* NSString-WIAdditions: byte size strings */
17	20	"%@ KB" = "%@ KB";
18	21
19		/* NSString-WIAdditions: size strings */
	22	/* NSString-WIAdditions: bit size strings */
	23	"%@ kbit" = "%@ kbit";
	24
	25	/* NSString-WIAdditions: byte size strings */
20	26	"%@ MB" = "%@ MB";
21	27
22		/* NSString-WIAdditions: size strings */
	28	/* NSString-WIAdditions: bit size strings */
	29	"%@ Mbit" = "%@ Mbit";
	30
	31	/* NSString-WIAdditions: byte size strings */
23	32	"%@ PB" = "%@ PB";
24	33
25		/* NSString-WIAdditions: size strings */
	34	/* NSString-WIAdditions: bit size strings */
	35	"%@ Pbit" = "%@ Pbit";
	36
	37	/* NSString-WIAdditions: byte size strings */
26	38	"%@ TB" = "%@ TB";
27	39
28		/* NSString-WIAdditions: size strings */
	40	/* NSString-WIAdditions: bit size strings */
	41	"%@ Tbit" = "%@ Tbit";
	42
	43	/* NSString-WIAdditions: bit size strings */
	44	"%llu bits" = "%llu bits";
	45
	46	/* NSString-WIAdditions: byte size strings */
29	47	"%llu bytes" = "%llu bytes";
30	48

WiredAdditions/trunk/French.lproj/Localizable.strings

r4847	r4960
11	11	"%@ ago" = "depuis %@";
12	12
13		/* NSString-WIAdditions: size strings */
	13	/* NSString-WIAdditions: byte size strings */
14	14	"%@ GB" = "%@ GB";
15	15
16		/* NSString-WIAdditions: size strings */
	16	/* NSString-WIAdditions: bit size strings */
	17	"%@ Gbit" = "%@ Gbit";
	18
	19	/* NSString-WIAdditions: byte size strings */
17	20	"%@ KB" = "%@ KB";
18	21
19		/* NSString-WIAdditions: size strings */
	22	/* NSString-WIAdditions: bit size strings */
	23	"%@ kbit" = "%@ kbit";
	24
	25	/* NSString-WIAdditions: byte size strings */
20	26	"%@ MB" = "%@ MB";
21	27
22		/* NSString-WIAdditions: size strings */
	28	/* NSString-WIAdditions: bit size strings */
	29	"%@ Mbit" = "%@ Mbit";
	30
	31	/* NSString-WIAdditions: byte size strings */
23	32	"%@ PB" = "%@ PB";
24	33
25		/* NSString-WIAdditions: size strings */
	34	/* NSString-WIAdditions: bit size strings */
	35	"%@ Pbit" = "%@ Pbit";
	36
	37	/* NSString-WIAdditions: byte size strings */
26	38	"%@ TB" = "%@ TB";
27	39
28		/* NSString-WIAdditions: size strings */
	40	/* NSString-WIAdditions: bit size strings */
	41	"%@ Tbit" = "%@ Tbit";
	42
	43	/* NSString-WIAdditions: bit size strings */
	44	"%llu bits" = "%llu bits";
	45
	46	/* NSString-WIAdditions: byte size strings */
	47	"%llu bytes" = "%llu bytes";
	48
	49	/* NSString-WIAdditions: byte size strings */
29	50	"%llu bytes" = "%llu bytes";
30	51

WiredAdditions/trunk/German.lproj/Localizable.strings

r4847	r4960
11	11	"%@ ago" = "vor %@";
12	12
13		/* NSString-WIAdditions: size strings */
	13	/* NSString-WIAdditions: byte size strings */
14	14	"%@ GB" = "%@ GB";
15	15
16		/* NSString-WIAdditions: size strings */
	16	/* NSString-WIAdditions: bit size strings */
	17	"%@ Gbit" = "%@ Gbit";
	18
	19	/* NSString-WIAdditions: byte size strings */
17	20	"%@ KB" = "%@ KB";
18	21
19		/* NSString-WIAdditions: size strings */
	22	/* NSString-WIAdditions: bit size strings */
	23	"%@ kbit" = "%@ kbit";
	24
	25	/* NSString-WIAdditions: byte size strings */
20	26	"%@ MB" = "%@ MB";
21	27
22		/* NSString-WIAdditions: size strings */
	28	/* NSString-WIAdditions: bit size strings */
	29	"%@ Mbit" = "%@ Mbit";
	30
	31	/* NSString-WIAdditions: byte size strings */
23	32	"%@ PB" = "%@ PB";
24	33
25		/* NSString-WIAdditions: size strings */
	34	/* NSString-WIAdditions: bit size strings */
	35	"%@ Pbit" = "%@ Pbit";
	36
	37	/* NSString-WIAdditions: byte size strings */
26	38	"%@ TB" = "%@ TB";
27	39
28		/* NSString-WIAdditions: size strings */
	40	/* NSString-WIAdditions: bit size strings */
	41	"%@ Tbit" = "%@ Tbit";
	42
	43	/* NSString-WIAdditions: bit size strings */
	44	"%llu bits" = "%llu Bits";
	45
	46	/* NSString-WIAdditions: byte size strings */
29	47	"%llu bytes" = "%llu Bytes";
30	48

WiredAdditions/trunk/Japanese.lproj/Localizable.strings

r4847	r4960
11	11	"%@ ago" = "%@ 前";
12	12
13		/* NSString-WIAdditions: size strings */
	13	/* NSString-WIAdditions: byte size strings */
14	14	"%@ GB" = "%@ GB";
15	15
16		/* NSString-WIAdditions: size strings */
	16	/* NSString-WIAdditions: bit size strings */
	17	"%@ Gbit" = "%@ Gbit";
	18
	19	/* NSString-WIAdditions: byte size strings */
17	20	"%@ KB" = "%@ KB";
18	21
19		/* NSString-WIAdditions: size strings */
	22	/* NSString-WIAdditions: bit size strings */
	23	"%@ kbit" = "%@ kbit";
	24
	25	/* NSString-WIAdditions: byte size strings */
20	26	"%@ MB" = "%@ MB";
21	27
22		/* NSString-WIAdditions: size strings */
	28	/* NSString-WIAdditions: bit size strings */
	29	"%@ Mbit" = "%@ Mbit";
	30
	31	/* NSString-WIAdditions: byte size strings */
23	32	"%@ PB" = "%@ PB";
24	33
25		/* NSString-WIAdditions: size strings */
	34	/* NSString-WIAdditions: bit size strings */
	35	"%@ Pbit" = "%@ Pbit";
	36
	37	/* NSString-WIAdditions: byte size strings */
26	38	"%@ TB" = "%@ TB";
27	39
28		/* NSString-WIAdditions: size strings */
	40	/* NSString-WIAdditions: bit size strings */
	41	"%@ Tbit" = "%@ Tbit";
	42
	43	/* NSString-WIAdditions: bit size strings */
	44	"%llu bits" = "%llu ビット";
	45
	46	/* NSString-WIAdditions: byte size strings */
29	47	"%llu bytes" = "%llu バイト";
30	48

WiredAdditions/trunk/NSString-WIAdditions.h

r4827	r4960
45	45
46	46	- (BOOL)containsSubstring:(NSString *)string;
	47	- (BOOL)containsSubstring:(NSString *)string options:(unsigned int)options;
47	48	- (BOOL)containsCharactersFromSet:(NSCharacterSet *)set;
48	49	- (BOOL)isComposedOfCharactersFromSet:(NSCharacterSet *)characterSet;
…	…
73	74
74	75	+ (NSString *)humanReadableStringForTimeInterval:(NSTimeInterval)interval;
75		+ (NSString *)humanReadableStringForSize:(unsigned long long)size;
76		+ (NSString *)humanReadableStringWithBytesForSize:(unsigned long long)size;
	76	+ (NSString *)humanReadableStringForSizeInBytes:(unsigned long long)size;
	77	+ (NSString *)humanReadableStringForSizeInBytes:(unsigned long long)size withBytes:(BOOL)bytes;
	78	+ (NSString *)humanReadableStringForSizeInBits:(unsigned long long)size;
77	79	+ (NSString *)humanReadableStringForBandwidth:(NSUInteger)speed;
78	80

WiredAdditions/trunk/NSString-WIAdditions.m

r4798	r4960
115	115	}
116	116
	117
	118	- (BOOL)containsSubstring:(NSString *)string options:(unsigned int)options {
	119	return ([self rangeOfString:string options:options].location != NSNotFound);
	120	}
117	121
	122
118	123	- (BOOL)containsCharactersFromSet:(NSCharacterSet *)set {
119	124	return ([self rangeOfCharacterFromSet:set].location != NSNotFound);
…	…
347	352
348	353
349		+ (NSString *)humanReadableStringForSize:(unsigned long long)size {
	354	+ (NSString *)humanReadableStringForSizeInBytes:(unsigned long long)size {
350	355	static NSNumberFormatter *formatter;
351	356	double kb, mb, gb, tb, pb;
…	…
358	363
359	364	if(size < 1000) {
360		return [NSSWF:WILS(@"%llu bytes", @"NSString-WIAdditions: size strings"),
	365	return [NSSWF:WILS(@"%llu bytes", @"NSString-WIAdditions: byte size strings"),
361	366	size];
362	367	}
…	…
365	370
366	371	if(kb < 1000) {
367		return [NSSWF:WILS(@"%@ KB", @"NSString-WIAdditions: size strings"),
	372	return [NSSWF:WILS(@"%@ KB", @"NSString-WIAdditions: byte size strings"),
368	373	[formatter stringForObjectValue:[NSNumber numberWithDouble:kb]]];
369	374	}
…	…
372	377
373	378	if(mb < 1000) {
374		return [NSSWF:WILS(@"%@ MB", @"NSString-WIAdditions: size strings"),
	379	return [NSSWF:WILS(@"%@ MB", @"NSString-WIAdditions: byte size strings"),
375	380	[formatter stringForObjectValue:[NSNumber numberWithDouble:mb]]];
376	381	}
…	…
379	384
380	385	if(gb < 1000) {
381		return [NSSWF:WILS(@"%@ GB", @"NSString-WIAdditions: size strings"),
	386	return [NSSWF:WILS(@"%@ GB", @"NSString-WIAdditions: byte size strings"),
382	387	[formatter stringForObjectValue:[NSNumber numberWithDouble:gb]]];
383	388	}
…	…
386	391
387	392	if(tb < 1000) {
388		return [NSSWF:WILS(@"%@ TB", @"NSString-WIAdditions: size strings"),
	393	return [NSSWF:WILS(@"%@ TB", @"NSString-WIAdditions: byte size strings"),
389	394	[formatter stringForObjectValue:[NSNumber numberWithDouble:tb]]];
390	395	}
…	…
393	398
394	399	if(pb < 1000) {
395		return [NSSWF:WILS(@"%@ PB", @"NSString-WIAdditions: size strings"),
	400	return [NSSWF:WILS(@"%@ PB", @"NSString-WIAdditions: byte size strings"),
396	401	[formatter stringForObjectValue:[NSNumber numberWithDouble:pb]]];
397	402	}
…	…
402	407
403	408
404		+ (NSString *)humanReadableString~~WithBytesForSize:(unsigned long long)size~~ {
	409	+ (NSString *)humanReadableStringForSizeInBytes:(unsigned long long)size withBytes:(BOOL)bytes {
405	410	static NSNumberFormatter *formatter;
406	411	NSString *string;
407	412
408		string = [NSString humanReadableStringForSize:size];
409
410		if(size > 1024) {
	413	string = [NSString humanReadableStringForSizeInBytes:size];
	414
	415	if(size > 1024 && bytes) {
411	416	if(!formatter) {
412	417	formatter = [[NSNumberFormatter alloc] init];
…	…
424	429
425	430	return string;
	431	}
	432
	433
	434
	435	+ (NSString *)humanReadableStringForSizeInBits:(unsigned long long)size {
	436	static NSNumberFormatter *formatter;
	437	double kb, mb, gb, tb, pb;
	438
	439	if(!formatter) {
	440	formatter = [[NSNumberFormatter alloc] init];
	441	[formatter setLocalizesFormat:YES];
	442	[formatter setFormat:@"###,##0.0"];
	443	}
	444
	445	if(size < 1000) {
	446	return [NSSWF:WILS(@"%llu bits", @"NSString-WIAdditions: bit size strings"),
	447	size];
	448	}
	449
	450	kb = (double) size / 1024.0;
	451
	452	if(kb < 1000) {
	453	return [NSSWF:WILS(@"%@ kbit", @"NSString-WIAdditions: bit size strings"),
	454	[formatter stringForObjectValue:[NSNumber numberWithDouble:kb]]];
	455	}
	456
	457	mb = (double) kb / 1024.0;
	458
	459	if(mb < 1000) {
	460	return [NSSWF:WILS(@"%@ Mbit", @"NSString-WIAdditions: bit size strings"),
	461	[formatter stringForObjectValue:[NSNumber numberWithDouble:mb]]];
	462	}
	463
	464	gb = (double) mb / 1024.0;
	465
	466	if(gb < 1000) {
	467	return [NSSWF:WILS(@"%@ Gbit", @"NSString-WIAdditions: bit size strings"),
	468	[formatter stringForObjectValue:[NSNumber numberWithDouble:gb]]];
	469	}
	470
	471	tb = (double) gb / 1024.0;
	472
	473	if(tb < 1000) {
	474	return [NSSWF:WILS(@"%@ Tbit", @"NSString-WIAdditions: bit size strings"),
	475	[formatter stringForObjectValue:[NSNumber numberWithDouble:tb]]];
	476	}
	477
	478	pb = (double) tb / 1024.0;
	479
	480	if(pb < 1000) {
	481	return [NSSWF:WILS(@"%@ Pbit", @"NSString-WIAdditions: bit size strings"),
	482	[formatter stringForObjectValue:[NSNumber numberWithDouble:pb]]];
	483	}
	484
	485	return NULL;
426	486	}
427	487

Navigation

Changeset 4960

Legend:

WiredAdditions/trunk/English.lproj/Localizable.strings

WiredAdditions/trunk/French.lproj/Localizable.strings

WiredAdditions/trunk/German.lproj/Localizable.strings

WiredAdditions/trunk/Japanese.lproj/Localizable.strings

WiredAdditions/trunk/NSString-WIAdditions.h

WiredAdditions/trunk/NSString-WIAdditions.m

Download in other formats: