Commit 2fdb15cb8e59e20731bfaaf8b6076884316fd2c3

Authored by nbm
1 parent 9d908fba

Improve marking up of translatable text.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5156 c91229c3-7414-0410-bfa2-8a42b809f60b
plugins/ktcore/KTDocumentActions.php
... ... @@ -135,7 +135,7 @@ class KTDocumentCheckOutAction extends KTDocumentAction {
135 135 function do_checkout() {
136 136 $aErrorOptions = array(
137 137 'redirect_to' => array('','fDocumentId=' . $this->oDocument->getId()),
138   - 'message' => "You must provide a reason"
  138 + 'message' => _kt("You must provide a reason"),
139 139 );
140 140  
141 141 $oTemplate =& $this->oValidator->validateTemplate('ktcore/action/checkout_final');
... ... @@ -845,7 +845,7 @@ class KTDocumentArchiveAction extends KTDocumentAction {
845 845  
846 846 $aErrorOptions = array(
847 847 'redirect_to' => array('','fDocumentId=' . $this->oDocument->getId()),
848   - 'message' => "You must provide a reason"
  848 + 'message' => _kt("You must provide a reason"),
849 849 );
850 850  
851 851 $sReason = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'reason'), $aErrorOptions);
... ... @@ -954,7 +954,7 @@ class KTDocumentWorkflowAction extends KTDocumentAction {
954 954  
955 955 $aErrorOptions = array(
956 956 'redirect_to' => array('main', sprintf('fDocumentId=%d', $_REQUEST['fDocumentId'])),
957   - 'message' => 'You must provide a reason for the transition'
  957 + 'message' => _kt('You must provide a reason for the transition'),
958 958 );
959 959  
960 960 $sComments =& $this->oValidator->validateString($_REQUEST['fComments'], $aErrorOptions);
... ...
plugins/ktcore/KTPermissions.php
... ... @@ -635,4 +635,4 @@ class KTDocumentRolesAction extends KTDocumentAction {
635 635 );
636 636 return $oTemplate->render($aTemplateData);
637 637 }
638   -}
639 638 \ No newline at end of file
  639 +}
... ...
plugins/ktcore/admin/documentFields.php
... ... @@ -173,7 +173,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
173 173 $sName = $this->oValidator->validateEntityName("KTFieldset", $_REQUEST['name'], $aErrorOptions);
174 174  
175 175 $sDescription = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'description'),
176   - KTUtil::meldOptions($aErrorOptions, array('message' => "You must provide a description")));
  176 + KTUtil::meldOptions($aErrorOptions, array('message' => _kt("You must provide a description"))));
177 177  
178 178 $sNamespace = KTUtil::arrayGet($_REQUEST, 'namespace');
179 179  
... ... @@ -224,7 +224,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
224 224 unset($aErrorOptions['condition']);
225 225  
226 226 $sDescription = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'description'),
227   - KTUtil::meldOptions($aErrorOptions, array('message' => "You must provide a description")));
  227 + KTUtil::meldOptions($aErrorOptions, array('message' => _kt("You must provide a description"))));
228 228  
229 229  
230 230 $oFieldset = KTFieldset::get($_REQUEST['fFieldsetId']);
... ... @@ -288,7 +288,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
288 288 );
289 289  
290 290 $sName = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'name'),
291   - KTUtil::meldOptions($aErrorOptions, array('message' => "You must provide a name")));
  291 + KTUtil::meldOptions($aErrorOptions, array('message' => _kt("You must provide a name"))));
292 292  
293 293 $aErrorOptions['condition'] = array('parent_fieldset' => $oFieldset->getId());
294 294 $aErrorOptions['rename'] = $oField->getId();
... ... @@ -297,7 +297,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
297 297 unset($aErrorOptions['rename']);
298 298  
299 299 $sDescription = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'description'),
300   - KTUtil::meldOptions($aErrorOptions, array('message' => "You must provide a description")));
  300 + KTUtil::meldOptions($aErrorOptions, array('message' => _kt("You must provide a description"))));
