If the translated message is empty return the original message
(bug #797570, STR #4033).
This commit is contained in:
parent
1b8e2d6fcd
commit
746458f777
12
cups-translation.patch
Normal file
12
cups-translation.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up cups-1.5.2/cups/language.c.translation cups-1.5.2/cups/language.c
|
||||||
|
--- cups-1.5.2/cups/language.c.translation 2011-11-01 07:06:15.000000000 +0100
|
||||||
|
+++ cups-1.5.2/cups/language.c 2012-02-28 10:54:58.448744034 +0100
|
||||||
|
@@ -1134,7 +1134,7 @@ _cupsMessageLookup(cups_array_t *a, /* I
|
||||||
|
}
|
||||||
|
#endif /* __APPLE__ && CUPS_BUNDLEDIR */
|
||||||
|
|
||||||
|
- if (match && match->str)
|
||||||
|
+ if (match && match->str && (strlen(match->str) > 0))
|
||||||
|
return (match->str);
|
||||||
|
else
|
||||||
|
return (m);
|
10
cups.spec
10
cups.spec
@ -19,7 +19,7 @@
|
|||||||
Summary: Common Unix Printing System
|
Summary: Common Unix Printing System
|
||||||
Name: cups
|
Name: cups
|
||||||
Version: 1.5.2
|
Version: 1.5.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
|
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
|
||||||
@ -78,6 +78,7 @@ Patch35: cups-icc.patch
|
|||||||
Patch36: cups-systemd-socket.patch
|
Patch36: cups-systemd-socket.patch
|
||||||
Patch37: cups-str4014.patch
|
Patch37: cups-str4014.patch
|
||||||
Patch38: cups-polld-reconnect.patch
|
Patch38: cups-polld-reconnect.patch
|
||||||
|
Patch39: cups-translation.patch
|
||||||
|
|
||||||
Patch100: cups-lspp.patch
|
Patch100: cups-lspp.patch
|
||||||
|
|
||||||
@ -301,6 +302,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
|
|||||||
# cups-polld: restart polling on error (bug #769292, STR #4031).
|
# cups-polld: restart polling on error (bug #769292, STR #4031).
|
||||||
%patch38 -p1 -b .polld-reconnect
|
%patch38 -p1 -b .polld-reconnect
|
||||||
|
|
||||||
|
# If the translated message is empty return the original message (bug #797570, STR #4033).
|
||||||
|
%patch39 -p1 -b .translation
|
||||||
|
|
||||||
%if %lspp
|
%if %lspp
|
||||||
# LSPP support.
|
# LSPP support.
|
||||||
%patch100 -p1 -b .lspp
|
%patch100 -p1 -b .lspp
|
||||||
@ -660,6 +664,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man1/ipptool.1.gz
|
%{_mandir}/man1/ipptool.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 28 2012 Jiri Popelka <jpopelka@redhat.com> 1:1.5.2-5
|
||||||
|
- If the translated message is empty return the original message
|
||||||
|
(bug #797570, STR #4033).
|
||||||
|
|
||||||
* Thu Feb 23 2012 Tim Waugh <twaugh@redhat.com> 1:1.5.2-4
|
* Thu Feb 23 2012 Tim Waugh <twaugh@redhat.com> 1:1.5.2-4
|
||||||
- cups-polld: restart polling on error (bug #769292, STR #4031).
|
- cups-polld: restart polling on error (bug #769292, STR #4031).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user