[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kdeprint/cups
From:       Stephan Kulow <coolo () kde ! org>
Date:       2003-09-11 13:08:56
[Download RAW message or body]

CVS commit by coolo: 

as discussed with Michael - this gives the error messages a bit more clearness
(especially for i18n users :)


  M +7 -8      ipprequest.cpp   1.27


--- kdelibs/kdeprint/cups/ipprequest.cpp  #1.26:1.27
@@ -97,22 +97,21 @@ void dumpRequest(ipp_t *req, bool answer
 QString errorString(int status)
 {
-        // FIXME: in the end, should use translation => 3.1
         QString str;
         switch (status)
         {
                 case IPP_FORBIDDEN:
-                        str = "You don't have access to the requested resource.";
+                        str = i18n("You don't have access to the requested resource.");
                         break;
                 case IPP_NOT_AUTHORIZED:
-                        str = "You are not authorized to access the requested resource.";
+                        str = i18n("You are not authorized to access the requested resource.");
                         break;
                 case IPP_NOT_POSSIBLE:
-                        str = "The requested operation cannot be completed.";
+                        str = i18n("The requested operation cannot be completed.");
                         break;
                 case IPP_SERVICE_UNAVAILABLE:
-                        str = "The requested service is currently unavailable.";
+                        str = i18n("The requested service is currently unavailable.");
                         break;
                 case IPP_NOT_ACCEPTING:
-                        str = "The target printer is not accepting print jobs.";
+                        str = i18n("The target printer is not accepting print jobs.");
                         break;
                 default:
@@ -215,5 +214,5 @@ void IppRequest::setOperation(int op)
 int IppRequest::status()
 {
-        return (request_ ? request_->request.status.status_code : (connect_ ? -1 : -2));
+        return (request_ ? request_->request.status.status_code : (connect_ ? cupsLastError() : -2));
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]