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

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
nbm
1 parent 9d908fba
Showing 30 changed files with 52 additions and 52 deletions
plugins/ktcore/KTDocumentActions.php
plugins/ktcore/KTPermissions.php
plugins/ktcore/admin/documentFields.php
plugins/ktcore/admin/plugins.php
plugins/ktcore/admin/unitManagement.php
plugins/ktcore/authentication/authenticationadminpage.inc.php
plugins/ktcore/document/Rename.php
plugins/ktcore/folder/BulkUpload.php
plugins/ktcore/folder/Rename.php
plugins/ktcore/folder/addDocument.php
templates/kt3/browse_lookup_selection.smarty
templates/kt3/browse_types.smarty
templates/ktcore/authentication/manage.smarty
templates/ktcore/dashlets/admintutorial.smarty
templates/ktcore/document/admin/expungeconfirmlist.smarty
templates/ktcore/document/document_permissions.smarty
templates/ktcore/folder/permissions.smarty
templates/ktcore/help_with_edit.smarty
templates/ktcore/javascript_i18n.smarty
templates/ktcore/manage_help.smarty
@@ -135,7 +135,7 @@ class KTDocumentCheckOutAction extends KTDocumentAction {
     function do_checkout() {
         $aErrorOptions = array(
             'redirect_to' => array('','fDocumentId=' . $this->oDocument->getId()),
-            'message' => "You must provide a reason"
+            'message' => _kt("You must provide a reason"),
         );
         $oTemplate =& $this->oValidator->validateTemplate('ktcore/action/checkout_final');
@@ -845,7 +845,7 @@ class KTDocumentArchiveAction extends KTDocumentAction {
         $aErrorOptions = array(
             'redirect_to' => array('','fDocumentId=' . $this->oDocument->getId()),
-            'message' => "You must provide a reason"
+            'message' => _kt("You must provide a reason"),
         );
         $sReason = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'reason'), $aErrorOptions);
@@ -954,7 +954,7 @@ class KTDocumentWorkflowAction extends KTDocumentAction {
         $aErrorOptions = array(
             'redirect_to' => array('main', sprintf('fDocumentId=%d', $_REQUEST['fDocumentId'])),
-            'message' => 'You must provide a reason for the transition'
+            'message' => _kt('You must provide a reason for the transition'),
         );
         $sComments =& $this->oValidator->validateString($_REQUEST['fComments'], $aErrorOptions);
@@ -635,4 +635,4 @@ class KTDocumentRolesAction extends KTDocumentAction {
         );
         return $oTemplate->render($aTemplateData);
     }
-}
 \ No newline at end of file
+}
@@ -173,7 +173,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
         $sName = $this->oValidator->validateEntityName("KTFieldset", $_REQUEST['name'], $aErrorOptions);
 		$sDescription = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'description'), 
-			KTUtil::meldOptions($aErrorOptions, array('message' => "You must provide a description")));
+			KTUtil::meldOptions($aErrorOptions, array('message' => _kt("You must provide a description"))));
         $sNamespace = KTUtil::arrayGet($_REQUEST, 'namespace');
@@ -224,7 +224,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
         unset($aErrorOptions['condition']);
 		$sDescription = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'description'), 
-			KTUtil::meldOptions($aErrorOptions, array('message' => "You must provide a description")));
+			KTUtil::meldOptions($aErrorOptions, array('message' => _kt("You must provide a description"))));
         $oFieldset = KTFieldset::get($_REQUEST['fFieldsetId']);
@@ -288,7 +288,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
 		);	
 		$sName = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'name'), 
-			KTUtil::meldOptions($aErrorOptions, array('message' => "You must provide a name")));
+			KTUtil::meldOptions($aErrorOptions, array('message' => _kt("You must provide a name"))));
         $aErrorOptions['condition'] = array('parent_fieldset' => $oFieldset->getId());
         $aErrorOptions['rename'] = $oField->getId();
@@ -297,7 +297,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
         unset($aErrorOptions['rename']);
 		$sDescription = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'description'), 
-			KTUtil::meldOptions($aErrorOptions, array('message' => "You must provide a description")));
+			KTUtil::meldOptions($aErrorOptions, array('message' => _kt("You must provide a description"))));
         $oField->setName($_REQUEST['name']);
         $oField->setDescription($sDescription);
