|
 |
5e19ecc |
diff -up rpm-4.7.90.git9301/lib/tagexts.c.fedora-specspo rpm-4.7.90.git9301/lib/tagexts.c
|
|
|
5e19ecc |
--- rpm-4.7.90.git9301/lib/tagexts.c.fedora-specspo 2009-09-02 13:59:38.000000000 +0300
|
|
|
5e19ecc |
+++ rpm-4.7.90.git9301/lib/tagexts.c 2009-09-02 14:51:10.000000000 +0300
|
|
|
5e19ecc |
@@ -460,12 +460,6 @@ static int filerequireTag(Header h, rpmt
|
|
|
4b92b80 |
}
|
|
|
4b92b80 |
|
|
|
4b92b80 |
/* I18N look aside diversions */
|
|
|
4b92b80 |
-
|
|
|
4b92b80 |
-#if defined(ENABLE_NLS)
|
|
|
4b92b80 |
-extern int _nl_msg_cat_cntr; /* XXX GNU gettext voodoo */
|
|
|
4b92b80 |
-#endif
|
|
|
4b92b80 |
-static const char * const language = "LANGUAGE";
|
|
|
4b92b80 |
-
|
|
|
4b92b80 |
static const char * const _macro_i18ndomains = "%{?_i18ndomains}";
|
|
|
4b92b80 |
|
|
|
4b92b80 |
/**
|
|
|
5e19ecc |
@@ -477,61 +471,27 @@ static const char * const _macro_i18ndom
|
|
|
4b92b80 |
*/
|
|
|
5e19ecc |
static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags)
|
|
|
4b92b80 |
{
|
|
|
4b92b80 |
- char * dstring = rpmExpand(_macro_i18ndomains, NULL);
|
|
|
4b92b80 |
- int rc;
|
|
|
5e19ecc |
-
|
|
|
4b92b80 |
- td->type = RPM_STRING_TYPE;
|
|
|
4b92b80 |
- td->data = NULL;
|
|
|
4b92b80 |
- td->count = 0;
|
|
|
4b92b80 |
-
|
|
|
4b92b80 |
- if (dstring && *dstring) {
|
|
|
4b92b80 |
- char *domain, *de;
|
|
|
4b92b80 |
- const char * langval;
|
|
|
4b92b80 |
- char * msgkey;
|
|
|
4b92b80 |
- const char * msgid;
|
|
|
4b92b80 |
-
|
|
|
5e19ecc |
- rasprintf(&msgkey, "%s(%s)", headerGetString(h, RPMTAG_NAME),
|
|
|
5e19ecc |
- rpmTagGetName(tag));
|
|
|
4b92b80 |
-
|
|
|
4b92b80 |
- /* change to en_US for msgkey -> msgid resolution */
|
|
|
4b92b80 |
- langval = getenv(language);
|
|
|
4b92b80 |
- (void) setenv(language, "en_US", 1);
|
|
|
4b92b80 |
-#if defined(ENABLE_NLS)
|
|
|
4b92b80 |
- ++_nl_msg_cat_cntr;
|
|
|
4b92b80 |
-#endif
|
|
|
5e19ecc |
+ int rc = headerGet(h, tag, td, HEADERGET_ALLOC);
|
|
|
5e19ecc |
+ if (rc) {
|
|
|
5e19ecc |
+ char *de, *dstring = rpmExpand(_macro_i18ndomains, NULL);
|
|
|
5e19ecc |
+ const char *domain;
|
|
|
5e19ecc |
|
|
|
4b92b80 |
- msgid = NULL;
|
|
|
4b92b80 |
for (domain = dstring; domain != NULL; domain = de) {
|
|
|
4b92b80 |
+ const char *msgid = td->data;
|
|
|
4b92b80 |
+ const char *msg = NULL;
|
|
|
4b92b80 |
+
|
|
|
4b92b80 |
de = strchr(domain, ':');
|
|
|
4b92b80 |
if (de) *de++ = '\0';
|
|
|
4b92b80 |
- msgid = dgettext(domain, msgkey);
|
|
|
4b92b80 |
- if (msgid != msgkey) break;
|
|
|
4b92b80 |
- }
|
|
|
4b92b80 |
-
|
|
|
4b92b80 |
- /* restore previous environment for msgid -> msgstr resolution */
|
|
|
4b92b80 |
- if (langval)
|
|
|
4b92b80 |
- (void) setenv(language, langval, 1);
|
|
|
4b92b80 |
- else
|
|
|
4b92b80 |
- unsetenv(language);
|
|
|
4b92b80 |
-#if defined(ENABLE_NLS)
|
|
|
4b92b80 |
- ++_nl_msg_cat_cntr;
|
|
|
4b92b80 |
-#endif
|
|
|
4b92b80 |
-
|
|
|
4b92b80 |
- if (domain && msgid) {
|
|
|
4b92b80 |
- td->data = dgettext(domain, msgid);
|
|
|
4b92b80 |
- td->data = xstrdup(td->data); /* XXX xstrdup has side effects. */
|
|
|
4b92b80 |
- td->count = 1;
|
|
|
4b92b80 |
- td->flags = RPMTD_ALLOCED;
|
|
|
4b92b80 |
+ msg = dgettext(domain, td->data);
|
|
|
4b92b80 |
+ if (msg != msgid) {
|
|
|
4b92b80 |
+ free(td->data);
|
|
|
4b92b80 |
+ td->data = xstrdup(msg);
|
|
|
4b92b80 |
+ break;
|
|
|
4b92b80 |
+ }
|
|
|
4b92b80 |
}
|
|
|
4b92b80 |
- dstring = _free(dstring);
|
|
|
4b92b80 |
- free(msgkey);
|
|
|
4b92b80 |
- if (td->data)
|
|
|
4b92b80 |
- return 1;
|
|
|
4b92b80 |
+ free(dstring);
|
|
|
4b92b80 |
}
|
|
|
5e19ecc |
|
|
|
4b92b80 |
- dstring = _free(dstring);
|
|
|
4b92b80 |
-
|
|
|
5e19ecc |
- rc = headerGet(h, tag, td, HEADERGET_ALLOC);
|
|
|
4b92b80 |
return rc;
|
|
|
4b92b80 |
}
|
|
|
4b92b80 |
|