Peter M. Groen / knowledgetree

Commit 689a7b41b6f8c22ed132dfd460412a34e16d78e4

Authored by Brad Shuttleworth
1 parent beac73a0

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
Inline Side-by-side
Showing 11 changed files with 26 additions and 25 deletions
browse.php
  View file @689a7b4
... ... @@ -327,8 +327,8 @@ class BrowseDispatcher extends KTStandardDispatcher {
327 327 }
328 328  
329 329 function do_startMove() {
330   - $this->oPage->setTitle('Move Files and Folders');
331   - $this->oPage->setBreadcrumbDetails('Move Files and Folders');
  330 + $this->oPage->setTitle(_kt('Move Files and Folders'));
  331 + $this->oPage->setBreadcrumbDetails(_kt('Move Files and Folders'));
332 332  
333 333 // FIXME double-check that the movecode actually exists...
334 334  
... ... @@ -666,8 +666,8 @@ class BrowseDispatcher extends KTStandardDispatcher {
666 666 }
667 667  
668 668 function do_startDelete() {
669   - $this->oPage->setTitle('Delete Files and Folders');
670   - $this->oPage->setBreadcrumbDetails('Delete Files and Folders');
  669 + $this->oPage->setTitle(_kt('Delete Files and Folders'));
  670 + $this->oPage->setBreadcrumbDetails(_kt('Delete Files and Folders'));
671 671 $fFolderId = KTUtil::arrayGet($_REQUEST, 'fFolderId', 1);
672 672  
673 673 $aFolderSelection = KTUtil::arrayGet($_REQUEST, 'selection_f' , array());
... ...
lib/browse/Criteria.inc
  View file @689a7b4
... ... @@ -432,13 +432,13 @@ class DateCreatedCriterion extends BrowseCriterion {
432 432 $sEnd = KTUtil::arrayGet($aData, $this->getWidgetBase() . '_end', false);
433 433  
434 434 if($sStart) {
435   - $sDisp .= 'after ' .$sStart;
  435 + $sDisp .= _kt('after ') .$sStart;
436 436 }
437 437 if($sStart && $sEnd) {
438   - $sDisp .= ' and ';
  438 + $sDisp .= _kt(' and ');
439 439 }
440 440 if($sEnd) {
441   - $sDisp .= 'before ' .$sEnd;
  441 + $sDisp .= _kt('before ') .$sEnd;
442 442 }
443 443 return $sDisp;
444 444 }
... ... @@ -460,8 +460,8 @@ class DateCreatedCriterion extends BrowseCriterion {
460 460 $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>";
461 461 */
462 462 $sToRender = $this->getNotWidget($aPreValue);
463   - $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 ';
464   - $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 />';
  463 + $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 ';
  464 + $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 />';
465 465 return $sToRender;
466 466 }
467 467 function searchSQL ($aRequest) {
... ...
lib/documentmanagement/documentutil.inc.php
  View file @689a7b4
... ... @@ -648,11 +648,11 @@ class KTDocumentUtil {
648 648 global $default;
649 649  
650 650 if (count(trim($sReason)) == 0) {
651   - return PEAR::raiseError('Deletion requires a reason');
  651 + return PEAR::raiseError(_kt('Deletion requires a reason'));
652 652 }
653 653  
654 654 if (PEAR::isError($oDocument) || ($oDocument == false)) {
655   - return PEAR::raiseError('Invalid document object.');
  655 + return PEAR::raiseError(_kt('Invalid document object.'));
656 656 }
657 657  
658 658 if ($oDocument->getIsCheckedOut() == true) {
... ...
templates/kt3/fields/jsonlookup.smarty
  View file @689a7b4
... ... @@ -52,7 +52,7 @@
52 52 <option value="{$lookup_key}" {if ($value == $lookup_key)}selected="selected"{/if}>{$lookup->getName()}</option>
53 53 {/foreach}
54 54 </select>
55   - <div><label for="filter_{$name}_assigned">Filter</label><input type="text" id="filter_{$name}_assigned" /></div>
  55 + <div><label for="filter_{$name}_assigned">{i18n}Filter{/i18n}</label><input type="text" id="filter_{$name}_assigned" /></div>
56 56 </td>
57 57 </tr>
58 58 </tbody>
... ...
templates/ktcore/folder/permissions.smarty
  View file @689a7b4
... ... @@ -38,9 +38,9 @@
38 38  
39 39 <thead>
40 40 <tr>
41   - <td style="width:45%"><label for="select_{$name}_avail">Available Entities</label></td>
  41 + <td style="width:45%"><label for="select_{$name}_avail">{i18n}Available Entities{/i18n}</label></td>
42 42 <td style="width:10%">&nbsp;</td>
43   - <td style="width:45%"><label for="select_{$name}_assigned">Assigned Entities</label></td>
  43 + <td style="width:45%"><label for="select_{$name}_assigned">{i18n}Assigned Entities{/i18n}</label></td>
44 44 </tr>
45 45 </thead>
46 46  
... ... @@ -51,7 +51,7 @@
51 51 <select name="entities" id="select_entities_avail" multiple="true"size="5">
52 52 </select>
53 53  
54   - <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>
  54 + <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>
55 55 </td>
56 56  
57 57 <td>
... ... @@ -66,7 +66,7 @@
66 66  
67 67 <select name="entities" id="select_entities_assigned" multiple="true"size="5">
68 68 </select>
69   - <div><label for="filter_entities_assigned">Filter</label><input type="text" id="filter_entities_assigned" /></div>
  69 + <div><label for="filter_entities_assigned">{i18n}Filter{/i18n}</label><input type="text" id="filter_entities_assigned" /></div>
70 70 </td>
71 71 </tr>
72 72 </tbody>
... ...
templates/ktcore/folder/roles.smarty
  View file @689a7b4
... ... @@ -42,7 +42,7 @@ role allocations may take a some time, depending on the number of folders below
42 42 <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>
43 43 {if !$is_root}
44 44 <td class="centered"><a href="{addQS}action=useParent&role_id={$role_id}&fFolderId={$context->oFolder->getId()}{/addQS}" class="ktAction ktDelete"
45   - kt:deleteMessage="Are you sure you wish to remove this role allocation?"
  45 + kt:deleteMessage="{i18n}Are you sure you wish to remove this role allocation?{/i18n}"
46 46 title="{i18n}Use parent's allocation{/i18n}">{i18n}Use parent's allocation{/i18n}</a></td>
47 47 {/if}
48 48 {/if}
... ...
templates/ktcore/folder/view_permissions.smarty
  View file @689a7b4
... ... @@ -18,7 +18,7 @@ assigned are shown.{/i18n}&lt;/p&gt;
18 18 <p>{i18n arg_permission_source=$inherited}This folder <strong>inherits</strong> its permissions from #permission_source#.{/i18n}
19 19 {if $inheritable}
20 20 <a class="ktActionLink ktDelete"
21   - kt:deleteMessage="Are you sure you wish to override the permissions?"
  21 + kt:deleteMessage="{i18n}Are you sure you wish to override the permissions?{/i18n}"
22 22 href="{addQS}action=edit&fFolderId={$oFolder->getId()}&override=1{/addQS}">{i18n}Override permissions{/i18n}</a>
23 23 {/if}
24 24 </p>
... ...
templates/ktstandard/action/discussion.smarty
  View file @689a7b4
... ... @@ -44,7 +44,7 @@
44 44 <input type="hidden" name="fDocumentId" value="{$context->oDocument->getId()}" />
45 45 <input type="hidden" name="fIncludeClosed" value="1" />
46 46 <fieldset><legend>{i18n}View all threads{/i18n}</legend>
47   -<p class="descriptiveText">Click below to view all discussion threads on this document, including those that are closed.</p>
  47 +<p class="descriptiveText">{i18n}Click below to view all discussion threads on this document, including those that are closed.{/i18n}</p>
48 48  
49 49 <div class="form_actions ">
50 50 <input type="submit" name="submit" value="{i18n}View threads{/i18n}" />
... ...
templates/ktstandard/action/discussion_comment_list_item.smarty
  View file @689a7b4
... ... @@ -6,11 +6,12 @@
6 6 <dl class="kt-discussion-comment odd-comment">
7 7 {/if}
8 8  
9   - <dt>
10   - <span class="subject">{$comment->getSubject()}</span>
  9 + <dt>{i18n arg_subject=$comment->getSubject() arg_author=$creator->getName() arg_date=$comment->getDate()}
  10 + <span class="subject">#subject#</span>
11 11 by
12   - <span class="author">{$creator->getName()}</span>
13   - <span class="date">({$comment->getDate()})</span>
  12 + <span class="author">{#author#}</span>
  13 + <span class="date">(#date#)</span>
  14 + {/i18n}
14 15 </dt>
15 16  
16 17 <dd>{$comment->getBody()}</dd>
... ...
templates/ktstandard/action/discussion_thread.smarty
  View file @689a7b4
... ... @@ -42,7 +42,7 @@
42 42 {else}
43 43  
44 44 <div>
45   - Thread closed ({$thread->getCloseReason()})
  45 + {i18n}Thread closed{/i18n} ({$thread->getCloseReason()})
46 46 </div>
47 47  
48 48 {/if}
... ...
templates/ktstandard/action/discussion_thread_list_item.smarty
  View file @689a7b4
... ... @@ -10,6 +10,6 @@
10 10 {$sStateName}<br/>
11 11 {if ($iStateId==DISCUSSION_FINALISED || $iStateId==DISCUSSION_IMPLEMENTED || $iStateId==DISCUSSION_CLOSED)}
12 12 <strong>{i18n}Conclusion{/i18n}:</strong> {$thread->getCloseReason()}{/if}
13   - {if ($iStateId==DISCUSSION_CLOSED)}<br/>(Closed at metadata version: {$thread->getCloseMetadataVersion()}){/if}
  13 + {if ($iStateId==DISCUSSION_CLOSED)}<br/>{i18n arg_ver=$thread->getCloseMetadataVersion()}(Closed at metadata version: #ver#{/i18n]{/if}
14 14 </td>
15 15 </tr>
... ...