final parts of fix for KTS-1300

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6007 c91229c3-7414-0410-bfa2-8a42b809f60b

final parts of fix for KTS-1300
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6007 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent beac73a0
Showing 11 changed files with 26 additions and 25 deletions
browse.php
lib/browse/Criteria.inc
lib/documentmanagement/documentutil.inc.php
templates/kt3/fields/jsonlookup.smarty
templates/ktcore/folder/permissions.smarty
templates/ktcore/folder/roles.smarty
templates/ktcore/folder/view_permissions.smarty
templates/ktstandard/action/discussion.smarty
templates/ktstandard/action/discussion_comment_list_item.smarty
templates/ktstandard/action/discussion_thread.smarty
templates/ktstandard/action/discussion_thread_list_item.smarty
@@ -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());
@@ -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 .= "&nbsp;&nbsp;<a href=\"javascript:show_calendar('MainForm." . $sEndWidget . "',null,null,'YYYY-MM-DD', false);\" onmouseover=\"window.status='Date Picker';return true;\" onmouseout=\"window.status='';return true;\"><img src=\"$default->graphicsUrl/calendar/calendar.gif\" name=\"imgCalendar\" width=\"34\" height=\"21\" border=\"0\" alt=\"\"></a>";
         */
         $sToRender = $this->getNotWidget($aPreValue);
