Only call bindtextdomain if a translated string is being returned.
authorDan Fandrich <dan@coneharvesters.com>
Fri, 18 Dec 2009 01:34:26 +0000 (17:34 -0800)
committerDan Fandrich <dan@coneharvesters.com>
Fri, 18 Dec 2009 01:34:26 +0000 (17:34 -0800)
libexif/canon/mnote-canon-tag.c
libexif/fuji/mnote-fuji-tag.c
libexif/olympus/mnote-olympus-tag.c
libexif/pentax/mnote-pentax-tag.c

index c640138..6ef73a4 100644 (file)
@@ -190,12 +190,12 @@ mnote_canon_tag_get_description (MnoteCanonTag t)
 {
        unsigned int i;
 
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
                if (table[i].tag == t) {
                        if (!*table[i].description)
                                return "";
-                       return (_(table[i].description));
+                       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+                       return _(table[i].description);
                }
        return NULL;
 }
index a2f8445..eba3777 100644 (file)
@@ -94,12 +94,12 @@ mnote_fuji_tag_get_description (MnoteFujiTag t)
 {
        unsigned int i;
 
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
                if (table[i].tag == t) {
                        if (!*table[i].description)
                                return "";
-                       return (_(table[i].description));
+                       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+                       return _(table[i].description);
                }
        return NULL;
 }
index ae7c124..1250d24 100644 (file)
@@ -219,12 +219,12 @@ mnote_olympus_tag_get_description (MnoteOlympusTag t)
 {
        unsigned int i;
 
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
                if (table[i].tag == t) {
                        if (!table[i].description || !*table[i].description)
                                return "";
-                       return (_(table[i].description));
+                       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+                       return _(table[i].description);
                }
        return NULL;
 }
index 049417c..20afbbe 100644 (file)
@@ -164,12 +164,12 @@ mnote_pentax_tag_get_description (MnotePentaxTag t)
 {
        unsigned int i;
 
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
                if (table[i].tag == t) {
                        if (!table[i].description || !*table[i].description)
                                return "";
-                       return (_(table[i].description));
+                       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+                       return _(table[i].description);
                }
        return NULL;
 }