witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Define ENABLE_NLS instead of HAVE_INTL when internationalization is available

Browse source
This commit is contained in:
François Grisez 2015-07-07 14:00:32 +02:00
parent 56055005a5
commit 74fa01a0e2
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.h.cmake
View file

@ -42,4 +42,4 @@
#cmakedefine HAVE_ZLIB 1
#cmakedefine HAVE_CU_GET_SUITE 1
#cmakedefine HAVE_CU_CURSES 1
#cmakedefine HAVE_INTL 1
#cmakedefine ENABLE_NLS 1

4
console/linphonec.c
View file

@ -65,7 +65,7 @@
#endif /*_WIN32_WCE*/
#ifdef HAVE_INTL
#ifdef ENABLE_NLS
#include <libintl.h>
#ifndef _
#define _(String) gettext(String)
@ -714,7 +714,7 @@ linphonec_init(int argc, char **argv)
default:
break;
}
#ifdef HAVE_INTL
#ifdef ENABLE_NLS
if (NULL == bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR))
perror ("bindtextdomain failed");
#ifndef __ARM__

2
coreapi/misc.c
View file

@ -96,7 +96,7 @@ void linphone_core_set_payload_type_number(LinphoneCore *lc, PayloadType *pt, in
const char *linphone_core_get_payload_type_description(LinphoneCore *lc, PayloadType *pt){
if (ms_filter_codec_supported(pt->mime_type)){
MSFilterDesc *desc=ms_filter_get_encoder(pt->mime_type);
#ifdef HAVE_INTL
#ifdef ENABLE_NLS
return dgettext("mediastreamer",desc->text);
#else
return desc->text;

2
coreapi/private.h
View file

@ -65,7 +65,7 @@ extern "C" {
#define PACKAGE_DATA_DIR "."
#endif
#ifdef HAVE_INTL
#ifdef ENABLE_NLS
#include <libintl.h>
#ifndef _
#define _(String) dgettext(GETTEXT_PACKAGE,String)

2
gtk/linphone.h
View file

@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "ldap/ldapprovider.h"
#ifdef HAVE_INTL
#ifdef ENABLE_NLS
# include <libintl.h>
# undef _
# define _(String) dgettext (GETTEXT_PACKAGE,String)

6
gtk/main.c
View file

@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <libnotify/notify.h>
#endif
#ifdef HAVE_INTL
#ifdef ENABLE_NLS
#include <locale.h>
#endif
@ -2098,7 +2098,7 @@ int main(int argc, char *argv[]){
g_setenv("LANGUAGE",lang,1);
}
#ifdef HAVE_INTL
#ifdef ENABLE_NLS
setlocale(LC_ALL, "");
bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@ -2148,7 +2148,7 @@ int main(int argc, char *argv[]){
}
}
#if defined(__APPLE__) && defined(HAVE_INTL)
#if defined(__APPLE__) && defined(ENABLE_NLS)
/*workaround for bundles. GTK is unable to find translations in the bundle (obscure bug again).
So we help it:*/
{

2
intl/libgettext.h
View file

@ -20,7 +20,7 @@
#define _LIBGETTEXT_H 1
/* NLS can be disabled through the configure --disable-nls option. */
#if HAVE_INTL
#if ENABLE_NLS
/* Get declarations of GNU message catalog functions. */
# include <libintl.h>