Peter M. Groen / knowledgetree

Commit d344ff94c0f97e3ba7fe5f3308879f3fe95a7831

Authored by Kevin Fourie
1 parent 41bdeec6

KTS-1661 

"i18n patches"
Verified and applied patch from Antti Poro.

Reviewed By: Conrad



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6186 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
preferences.php
  View file @d344ff9
@@ -109,7 +109,7 @@ class PreferencesDispatcher extends KTStandardDispatcher { @@ -109,7 +109,7 @@ class PreferencesDispatcher extends KTStandardDispatcher {
109 'fail_action' => 'setPassword', 109 'fail_action' => 'setPassword',
110 'cancel_action' => 'main', 110 'cancel_action' => 'main',
111 'label' => _kt('Change your password'), 111 'label' => _kt('Change your password'),
112 - 'submit_label' => _kt('Set pasword'), 112 + 'submit_label' => _kt('Set password'),
113 'extraargs' => $this->meldPersistQuery("","", true), 113 'extraargs' => $this->meldPersistQuery("","", true),
114 )); 114 ));
115 115
view.php
  View file @d344ff9
@@ -97,13 +97,13 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -97,13 +97,13 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
97 $document_data = array(); 97 $document_data = array();
98 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId'); 98 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
99 if ($document_id === null) { 99 if ($document_id === null) {
100 - $this->oPage->addError('No document was requested. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.'); 100 + $this->oPage->addError(sprintf(_kt("No document was requested. Please <a href=\"%s\">browse</a> for one."), KTBrowseUtil::getBrowseBaseUrl()));
101 return $this->do_error(); 101 return $this->do_error();
102 } 102 }
103 // try get the document. 103 // try get the document.
104 $oDocument =& Document::get($document_id); 104 $oDocument =& Document::get($document_id);
105 if (PEAR::isError($oDocument)) { 105 if (PEAR::isError($oDocument)) {
106 - $this->oPage->addError('The document you attempted to retrieve is invalid. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.'); 106 + $this->oPage->addError(sprintf(_kt("The document you attempted to retrieve is invalid. Please <a href=\"%s\">browse</a> for one."), KTBrowseUtil::getBrowseBaseUrl()));
107 return $this->do_error(); 107 return $this->do_error();
108 } 108 }
109 $document_id = $oDocument->getId(); 109 $document_id = $oDocument->getId();
@@ -146,7 +146,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -146,7 +146,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
146 $is_valid_doctype = true; 146 $is_valid_doctype = true;
147 147
148 if (PEAR::isError($document_data["document_type"])) { 148 if (PEAR::isError($document_data["document_type"])) {
149 - $this->oPage->addError('The document you requested has an invalid <strong>document type</strong>. Unfortunately, this means that we cannot effectively display it.'); 149 + $this->oPage->addError(_kt('The document you requested has an invalid <strong>document type</strong>. Unfortunately, this means that we cannot effectively display it.'));
150 $is_valid_doctype = false; 150 $is_valid_doctype = false;
151 } 151 }
152 152
@@ -248,7 +248,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -248,7 +248,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
248 $document_data = array(); 248 $document_data = array();
249 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId'); 249 $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
250 if ($document_id === null) { 250 if ($document_id === null) {
251 - $this->oPage->addError('No document was requested. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.'); 251 + $this->oPage->addError(sprintf(_kt("No document was requested. Please <a href=\"%s\">browse</a> for one."), KTBrowseUtil::getBrowseBaseUrl()));
252 return $this->do_error(); 252 return $this->do_error();
253 } 253 }
254 254
@@ -259,7 +259,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -259,7 +259,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
259 // try get the document. 259 // try get the document.
260 $oDocument =& Document::get($document_id, $base_version); 260 $oDocument =& Document::get($document_id, $base_version);
261 if (PEAR::isError($oDocument)) { 261 if (PEAR::isError($oDocument)) {
262 - $this->oPage->addError('The base document you attempted to retrieve is invalid. Please <a href="' . KTBrowseUtil::getBrowseBaseUrl() . '">browse</a> for one.'); 262 + $this->oPage->addError(sprintf(_kt("The base document you attempted to retrieve is invalid. Please <a href=\"%s\">browse</a> for one."), KTBrowseUtil::getBrowseBaseUrl()));
263 return $this->do_error(); 263 return $this->do_error();
264 } 264 }
265 265
@@ -281,7 +281,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -281,7 +281,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
281 281
282 $comparison_version = KTUtil::arrayGet($_REQUEST, 'fComparisonVersion'); 282 $comparison_version = KTUtil::arrayGet($_REQUEST, 'fComparisonVersion');
283 if ($comparison_version=== null) { 283 if ($comparison_version=== null) {
284 - $this->oPage->addError('No comparison version was requested. Please <a href="' . KTUtil::addQueryStringSelf('action=history&fDocumentId=' . $document_id) . '">s elect a version</a>.'); 284 + $this->oPage->addError(sprintf(_kt("No comparison version was requested. Please <a href=\"%s\">select a version</a>."), KTUtil::addQueryStringSelf('action=history&fDocumentId=' . $document_id)));
285 return $this->do_error(); 285 return $this->do_error();
286 } 286 }
287 287
@@ -302,7 +302,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -302,7 +302,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
302 $is_valid_doctype = true; 302 $is_valid_doctype = true;
303 303
304 if (PEAR::isError($document_data["document_type"])) { 304 if (PEAR::isError($document_data["document_type"])) {
305 - $this->oPage->addError('The document you requested has an invalid <strong>document type</strong>. Unfortunately, this means that we cannot effectively display it.'); 305 + $this->oPage->addError(_kt('The document you requested has an invalid <strong>document type</strong>. Unfortunately, this means that we cannot effectively display it.'));
306 $is_valid_doctype = false; 306 $is_valid_doctype = false;
307 } 307 }
308 308