[Tkabber-dev] [tclxmpp] r135 committed - * xmpp/sasl.tcl, xmpp/stanzaerror.tcl, xmpp/streamerror.tcl: Changed...

tclxmpp at googlecode.com tclxmpp at googlecode.com
Sat Jan 16 16:52:35 MSK 2010


Revision: 135
Author: sgolovan
Date: Sat Jan 16 05:51:46 2010
Log: 	* xmpp/sasl.tcl, xmpp/stanzaerror.tcl, xmpp/streamerror.tcl: Changed
	  capitalization of error messages.

http://code.google.com/p/tclxmpp/source/detail?r=135

Modified:
  /trunk/ChangeLog
  /trunk/xmpp/sasl.tcl
  /trunk/xmpp/stanzaerror.tcl
  /trunk/xmpp/streamerror.tcl

=======================================
--- /trunk/ChangeLog	Sat Jan 16 04:40:36 2010
+++ /trunk/ChangeLog	Sat Jan 16 05:51:46 2010
@@ -4,6 +4,9 @@
  	  in asynchronous mode where the operation must always succeede and
  	  its status is reported via a callback.

+	* xmpp/sasl.tcl, xmpp/stanzaerror.tcl, xmpp/streamerror.tcl: Changed
+	  capitalization of error messages.
+
  2010-01-14  Sergei Golovan  <sgolovan at nes.ru>

  	* xmpp/tcp.tcl, xmpp/tls.tcl, xmpp/zlib.tcl: Fixed aborting underlying
=======================================
--- /trunk/xmpp/sasl.tcl	Tue Dec 29 05:00:26 2009
+++ /trunk/xmpp/sasl.tcl	Sat Jan 16 05:51:46 2010
@@ -48,7 +48,7 @@
      }

      # SASL error messages