@@ -65,12 +65,12 @@ class KTPluginDispatcher extends KTAdminDispatcher {
         $sTable = KTUtil::getTableName('plugins');
         $aIds = (array) KTUtil::arrayGet($_REQUEST, 'pluginids');
         KTPluginEntity::setEnabled($aIds);
-        $this->successRedirectToMain('Plugins updated');
+        $this->successRedirectToMain(_kt('Plugins updated'));
     }
     function do_reread() {
         KTPluginUtil::registerPlugins();
-        $this->successRedirectToMain('Plugins read from the filesystem');
+        $this->successRedirectToMain(_kt('Plugins read from the filesystem'));
     }
 }
@@ -178,7 +178,7 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
             'name' => $sName,
             'folderid' => $oFolder->getId(),
         ));
-        return $this->successRedirectToMain('Unit created');
+        return $this->successRedirectToMain(_kt('Unit created'));
     }
     function do_editUnit() {
@@ -255,7 +255,7 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
                 KTFolderUtil::delete($oFolder, $this->oUser, "Unit deleted", $aOptions);
             }
         }
-        $this->successRedirectToMain("Unit removed");
+        $this->successRedirectToMain(_kt("Unit removed"));
     }
 }
@@ -150,11 +150,11 @@ class KTAuthenticationAdminPage extends KTAdminDispatcher {
         $oSource->setAuthenticationProvider($authentication_provider);
         $res = $oSource->update();
         $aOptions = array(
-            'message' => 'Update failed',
+            'message' => _kt('Update failed'),
             'redirect_to' => array('editsource', sprintf('source_id=%d', $oSource->getId())),
         );
         $this->oValidator->notErrorFalse($res, $aOptions);
-        $this->successRedirectTo('viewsource', 'Details updated', sprintf('source_id=%d', $oSource->getId()));
+        $this->successRedirectTo('viewsource', _kt('Details updated'), sprintf('source_id=%d', $oSource->getId()));
     }
     function do_newsource() {
@@ -85,7 +85,7 @@ class KTDocumentRenameAction extends KTDocumentAction {
         $sFilename = KTUtil::arrayGet($_REQUEST, 'filename');
         $aOptions = array(
             'redirect_to' => array('', sprintf('fDocumentId=%d', $this->oDocument->getId())),
-            'message' => "No filename given",
+            'message' => _kt("No filename given"),
         );
         $this->oValidator->validateString($sFilename, $aOptions);
@@ -56,7 +56,7 @@ class KTBulkUploadFolderAction extends KTFolderAction {
         if (!empty($postExpected)) {
             $aErrorOptions = array(
                 'redirect_to' => array('main', sprintf('fFolderId=%d', $this->oFolder->getId())),
-                'message' => 'Upload larger than maximum POST size (max_post_size variable in .htaccess or php.ini)',
+                'message' => _kt('Upload larger than maximum POST size (max_post_size variable in .htaccess or php.ini)'),
             );
             $this->oValidator->notEmpty($postReceived, $aErrorOptions);
         }
@@ -67,7 +67,7 @@ class KTFolderRenameAction extends KTFolderAction {
         $sName = KTUtil::arrayGet($_REQUEST, 'foldername');
         $aOptions = array(
             'redirect_to' => array('', sprintf('fFolderId=%d', $this->oFolder->getId())),
-            'message' => "No folder name given",
+            'message' => _kt("No folder name given"),
         );
         $this->oValidator->validateString($sName, $aOptions);
@@ -54,7 +54,7 @@ class KTFolderAddDocumentAction extends KTFolderAction {
         if (!empty($postExpected)) {
             $aErrorOptions = array(
                 'redirect_to' => array('main', sprintf('fFolderId=%d', $this->oFolder->getId())),
-                'message' => 'Upload larger than maximum POST size (max_post_size variable in .htaccess or php.ini)',
+                'message' => _kt('Upload larger than maximum POST size (max_post_size variable in .htaccess or php.ini)'),
             );
             $this->oValidator->notEmpty($postReceived, $aErrorOptions);
         }
-<h2>Select a Field</h2>
+<h2>{i18n}Select a Field{/i18n}</h2>
 <p class="descriptiveText">{i18n}In some circumstances it is useful to view all
 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;
 {foreach item=oField from=$fields}
   <li><a href="{$smarty.server.PHP_SELF}?action=selectLookup&fField={$oField->getId()}&fBrowseMode=field">{$oField->getName()}</a></li>
 {/foreach}
-</ul>
 \ No newline at end of file
+</ul>
-<h2>Select a document type</h2>
+<h2>{i18n}Select a document type{/i18n}</h2>
 <p class="descriptiveText">{i18n}In some circumstances it is useful to view all
 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;
 {foreach item=oType from=$document_types}
   <li><a href="{$smarty.server.PHP_SELF}?action=main&fType={$oType->getId()}&fBrowseMode=document_type">{$oType->getName()}</a></li>
 {/foreach}
-</ul>
 \ No newline at end of file
+</ul>
@@ -9,7 +9,7 @@ specify additional sources of authentication data.{/i18n}&lt;/p&gt;
 {if $providers}
 <p><a href="{addQS}action=addSource{/addQS}" class="ktAction ktAddGroup
-ktInline">{i18n}Add authentication source</a><a href="{addQS}action=addSource{/addQS}">Add a new
+ktInline">{i18n}Add authentication source{/i18n}</a><a href="{addQS}action=addSource{/addQS}">{i18n}Add a new
 authentication source{/i18n}</a>.</p>
 {else}
 <div class="ktInfo"><p>{i18n}Only the standard database authentication is currently available.
-<h2>KnowledgeTree administrator's Guide</h2>
+<h2>{i18n}KnowledgeTree administrator's Guide{/i18n}</h2>
 <p class="descriptiveText">{i18n}If this is your first KnowledgeTree installation,
 or if you've just upgraded from KnowledgeTree 2.x, we've put together some information
 which might help you get to grips with the new system.{/i18n}</p>
-<h2>Confirm Expunge</h2>
+<h2>{i18n}Confirm Expunge{/i18n}</h2>
 <div class="ktInfo"><p><strong>{i18n}Note{/i18n}:</strong> {i18n}please
 confirm that you want to delete these documents.{/i18n}</p></div>
@@ -121,7 +121,7 @@ value=&quot;{$iGroupId}&quot;&gt;&lt;/td&gt;
 {if (!empty($conditions))}
 {if ($edit || $dynamic_conditions)}
-<h2>Dynamic permissions</h2>
+<h2>{i18n}Dynamic permissions{/i18n}</h2>
 {/if}
 { if $dynamic_conditions }
 <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
 <input type="submit" name="submit" value="{i18n}Add{/i18n}" />
 </form>
 { /if }
-{/if}
 \ No newline at end of file
+{/if}
@@ -114,7 +114,7 @@ value=&quot;{$iGroupId}&quot;&gt;&lt;/td&gt;
 {if (!empty($conditions))}
 {if ($edit || $dynamic_conditions)}
-<h2>Dynamic permissions</h2>
+<h2>{i18n}Dynamic permissions{/i18n}</h2>
 {/if}
 { if $dynamic_conditions }
 <table class="kt_collection" cellpadding="0" cellspacing="0">
 {if (!$help_body)}
-<div class="ktError"><p>No content specified for this help file yet. <strong>Edit it first.</strong></p></div>
+<div class="ktError"><p>{i18n}No content specified for this help file yet. <strong>Edit it first.</strong>{/i18n}</p></div>
 {else}
 {$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
 <a href="{ktLink base="help.php" query="action=go_back&back_key=`$back_key`"}" class="ktAction ktBack" style="float:
 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>
- 
 \ No newline at end of file
+ 
@@ -17,8 +17,6 @@ function _(trans_string) {
-// strings for file: resources/js/add_document.js
-
 // strings for file: resources/js/conditional_complex_edit.js
 i18n['Finish with this column\'s behaviours.'] = '{i18n}Finish with this column\'s behaviours.{/i18n}';
 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;;
 i18n['any'] = '{i18n}any{/i18n}';
 i18n['of the criteria specified.'] = '{i18n}of the criteria specified.{/i18n}';
-// strings for file: resources/js/constructed_search_postprocess.js
+// strings for file: resources/js/taillog.js
-// strings for file: resources/js/help.js
+// strings for file: resources/js/add_document.js
-// strings for file: resources/js/kt-utility.js
+// strings for file: resources/js/constructed_search_postprocess.js
 // strings for file: resources/js/kt3calendar.js
-// strings for file: resources/js/taillog.js
-
 // strings for file: resources/js/toggleselect.js
+// strings for file: resources/js/kt-utility.js
+
+// strings for file: resources/js/help.js
+
@@ -4,13 +4,13 @@
 via the help system and click on <strong>customise this help file</strong>.{/i18n}</p>
 { if $helpreplacements }
-<h2>Existing customised help pages</h2>
+<h2>{i18n}Existing customised help pages{/i18n}</h2>
 <table class="listing" cellspacing="0" cellpadding="0" border="0">
 <thead>
 <tr>
-<th>Name</th>
-<th>Actions</th>
+<th>{i18n}Name{/i18n}</th>
+<th>{i18n}Actions{/i18n}</th>
 </tr>
 </thead>
 { foreach item=oHelpReplacement from=$helpreplacements }
@@ -80,7 +80,7 @@ ordering!{/i18n}&lt;/p&gt;
 {if !$oMasterField}
-<h2>Master field</h2>
+<h2>{i18n}Master field{/i18n}</h2>
 {i18n}No master field is set, please select the master field{/i18n}:
 <form action="{$smarty.server.PHP_SELF}" method="POST">
@@ -95,7 +95,7 @@ ordering!{/i18n}&lt;/p&gt;
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Master field</legend>
+<legend>{i18n}Master field{/i18n}</legend>
 <input type="hidden" name="action" value="setMasterField" />
 <input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
@@ -60,7 +60,7 @@
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Existing values</legend>
+<legend>{i18n}Existing values{/i18n}</legend>
 <input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
 <input type="hidden" name="fFieldId" value="{$oField->getId()}" />
 <input type="hidden" name="action" value="metadataMultiAction" />
@@ -87,7 +87,7 @@ from another source{/i18n})&lt;/span&gt;
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Disabled values</legend>
+<legend>{i18n}Disabled values{/i18n}</legend>
 <input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
 <input type="hidden" name="fFieldId" value="{$oField->getId()}" />
 <input type="hidden" name="action" value="metadataMultiAction" />
-<h2>Delete Unit</h2>
+<h2>{i18n}Delete Unit{/i18n}</h2>
 <p class="descriptiveText">{i18n arg_name=$unit->getName()}Delete
 unit <strong>#name#</strong> from the system{/i18n}</p>
-<h2>Edit Group Details</h2>
+<h2>{i18n}Edit Group Details{/i18n}</h2>
 <p class="descriptiveText">{i18n arg_name=$edit_group->getName()}Change
 the system's information about group <strong>#name#</strong>{/i18n}</p>
@@ -4,7 +4,7 @@
 <legend>{i18n}Add New Group{/i18n}</legend>
 <p class="descriptiveText">{i18n}Groups allow you to assign permissions and roles to a 
 number of different users at once.{/i18n}</p>
-<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>
+<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>
 </fieldset>
 <!-- we roll both in here. -->
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<h2>Password</h2>
+<h2>{i18n}Password{/i18n}</h2>
 <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>
-<h2>Preferences</h2>
+<h2>{i18n}Preferences{/i18n}</h2>
 <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>
@@ -223,7 +223,7 @@ documents are in this state.{/i18n}&lt;/p&gt;&lt;/div&gt;
 {/if}
 {else}
-<div class="ktInfo"><p>No permissions have been created within KnowledgeTree.</p></div>
+<div class="ktInfo"><p>{i18n}No permissions have been created within KnowledgeTree.{/i18n}</p></div>
 {/if}
@@ -5,7 +5,7 @@ begin.{/i18n}&lt;/p&gt;
 <input type="hidden" name="action" value="addGroupFromSource" />
 <input type="hidden" name="source_id" value="{$source->getId()}" />
-<fieldset><legend>Search for group</legend>
+<fieldset><legend>{i18n}Search for group{/i18n}</legend>
 {foreach from=$fields item=oWidget}
   {$oWidget->render()}
 {/foreach}
@@ -11,7 +11,7 @@ begin.{/i18n}&lt;/p&gt;
 <input type="hidden" name="action" value="addUserFromSource" />
 <input type="hidden" name="source_id" value="{$source->getId()}" />
-<fieldset><legend>Search for user</legend>
+<fieldset><legend>{i18n}Search for user{/i18n}</legend>
 {foreach from=$fields item=oWidget}
   {$oWidget->render()}
 {/foreach}