Overview
| Comment: | Fix compilation with --disable-files |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
1bf4f2e210f7a1f9ac145330fe429e2f |
| User & Date: | js on 2017-03-12 23:40:19 |
| Other Links: | manifest | tags |
Context
|
2017-03-20
| ||
| 22:50 | of_explicit_memset(): Add explicit cast for C++ check-in: 1ff91c7491 user: js tags: trunk | |
|
2017-03-12
| ||
| 23:40 | Fix compilation with --disable-files check-in: 1bf4f2e210 user: js tags: trunk | |
| 02:34 | Handle strerror_r being different with _GNU_SOURCE check-in: ff538c8d26 user: js tags: trunk | |
Changes
Modified src/OFLocalization.h from [e9be33b3dd] to [9465b8ba1c].
| ︙ | ︙ | |||
118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | /*! * @brief Returns the decimal point of the system's locale. * * @return The decimal point of the system's locale */ + (OFString*)decimalPoint; /*! * @brief Adds a directory to scan for language files. * * @param path The path to the directory to scan for language files */ + (void)addLanguageDirectory: (OFString*)path; /*! * @brief Initializes the OFLocalization singleton with the specified locale. * * @warning You should never call this yourself, except if you do not use * @ref OFApplication. In this case, you need to allocate exactly one * instance of OFLocalization, which will be come the singleton, and * call this method. * * @param locale The locale used, as returned from `setlocale()` */ - initWithLocale: (char*)locale; /*! * @brief Adds a directory to scan for language files. * * @param path The path to the directory to scan for language files */ - (void)addLanguageDirectory: (OFString*)path; /*! * @brief Returns the localized string for the specified ID, using the fallback * string if it cannot be looked up or is missing. * * @note This takes a variadic argument, terminated by `nil`, that consists of * pairs of variable names and variable values, which will be replaced | > > > > | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | /*! * @brief Returns the decimal point of the system's locale. * * @return The decimal point of the system's locale */ + (OFString*)decimalPoint; #ifdef OF_HAVE_FILES /*! * @brief Adds a directory to scan for language files. * * @param path The path to the directory to scan for language files */ + (void)addLanguageDirectory: (OFString*)path; #endif /*! * @brief Initializes the OFLocalization singleton with the specified locale. * * @warning You should never call this yourself, except if you do not use * @ref OFApplication. In this case, you need to allocate exactly one * instance of OFLocalization, which will be come the singleton, and * call this method. * * @param locale The locale used, as returned from `setlocale()` */ - initWithLocale: (char*)locale; #ifdef OF_HAVE_FILES /*! * @brief Adds a directory to scan for language files. * * @param path The path to the directory to scan for language files */ - (void)addLanguageDirectory: (OFString*)path; #endif /*! * @brief Returns the localized string for the specified ID, using the fallback * string if it cannot be looked up or is missing. * * @note This takes a variadic argument, terminated by `nil`, that consists of * pairs of variable names and variable values, which will be replaced |
| ︙ | ︙ |
Modified src/OFLocalization.m from [4d020bd421] to [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;
|
| ︙ | ︙ |
Modified src/OFString.m from [d951599798] to [99b26a69a8].
| ︙ | ︙ | |||
974 975 976 977 978 979 980 |
}
- initWithContentsOfURL: (OFURL*)URL
encoding: (of_string_encoding_t)encoding
{
void *pool;
OFString *scheme;
| | | 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 |
}
- initWithContentsOfURL: (OFURL*)URL
encoding: (of_string_encoding_t)encoding
{
void *pool;
OFString *scheme;
# ifdef OF_HAVE_FILES
Class c = [self class];
# endif
[self release];
pool = objc_autoreleasePoolPush();
|
| ︙ | ︙ |
Modified tests/Makefile from [e3ac8e67cf] to [2bdc0e082a].
| ︙ | ︙ | |||
10 11 12 13 14 15 16 |
PROG_NOINST = tests${PROG_SUFFIX}
SRCS = ForwardingTests.m \
OFArrayTests.m \
${OFBLOCKTESTS_M} \
OFDataArrayTests.m \
OFDateTests.m \
OFDictionaryTests.m \
| < > | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 |
PROG_NOINST = tests${PROG_SUFFIX}
SRCS = ForwardingTests.m \
OFArrayTests.m \
${OFBLOCKTESTS_M} \
OFDataArrayTests.m \
OFDateTests.m \
OFDictionaryTests.m \
OFJSONTests.m \
OFListTests.m \
OFNumberTests.m \
OFObjectTests.m \
OFSetTests.m \
OFStreamTests.m \
OFStringTests.m \
OFURLTests.m \
OFXMLElementBuilderTests.m \
OFXMLNodeTests.m \
OFXMLParserTests.m \
PBKDF2Tests.m \
RuntimeTests.m \
ScryptTests.m \
TestsAppDelegate.m \
${USE_SRCS_FILES} \
${USE_SRCS_PLUGINS} \
${USE_SRCS_SOCKETS} \
${USE_SRCS_THREADS} \
${OFHTTPCLIENTTESTS_M}
SRCS_FILES = OFHMACTests.m \
OFINIFileTests.m \
OFMD5HashTests.m \
OFRIPEMD160HashTests.m \
OFSerializationTests.m \
OFSHA1HashTests.m \
OFSHA224HashTests.m \
OFSHA256HashTests.m \
OFSHA384HashTests.m \
|
| ︙ | ︙ |