Differences From Artifact [d21618db7e]:
- File
src/OFLocalization.h
— part of check-in
[2f4e0df8be]
at
2017-10-17 00:33:37
on branch trunk
— Do not use implicit method return types
Instead, explicitly declare them, as OF_ASSUME_NONNULL_{BEGIN,END} does
not apply to implicit return types. This means that after this commit,
all init methods have a nonnull return type, as they should have. (user: js, size: 6100) [annotate] [blame] [check-ins using]
To Artifact [049d31c9e7]:
- File
src/OFLocalization.h
— part of check-in
[a2e849c681]
at
2017-10-30 00:23:35
on branch trunk
— Add class properties where appropriate
This improves Swift compatibility. (user: js, size: 6533) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 | OFString *_Nullable _language, *_Nullable _territory; of_string_encoding_t _encoding; OFString *_decimalPoint; OFMutableArray OF_GENERIC(OFDictionary OF_GENERIC(OFString *, id) *) *_localizedStrings; } /*! * The language of the locale for messages. * * If the language is unknown, it is `nil`. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *language; | > > > > > > > > > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
OFString *_Nullable _language, *_Nullable _territory;
of_string_encoding_t _encoding;
OFString *_decimalPoint;
OFMutableArray OF_GENERIC(OFDictionary OF_GENERIC(OFString *, id) *)
*_localizedStrings;
}
#ifdef OF_HAVE_CLASS_PROPERTIES
@property (class, readonly, nullable, nonatomic)
OFLocalization *sharedLocalization;
@property (class, readonly, nullable, nonatomic) OFString *language;
@property (class, readonly, nullable, nonatomic) OFString *territory;
@property (class, readonly, nonatomic) of_string_encoding_t encoding;
@property (class, readonly, nullable, nonatomic) OFString *decimalPoint;
#endif
/*!
* The language of the locale for messages.
*
* If the language is unknown, it is `nil`.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *language;
|
| ︙ | ︙ | |||
77 78 79 80 81 82 83 | * * @warning If you don't use @ref OFApplication, this might be `nil`! In this * case, you need to manually allocate an instance and call * @ref init once. * * @return The shared OFLocalization instance */ | | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | * * @warning If you don't use @ref OFApplication, this might be `nil`! In this * case, you need to manually allocate an instance and call * @ref init once. * * @return The shared OFLocalization instance */ + (nullable OFLocalization *)sharedLocalization; /*! * @brief Returns the language of the locale. * * If the language is unknown, `nil` is returned. * * @return The language of the locale. |
| ︙ | ︙ | |||
114 115 116 117 118 119 120 | + (of_string_encoding_t)encoding; /*! * @brief Returns the decimal point of the system's locale. * * @return The decimal point of the system's locale */ | | | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | + (of_string_encoding_t)encoding; /*! * @brief Returns the decimal point of the system's locale. * * @return The decimal point of the system's locale */ + (nullable 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 */ |
| ︙ | ︙ |