gettext_define() -> r()

horde · Jan 29, 2014 · d677c1b · d677c1b
1 parent b0cc314
commit d677c1b
Show file tree

Hide file tree

Showing 15 changed files with 80 additions and 80 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Auth/DigestMD5.php b/framework/Imap_Client/lib/Horde/Imap/Client/Auth/DigestMD5.php
@@ -155,7 +155,7 @@ protected function _parseChallenge($challenge)
         // Required directives.
         if (!isset($tokens['nonce']) || !isset($tokens['algorithm'])) {
             throw new Horde_Imap_Client_Exception(
-                Horde_Imap_Client_Translation::gettext_define("Authentication failure."),
+                Horde_Imap_Client_Translation::r("Authentication failure."),
                 'SERVER_CONNECT'
             );
         }

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -2029,7 +2029,7 @@ public function close(array $options = array())
             $this->openMailbox($this->_selected, Horde_Imap_Client::OPEN_READWRITE);
             if ($this->_mode == Horde_Imap_Client::OPEN_READONLY) {
                 throw new Horde_Imap_Client_Exception(
-                    Horde_Imap_Client_Translation::gettext_define("Cannot expunge read-only mailbox."),
+                    Horde_Imap_Client_Translation::r("Cannot expunge read-only mailbox."),
                     Horde_Imap_Client_Exception::MAILBOX_READONLY
                 );
             }
@@ -2092,7 +2092,7 @@ public function expunge($mailbox, array $options = array())
         /* Don't expunge if the mailbox is readonly. */
         if ($this->_mode == Horde_Imap_Client::OPEN_READONLY) {
             throw new Horde_Imap_Client_Exception(
-                Horde_Imap_Client_Translation::gettext_define("Cannot expunge read-only mailbox."),
+                Horde_Imap_Client_Translation::r("Cannot expunge read-only mailbox."),
                 Horde_Imap_Client_Exception::MAILBOX_READONLY
             );
         }
@@ -2362,7 +2362,7 @@ public function search($mailbox, $query = null, array $options = array())
             if (in_array('CONDSTORE', $options['_query']['exts']) &&
                 !$this->_mailboxOb()->getStatus(Horde_Imap_Client::STATUS_HIGHESTMODSEQ)) {
                 throw new Horde_Imap_Client_Exception(
-                    Horde_Imap_Client_Translation::gettext_define("Mailbox does not support mod-sequences."),
+                    Horde_Imap_Client_Translation::r("Mailbox does not support mod-sequences."),
                     Horde_Imap_Client_Exception::MBOXNOMODSEQ
                 );
             }
@@ -2682,7 +2682,7 @@ private function _fetchWrapper($mailbox, $query, $options)
             /* RFC 4551 [3.1] - trying to do a MODSEQ FETCH on a mailbox that
              * doesn't support it will return BAD. */
             throw new Horde_Imap_Client_Exception(
-                Horde_Imap_Client_Translation::gettext_define("Mailbox does not support mod-sequences."),
+                Horde_Imap_Client_Translation::r("Mailbox does not support mod-sequences."),
                 Horde_Imap_Client_Exception::MBOXNOMODSEQ
             );
         }
@@ -2947,7 +2947,7 @@ public function vanished($mailbox, $modseq, array $opts = array())
         if ($qresync) {
             if (!$this->_mailboxOb()->getStatus(Horde_Imap_Client::STATUS_HIGHESTMODSEQ)) {
                 throw new Horde_Imap_Client_Exception(
-                    Horde_Imap_Client_Translation::gettext_define("Mailbox does not support mod-sequences."),
+                    Horde_Imap_Client_Translation::r("Mailbox does not support mod-sequences."),
                     Horde_Imap_Client_Exception::MBOXNOMODSEQ
                 );
             }
@@ -3032,7 +3032,7 @@ public function store($mailbox, array $options = array())
              * mailbox that doesn't support it will return BAD. */
             if (!$this->_mailboxOb()->getStatus(Horde_Imap_Client::STATUS_HIGHESTMODSEQ)) {
                 throw new Horde_Imap_Client_Exception(
-                    Horde_Imap_Client_Translation::gettext_define("Mailbox does not support mod-sequences."),
+                    Horde_Imap_Client_Translation::r("Mailbox does not support mod-sequences."),
                     Horde_Imap_Client_Exception::MBOXNOMODSEQ
                 );
             }

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Exception/NoSupportExtension.php b/framework/Imap_Client/lib/Horde/Imap/Client/Exception/NoSupportExtension.php
@@ -43,7 +43,7 @@ public function __construct($extension, $msg = null)
 
         if (is_null($msg)) {
             $msg = sprintf(
-                Horde_Imap_Client_Translation::gettext_define("The server does not support the %s extension."),
+                Horde_Imap_Client_Translation::r("The server does not support the %s extension."),
                 $extension
             );
         }

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Exception/NoSupportPop3.php b/framework/Imap_Client/lib/Horde/Imap/Client/Exception/NoSupportPop3.php
@@ -31,7 +31,7 @@ class Horde_Imap_Client_Exception_NoSupportPop3
     public function __construct($feature)
     {
         parent::__construct(
-            sprintf(Horde_Imap_Client_Translation::gettext_define("%s not supported on POP3 servers."), $feature),
+            sprintf(Horde_Imap_Client_Translation::r("%s not supported on POP3 servers."), $feature),
             self::NOT_SUPPORTED
         );
     }

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Exception/SearchCharset.php b/framework/Imap_Client/lib/Horde/Imap/Client/Exception/SearchCharset.php
@@ -42,7 +42,7 @@ public function __construct($charset)
         $this->charset = $charset;
 
         parent::__construct(
-            Horde_Imap_Client_Translation::gettext_define("Cannot convert search query text to new charset"),
+            Horde_Imap_Client_Translation::r("Cannot convert search query text to new charset"),
             self::BADCHARSET
         );
     }

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Interaction/Server/Tagged.php b/framework/Imap_Client/lib/Horde/Imap/Client/Interaction/Server/Tagged.php
@@ -41,7 +41,7 @@ public function __construct(Horde_Imap_Client_Tokenize $token, $tag)
 
         if (is_null($this->status)) {
             throw new Horde_Imap_Client_Exception(
-                Horde_Imap_Client_Translation::gettext_define("Bad tagged response.")
+                Horde_Imap_Client_Translation::r("Bad tagged response.")
             );
         }
     }