From 354d116e2ad3b281527c4ff01c7cfbb91f5cdf43 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 17 Mar 2005 17:00:30 +0100 Subject: [PATCH] use LOCALEDIR instead of _LOCALEDIR --- configure.in | 3 +-- libexif/canon/mnote-canon-tag.c | 4 ++-- libexif/exif-entry.c | 2 +- libexif/exif-format.c | 2 +- libexif/exif-tag.c | 6 +++--- libexif/olympus/mnote-olympus-tag.c | 4 ++-- libexif/pentax/mnote-pentax-tag.c | 4 ++-- test/nls/print-localedir.c | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/configure.in b/configure.in index 444c0db..a8562e9 100644 --- a/configure.in +++ b/configure.in @@ -63,8 +63,7 @@ dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as dnl we require make to do insert the proper $(datadir) value localedir="\$(datadir)/locale" AC_SUBST(localedir) -AM_CFLAGS="$AM_CFLAGS -DLIBEXIF_LOCALEDIR=\\\"${localedir}\\\"" -AM_CFLAGS="$AM_CFLAGS -DLIBMNOTE_LOCALEDIR=\\\"${localedir}\\\"" +AM_CFLAGS="$AM_CFLAGS -DLOCALEDIR=\\\"${localedir}\\\"" dnl --------------------------------------------------------------------------- diff --git a/libexif/canon/mnote-canon-tag.c b/libexif/canon/mnote-canon-tag.c index 7798390..890a5fc 100644 --- a/libexif/canon/mnote-canon-tag.c +++ b/libexif/canon/mnote-canon-tag.c @@ -57,7 +57,7 @@ mnote_canon_tag_get_title (MnoteCanonTag t) { unsigned int i; - bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) if (table[i].tag == t) return (_(table[i].title)); return NULL; @@ -68,7 +68,7 @@ mnote_canon_tag_get_description (MnoteCanonTag t) { unsigned int i; - bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) if (table[i].tag == t) return (_(table[i].description)); return NULL; diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c index 83eedd2..d238fdd 100644 --- a/libexif/exif-entry.c +++ b/libexif/exif-entry.c @@ -566,7 +566,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) }; bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); /* We need the byte order */ if (!e || !e->parent || !e->parent->parent) diff --git a/libexif/exif-format.c b/libexif/exif-format.c index ec61f54..1e51394 100644 --- a/libexif/exif-format.c +++ b/libexif/exif-format.c @@ -51,7 +51,7 @@ exif_format_get_name (ExifFormat format) unsigned int i; bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); for (i = 0; ExifFormatTable[i].name; i++) if (ExifFormatTable[i].format == format) diff --git a/libexif/exif-tag.c b/libexif/exif-tag.c index 1401f49..0cef378 100644 --- a/libexif/exif-tag.c +++ b/libexif/exif-tag.c @@ -266,7 +266,7 @@ static struct { "as unknown.")}, {EXIF_TAG_EXPOSURE_TIME, "ExposureTime", N_("Exposure Time"), N_("Exposure time, given in seconds (sec).")}, - {EXIF_TAG_FNUMBER, "FNumber", "FNumber", + {EXIF_TAG_FNUMBER, "FNumber", N_("FNumber"), N_("The F number.")}, {EXIF_TAG_IPTC_NAA, "IPTC/NAA", "IPTC/NAA", ""}, {EXIF_TAG_IMAGE_RESOURCES, "ImageResources", N_("Image Resources Block"), ""}, @@ -640,7 +640,7 @@ exif_tag_get_title (ExifTag tag) unsigned int i; bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); for (i = 0; ExifTagTable[i].title; i++) if (ExifTagTable[i].tag == tag) break; @@ -653,7 +653,7 @@ exif_tag_get_description (ExifTag tag) unsigned int i; bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); for (i = 0; ExifTagTable[i].description; i++) if (ExifTagTable[i].tag == tag) break; diff --git a/libexif/olympus/mnote-olympus-tag.c b/libexif/olympus/mnote-olympus-tag.c index b40c224..b7beacd 100644 --- a/libexif/olympus/mnote-olympus-tag.c +++ b/libexif/olympus/mnote-olympus-tag.c @@ -137,7 +137,7 @@ mnote_olympus_tag_get_title (MnoteOlympusTag t) { unsigned int i; - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) if (table[i].tag == t) return (_(table[i].title)); return NULL; @@ -148,7 +148,7 @@ mnote_olympus_tag_get_description (MnoteOlympusTag t) { unsigned int i; - bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) if (table[i].tag == t) return (_(table[i].description)); return NULL; diff --git a/libexif/pentax/mnote-pentax-tag.c b/libexif/pentax/mnote-pentax-tag.c index eb3e8d2..76823a4 100644 --- a/libexif/pentax/mnote-pentax-tag.c +++ b/libexif/pentax/mnote-pentax-tag.c @@ -76,7 +76,7 @@ mnote_pentax_tag_get_title (MnotePentaxTag t) { unsigned int i; - bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) if (table[i].tag == t) return (_(table[i].title)); return NULL; @@ -87,7 +87,7 @@ mnote_pentax_tag_get_description (MnotePentaxTag t) { unsigned int i; - bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) if (table[i].tag == t) return (_(table[i].description)); return NULL; diff --git a/test/nls/print-localedir.c b/test/nls/print-localedir.c index ab1392b..54a554e 100644 --- a/test/nls/print-localedir.c +++ b/test/nls/print-localedir.c @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { - puts(LIBEXIF_LOCALEDIR); + puts(LOCALEDIR); puts("\n"); return 0; } -- 2.7.4