-    ::xmpp::stanzaerror::registerType sasl [::msgcat::mc "Authentication  
Error"]
+    ::xmpp::stanzaerror::registerType sasl [::msgcat::mc "Authentication  
error"]

      foreach {lcode type cond description} [list \
          401 sasl aborted                [::msgcat::mc "Aborted"] \
@@ -56,7 +56,7 @@
          401 sasl invalid-authzid        [::msgcat::mc "Invalid authzid"] \
          401 sasl invalid-mechanism      [::msgcat::mc "Invalid mechanism"]  
\
          401 sasl mechanism-too-weak     [::msgcat::mc "Mechanism too  
weak"] \
-        401 sasl not-authorized         [::msgcat::mc "Not Authorized"] \
+        401 sasl not-authorized         [::msgcat::mc "Not authorized"] \
          401 sasl temporary-auth-failure [::msgcat::mc "Temporary auth\
                                                         failure"]] \
      {
=======================================
--- /trunk/xmpp/stanzaerror.tcl	Mon Feb 23 06:48:06 2009
+++ /trunk/xmpp/stanzaerror.tcl	Sat Jan 16 05:51:46 2010
@@ -18,56 +18,56 @@

      # Defined error types (see XMPP core, section 9.3.2)
      array set Type [list \
-        cancel   [::msgcat::mc "Unrecoverable Error"] \
+        cancel   [::msgcat::mc "Unrecoverable error"] \
          continue [::msgcat::mc "Warning"] \
-        modify   [::msgcat::mc "Request Error"] \
-        auth     [::msgcat::mc "Authentication Error"] \
-        wait     [::msgcat::mc "Temporary Error"]]
+        modify   [::msgcat::mc "Request error"] \
+        auth     [::msgcat::mc "Authentication error"] \
+        wait     [::msgcat::mc "Temporary error"]]

      set DefinedConditions {}

      # Defined error conditions (see XMPP core, section 9.3.3, and  
XEP-0086).
      foreach {clist lcode type cond description} [list \
-        {400} 400 modify bad-request             [::msgcat::mc "Bad  
Request"] \
+        {400} 400 modify bad-request             [::msgcat::mc "Bad  
request"] \
          {409} 409 cancel conflict                [::msgcat::mc "Conflict"]  
\
-        {501} 501 cancel feature-not-implemented [::msgcat::mc "Feature  
Not\
-                                                                 
Implemented"] \
+        {501} 501 cancel feature-not-implemented [::msgcat::mc "Feature  
not\
+                                                                 
implemented"] \
          {403} 403 auth   forbidden                
[::msgcat::mc "Forbidden"] \
          {302} 302 modify gone                    [::msgcat::mc "Gone"] \
-        {500} 500 wait   internal-server-error   [::msgcat::mc "Internal  
Server\
-                                                                Error"] \
-        {404} 404 cancel item-not-found          [::msgcat::mc "Item Not\
-                                                                Found"] \
+        {500} 500 wait   internal-server-error   [::msgcat::mc "Internal  
server\
+                                                                error"] \
+        {404} 404 cancel item-not-found          [::msgcat::mc "Item not\
+                                                                found"] \
          {}    400 modify jid-malformed           [::msgcat::mc "JID\
-                                                                 
Malformed"] \
+                                                                 
malformed"] \
          {406} 406 modify not-acceptable          [::msgcat::mc "Not\
-                                                                 
Acceptable"] \
-        {405} 405 cancel not-allowed             [::msgcat::mc "Not  
Allowed"] \
+                                                                 
acceptable"] \
+        {405} 405 cancel not-allowed             [::msgcat::mc "Not  
allowed"] \
          {401} 401 auth   not-authorized          [::msgcat::mc "Not\
-                                                                 
Authorized"] \
+                                                                 
authorized"] \
          {402} 402 auth   payment-required        [::msgcat::mc "Payment\
-                                                                Required"]  
\
+                                                                required"]  
\
          {}    404 wait   recipient-unavailable   [::msgcat::mc "Recipient\
-                                                                 
Unavailable"] \
+                                                                 
unavailable"] \
          {}    302 modify redirect                [::msgcat::mc "Redirect"]  
\
          {407} 407 auth   registration-required    
[::msgcat::mc "Registration\
-                                                                Required"]  
\
-        {}    404 cancel remote-server-not-found [::msgcat::mc "Remote  
Server\
-                                                                Not  
Found"] \
+                                                                required"]  
\
+        {}    404 cancel remote-server-not-found [::msgcat::mc "Remote  
server\
+                                                                not  
found"] \
          {408 504} \
-              504 wait   remote-server-timeout   [::msgcat::mc "Remote  
Server\
-                                                                Timeout"] \
+              504 wait   remote-server-timeout   [::msgcat::mc "Remote  
server\
+                                                                timeout"] \
          {}    500 wait   resource-constraint     [::msgcat::mc "Resource\
-                                                                 
Constraint"] \
+                                                                 
constraint"] \
          {502 503 510} \
                503 cancel service-unavailable     [::msgcat::mc "Service\
-                                                                 
Unavailable"] \
+                                                                 
unavailable"] \
          {}    407 auth   subscription-required    
[::msgcat::mc "Subscription\
-                                                                Required"]  
\
+                                                                required"]  
\
          {}    500 any    undefined-condition     [::msgcat::mc "Undefined\
-                                                                 
Condition"] \
+                                                                 
condition"] \
          {}    400 wait   unexpected-request      [::msgcat::mc "Unexpected\
-                                                                Request"]]  
\
+                                                                request"]]  
\
      {
          lappend DefinedConditions $cond
          set Description($type,$cond) $description
=======================================
--- /trunk/xmpp/streamerror.tcl	Mon Aug 17 06:10:10 2009
+++ /trunk/xmpp/streamerror.tcl	Sat Jan 16 05:51:46 2010
@@ -17,30 +17,30 @@

      # Defined error conditions (see XMPP core, section 4.7.3)
      foreach {cond message} [list \
-        bad-format               [::msgcat::mc "Bad Format"] \
-        bad-namespace-prefix     [::msgcat::mc "Bad Namespace Prefix"] \
+        bad-format               [::msgcat::mc "Bad format"] \
+        bad-namespace-prefix     [::msgcat::mc "Bad namespace prefix"] \
          conflict                 [::msgcat::mc "Conflict"] \
-        connection-timeout       [::msgcat::mc "Connection Timeout"] \
-        host-gone                [::msgcat::mc "Host Gone"] \
-        host-unknown             [::msgcat::mc "Host Unknown"] \
-        improper-addressing      [::msgcat::mc "Improper Addressing"] \
-        internal-server-error    [::msgcat::mc "Internal Server Error"] \
-        invalid-from             [::msgcat::mc "Invalid From"] \
+        connection-timeout       [::msgcat::mc "Connection timeout"] \
+        host-gone                [::msgcat::mc "Host gone"] \
+        host-unknown             [::msgcat::mc "Host unknown"] \
+        improper-addressing      [::msgcat::mc "Improper addressing"] \
+        internal-server-error    [::msgcat::mc "Internal server error"] \
+        invalid-from             [::msgcat::mc "Invalid from"] \
          invalid-id               [::msgcat::mc "Invalid ID"] \
-        invalid-namespace        [::msgcat::mc "Invalid Namespace"] \
+        invalid-namespace        [::msgcat::mc "Invalid namespace"] \
          invalid-xml              [::msgcat::mc "Invalid XML"] \
-        not-authorized           [::msgcat::mc "Not Authorized"] \
-        policy-violation         [::msgcat::mc "Policy Violation"] \
-        remote-connection-failed [::msgcat::mc "Remote Connection Failed"]  
\
-        resource-constraint      [::msgcat::mc "Resource Constraint"] \
+        not-authorized           [::msgcat::mc "Not authorized"] \
+        policy-violation         [::msgcat::mc "Policy violation"] \
+        remote-connection-failed [::msgcat::mc "Remote connection failed"]  
\
+        resource-constraint      [::msgcat::mc "Resource constraint"] \
          restricted-xml           [::msgcat::mc "Restricted XML"] \
-        see-other-host           [::msgcat::mc "See Other Host"] \
-        system-shutdown          [::msgcat::mc "System Shutdown"] \
-        undefined-condition      [::msgcat::mc "Undefined Condition"] \
-        unsupported-encoding     [::msgcat::mc "Unsupported Encoding"] \
-        unsupported-stanza-type  [::msgcat::mc "Unsupported Stanza Type"] \
-        unsupported-version      [::msgcat::mc "Unsupported Version"] \
-        xml-not-well-formed      [::msgcat::mc "XML Not Well-Formed"]] \
+        see-other-host           [::msgcat::mc "See other host"] \
+        system-shutdown          [::msgcat::mc "System shutdown"] \
+        undefined-condition      [::msgcat::mc "Undefined condition"] \
+        unsupported-encoding     [::msgcat::mc "Unsupported encoding"] \
+        unsupported-stanza-type  [::msgcat::mc "Unsupported stanza type"] \
+        unsupported-version      [::msgcat::mc "Unsupported version"] \
+        xml-not-well-formed      [::msgcat::mc "XML not well-formed"]] \
      {
          set StreamerrorDesc($cond) $message
      }
@@ -102,9 +102,9 @@
          # Legacy error
          set cdata [string trim $cdata]
          if {[string length $cdata] > 0} {
-            return [list legacy [::msgcat::mc "Stream Error (%s)" $cdata]]
+            return [list legacy [::msgcat::mc "Stream error (%s)" $cdata]]
          } else {
-            return [list legacy [::msgcat::mc "Stream Error"]]
+            return [list legacy [::msgcat::mc "Stream error"]]
          }
      } else {
          # XMPP error
@@ -133,18 +133,18 @@
          }
          switch -glob -- [string length $desc]/[string length $text] {
              0/0 {
-                return [list $condition [::msgcat::mc "Stream Error"]]
+                return [list $condition [::msgcat::mc "Stream error"]]
              }
              0/* {
-                return [list $condition [::msgcat::mc "Stream Error: %s" \
+                return [list $condition [::msgcat::mc "Stream error: %s" \
                                                        $text]]
              }
              */0 {
-                return [list $condition [::msgcat::mc "Stream Error (%s)" \
+                return [list $condition [::msgcat::mc "Stream error (%s)" \
                                                        $desc]]
              }
              default {
-                return [list $condition [::msgcat::mc "Stream Error  
(%s): %s" \
+                return [list $condition [::msgcat::mc "Stream error  
(%s): %s" \
                                                        $desc $text]]
              }
          }


More information about the Tkabber-dev mailing list