diff --git a/i18n/knowledgeTree.pot b/i18n/knowledgeTree.pot
index aa2fff1..0013039 100644
--- a/i18n/knowledgeTree.pot
+++ b/i18n/knowledgeTree.pot
@@ -1850,7 +1850,7 @@ msgid "Control which users can log in, and are part of which groups and organisa
msgstr ""
#: i18n/templates.c:3494 i18n/templates.c:3608
-msgid "Controlled Actions available:"
+msgid "Controlled Actions available"
msgstr ""
#: plugins/ktcore/admin/workflowsv2.php:1022 i18n/templates.c:3314
@@ -2285,7 +2285,7 @@ msgid "Dashboard"
msgstr ""
#: lib/validation/errorviewer.inc.php:130
-msgid "Database error:"
+msgid "Database error"
msgstr ""
#: i18n/templates.c:146 i18n/templates.c:155 i18n/templates.c:242
@@ -4131,7 +4131,7 @@ msgstr ""
#: i18n/templates.c:3326 i18n/templates.c:4043 i18n/templates.c:4415
#: i18n/templates.c:4922
-msgid "Group:"
+msgid "Group"
msgstr ""
#: plugins/ktcore/admin/groupManagement.php:398
@@ -4159,7 +4159,7 @@ msgstr ""
#: plugins/ktcore/admin/workflowsv2.php:1915 i18n/templates.c:4127
#: i18n/templates.c:4586
-msgid "Groups:"
+msgid "Groups"
msgstr ""
#: plugins/ktcore/admin/workflowsv2.php:1418
@@ -5154,7 +5154,7 @@ msgid "Master field has no values which are assigned to behaviours."
msgstr ""
#: i18n/templates.c:1331
-msgid "Match #join# of the following:"
+msgid "Match #join# of the following"
msgstr ""
#: plugins/ktcore/admin/userManagement.php:138
@@ -6044,7 +6044,7 @@ msgid "Notifications updated."
msgstr ""
#: i18n/templates.c:3491 i18n/templates.c:3605
-msgid "Notified groups & roles:"
+msgid "Notified groups & roles"
msgstr ""
#: i18n/templates.c:5231
@@ -6126,7 +6126,7 @@ msgid "Orphaned Folders Plugin"
msgstr ""
#: i18n/templates.c:2081
-msgid "Over time, the lookup values which make sense will change and evolve as your organisation does. You may thus need to change the lookup values associated with a given field. There are a number of different states that are possible for a given lookup:"
+msgid "Over time, the lookup values which make sense will change and evolve as your organisation does. You may thus need to change the lookup values associated with a given field. There are a number of different states that are possible for a given lookup"
msgstr ""
#: i18n/templates.c:4130
@@ -6255,7 +6255,7 @@ msgid "Permissions on folder updated"
msgstr ""
#: i18n/templates.c:3497 i18n/templates.c:3611
-msgid "Permissions overridden:"
+msgid "Permissions overridden"
msgstr ""
#: plugins/ktcore/folder/Permissions.php:487
@@ -6926,7 +6926,7 @@ msgstr ""
#: i18n/templates.c:3323 i18n/templates.c:4034 i18n/templates.c:4406
#: i18n/templates.c:4913
-msgid "Role:"
+msgid "Role"
msgstr ""
#: plugins/ktcore/KTCorePlugin.php:218 i18n/templates.c:3230
@@ -6935,7 +6935,7 @@ msgid "Roles"
msgstr ""
#: plugins/ktcore/admin/workflowsv2.php:1921
-msgid "Roles:"
+msgid "Roles"
msgstr ""
#: plugins/ktcore/admin/fieldsets/basic.inc.php:707
@@ -7650,7 +7650,7 @@ msgid "The action cannot be performed on any of the selected entities."
msgstr ""
#: i18n/templates.c:5729
-msgid "The action will be performed on the following documents and folders:"
+msgid "The action will be performed on the following documents and folders"
msgstr ""
#: plugins/ktcore/folder/BulkUpload.php:68
@@ -7682,7 +7682,7 @@ msgid "The core of a workflow is the process that documents in
msgstr ""
#: plugins/ktcore/document/Rename.php:74
-msgid "The current file name is shown below:"
+msgid "The current file name is shown below"
msgstr ""
#: i18n/templates.c:974
@@ -7807,7 +7807,7 @@ msgid "The following files are present in the repository, but do not exist in th
msgstr ""
#: i18n/templates.c:5708
-msgid "The following list shows documents and folders in your list which cannot be acted on by this bulk action:"
+msgid "The following list shows documents and folders in your list which cannot be acted on by this bulk action"
msgstr ""
#: plugins/ktcore/admin/fieldsets/basic.inc.php:377
@@ -7821,11 +7821,11 @@ msgid "The following permissions are required: %s"
msgstr ""
#: i18n/templates.c:1010
-msgid "The following upgrade is available:"
+msgid "The following upgrade is available"
msgstr ""
#: i18n/templates.c:1013
-msgid "The following upgrades are available:"
+msgid "The following upgrades are available"
msgstr ""
#: plugins/ktcore/admin/userManagement.php:131
@@ -8037,7 +8037,7 @@ msgid "There are #closed# closed threads - use the \"View All\" option below to
msgstr ""
#: i18n/templates.c:3962
-msgid "There are 3 different ways in which workflows interact with the system's security:"
+msgid "There are 3 different ways in which workflows interact with the system's security"
msgstr ""
#: i18n/templates.c:3086
@@ -8136,7 +8136,7 @@ msgid "There was an error updating the thread with the new comment"
msgstr ""
#: i18n/templates.c:5687
-msgid "These are the results of the bulk action:"
+msgid "These are the results of the bulk action"
msgstr ""
#: i18n/templates.c:1613
@@ -8418,11 +8418,11 @@ msgid "To add users to this role, select one or more user names in the Available
msgstr ""
#: i18n/templates.c:704
-msgid "To connect to #appname# via a third-party WebDAV client, please use the following address:"
+msgid "To connect to #appname# via a third-party WebDAV client, please use the following address"
msgstr ""
#: i18n/templates.c:707
-msgid "To connect with the #appname# Tools for Windows package, use this address:"
+msgid "To connect with the #appname# Tools for Windows package, use this address"
msgstr ""
#: i18n/templates.c:5504
@@ -8583,7 +8583,7 @@ msgid "Transitions are what drive the workflow of documents. Each step that need
msgstr ""
#: i18n/templates.c:3500 i18n/templates.c:3614
-msgid "Transitions available:"
+msgid "Transitions available"
msgstr ""
#: i18n/templates.c:3296
@@ -8595,7 +8595,7 @@ msgid "Transitions to this state"
msgstr ""
#: i18n/templates.c:3503 i18n/templates.c:3617
-msgid "Transitions to this state:"
+msgid "Transitions to this state"
msgstr ""
#: lib/documentmanagement/DocumentField.inc:168
@@ -9252,7 +9252,7 @@ msgstr ""
#: i18n/templates.c:4052 i18n/templates.c:4355 i18n/templates.c:4424
#: i18n/templates.c:4886 i18n/templates.c:4931
-msgid "User:"
+msgid "User"
msgstr ""
#: i18n/templates.c:443
@@ -9311,7 +9311,7 @@ msgstr ""
#: plugins/ktcore/admin/workflowsv2.php:1909 i18n/templates.c:4124
#: i18n/templates.c:4583
-msgid "Users:"
+msgid "Users"
msgstr ""
#: lib/documentmanagement/documentutil.inc.php:983
@@ -9452,7 +9452,7 @@ msgid "Want to know who all has logged in the system over a period of time? You
msgstr ""
#: i18n/templates.c:3083 i18n/templates.c:4100
-msgid "Warning:"
+msgid "Warning"
msgstr ""
#: i18n/templates.c:4838
diff --git a/lib/documentmanagement/DocumentFieldLink.inc b/lib/documentmanagement/DocumentFieldLink.inc
index a614c27..5d8ca20 100644
--- a/lib/documentmanagement/DocumentFieldLink.inc
+++ b/lib/documentmanagement/DocumentFieldLink.inc
@@ -121,7 +121,7 @@ class DocumentFieldLink extends KTEntity {
*
*/
function getValue() {
- return $this->sValue;
+ return sanitizeForHTML($this->sValue);
}
/**
@@ -131,7 +131,7 @@ class DocumentFieldLink extends KTEntity {
*
*/
function setValue($sNewValue) {
- $this->sValue = $sNewValue;
+ $this->sValue = sanitizeForSQL($sNewValue);
}
function _table () {
diff --git a/lib/documentmanagement/documentmetadataversion.inc.php b/lib/documentmanagement/documentmetadataversion.inc.php
index 0d39e50..621587f 100644
--- a/lib/documentmanagement/documentmetadataversion.inc.php
+++ b/lib/documentmanagement/documentmetadataversion.inc.php
@@ -97,8 +97,8 @@ class KTDocumentMetadataVersion extends KTEntity {
function setDocumentTypeId($iNewValue) { $this->iDocumentTypeId = $iNewValue; }
function getName() { return sanitizeForSQLtoHTML($this->sName); }
function setName($sNewValue) { $this->sName = sanitizeForSQL($sNewValue); }
- function getDescription() { return $this->sDescription; }
- function setDescription($sNewValue) { $this->sDescription = $sNewValue; }
+ function getDescription() { return sanitizeForSQLtoHTML($this->sDescription); }
+ function setDescription($sNewValue) { $this->sDescription = sanitizeForSQL($sNewValue); }
function getStatusId() { return $this->iStatusId; }
function setStatusId($iNewValue) { $this->iStatusId = $iNewValue; }
function getVersionCreated() { return $this->dVersionCreated; }
diff --git a/lib/foldermanagement/Folder.inc b/lib/foldermanagement/Folder.inc
index e54b305..c129c15 100644
--- a/lib/foldermanagement/Folder.inc
+++ b/lib/foldermanagement/Folder.inc
@@ -75,10 +75,10 @@ class Folder extends KTEntity {
// }}}
function getID() { return $this->iId; }
- function getName() { return $this->sName; }
- function setName($sNewValue) { $this->sName = $sNewValue; }
- function getDescription() { return $this->sDescription; }
- function setDescription($sNewValue) { $this->sDescription = $sNewValue; }
+ function getName() { return sanitizeForSQLtoHTML($this->sName); }
+ function setName($sNewValue) { $this->sName = sanitizeForSQL($sNewValue); }
+ function getDescription() { return sanitizeForSQLtoHTML($this->sDescription); }
+ function setDescription($sNewValue) { $this->sDescription = sanitizeForSQL($sNewValue); }
function getParentID() { return $this->iParentID; }
function setParentID($iNewValue) { $this->iParentID = $iNewValue; }
function getCreatorID() { return $this->iCreatorID; }
diff --git a/lib/validation/errorviewer.inc.php b/lib/validation/errorviewer.inc.php
index e4a4195..ba8995d 100644
--- a/lib/validation/errorviewer.inc.php
+++ b/lib/validation/errorviewer.inc.php
@@ -132,7 +132,7 @@ $oEVRegistry->register("KTErrorViewer", "PEAR_Error");
class KTDBErrorViewer extends KTErrorViewer {
function view() {
- return _kt("Database error:") . " " . $this->oError->getMessage();
+ return _kt("Database error") . ": " . $this->oError->getMessage();
}
function page() {
diff --git a/plugins/ktcore/KTColumns.inc.php b/plugins/ktcore/KTColumns.inc.php
index d4e3324..aec696a 100644
--- a/plugins/ktcore/KTColumns.inc.php
+++ b/plugins/ktcore/KTColumns.inc.php
@@ -72,7 +72,15 @@ class AdvancedTitleColumn extends AdvancedColumn {
function renderFolderLink($aDataRow) {
- $outStr = htmlentities($aDataRow["folder"]->getName(), ENT_NOQUOTES, 'UTF-8');
+ /* this check has to be done so that any titles longer than 40 characters is not displayed incorrectly.
+ as mozilla cannot wrap text without white spaces */
+ if (mb_strlen($aDataRow["folder"]->getName(), 'UTF-8') > 40) {
+ mb_internal_encoding("UTF-8");
+ $outStr = htmlentities(mb_substr($aDataRow["folder"]->getName(), 0, 40, 'UTF-8')."...", ENT_NOQUOTES, 'UTF-8');
+ }else{
+ $outStr = htmlentities($aDataRow["folder"]->getName(), ENT_NOQUOTES, 'UTF-8');
+ }
+
if($this->link_folders) {
$outStr = '' . $outStr . '';
}
@@ -80,7 +88,7 @@ class AdvancedTitleColumn extends AdvancedColumn {
}
function renderDocumentLink($aDataRow) {
- /* this chack has to be done so that any titles longer than 40 characters is not displayed incorrectly.
+ /* this check has to be done so that any titles longer than 40 characters is not displayed incorrectly.
as mozilla cannot wrap text without white spaces */
if (mb_strlen($aDataRow["document"]->getName(), 'UTF-8') > 40) {
mb_internal_encoding("UTF-8");
diff --git a/plugins/ktcore/KTDocumentActions.php b/plugins/ktcore/KTDocumentActions.php
index 57c015a..87cdf00 100644
--- a/plugins/ktcore/KTDocumentActions.php
+++ b/plugins/ktcore/KTDocumentActions.php
@@ -824,13 +824,13 @@ class KTDocumentMoveAction extends KTDocumentAction {
function do_main() {
$oForm = $this->form_move();
- return $oForm->renderPage();
+ return $oForm->renderPage(_kt('Move Document') . ': ' . $this->oDocument->getName());
}
function form_move() {
$oForm = new KTForm;
$oForm->setOptions(array(
- 'label' => sprintf(_kt('Move Document "%s"'), $this->oDocument->getName()),
+ 'label' => _kt('Move Document'),
'submit_label' => _kt('Move'),
'identifier' => 'ktcore.actions.movedoc',
'action' => 'move',
@@ -1031,7 +1031,7 @@ class KTDocumentCopyAction extends KTDocumentAction {
function form_copyselection() {
$oForm = new KTForm;
$oForm->setOptions(array(
- 'label' => sprintf(_kt('Copy Document "%s"'), $this->oDocument->getName()),
+ 'label' => _kt('Copy Document'),
'submit_label' => _kt('Copy'),
'identifier' => 'ktcore.actions.copydoc',
'action' => 'copy',
@@ -1118,7 +1118,7 @@ class KTDocumentCopyAction extends KTDocumentAction {
function do_main() {
$this->oPage->setBreadcrumbDetails(_kt('Copy'));
$oForm = $this->form_copyselection();
- return $oForm->renderPage();
+ return $oForm->renderPage(_kt('Copy Document') . ': ' . $this->oDocument->getName());
}
function do_copy() {
@@ -1540,7 +1540,6 @@ class KTOwnershipChangeAction extends KTDocumentAction {
$oTemplate->setData(array(
'context' => $this,
- 'docname' => $this->oDocument->getName(),
'form' => $change_form,
));
return $oTemplate->render();
diff --git a/plugins/ktcore/KTFolderActions.php b/plugins/ktcore/KTFolderActions.php
index e331dc3..8c4e096 100644
--- a/plugins/ktcore/KTFolderActions.php
+++ b/plugins/ktcore/KTFolderActions.php
@@ -109,7 +109,6 @@ class KTFolderAddFolderAction extends KTFolderAction {
$oForm = $this->form_main();
-
$oTemplate->setData(array(
'context' => &$this,
'form' => $oForm,
diff --git a/plugins/ktcore/KTPermissions.php b/plugins/ktcore/KTPermissions.php
index b5d5c4d..2d46964 100644
--- a/plugins/ktcore/KTPermissions.php
+++ b/plugins/ktcore/KTPermissions.php
@@ -388,7 +388,6 @@ class KTRoleAllocationPlugin extends KTFolderAction {
$aTemplateData = array(
'context' => &$this,
'roles' => $aRoles,
- 'foldername' => $this->oFolder->getName(),
'is_root' => ($this->oFolder->getId() == 1),
);
return $oTemplate->render($aTemplateData);
diff --git a/plugins/ktcore/admin/workflowsv2.php b/plugins/ktcore/admin/workflowsv2.php
index 9aae25d..f3cf3dc 100644
--- a/plugins/ktcore/admin/workflowsv2.php
+++ b/plugins/ktcore/admin/workflowsv2.php
@@ -2127,19 +2127,19 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
$sNotify = '';
if (!empty($aUsers)) {
- $sNotify .= '' . _kt('Users:') . ' ';
+ $sNotify .= '' . _kt('Users') . ': ';
$sNotify .= implode(', ', $aUsers);
}
if (!empty($aGroups)) {
if (!empty($sNotify)) { $sNotify .= ' — '; }
- $sNotify .= '' . _kt('Groups:') . ' ';
+ $sNotify .= '' . _kt('Groups') . ': ';
$sNotify .= implode(', ', $aGroups);
}
if (!empty($aRoles)) {
if (!empty($sNotify)) { $sNotify .= ' — '; }
- $sNotify .= '' . _kt('Roles:') . ' ';
+ $sNotify .= '' . _kt('Roles') . ': ';
$sNotify .= implode(', ', $aRoles);
}
diff --git a/plugins/ktcore/document/edit.php b/plugins/ktcore/document/edit.php
index f854ebc..676707c 100644
--- a/plugins/ktcore/document/edit.php
+++ b/plugins/ktcore/document/edit.php
@@ -100,7 +100,7 @@ class KTDocumentEditAction extends KTDocumentAction {
)),
);
$validators = array(
- array('ktcore.validators.string',array(
+ array('ktcore.validators.string', array(
'test' => 'document_title',
'output' => 'document_title',
)),
diff --git a/plugins/ktcore/folder/BulkImport.php b/plugins/ktcore/folder/BulkImport.php
index df33ede..af5c024 100644
--- a/plugins/ktcore/folder/BulkImport.php
+++ b/plugins/ktcore/folder/BulkImport.php
@@ -87,7 +87,6 @@ class KTBulkImportFolderAction extends KTFolderAction {
'context' => &$this,
'add_fields' => $add_fields,
'generic_fieldsets' => $fieldsets,
- 'foldername' => $this->oFolder->getName(),
));
return $oTemplate->render();
}
diff --git a/plugins/ktcore/folder/BulkUpload.php b/plugins/ktcore/folder/BulkUpload.php
index 2acd459..501ac29 100644
--- a/plugins/ktcore/folder/BulkUpload.php
+++ b/plugins/ktcore/folder/BulkUpload.php
@@ -93,7 +93,6 @@ class KTBulkUploadFolderAction extends KTFolderAction {
'context' => &$this,
'add_fields' => $add_fields,
'generic_fieldsets' => $fieldsets,
- 'foldername' => $this->oFolder->getName(),
));
return $oTemplate->render();
}
diff --git a/plugins/ktcore/folder/Permissions.php b/plugins/ktcore/folder/Permissions.php
index 5c3fdb9..6a6e1d2 100644
--- a/plugins/ktcore/folder/Permissions.php
+++ b/plugins/ktcore/folder/Permissions.php
@@ -177,7 +177,6 @@ class KTFolderPermissionsAction extends KTFolderAction {
'edit' => $bEdit,
'inheritable' => $bInheritable,
'inherited' => $sInherited,
- 'foldername' => $this->oFolder->getName(),
'conditions' => $aConditions,
);
return $oTemplate->render($aTemplateData);
@@ -411,14 +410,14 @@ class KTFolderPermissionsAction extends KTFolderAction {
if($bSelected) {
if(count($aPerm))
$aEntityList['g'.$oGroup->getId()] = array('type' => 'group',
- 'display' => _kt('Group:') . ' ' . $oGroup->getName(),
+ 'display' => _kt('Group') . ': ' . $oGroup->getName(),
'name' => $oGroup->getName(),
'permissions' => $aPerm,
'id' => $oGroup->getId(),
'selected' => true);
} else {
$aEntityList['g'.$oGroup->getId()] = array('type' => 'group',
- 'display' => _kt('Group:') . ' ' . $oGroup->getName(),
+ 'display' => _kt('Group') . ': ' . $oGroup->getName(),
'name' => $oGroup->getName(),
'permissions' => $aPerm,
'id' => $oGroup->getId());
@@ -435,14 +434,14 @@ class KTFolderPermissionsAction extends KTFolderAction {
if($bSelected) {
if(count($aPerm))
$aEntityList['r'.$oRole->getId()] = array('type' => 'role',
- 'display' => _kt('Role:') . ' ' . $oRole->getName(),
+ 'display' => _kt('Role') . ': ' . $oRole->getName(),
'name' => $oRole->getName(),
'permissions' => $aPerm,
'id' => $oRole->getId(),
'selected' => true);
} else {
$aEntityList['r'.$oRole->getId()] = array('type' => 'role',
- 'display' => _kt('Role:') . ' ' . $oRole->getName(),
+ 'display' => _kt('Role') . ': ' . $oRole->getName(),
'name' => $oRole->getName(),
'permissions' => $aPerm,
'id' => $oRole->getId());
diff --git a/plugins/ktcore/folder/Transactions.php b/plugins/ktcore/folder/Transactions.php
index 11c0c97..ca2daec 100644
--- a/plugins/ktcore/folder/Transactions.php
+++ b/plugins/ktcore/folder/Transactions.php
@@ -50,8 +50,6 @@ class KTFolderTransactionsAction extends KTFolderAction {
$this->oPage->setBreadcrumbDetails(_kt("transactions"));
$this->oPage->setTitle(_kt('Folder transactions'));
- // $oTemplate =& $this->oValidator->validateTemplate('ktcore/folder/transactions');
-
$folder_data = array();
$folder_data["folder_id"] = $this->oFolder->getId();
diff --git a/plugins/ktcore/folder/addDocument.php b/plugins/ktcore/folder/addDocument.php
index 04e1817..8db5fa0 100644
--- a/plugins/ktcore/folder/addDocument.php
+++ b/plugins/ktcore/folder/addDocument.php
@@ -143,12 +143,8 @@ class KTFolderAddDocumentAction extends KTFolderAction {
function do_main() {
$this->oPage->setBreadcrumbDetails(_kt("Add a document"));
- $this->oPage->setTitle(_kt('Add a document'));
-
- $oTemplate =& $this->oValidator->validateTemplate('ktcore/document/add');
-
$oForm = $this->form_initialdata();
- return $oForm->render();
+ return $oForm->renderPage(_kt('Add a document to: ') . $this->oFolder->getName());
}
function do_processInitialData() {
diff --git a/plugins/ktstandard/KTDocumentLinks.php b/plugins/ktstandard/KTDocumentLinks.php
index 44804ef..71d411e 100644
--- a/plugins/ktstandard/KTDocumentLinks.php
+++ b/plugins/ktstandard/KTDocumentLinks.php
@@ -150,7 +150,6 @@ class KTDocumentLinkAction extends KTDocumentAction {
$oReadPermission =& KTPermission::getByName('ktcore.permissions.read');
$oWritePermission =& KTPermission::getByName('ktcore.permissions.write');
-
$aTemplateData = array(
'context' => $this,
'links_from' => DocumentLink::getLinksFromDocument($oDocument->getId()),
diff --git a/plugins/ktstandard/KTEmail.php b/plugins/ktstandard/KTEmail.php
index 190e44a..d46fa6d 100644
--- a/plugins/ktstandard/KTEmail.php
+++ b/plugins/ktstandard/KTEmail.php
@@ -141,7 +141,7 @@ function sendEmailDocument($sDestEmailAddress, $sDestUserName, $iDocumentID, $sD
$sMessage .= sprintf(_kt("Your colleague, %s, wishes you to view the attached document entitled '%s'."), $oSendingUser->getName(), $sDocumentName);
$sMessage .= "\n\n";
if (strlen($sComment) > 0) {
- $sMessage .= '
' . _kt('Comments:') . '
' . $sComment;
+ $sMessage .= '
' . _kt('Comments') . ':
' . $sComment;
}
$sTitle = sprintf(_kt("Document: %s from %s"), $sDocumentName, $oSendingUser->getName());
@@ -202,7 +202,7 @@ function sendEmailHyperlink($sDestEmailAddress, $sDestUserName, $iDocumentID, $s
$sMessage .= '
' . generateControllerLink('viewDocument', "fDocumentID=$iDocumentID", $sDocumentName, true);
// add optional comment
if (strlen($sComment) > 0) {
- $sMessage .= '
' . _kt('Comments:') . '
' . $sComment;
+ $sMessage .= '
' . _kt('Comments') . ':
' . $sComment;
}
$sMessage .= '';
$sTitle = sprintf(_kt("Link: %s from %s"), $sDocumentName, $oSendingUser->getName());
diff --git a/plugins/rssplugin/RSSFolderLinkAction.php b/plugins/rssplugin/RSSFolderLinkAction.php
index cf9d8c6..5bf6d6e 100644
--- a/plugins/rssplugin/RSSFolderLinkAction.php
+++ b/plugins/rssplugin/RSSFolderLinkAction.php
@@ -68,6 +68,7 @@ class RSSFolderLinkAction extends KTFolderAction {
'context' => $this,
'link' => KTrss::getRssLink($iFId, 'folder'),
'linkIcon' => KTrss::getImageLink($iFId, 'folder'),
+ 'folderName' => $this->oFolder->getName(),
);
return $oTemplate->render($aTemplateData);
diff --git a/plugins/rssplugin/templates/RSSPlugin/rssdocumentaction.smarty b/plugins/rssplugin/templates/RSSPlugin/rssdocumentaction.smarty
index 98e434d..ce3a66b 100644
--- a/plugins/rssplugin/templates/RSSPlugin/rssdocumentaction.smarty
+++ b/plugins/rssplugin/templates/RSSPlugin/rssdocumentaction.smarty
@@ -1,9 +1,10 @@
-
You can copy the following link into any RSS aggregator to create a feed to the selected document.
You can copy the following link into any RSS aggragator to create a feed to the selected folder.
{i18n arg_join=$mainjoin}Match #join# of the following:{/i18n}
+{i18n arg_join=$mainjoin}Match #join# of the following{/i18n}:
{foreach from=$params key=key item=group} {assign var=join value=$joins[$key]} diff --git a/templates/kt3/document/edit.smarty b/templates/kt3/document/edit.smarty index 1fd7e65..a7d42e7 100644 --- a/templates/kt3/document/edit.smarty +++ b/templates/kt3/document/edit.smarty @@ -11,7 +11,7 @@ {$context->oPage->requireCSSResource('resources/css/kt-treewidget.css')} -{i18n arg_link=$link}Change the document type{/i18n}
diff --git a/templates/kt3/view_folder_history.smarty b/templates/kt3/view_folder_history.smarty index b23a5c5..ee300f5 100644 --- a/templates/kt3/view_folder_history.smarty +++ b/templates/kt3/view_folder_history.smarty @@ -1,4 +1,4 @@ -{i18n}This page provides details of all activities that have been carried out on the folder.{/i18n}
diff --git a/templates/ktcore/action/addFolder.smarty b/templates/ktcore/action/addFolder.smarty index 7712729..2b75999 100644 --- a/templates/ktcore/action/addFolder.smarty +++ b/templates/ktcore/action/addFolder.smarty @@ -1,4 +1,4 @@ -{i18n}Folders are one way of organising documents in the document management system. Folders provide meaning in the diff --git a/templates/ktcore/action/archive.smarty b/templates/ktcore/action/archive.smarty index 670a986..aef5ed7 100644 --- a/templates/ktcore/action/archive.smarty +++ b/templates/ktcore/action/archive.smarty @@ -1,4 +1,4 @@ -
{i18n}Archiving a document changes the document's state to invisible to non-administrative users. Only an diff --git a/templates/ktcore/action/assistance.smarty b/templates/ktcore/action/assistance.smarty index a67ac33..c401b15 100644 --- a/templates/ktcore/action/assistance.smarty +++ b/templates/ktcore/action/assistance.smarty @@ -1,4 +1,5 @@ -
{i18n}If you are unable to perform an action on this document that you think you should be able to, or wish to diff --git a/templates/ktcore/action/cancel_checkout.smarty b/templates/ktcore/action/cancel_checkout.smarty index a8f0776..09b7302 100644 --- a/templates/ktcore/action/cancel_checkout.smarty +++ b/templates/ktcore/action/cancel_checkout.smarty @@ -1,4 +1,4 @@ -
{i18n}If you do not want to have this document be checked-out, diff --git a/templates/ktcore/action/checkin.smarty b/templates/ktcore/action/checkin.smarty index 34e5118..2d39645 100644 --- a/templates/ktcore/action/checkin.smarty +++ b/templates/ktcore/action/checkin.smarty @@ -1,4 +1,5 @@ -
{i18n}Checking in a document updates the document and allows others to make changes to the document and its metadata.{/i18n}
diff --git a/templates/ktcore/action/checkout.smarty b/templates/ktcore/action/checkout.smarty index bf1f89b..965e158 100644 --- a/templates/ktcore/action/checkout.smarty +++ b/templates/ktcore/action/checkout.smarty @@ -1,4 +1,4 @@ -{i18n}Checking out a document reserves it for your exclusive use. This ensures that you can edit the document without diff --git a/templates/ktcore/action/checkout_final.smarty b/templates/ktcore/action/checkout_final.smarty index 4006a44..9b91929 100644 --- a/templates/ktcore/action/checkout_final.smarty +++ b/templates/ktcore/action/checkout_final.smarty @@ -16,6 +16,8 @@ addLoadEvent(scheduleCheckout); {/capture} {$context->oPage->requireJSStandalone($sJavascript)} +
{i18n arg_link=$link}The document you wish to check out will begin to download soon. If it does not automatically diff --git a/templates/ktcore/action/copy.smarty b/templates/ktcore/action/copy.smarty index b9cf364..acdd726 100644 --- a/templates/ktcore/action/copy.smarty +++ b/templates/ktcore/action/copy.smarty @@ -1,4 +1,4 @@ -
{i18n}Deleting a document marks it as no longer being displayed. The document management system does not remove the diff --git a/templates/ktcore/action/move_final.smarty b/templates/ktcore/action/move_final.smarty index ac1de89..54b5d18 100644 --- a/templates/ktcore/action/move_final.smarty +++ b/templates/ktcore/action/move_final.smarty @@ -1,6 +1,5 @@ -
{i18n}Moving a document relocates the document -within the DMS.{/i18n}
+{i18n}Moving a document relocates the document within the DMS.{/i18n}
{$form->render()} diff --git a/templates/ktcore/action/rename.smarty b/templates/ktcore/action/rename.smarty index 4496a65..889cb0e 100644 --- a/templates/ktcore/action/rename.smarty +++ b/templates/ktcore/action/rename.smarty @@ -1,4 +1,4 @@ -{i18n}This page allows you to rename the file name (not the document title) for a document.{/i18n}
diff --git a/templates/ktcore/action/view_roles.smarty b/templates/ktcore/action/view_roles.smarty index e9e3f4e..3943ea8 100644 --- a/templates/ktcore/action/view_roles.smarty +++ b/templates/ktcore/action/view_roles.smarty @@ -1,4 +1,4 @@ -{i18n} In many cases, workflow actions will be assigned to certain roles @@ -22,8 +22,8 @@
{i18n}These are the results of the bulk action:{/i18n}
+{i18n}These are the results of the bulk action{/i18n}:
{if count($list.folders)}| {i18n}Role:{/i18n} {$oRole->getName()} | +{i18n}Role{/i18n}: {$oRole->getName()} | { assign var=iRoleId value=$oRole->getId() } { foreach item=oPerm from=$permissions } { assign var=iPermId value=$oPerm->getId() } @@ -46,7 +46,7 @@ permissions are not shown.{/i18n} { foreach item=oGroup from=$groups } -{i18n}Group:{/i18n} {$oGroup->getName()} | +{i18n}Group{/i18n}: {$oGroup->getName()} | { assign var=iGroupId value=$oGroup->getId() } { foreach item=oPerm from=$permissions } { assign var=iPermId value=$oPerm->getId() } diff --git a/templates/ktcore/document/edit.smarty b/templates/ktcore/document/edit.smarty index 5b334a7..3512dae 100644 --- a/templates/ktcore/document/edit.smarty +++ b/templates/ktcore/document/edit.smarty @@ -11,7 +11,7 @@ {$context->oPage->requireCSSResource('resources/css/kt-treewidget.css')} -