301 301  
302 302 $oField->setName($_REQUEST['name']);
303 303 $oField->setDescription($sDescription);
... ...
plugins/ktcore/admin/plugins.php
... ... @@ -65,12 +65,12 @@ class KTPluginDispatcher extends KTAdminDispatcher {
65 65 $sTable = KTUtil::getTableName('plugins');
66 66 $aIds = (array) KTUtil::arrayGet($_REQUEST, 'pluginids');
67 67 KTPluginEntity::setEnabled($aIds);
68   - $this->successRedirectToMain('Plugins updated');
  68 + $this->successRedirectToMain(_kt('Plugins updated'));
69 69 }
70 70  
71 71 function do_reread() {
72 72 KTPluginUtil::registerPlugins();
73   - $this->successRedirectToMain('Plugins read from the filesystem');
  73 + $this->successRedirectToMain(_kt('Plugins read from the filesystem'));
74 74 }
75 75 }
76 76  
... ...
plugins/ktcore/admin/unitManagement.php
... ... @@ -178,7 +178,7 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
178 178 'name' => $sName,
179 179 'folderid' => $oFolder->getId(),
180 180 ));
181   - return $this->successRedirectToMain('Unit created');
  181 + return $this->successRedirectToMain(_kt('Unit created'));
182 182 }
183 183  
184 184 function do_editUnit() {
... ... @@ -255,7 +255,7 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
255 255 KTFolderUtil::delete($oFolder, $this->oUser, "Unit deleted", $aOptions);
256 256 }
257 257 }
258   - $this->successRedirectToMain("Unit removed");
  258 + $this->successRedirectToMain(_kt("Unit removed"));
