Peter M. Groen / knowledgetree

Commit a034353e4ee3f83dfa5d912d6dfaca59f02e1e4f

Authored by Bryn Divey
1 parent 225ca57d

Fixed a number of '_()'s that hadn't become '_kt()'s. 



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5557 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 6 additions and 4 deletions
lib/documentmanagement/Document.inc
  View file @a034353
... ... @@ -200,7 +200,7 @@ class Document {
200 200 // {{{ get
201 201 function &get($iId, $iMetadataVersion=null) {
202 202 if (!is_numeric($iId)) {
203   - return PEAR::raiseError(_('Non-numeric identifier'));
  203 + return PEAR::raiseError(_kt('Non-numeric identifier'));
204 204 }
205 205 $iId = (int)$iId;
206 206 $oDocument = new Document();
... ... @@ -536,7 +536,7 @@ class Document {
536 536 // {{{ startNewContentVersion
537 537 function startNewContentVersion($oUser) {
538 538 if ($this->getImmutable()) {
539   - return PEAR::raiseError(_('Cannot create new version of document: Document is immutable'));
  539 + return PEAR::raiseError(_kt('Cannot create new version of document: Document is immutable'));
540 540 }
541 541 $iUserId = KTUtil::getId($oUser);
542 542 $this->_oDocumentContentVersion =& $this->_oDocumentContentVersion->newCopy();
... ...
lib/ktentity.inc
  View file @a034353
... ... @@ -629,7 +629,7 @@ class KTEntityUtil {
629 629  
630 630 function &get($sClassName, $iId) {
631 631 if (!is_numeric($iId)) {
632   - return PEAR::raiseError(_('Non-numeric identifier'));
  632 + return PEAR::raiseError(_kt('Non-numeric identifier'));
633 633 }
634 634 $iId = (int)$iId;
635 635 /* */
... ...
lib/session/Session.inc
  View file @a034353
... ... @@ -202,7 +202,7 @@ class Session {
202 202 // check that ip matches
203 203 $ip = $this->getClientIP();
204 204 if ($ipTracking && ($ip != trim($aRow["ip"]))) {
205   - return PEAR::raiseError(_("You are coming from a different IP address than the session requires"));
  205 + return PEAR::raiseError(_kt("You are coming from a different IP address than the session requires"));
206 206 }
207 207  
208 208 // now check if the timeout has been exceeded
... ...
lib/validation/errorviewer.inc.php
  View file @a034353
... ... @@ -138,6 +138,7 @@ class KTDBErrorViewer extends KTErrorViewer {
138 138 $ret .= "\t<dt>Error type</dt>\n";
139 139 $ret .= "\t<dd>" . $this->oError->getMessage() . "</dd>\n";
140 140 $sInfo = $this->parseUserInfo();
  141 +
141 142 if ($sInfo) {
142 143 $ret .= "\t<dt>Additional information</dt>\n";
143 144 $ret .= "\t<dd>" . $sInfo . "</dd>\n";
... ... @@ -149,6 +150,7 @@ class KTDBErrorViewer extends KTErrorViewer {
149 150 function parseUserInfo() {
150 151 $sUserInfo = $this->oError->getUserInfo();
151 152 $aMatches = array();
  153 +
152 154 if (preg_match("#^ ?\[nativecode=(Can't connect to local.*) \(13\)#", $sUserInfo, $aMatches)) {
153 155 return $aMatches[1];
154 156 }
... ...