ObjFW  Diff

Differences From Artifact [4d020bd421]:

To Artifact [a996c854ff]:


53
54
55
56
57
58
59

60
61
62
63

64
65
66
67
68
69
70
}

+ (OFString*)decimalPoint
{
	return [sharedLocalization decimalPoint];
}


+ (void)addLanguageDirectory: (OFString*)path
{
	[sharedLocalization addLanguageDirectory: path];
}


- initWithLocale: (char*)locale
{
	self = [super init];

	@try {
		_localizedStrings = [[OFMutableArray alloc] init];







>




>







53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
}

+ (OFString*)decimalPoint
{
	return [sharedLocalization decimalPoint];
}

#ifdef OF_HAVE_FILES
+ (void)addLanguageDirectory: (OFString*)path
{
	[sharedLocalization addLanguageDirectory: path];
}
#endif

- initWithLocale: (char*)locale
{
	self = [super init];

	@try {
		_localizedStrings = [[OFMutableArray alloc] init];
140
141
142
143
144
145
146

147
148
149
150
151
152
153
	[_territory release];
	[_decimalPoint release];
	[_localizedStrings release];

	[super dealloc];
}


- (void)addLanguageDirectory: (OFString*)path
{
	void *pool;
	OFString *mapPath, *language, *territory, *languageFile;
	OFDictionary *map;

	if (_language == nil)







>







142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
	[_territory release];
	[_decimalPoint release];
	[_localizedStrings release];

	[super dealloc];
}

#ifdef OF_HAVE_FILES
- (void)addLanguageDirectory: (OFString*)path
{
	void *pool;
	OFString *mapPath, *language, *territory, *languageFile;
	OFDictionary *map;

	if (_language == nil)
178
179
180
181
182
183
184

185
186
187
188
189
190
191
	    [languageFile stringByAppendingString: @".json"]];

	[_localizedStrings addObject:
	    [[OFString stringWithContentsOfFile: languageFile] JSONValue]];

	objc_autoreleasePoolPop(pool);
}


- (OFString*)localizedStringForID: (OFConstantString*)ID
			 fallback: (OFConstantString*)fallback, ...
{
	OFString *ret;
	va_list args;








>







181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
	    [languageFile stringByAppendingString: @".json"]];

	[_localizedStrings addObject:
	    [[OFString stringWithContentsOfFile: languageFile] JSONValue]];

	objc_autoreleasePoolPop(pool);
}
#endif

- (OFString*)localizedStringForID: (OFConstantString*)ID
			 fallback: (OFConstantString*)fallback, ...
{
	OFString *ret;
	va_list args;