forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
- Loading branch information
Showing
259 changed files
with
30,077 additions
and
25,941 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
LOCAL_PATH := $(call my-dir) | ||
|
||
########################### | ||
# | ||
# libintl-lite shared library | ||
# | ||
########################### | ||
|
||
include $(CLEAR_VARS) | ||
|
||
LOCAL_MODULE := libintl-lite | ||
|
||
LOCAL_C_INCLUDES := $(LOCAL_PATH) | ||
|
||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) | ||
|
||
LOCAL_SRC_FILES := libintl.cpp | ||
|
||
LOCAL_CPP_FEATURES := exceptions rtti | ||
|
||
LOCAL_LDLIBS := -llog | ||
|
||
include $(BUILD_SHARED_LIBRARY) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
Boost Software License - Version 1.0 - August 17th, 2003 | ||
|
||
Permission is hereby granted, free of charge, to any person or organization | ||
obtaining a copy of the software and accompanying documentation covered by | ||
this license (the "Software") to use, reproduce, display, distribute, | ||
execute, and transmit the Software, and to prepare derivative works of the | ||
Software, and to permit third-parties to whom the Software is furnished to | ||
do so, all subject to the following: | ||
|
||
The copyright notices in the Software and this entire statement, including | ||
the above license grant, this restriction and the following disclaimer, | ||
must be included in all copies of the Software, in whole or in part, and | ||
all derivative works of the Software, unless such copies or derivative | ||
works are solely in the form of machine-executable object code generated by | ||
a source language processor. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT | ||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE | ||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, | ||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
DEALINGS IN THE SOFTWARE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
/* | ||
Boost Software License - Version 1.0 - August 17th, 2003 | ||
Permission is hereby granted, free of charge, to any person or organization | ||
obtaining a copy of the software and accompanying documentation covered by | ||
this license (the "Software") to use, reproduce, display, distribute, | ||
execute, and transmit the Software, and to prepare derivative works of the | ||
Software, and to permit third-parties to whom the Software is furnished to | ||
do so, all subject to the following: | ||
The copyright notices in the Software and this entire statement, including | ||
the above license grant, this restriction and the following disclaimer, | ||
must be included in all copies of the Software, in whole or in part, and | ||
all derivative works of the Software, unless such copies or derivative | ||
works are solely in the form of machine-executable object code generated by | ||
a source language processor. | ||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT | ||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE | ||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, | ||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
DEALINGS IN THE SOFTWARE. | ||
*/ | ||
|
||
#ifndef LIBINTL_INTERNAL_MESSAGECATALOG_HPP_ | ||
#define LIBINTL_INTERNAL_MESSAGECATALOG_HPP_ | ||
|
||
#include <algorithm> | ||
#include <string> | ||
|
||
namespace libintllite | ||
{ | ||
|
||
namespace internal | ||
{ | ||
|
||
class MessageCatalog | ||
{ | ||
private: | ||
MessageCatalog( const MessageCatalog & ); | ||
MessageCatalog &operator=( const MessageCatalog & ); | ||
|
||
uint32_t numberOfStrings; | ||
const std::string *sortedOrigStringsArray; | ||
const std::string *translatedStringsArray; | ||
|
||
public: | ||
// The ownership of these arrays is transfered to the created message | ||
// catalog object! | ||
// Does not throw exceptions! | ||
MessageCatalog( uint32_t numberOfStrings, | ||
const std::string *sortedOrigStringsArray, | ||
const std::string *translatedStringsArray ) : | ||
numberOfStrings( numberOfStrings ), | ||
sortedOrigStringsArray( sortedOrigStringsArray ), | ||
translatedStringsArray( translatedStringsArray ) { | ||
} | ||
|
||
~MessageCatalog() { | ||
delete[] this->sortedOrigStringsArray; | ||
delete[] this->translatedStringsArray; | ||
} | ||
|
||
// Returns NULL, if the original string was not found. | ||
// Does not throw exceptions! | ||
const std::string *getTranslatedStrPtr( const std::string &orig ) const { | ||
const std::string *lastSortedOrigStringEndIter | ||
= this->sortedOrigStringsArray + this->numberOfStrings; | ||
const std::string *origStrPtr = std::lower_bound( this->sortedOrigStringsArray, | ||
lastSortedOrigStringEndIter, | ||
orig ); | ||
#ifdef __ANDROID__ | ||
// Bugfix from j-jorge's branch of libintl-lite: https://github.com/j-jorge/libintl-lite/commit/40e5a41e9b19e3252d348e0548f85e66fa44a79e | ||
// However, libintl-lite does not seem to support plural form strings + translations properly, so I've had to modify the fix further. | ||
// Plural strings are stored as "<singular>NUL<plural>NUL<plural>..." for as many plurals are in the language, eg. Russian has 4, French has 2, Japanese has 1. | ||
// So we only compare the first singular string as per gettext MO files spec here: https://www.gnu.org/software/gettext/manual/html_node/MO-Files.html | ||
// We do this via c_str() which clamps at the first NUL character. | ||
// Later on once we have a match, we will dig out the proper plural translation from this megastring. | ||
if( !origStrPtr || ( origStrPtr == lastSortedOrigStringEndIter ) || | ||
( std::string( ( *origStrPtr ).c_str() ) != std::string( orig.c_str() ) ) ) | ||
#else | ||
if( !origStrPtr || ( origStrPtr == lastSortedOrigStringEndIter ) ) | ||
#endif | ||
{ | ||
return NULL; | ||
} else { | ||
return &this->translatedStringsArray[origStrPtr - this->sortedOrigStringsArray]; | ||
} | ||
} | ||
}; | ||
|
||
} // namespace internal | ||
|
||
} // namespace libintllite | ||
|
||
#endif // LIBINTL_INTERNAL_MESSAGECATALOG_HPP_ |
Oops, something went wrong.