diff options
| -rw-r--r-- | navit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | navit/Makefile.am | 2 | ||||
| -rw-r--r-- | navit/android.c | 4 | ||||
| -rw-r--r-- | navit/command.c | 2 | ||||
| -rw-r--r-- | navit/country.c | 6 | ||||
| -rw-r--r-- | navit/gui/gtk/destination.c | 2 | ||||
| -rw-r--r-- | navit/gui/gtk/gui_gtk_action.c | 5 | ||||
| -rw-r--r-- | navit/navigation.c | 8 | ||||
| -rw-r--r-- | navit/navit_nls.c | 32 | ||||
| -rw-r--r-- | navit/navit_nls.h | 26 |
10 files changed, 51 insertions, 38 deletions
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index ee59a7673..310aac0cc 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/support") # navit cre set(NAVIT_SRC announcement.c atom.c attr.c cache.c callback.c command.c compass.c config_.c coord.c country.c data_window.c debug.c event.c file.c geom.c graphics.c gui.c item.c layout.c log.c main.c map.c maps.c - linguistics.c mapset.c maptype.c menu.c messages.c bookmarks.c navit.c navigation.c osd.c param.c phrase.c plugin.c popup.c + linguistics.c mapset.c maptype.c menu.c messages.c bookmarks.c navit.c navit_nls.c navigation.c osd.c param.c phrase.c plugin.c popup.c profile.c profile_option.c projection.c roadprofile.c route.c routech.c search.c speech.c start_real.c sunriset.c transform.c track.c util.c vehicle.c vehicleprofile.c xmlconfig.c ) diff --git a/navit/Makefile.am b/navit/Makefile.am index 139fdde75..99daddfe0 100644 --- a/navit/Makefile.am +++ b/navit/Makefile.am @@ -58,7 +58,7 @@ lib@LIBNAVIT@_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c comma map_data.h mapset.h maptype.h menu.h messages.h navigation.h navit.h osd.h \ param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h roadprofile.h search.h speech.h start_real.h \ transform.h track.h types.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \ - navit_nls.h sunriset.c sunriset.h glib_slice.h + navit_nls.c navit_nls.h sunriset.c sunriset.h glib_slice.h XSLTS=@XSLTS@ navit.xml: navit_shipped.xml $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt)))) navit_android_xml diff --git a/navit/android.c b/navit/android.c index 73a8382d6..5c0585fd9 100644 --- a/navit/android.c +++ b/navit/android.c @@ -198,7 +198,7 @@ Java_org_navitproject_navit_NavitGraphics_CallbackLocalizedString( JNIEnv* env, s=(*env)->GetStringUTFChars(env, str, NULL); //dbg(0,"*****string=%s\n",s); - localized_str=gettext(s); + localized_str=navit_nls_gettext(s); //dbg(0,"localized string=%s",localized_str); // jstring dataStringValue = (jstring) localized_str; @@ -441,7 +441,7 @@ Java_org_navitproject_navit_NavitGraphics_GetAllCountries( JNIEnv* env, jobject if (strlen(res->country->iso2)==2) { jstring j_iso2 = (*env)->NewStringUTF(env, res->country->iso2); - jstring j_name = (*env)->NewStringUTF(env, gettext(res->country->name)); + jstring j_name = (*env)->NewStringUTF(env, navit_nls_gettext(res->country->name)); current_country = (jobjectArray)(*env)->NewObjectArray(env, 2, (*env)->FindClass(env, "java/lang/String"), NULL); diff --git a/navit/command.c b/navit/command.c index 9b21c3f10..d981c6b66 100644 --- a/navit/command.c +++ b/navit/command.c @@ -643,7 +643,7 @@ command_call_function(struct context *ctx, struct result *res) if (!strcmp(function,"_") && list && list[0] && list[0]->type >= attr_type_string_begin && list[0]->type <= attr_type_string_end) { result_free(res); res->attr.type=list[0]->type; - res->attr.u.str=g_strdup(gettext(list[0]->u.str)); + res->attr.u.str=g_strdup(navit_nls_gettext(list[0]->u.str)); res->allocated=1; } else if (!strncmp(function,"new ",4)) { diff --git a/navit/country.c b/navit/country.c index 52e5b0ef1..5375a22e6 100644 --- a/navit/country.c +++ b/navit/country.c @@ -317,7 +317,7 @@ country_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr) } return 0; case attr_label: - attr->u.str=gettext(country->name); + attr->u.str=navit_nls_gettext(country->name); this_->attr_next=attr_country_id; return 1; case attr_country_id: @@ -337,7 +337,7 @@ country_attr_get(void *priv_data, enum attr_type attr_type, struct attr *attr) this_->attr_next=attr_country_name; return 1; case attr_country_name: - attr->u.str=gettext(country->name); + attr->u.str=navit_nls_gettext(country->name); this_->attr_next=attr_none; return 1; default: @@ -403,7 +403,7 @@ country_search_get_item(struct country_search *this_) match(this_, attr_country_iso3, this_->country->iso3) || match(this_, attr_country_iso2, this_->country->iso2) || match(this_, attr_country_car, this_->country->car) || - match(this_, attr_country_name, gettext(this_->country->name))) { + match(this_, attr_country_name, navit_nls_gettext(this_->country->name))) { this_->item.id_lo=this_->country->id; return &this_->item; } diff --git a/navit/gui/gtk/destination.c b/navit/gui/gtk/destination.c index 48efc73b4..92236fc3e 100644 --- a/navit/gui/gtk/destination.c +++ b/navit/gui/gtk/destination.c @@ -148,7 +148,7 @@ static void set_columns(struct search_param *param, int mode) g_list_free(columns_list); while (*column_text) { GtkCellRenderer *cell=gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (param->treeview),-1, gettext(*column_text), cell, "text", i, NULL); + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (param->treeview),-1, navit_nls_gettext(*column_text), cell, "text", i, NULL); i++; column_text++; } diff --git a/navit/gui/gtk/gui_gtk_action.c b/navit/gui/gtk/gui_gtk_action.c index 4b2652c63..5f8b19427 100644 --- a/navit/gui/gtk/gui_gtk_action.c +++ b/navit/gui/gtk/gui_gtk_action.c @@ -32,10 +32,7 @@ #include "callback.h" #include "debug.h" #include "destination.h" - -#define gettext_noop(String) String -#define _(STRING) gettext(STRING) -#define _n(STRING) gettext_noop(STRING) +#include "navit_nls.h" struct menu_priv { char *path; diff --git a/navit/navigation.c b/navit/navigation.c index 201474835..fcec55d2a 100644 --- a/navit/navigation.c +++ b/navit/navigation.c @@ -464,14 +464,14 @@ get_distance(struct navigation *nav, int dist, enum attr_type type, int is_lengt } if (imperial) { if (is_length) - return g_strdup_printf(ngettext("one mile","%d miles", dist/1000), dist/1000); + return g_strdup_printf(navit_nls_ngettext("one mile","%d miles", dist/1000), dist/1000); else - return g_strdup_printf(ngettext("in one mile","in %d miles", dist/1000), dist/1000); + return g_strdup_printf(navit_nls_ngettext("in one mile","in %d miles", dist/1000), dist/1000); } else { if (is_length) - return g_strdup_printf(ngettext("one kilometer","%d kilometers", dist/1000), dist/1000); + return g_strdup_printf(navit_nls_ngettext("one kilometer","%d kilometers", dist/1000), dist/1000); else - return g_strdup_printf(ngettext("in one kilometer","in %d kilometers", dist/1000), dist/1000); + return g_strdup_printf(navit_nls_ngettext("in one kilometer","in %d kilometers", dist/1000), dist/1000); } } diff --git a/navit/navit_nls.c b/navit/navit_nls.c new file mode 100644 index 000000000..9d670f153 --- /dev/null +++ b/navit/navit_nls.c @@ -0,0 +1,32 @@ +#include "config.h" +#include "debug.h" + +#ifdef USE_LIBGNUINTL +#include <libgnuintl.h> +#else +#include <libintl.h> +#endif + + +const char * +navit_nls_gettext(const char *msgid) +{ +#ifdef ENABLE_NLS + return gettext(msgid); +#else + return msgid; +#endif +} + +const char * +navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n) +{ +#ifdef ENABLE_NLS +#else + if (n == 1) { + return msgid; + } else { + return msgid_plural; + } +#endif +} diff --git a/navit/navit_nls.h b/navit/navit_nls.h index 560d87158..764cd824a 100644 --- a/navit/navit_nls.h +++ b/navit/navit_nls.h @@ -1,27 +1,11 @@ #ifndef __NAVIT_NLS_H__ -#include "config.h" -#ifdef ENABLE_NLS -#ifdef USE_LIBGNUINTL -#include <libgnuintl.h> -#else -#include <libintl.h> -#endif -#define _(STRING) gettext(STRING) +const char *navit_nls_gettext(const char *msgid); +const char *navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n); + +#define _(STRING) navit_nls_gettext(STRING) #define gettext_noop(String) String #define _n(STRING) gettext_noop(STRING) -#else -#define _(STRING) STRING -#define _n(STRING) STRING -#define gettext(STRING) STRING -static inline const char *ngettext(const char *msgid, const char *msgid_plural, unsigned long int n) -{ - if (n == 1) { - return msgid; - } else { - return msgid_plural; - } -} -#endif + #define __NAVIT_NLS_H__ #endif |