[Fusionforge-commits] r17428 - trunk/src/common/docman
Marc-Etienne VARGENAU
vargenau at fusionforge.org
Tue Jun 25 09:37:56 CEST 2013
Author: vargenau
Date: 2013-06-25 09:37:56 +0200 (Tue, 25 Jun 2013)
New Revision: 17428
Modified:
trunk/src/common/docman/Document.class.php
Log:
Be consistent: directory --> folder
Modified: trunk/src/common/docman/Document.class.php
===================================================================
--- trunk/src/common/docman/Document.class.php 2013-06-25 07:30:43 UTC (rev 17427)
+++ trunk/src/common/docman/Document.class.php 2013-06-25 07:37:56 UTC (rev 17428)
@@ -833,7 +833,7 @@
$result = db_query_params('SELECT filename, doc_group FROM docdata_vw WHERE filename = $1 AND doc_group = $2 AND stateid = $3 AND docid != $4',
array($filename, $doc_group, $stateid, $this->getID()));
if (!$result || db_numrows($result) > 0) {
- $this->setError(_('Document already published in this directory'));
+ $this->setError(_('Document already published in this folder'));
return false;
}
}
@@ -930,10 +930,10 @@
$status = _('Updated document').' '._('by').' ' . $session->getRealName();
}
$subject = '['.$this->Group->getPublicName().'] '.$status.' - '.$this->getName();
- $body = _('Project:').' '.$this->Group->getPublicName()."\n";
- $body .= _('Directory:').' '.$this->getDocGroupName()."\n";
+ $body = _('Project')._(': ').$this->Group->getPublicName()."\n";
+ $body .= _('Folder')._(': ').$this->getDocGroupName()."\n";
$body .= _('Document Title')._(': ').$this->getName()."\n";
- $body .= _('Document description:').' '.util_unconvert_htmlspecialchars($this->getDescription())."\n";
+ $body .= _('Document description')._(': ').util_unconvert_htmlspecialchars($this->getDescription())."\n";
$body .= _('Submitter')._(': ').$this->getCreatorRealName()." (".$this->getCreatorUserName().") \n";
$body .= "\n\n-------------------------------------------------------\n".
_('For more info, visit:').
More information about the Fusionforge-commits
mailing list