From 689a7b41b6f8c22ed132dfd460412a34e16d78e4 Mon Sep 17 00:00:00 2001 From: Brad Shuttleworth Date: Thu, 28 Sep 2006 15:57:07 +0000 Subject: [PATCH] final parts of fix for KTS-1300 --- browse.php | 8 ++++---- lib/browse/Criteria.inc | 10 +++++----- lib/documentmanagement/documentutil.inc.php | 4 ++-- templates/kt3/fields/jsonlookup.smarty | 2 +- templates/ktcore/folder/permissions.smarty | 8 ++++---- templates/ktcore/folder/roles.smarty | 2 +- templates/ktcore/folder/view_permissions.smarty | 2 +- templates/ktstandard/action/discussion.smarty | 2 +- templates/ktstandard/action/discussion_comment_list_item.smarty | 9 +++++---- templates/ktstandard/action/discussion_thread.smarty | 2 +- templates/ktstandard/action/discussion_thread_list_item.smarty | 2 +- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/browse.php b/browse.php index cc06915..a22f240 100755 --- a/browse.php +++ b/browse.php @@ -327,8 +327,8 @@ class BrowseDispatcher extends KTStandardDispatcher { } function do_startMove() { - $this->oPage->setTitle('Move Files and Folders'); - $this->oPage->setBreadcrumbDetails('Move Files and Folders'); + $this->oPage->setTitle(_kt('Move Files and Folders')); + $this->oPage->setBreadcrumbDetails(_kt('Move Files and Folders')); // FIXME double-check that the movecode actually exists... @@ -666,8 +666,8 @@ class BrowseDispatcher extends KTStandardDispatcher { } function do_startDelete() { - $this->oPage->setTitle('Delete Files and Folders'); - $this->oPage->setBreadcrumbDetails('Delete Files and Folders'); + $this->oPage->setTitle(_kt('Delete Files and Folders')); + $this->oPage->setBreadcrumbDetails(_kt('Delete Files and Folders')); $fFolderId = KTUtil::arrayGet($_REQUEST, 'fFolderId', 1); $aFolderSelection = KTUtil::arrayGet($_REQUEST, 'selection_f' , array()); diff --git a/lib/browse/Criteria.inc b/lib/browse/Criteria.inc index 160d2ce..938b288 100644 --- a/lib/browse/Criteria.inc +++ b/lib/browse/Criteria.inc @@ -432,13 +432,13 @@ class DateCreatedCriterion extends BrowseCriterion { $sEnd = KTUtil::arrayGet($aData, $this->getWidgetBase() . '_end', false); if($sStart) { - $sDisp .= 'after ' .$sStart; + $sDisp .= _kt('after ') .$sStart; } if($sStart && $sEnd) { - $sDisp .= ' and '; + $sDisp .= _kt(' and '); } if($sEnd) { - $sDisp .= 'before ' .$sEnd; + $sDisp .= _kt('before ') .$sEnd; } return $sDisp; } @@ -460,8 +460,8 @@ class DateCreatedCriterion extends BrowseCriterion { $sToRender .= "  graphicsUrl/calendar/calendar.gif\" name=\"imgCalendar\" width=\"34\" height=\"21\" border=\"0\" alt=\"\">"; */ $sToRender = $this->getNotWidget($aPreValue); - $sToRender .= 'after: ' . $aPreValue[$sStartWidget] . ' and/or '; - $sToRender .= 'before: ' . $aPreValue[$sEndWidget] . '
'; + $sToRender .= _kt('after') . ': ' . $aPreValue[$sStartWidget] . ' and/or '; + $sToRender .= _kt('before') . ': ' . $aPreValue[$sEndWidget] . '
'; return $sToRender; } function searchSQL ($aRequest) { diff --git a/lib/documentmanagement/documentutil.inc.php b/lib/documentmanagement/documentutil.inc.php index fe855f5..d489256 100644 --- a/lib/documentmanagement/documentutil.inc.php +++ b/lib/documentmanagement/documentutil.inc.php @@ -648,11 +648,11 @@ class KTDocumentUtil { global $default; if (count(trim($sReason)) == 0) { - return PEAR::raiseError('Deletion requires a reason'); + return PEAR::raiseError(_kt('Deletion requires a reason')); } if (PEAR::isError($oDocument) || ($oDocument == false)) { - return PEAR::raiseError('Invalid document object.'); + return PEAR::raiseError(_kt('Invalid document object.')); } if ($oDocument->getIsCheckedOut() == true) { diff --git a/templates/kt3/fields/jsonlookup.smarty b/templates/kt3/fields/jsonlookup.smarty index 1f46f6f..4e2114e 100644 --- a/templates/kt3/fields/jsonlookup.smarty +++ b/templates/kt3/fields/jsonlookup.smarty @@ -52,7 +52,7 @@ {/foreach} -
+
diff --git a/templates/ktcore/folder/permissions.smarty b/templates/ktcore/folder/permissions.smarty index 5b6c5d5..0c2ffcd 100644 --- a/templates/ktcore/folder/permissions.smarty +++ b/templates/ktcore/folder/permissions.smarty @@ -38,9 +38,9 @@ - +   - + @@ -51,7 +51,7 @@ -

Show All
+

{i18n}Show All{/i18n}
@@ -66,7 +66,7 @@ -
+
diff --git a/templates/ktcore/folder/roles.smarty b/templates/ktcore/folder/roles.smarty index e897eb0..e89da1e 100644 --- a/templates/ktcore/folder/roles.smarty +++ b/templates/ktcore/folder/roles.smarty @@ -42,7 +42,7 @@ role allocations may take a some time, depending on the number of folders below {i18n}Edit Groups{/i18n} {if !$is_root} {i18n}Use parent's allocation{/i18n} {/if} {/if} diff --git a/templates/ktcore/folder/view_permissions.smarty b/templates/ktcore/folder/view_permissions.smarty index 0f9c631..b168475 100644 --- a/templates/ktcore/folder/view_permissions.smarty +++ b/templates/ktcore/folder/view_permissions.smarty @@ -18,7 +18,7 @@ assigned are shown.{/i18n}

{i18n arg_permission_source=$inherited}This folder inherits its permissions from #permission_source#.{/i18n} {if $inheritable} {i18n}Override permissions{/i18n} {/if}

diff --git a/templates/ktstandard/action/discussion.smarty b/templates/ktstandard/action/discussion.smarty index 70e9b94..fb864bd 100644 --- a/templates/ktstandard/action/discussion.smarty +++ b/templates/ktstandard/action/discussion.smarty @@ -44,7 +44,7 @@
{i18n}View all threads{/i18n} -

Click below to view all discussion threads on this document, including those that are closed.

+

{i18n}Click below to view all discussion threads on this document, including those that are closed.{/i18n}

diff --git a/templates/ktstandard/action/discussion_comment_list_item.smarty b/templates/ktstandard/action/discussion_comment_list_item.smarty index ff0d5ac..c88376f 100644 --- a/templates/ktstandard/action/discussion_comment_list_item.smarty +++ b/templates/ktstandard/action/discussion_comment_list_item.smarty @@ -6,11 +6,12 @@
{/if} -
- {$comment->getSubject()} +
{i18n arg_subject=$comment->getSubject() arg_author=$creator->getName() arg_date=$comment->getDate()} + #subject# by - {$creator->getName()} - ({$comment->getDate()}) + {#author#} + (#date#) + {/i18n}
{$comment->getBody()}
diff --git a/templates/ktstandard/action/discussion_thread.smarty b/templates/ktstandard/action/discussion_thread.smarty index 23e0a73..2b34b1c 100644 --- a/templates/ktstandard/action/discussion_thread.smarty +++ b/templates/ktstandard/action/discussion_thread.smarty @@ -42,7 +42,7 @@ {else}
- Thread closed ({$thread->getCloseReason()}) + {i18n}Thread closed{/i18n} ({$thread->getCloseReason()})
{/if} diff --git a/templates/ktstandard/action/discussion_thread_list_item.smarty b/templates/ktstandard/action/discussion_thread_list_item.smarty index 062dcfd..1561f5c 100644 --- a/templates/ktstandard/action/discussion_thread_list_item.smarty +++ b/templates/ktstandard/action/discussion_thread_list_item.smarty @@ -10,6 +10,6 @@ {$sStateName}
{if ($iStateId==DISCUSSION_FINALISED || $iStateId==DISCUSSION_IMPLEMENTED || $iStateId==DISCUSSION_CLOSED)} {i18n}Conclusion{/i18n}: {$thread->getCloseReason()}{/if} - {if ($iStateId==DISCUSSION_CLOSED)}
(Closed at metadata version: {$thread->getCloseMetadataVersion()}){/if} + {if ($iStateId==DISCUSSION_CLOSED)}
{i18n arg_ver=$thread->getCloseMetadataVersion()}(Closed at metadata version: #ver#{/i18n]{/if} -- libgit2 0.21.4