-        $sToRender .= 'after: <span class="kt_calendar_holder"><strong class="kt_calendar_datetext">' . $aPreValue[$sStartWidget] . '</strong><input type="hidden" name="' . $sStartWidget . '" class="kt_calendar_value" value="' . $aPreValue[$sStartWidget] . '"/> <input type="button" onclick="init_kt_calendar(this);" value="select"></span> and/or ';
-        $sToRender .= 'before: <span class="kt_calendar_holder"><strong class="kt_calendar_datetext">' . $aPreValue[$sEndWidget] . '</strong><input type="hidden" name="' . $sEndWidget . '" class="kt_calendar_value" value="' . $aPreValue[$sEndWidget] . '"/> <input type="button" onclick="init_kt_calendar(this);" value="select"></span><br />';
+        $sToRender .= _kt('after') . ': <span class="kt_calendar_holder"><strong class="kt_calendar_datetext">' . $aPreValue[$sStartWidget] . '</strong><input type="hidden" name="' . $sStartWidget . '" class="kt_calendar_value" value="' . $aPreValue[$sStartWidget] . '"/> <input type="button" onclick="init_kt_calendar(this);" value="select"></span> and/or ';
+        $sToRender .= _kt('before') . ': <span class="kt_calendar_holder"><strong class="kt_calendar_datetext">' . $aPreValue[$sEndWidget] . '</strong><input type="hidden" name="' . $sEndWidget . '" class="kt_calendar_value" value="' . $aPreValue[$sEndWidget] . '"/> <input type="button" onclick="init_kt_calendar(this);" value="select"></span><br />';
         return $sToRender;
     }
     function searchSQL ($aRequest) {
@@ -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) { 
@@ -52,7 +52,7 @@
        <option value="{$lookup_key}" {if ($value == $lookup_key)}selected="selected"{/if}>{$lookup->getName()}</option>
   {/foreach}
   </select>
-  <div><label for="filter_{$name}_assigned">Filter</label><input type="text" id="filter_{$name}_assigned" /></div>
+  <div><label for="filter_{$name}_assigned">{i18n}Filter{/i18n}</label><input type="text" id="filter_{$name}_assigned" /></div>
     </td>
     </tr>
 </tbody>
@@ -38,9 +38,9 @@
 <thead>
     <tr>
-        <td style="width:45%"><label for="select_{$name}_avail">Available Entities</label></td>
+        <td style="width:45%"><label for="select_{$name}_avail">{i18n}Available Entities{/i18n}</label></td>
         <td style="width:10%">&nbsp;</td>
-        <td style="width:45%"><label for="select_{$name}_assigned">Assigned Entities</label></td>
+        <td style="width:45%"><label for="select_{$name}_assigned">{i18n}Assigned Entities{/i18n}</label></td>
     </tr>
 </thead>
@@ -51,7 +51,7 @@
   <select name="entities" id="select_entities_avail" multiple="true"size="5">
   </select>
-  <div><label for="filter_entities_avail">Filter</label><input type="text" id="filter_entities_avail" /><br/><a href="#" id="entities_show_all">Show All</a></div>
+  <div><label for="filter_entities_avail">{i18n}Filter{/i18n}</label><input type="text" id="filter_entities_avail" /><br/><a href="#" id="entities_show_all">{i18n}Show All{/i18n}</a></div>
     </td>
     <td>
@@ -66,7 +66,7 @@
   <select name="entities" id="select_entities_assigned" multiple="true"size="5">
   </select>
-  <div><label for="filter_entities_assigned">Filter</label><input type="text" id="filter_entities_assigned" /></div>
+  <div><label for="filter_entities_assigned">{i18n}Filter{/i18n}</label><input type="text" id="filter_entities_assigned" /></div>
     </td>
     </tr>
 </tbody>
@@ -42,7 +42,7 @@ role allocations may take a some time, depending on the number of folders below 
         <td class="centered"><a href="{addQS}action=editRoleGroups&alloc_id={$aRole.allocation_id}&fFolderId={$context->oFolder->getId()}&role_id={$role_id}{/addQS}" class="ktAction ktEdit" title="{i18n}Edit Groups{/i18n}">{i18n}Edit Groups{/i18n}</a></td>
           {if !$is_root}
             <td class="centered"><a href="{addQS}action=useParent&role_id={$role_id}&fFolderId={$context->oFolder->getId()}{/addQS}" class="ktAction ktDelete" 
-	           kt:deleteMessage="Are you sure you wish to remove this role allocation?"	 
+	           kt:deleteMessage="{i18n}Are you sure you wish to remove this role allocation?{/i18n}"	 
 	           title="{i18n}Use parent's allocation{/i18n}">{i18n}Use parent's allocation{/i18n}</a></td>
           {/if}
         {/if}        
@@ -18,7 +18,7 @@ assigned are shown.{/i18n}&lt;/p&gt;
 <p>{i18n arg_permission_source=$inherited}This folder <strong>inherits</strong> its permissions from #permission_source#.{/i18n}
 {if $inheritable}
 <a class="ktActionLink ktDelete"
-   kt:deleteMessage="Are you sure you wish to override the permissions?"
+   kt:deleteMessage="{i18n}Are you sure you wish to override the permissions?{/i18n}"
    href="{addQS}action=edit&fFolderId={$oFolder->getId()}&override=1{/addQS}">{i18n}Override permissions{/i18n}</a>
 {/if}
 </p>
@@ -44,7 +44,7 @@
 <input type="hidden" name="fDocumentId" value="{$context->oDocument->getId()}" />
 <input type="hidden" name="fIncludeClosed" value="1" />
 <fieldset><legend>{i18n}View all threads{/i18n}</legend>
-<p class="descriptiveText">Click below to view all discussion threads on this document, including those that are closed.</p>
+<p class="descriptiveText">{i18n}Click below to view all discussion threads on this document, including those that are closed.{/i18n}</p>
 <div class="form_actions ">
   <input type="submit" name="submit" value="{i18n}View threads{/i18n}" />
@@ -6,11 +6,12 @@
 <dl class="kt-discussion-comment odd-comment">
 {/if}
-  <dt>
-    <span class="subject">{$comment->getSubject()}</span>
+  <dt>{i18n arg_subject=$comment->getSubject() arg_author=$creator->getName() arg_date=$comment->getDate()}
+    <span class="subject">#subject#</span>
     by
-    <span class="author">{$creator->getName()}</span>
-    <span class="date">({$comment->getDate()})</span>
+    <span class="author">{#author#}</span>
+    <span class="date">(#date#)</span>
+    {/i18n}
   </dt>
   <dd>{$comment->getBody()}</dd>
@@ -42,7 +42,7 @@
 {else}
 <div>
-    Thread closed ({$thread->getCloseReason()})
+    {i18n}Thread closed{/i18n} ({$thread->getCloseReason()})
 </div>
 {/if}
@@ -10,6 +10,6 @@
   {$sStateName}<br/>
   {if ($iStateId==DISCUSSION_FINALISED || $iStateId==DISCUSSION_IMPLEMENTED || $iStateId==DISCUSSION_CLOSED)}
   <strong>{i18n}Conclusion{/i18n}:</strong> {$thread->getCloseReason()}{/if}
-  {if ($iStateId==DISCUSSION_CLOSED)}<br/>(Closed at metadata version: {$thread->getCloseMetadataVersion()}){/if}
+  {if ($iStateId==DISCUSSION_CLOSED)}<br/>{i18n arg_ver=$thread->getCloseMetadataVersion()}(Closed at metadata version: #ver#{/i18n]{/if}
   </td>
 </tr>