259 259 }
260 260 }
261 261  
... ...
plugins/ktcore/authentication/authenticationadminpage.inc.php
... ... @@ -150,11 +150,11 @@ class KTAuthenticationAdminPage extends KTAdminDispatcher {
150 150 $oSource->setAuthenticationProvider($authentication_provider);
151 151 $res = $oSource->update();
152 152 $aOptions = array(
153   - 'message' => 'Update failed',
  153 + 'message' => _kt('Update failed'),
154 154 'redirect_to' => array('editsource', sprintf('source_id=%d', $oSource->getId())),
155 155 );
156 156 $this->oValidator->notErrorFalse($res, $aOptions);
157   - $this->successRedirectTo('viewsource', 'Details updated', sprintf('source_id=%d', $oSource->getId()));
  157 + $this->successRedirectTo('viewsource', _kt('Details updated'), sprintf('source_id=%d', $oSource->getId()));
158 158 }
159 159  
160 160 function do_newsource() {
... ...
plugins/ktcore/document/Rename.php
... ... @@ -85,7 +85,7 @@ class KTDocumentRenameAction extends KTDocumentAction {
85 85 $sFilename = KTUtil::arrayGet($_REQUEST, 'filename');
86 86 $aOptions = array(
87 87 'redirect_to' => array('', sprintf('fDocumentId=%d', $this->oDocument->getId())),
88   - 'message' => "No filename given",
  88 + 'message' => _kt("No filename given"),
89 89 );
90 90 $this->oValidator->validateString($sFilename, $aOptions);
91 91  
... ...
plugins/ktcore/folder/BulkUpload.php
... ... @@ -56,7 +56,7 @@ class KTBulkUploadFolderAction extends KTFolderAction {
56 56 if (!empty($postExpected)) {
57 57 $aErrorOptions = array(
58 58 'redirect_to' => array('main', sprintf('fFolderId=%d', $this->oFolder->getId())),
59   - 'message' => 'Upload larger than maximum POST size (max_post_size variable in .htaccess or php.ini)',
  59 + 'message' => _kt('Upload larger than maximum POST size (max_post_size variable in .htaccess or php.ini)'),
60 60 );
61 61 $this->oValidator->notEmpty($postReceived, $aErrorOptions);
62 62 }
... ...
plugins/ktcore/folder/Rename.php
... ... @@ -67,7 +67,7 @@ class KTFolderRenameAction extends KTFolderAction {
67 67 $sName = KTUtil::arrayGet($_REQUEST, 'foldername');
68 68 $aOptions = array(
69 69 'redirect_to' => array('', sprintf('fFolderId=%d', $this->oFolder->getId())),
70   - 'message' => "No folder name given",
  70 + 'message' => _kt("No folder name given"),
71 71 );
72 72 $this->oValidator->validateString($sName, $aOptions);
73 73  
... ...
plugins/ktcore/folder/addDocument.php
... ... @@ -54,7 +54,7 @@ class KTFolderAddDocumentAction extends KTFolderAction {
54 54 if (!empty($postExpected)) {
55 55 $aErrorOptions = array(
56 56 'redirect_to' => array('main', sprintf('fFolderId=%d', $this->oFolder->getId())),
57   - 'message' => 'Upload larger than maximum POST size (max_post_size variable in .htaccess or php.ini)',
  57 + 'message' => _kt('Upload larger than maximum POST size (max_post_size variable in .htaccess or php.ini)'),
58 58 );
59 59 $this->oValidator->notEmpty($postReceived, $aErrorOptions);
60 60 }
... ...
templates/kt3/browse_lookup_selection.smarty
1   -<h2>Select a Field</h2>
  1 +<h2>{i18n}Select a Field{/i18n}</h2>
2 2  
3 3 <p class="descriptiveText">{i18n}In some circumstances it is useful to view all
4 4 documents with a given value for a lookup field. Select the lookup field from the list below
... ... @@ -8,4 +8,4 @@ to view all relevant documents.{/i18n}&lt;/p&gt;
8 8 {foreach item=oField from=$fields}
9 9 <li><a href="{$smarty.server.PHP_SELF}?action=selectLookup&fField={$oField->getId()}&fBrowseMode=field">{$oField->getName()}</a></li>
10 10 {/foreach}
11   -</ul>
12 11 \ No newline at end of file
  12 +</ul>
... ...
templates/kt3/browse_types.smarty
1   -<h2>Select a document type</h2>
  1 +<h2>{i18n}Select a document type{/i18n}</h2>
2 2  
3 3 <p class="descriptiveText">{i18n}In some circumstances it is useful to view all
4 4 documents of a given <strong>document type</strong>. Select a <strong>document type</strong> from the list below
... ... @@ -8,4 +8,4 @@ to view all relevant documents.{/i18n}&lt;/p&gt;
8 8 {foreach item=oType from=$document_types}
9 9 <li><a href="{$smarty.server.PHP_SELF}?action=main&fType={$oType->getId()}&fBrowseMode=document_type">{$oType->getName()}</a></li>
10 10 {/foreach}
11   -</ul>
12 11 \ No newline at end of file
  12 +</ul>
... ...
templates/ktcore/authentication/manage.smarty
... ... @@ -9,7 +9,7 @@ specify additional sources of authentication data.{/i18n}&lt;/p&gt;
9 9  
10 10 {if $providers}
11 11 <p><a href="{addQS}action=addSource{/addQS}" class="ktAction ktAddGroup
12   -ktInline">{i18n}Add authentication source</a><a href="{addQS}action=addSource{/addQS}">Add a new
  12 +ktInline">{i18n}Add authentication source{/i18n}</a><a href="{addQS}action=addSource{/addQS}">{i18n}Add a new
13 13 authentication source{/i18n}</a>.</p>
14 14 {else}
15 15 <div class="ktInfo"><p>{i18n}Only the standard database authentication is currently available.
... ...
templates/ktcore/dashlets/admintutorial.smarty
1   -<h2>KnowledgeTree administrator's Guide</h2>
  1 +<h2>{i18n}KnowledgeTree administrator's Guide{/i18n}</h2>
2 2 <p class="descriptiveText">{i18n}If this is your first KnowledgeTree installation,
3 3 or if you've just upgraded from KnowledgeTree 2.x, we've put together some information
4 4 which might help you get to grips with the new system.{/i18n}</p>
... ...
templates/ktcore/document/admin/expungeconfirmlist.smarty
1   -<h2>Confirm Expunge</h2>
  1 +<h2>{i18n}Confirm Expunge{/i18n}</h2>
2 2  
3 3 <div class="ktInfo"><p><strong>{i18n}Note{/i18n}:</strong> {i18n}please
4 4 confirm that you want to delete these documents.{/i18n}</p></div>
... ...
templates/ktcore/document/document_permissions.smarty
... ... @@ -121,7 +121,7 @@ value=&quot;{$iGroupId}&quot;&gt;&lt;/td&gt;
121 121  
122 122 {if (!empty($conditions))}
123 123 {if ($edit || $dynamic_conditions)}
124   -<h2>Dynamic permissions</h2>
  124 +<h2>{i18n}Dynamic permissions{/i18n}</h2>
125 125 {/if}
126 126 { if $dynamic_conditions }
127 127 <table class="kt_collection" cellpadding="0" cellspacing="0">
... ... @@ -196,4 +196,4 @@ $this-&gt;assign(&quot;aPermissions&quot;, $this-&gt;_tpl_vars[&#39;oDynamicCondition&#39;]-&gt;getAssignme
196 196 <input type="submit" name="submit" value="{i18n}Add{/i18n}" />
197 197 </form>
198 198 { /if }
199   -{/if}
200 199 \ No newline at end of file
  200 +{/if}
... ...
templates/ktcore/folder/permissions.smarty
... ... @@ -114,7 +114,7 @@ value=&quot;{$iGroupId}&quot;&gt;&lt;/td&gt;
114 114  
115 115 {if (!empty($conditions))}
116 116 {if ($edit || $dynamic_conditions)}
117   -<h2>Dynamic permissions</h2>
  117 +<h2>{i18n}Dynamic permissions{/i18n}</h2>
118 118 {/if}
119 119 { if $dynamic_conditions }
120 120 <table class="kt_collection" cellpadding="0" cellspacing="0">
... ...
templates/ktcore/help_with_edit.smarty
1 1 {if (!$help_body)}
2   -<div class="ktError"><p>No content specified for this help file yet. <strong>Edit it first.</strong></p></div>
  2 +<div class="ktError"><p>{i18n}No content specified for this help file yet. <strong>Edit it first.</strong>{/i18n}</p></div>
3 3 {else}
4 4  
5 5 {$context->oPage->requireJSResource("resources/js/help.js")}
... ... @@ -16,4 +16,4 @@ left; padding-right: 0.5em;&quot;&gt;{i18n}Edit this help page.{/i18n}&lt;/a&gt;&lt;a href=&quot;{ktLi
16 16  
17 17 <a href="{ktLink base="help.php" query="action=go_back&back_key=`$back_key`"}" class="ktAction ktBack" style="float:
18 18 left; padding-right: 0.5em; clear: left; ">{i18n}Return to where you came from.{/i18n}</a><a href="{ktLink base="help.php" query="action=go_back&back_key=`$back_key`"}">{i18n}Return to where you came from.{/i18n}</a></p>
19   -
20 19 \ No newline at end of file
  20 +
... ...
templates/ktcore/javascript_i18n.smarty
... ... @@ -17,8 +17,6 @@ function _(trans_string) {
17 17  
18 18  
19 19  
20   -// strings for file: resources/js/add_document.js
21   -
22 20 // strings for file: resources/js/conditional_complex_edit.js
23 21 i18n['Finish with this column\'s behaviours.'] = '{i18n}Finish with this column\'s behaviours.{/i18n}';
24 22 i18n['Assuming this field has behaviour "'] = '{i18n}Assuming this field has behaviour "{/i18n}';
... ... @@ -45,15 +43,17 @@ i18n[&#39;all&#39;] = &#39;{i18n}all{/i18n}&#39;;
45 43 i18n['any'] = '{i18n}any{/i18n}';
46 44 i18n['of the criteria specified.'] = '{i18n}of the criteria specified.{/i18n}';
47 45  
48   -// strings for file: resources/js/constructed_search_postprocess.js
  46 +// strings for file: resources/js/taillog.js
49 47  
50   -// strings for file: resources/js/help.js
  48 +// strings for file: resources/js/add_document.js
51 49  
52   -// strings for file: resources/js/kt-utility.js
  50 +// strings for file: resources/js/constructed_search_postprocess.js
53 51  
54 52 // strings for file: resources/js/kt3calendar.js
55 53  
56   -// strings for file: resources/js/taillog.js
57   -
58 54 // strings for file: resources/js/toggleselect.js
59 55  
  56 +// strings for file: resources/js/kt-utility.js
  57 +
  58 +// strings for file: resources/js/help.js
  59 +
... ...
templates/ktcore/manage_help.smarty
... ... @@ -4,13 +4,13 @@
4 4 via the help system and click on <strong>customise this help file</strong>.{/i18n}</p>
5 5  
6 6 { if $helpreplacements }
7   -<h2>Existing customised help pages</h2>
  7 +<h2>{i18n}Existing customised help pages{/i18n}</h2>
8 8  
9 9 <table class="listing" cellspacing="0" cellpadding="0" border="0">
10 10 <thead>
11 11 <tr>
12   -<th>Name</th>
13   -<th>Actions</th>
  12 +<th>{i18n}Name{/i18n}</th>
  13 +<th>{i18n}Actions{/i18n}</th>
14 14 </tr>
15 15 </thead>
16 16 { foreach item=oHelpReplacement from=$helpreplacements }
... ...
templates/ktcore/metadata/conditional/manageConditional.smarty
... ... @@ -80,7 +80,7 @@ ordering!{/i18n}&lt;/p&gt;
80 80  
81 81  
82 82 {if !$oMasterField}
83   -<h2>Master field</h2>
  83 +<h2>{i18n}Master field{/i18n}</h2>
84 84 {i18n}No master field is set, please select the master field{/i18n}:
85 85  
86 86 <form action="{$smarty.server.PHP_SELF}" method="POST">
... ... @@ -95,7 +95,7 @@ ordering!{/i18n}&lt;/p&gt;
95 95  
96 96 <form action="{$smarty.server.PHP_SELF}" method="POST">
97 97 <fieldset>
98   -<legend>Master field</legend>
  98 +<legend>{i18n}Master field{/i18n}</legend>
99 99 <input type="hidden" name="action" value="setMasterField" />
100 100 <input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
101 101  
... ...
templates/ktcore/metadata/editField.smarty
... ... @@ -60,7 +60,7 @@
60 60  
61 61 <form action="{$smarty.server.PHP_SELF}" method="POST">
62 62 <fieldset>
63   -<legend>Existing values</legend>
  63 +<legend>{i18n}Existing values{/i18n}</legend>
64 64 <input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
65 65 <input type="hidden" name="fFieldId" value="{$oField->getId()}" />
66 66 <input type="hidden" name="action" value="metadataMultiAction" />
... ... @@ -87,7 +87,7 @@ from another source{/i18n})&lt;/span&gt;
87 87  
88 88 <form action="{$smarty.server.PHP_SELF}" method="POST">
89 89 <fieldset>
90   -<legend>Disabled values</legend>
  90 +<legend>{i18n}Disabled values{/i18n}</legend>
91 91 <input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
92 92 <input type="hidden" name="fFieldId" value="{$oField->getId()}" />
93 93 <input type="hidden" name="action" value="metadataMultiAction" />
... ...
templates/ktcore/principals/deleteunit.smarty
1   -<h2>Delete Unit</h2>
  1 +<h2>{i18n}Delete Unit{/i18n}</h2>
2 2  
3 3 <p class="descriptiveText">{i18n arg_name=$unit->getName()}Delete
4 4 unit <strong>#name#</strong> from the system{/i18n}</p>
... ...
templates/ktcore/principals/editgroup.smarty
1   -<h2>Edit Group Details</h2>
  1 +<h2>{i18n}Edit Group Details{/i18n}</h2>
2 2  
3 3 <p class="descriptiveText">{i18n arg_name=$edit_group->getName()}Change
4 4 the system's information about group <strong>#name#</strong>{/i18n}</p>
... ...
templates/ktcore/principals/groupadmin.smarty
... ... @@ -4,7 +4,7 @@
4 4 <legend>{i18n}Add New Group{/i18n}</legend>
5 5 <p class="descriptiveText">{i18n}Groups allow you to assign permissions and roles to a
6 6 number of different users at once.{/i18n}</p>
7   -<p><a href="{addQS}action=addGroup{/addQS}" class="ktAction ktAddGroup ktInline">Add Group</a><a href="{addQS}action=addGroup{/addQS}">{i18n}Add a new group{/i18n}</a>.</p>
  7 +<p><a href="{addQS}action=addGroup{/addQS}" class="ktAction ktAddGroup ktInline">{i18n}Add Group{/i18n}</a><a href="{addQS}action=addGroup{/addQS}">{i18n}Add a new group{/i18n}</a>.</p>
8 8 </fieldset>
9 9 <!-- we roll both in here. -->
10 10 <form action="{$smarty.server.PHP_SELF}" method="POST">
... ...
templates/ktcore/principals/password.smarty
1   -<h2>Password</h2>
  1 +<h2>{i18n}Password{/i18n}</h2>
2 2  
3 3 <p class="descriptiveText">{i18n}You may change your password by entering it in the fields below. Your system administrator may have defined certain rules (such as minimum password length) that your password must abide by.{/i18n}</p>
4 4  
... ...
templates/ktcore/principals/preferences.smarty
1   -<h2>Preferences</h2>
  1 +<h2>{i18n}Preferences{/i18n}</h2>
2 2  
3 3 <p class="descriptiveText">{i18n}You may change details about yourself by editing the entries below. Once you have completed the form, click on <strong>Update your details</strong>.{/i18n}</p>
4 4  
... ...
templates/ktcore/workflow/editState.smarty
... ... @@ -223,7 +223,7 @@ documents are in this state.{/i18n}&lt;/p&gt;&lt;/div&gt;
223 223 {/if}
224 224  
225 225 {else}
226   -<div class="ktInfo"><p>No permissions have been created within KnowledgeTree.</p></div>
  226 +<div class="ktInfo"><p>{i18n}No permissions have been created within KnowledgeTree.{/i18n}</p></div>
227 227 {/if}
228 228  
229 229  
... ...
templates/ktstandard/authentication/ldapsearchgroup.smarty
... ... @@ -5,7 +5,7 @@ begin.{/i18n}&lt;/p&gt;
5 5  
6 6 <input type="hidden" name="action" value="addGroupFromSource" />
7 7 <input type="hidden" name="source_id" value="{$source->getId()}" />
8   -<fieldset><legend>Search for group</legend>
  8 +<fieldset><legend>{i18n}Search for group{/i18n}</legend>
9 9 {foreach from=$fields item=oWidget}
10 10 {$oWidget->render()}
11 11 {/foreach}
... ...
templates/ktstandard/authentication/ldapsearchuser.smarty
... ... @@ -11,7 +11,7 @@ begin.{/i18n}&lt;/p&gt;
11 11  
12 12 <input type="hidden" name="action" value="addUserFromSource" />
13 13 <input type="hidden" name="source_id" value="{$source->getId()}" />
14   -<fieldset><legend>Search for user</legend>
  14 +<fieldset><legend>{i18n}Search for user{/i18n}</legend>
15 15 {foreach from=$fields item=oWidget}
16 16 {$oWidget->render()}
17 17 {/foreach}
... ...