Unified handling of unknown tag values, some messages were not translated

diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c
index 735de07..fd0925e 100644 (file)
--- a/libexif/olympus/mnote-olympus-entry.c
+++ b/libexif/olympus/mnote-olympus-entry.c
@@ -568,8 +568,8 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                        break;
                case EXIF_FORMAT_UNDEFINED:
                default:
-                       snprintf (v, maxlen, _("%li bytes unknown data: "),
-                                 (long int) entry->size);
+                       snprintf (v, maxlen, _("%i bytes unknown data: "),
+                                 entry->size);
                        for (i = 0; i < (int)entry->size; i++) {
                                sprintf (buf, "%02x", entry->data[i]);
                                strncat (v, buf, maxlen - strlen (v));

diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c
index 8866276..5e547d1 100644 (file)
--- a/libexif/pentax/mnote-pentax-entry.c
+++ b/libexif/pentax/mnote-pentax-entry.c
@@ -341,7 +341,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
                        /* search the tag */
                        for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++);
                        if (!items[i].tag) {
-                               strncpy (val, "Internal error", maxlen);
+                               strncpy (val, _("Internal error"), maxlen);
                                break;
                        }
 
@@ -350,7 +350,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
                            (items[i].elem[j].index < vs); j++);
                        if (items[i].elem[j].index != vs) {
                                snprintf (val, maxlen,
-                                         "Internal error (unknown value %i)", vs);
+                                         _("Internal error (unknown value %i)"), vs);
                                break;
                        }
                        strncpy (val, items[i].elem[j].string, maxlen);
@@ -364,7 +364,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
                        /* search the tag */
                        for (i = 0; (items2[i].tag && items2[i].tag != entry->tag); i++);
                        if (!items2[i].tag) {
-                               strncpy (val, "Internal error", maxlen);
+                               strncpy (val, _("Internal error"), maxlen);
                                break;
                        }
 
@@ -373,7 +373,7 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
                                || ((items2[i].elem[j].index2 == vs2) && (items2[i].elem[j].index1 < vs))); j++);
                        if ((items2[i].elem[j].index1 != vs) || (items2[i].elem[j].index2 != vs2)) {
                                snprintf (val, maxlen,
-                                         "Internal error (unknown value %i %i )", vs, vs2);
+                                         _("Internal error (unknown value %i %i)"), vs, vs2);
                                break;
                        }
                        strncpy (val, items2[i].elem[j].string, maxlen);
@@ -389,8 +389,8 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
        case MNOTE_PENTAX_TAG_PRINTIM:
                CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
                CC (entry->components, 124, val, maxlen);
-               snprintf (val, maxlen, "%li bytes unknown data",
-                         entry->components);
+               snprintf (val, maxlen, _("%i bytes unknown data"),
+                       entry->size);
                break;
        case MNOTE_PENTAX_TAG_TZ_CITY:
                CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
@@ -417,8 +417,8 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
                  break;
                case EXIF_FORMAT_UNDEFINED:
                default:
-                 snprintf (val, maxlen, "%li bytes unknown data",
-                           entry->components);
+                 snprintf (val, maxlen, _("%i bytes unknown data"),
+                         entry->size);
                  break;
                }
                break;