From da17f4a83bc2b22fbdcc351ff5c22de80e3e7519 Mon Sep 17 00:00:00 2001 From: nbm Date: Tue, 6 Dec 2005 10:58:51 +0000 Subject: [PATCH] Add i18n tags around translatable text. --- templates/kt3/document/edit.smarty | 6 +++--- templates/kt3/document/metadata_history.smarty | 18 +++++++++--------- templates/kt3/document/view.smarty | 7 +++++-- templates/kt3/fields/base.smarty | 4 ++-- templates/kt3/fields/checkbox.smarty | 4 ++-- templates/kt3/fields/fileupload.smarty | 2 +- templates/kt3/fields/lookup.smarty | 4 ++-- templates/kt3/fields/password.smarty | 4 ++-- templates/kt3/fields/statictext.smarty | 2 +- templates/kt3/fields/text.smarty | 2 +- templates/kt3/fields/tree.smarty | 4 ++-- templates/kt3/fieldsets/conditional_editable.smarty | 4 ++-- templates/kt3/fieldsets/generic.smarty | 21 +++++++++++---------- templates/kt3/fieldsets/generic_versioned.smarty | 25 +++++++++++-------------- templates/kt3/fieldsets/simple.smarty | 9 ++++++--- templates/kt3/fieldsets/simple_versioned.smarty | 8 ++++++-- templates/kt3/notifications/subscriptions.smarty | 8 ++++---- templates/kt3/portlets/search_portlet.smarty | 4 ++-- templates/kt3/standard_page.smarty | 2 +- templates/kt3/view_document.smarty | 8 ++++++-- templates/kt3/view_document_history.smarty | 17 +++++++++-------- templates/ktcore/authentication/manage.smarty | 8 ++++---- templates/ktcore/authentication/viewsource.smarty | 12 ++++++------ templates/ktcore/boolean_search.smarty | 36 ++++++++++++++++++++++++------------ templates/ktcore/fields/edit.smarty | 46 +++++++++++++++++++++++----------------------- templates/ktcore/fields/list.smarty | 24 ++++++++++++------------ templates/ktcore/login.smarty | 10 +++++----- templates/ktcore/metadata/conditional/editcomplex.smarty | 23 ++++++++++++----------- templates/ktcore/metadata/conditional/editsimple.smarty | 10 +++++----- templates/ktcore/metadata/conditional/manageConditional.smarty | 76 ++++++++++++++++++++++++++++++++++++++-------------------------------------- templates/ktcore/metadata/conditional/select_fieldset.smarty | 8 ++++---- templates/ktcore/widget_fieldset_conditional.smarty | 8 ++++---- templates/ktcore/workflow/documentWorkflow.smarty | 24 ++++++++++++------------ templates/ktcore/workflow/editState.smarty | 38 +++++++++++++++++++------------------- templates/ktcore/workflow/editTransition.smarty | 10 +++++----- templates/ktcore/workflow/editWorkflow.smarty | 26 +++++++++++++------------- templates/ktcore/workflow/listWorkflows.smarty | 10 +++++----- templates/ktstandard/action/discussion.smarty | 18 +++++++++--------- templates/ktstandard/action/discussion_comment_list_item.smarty | 12 +++++++++--- templates/ktstandard/action/discussion_thread.smarty | 4 ++-- templates/ktstandard/action/email.smarty | 4 ++-- templates/ktstandard/authentication/ldapadduser.smarty | 6 +++--- templates/ktstandard/authentication/ldapeditsource.smarty | 2 +- templates/ktstandard/authentication/ldapedituser.smarty | 2 +- templates/ktstandard/authentication/ldapsearchuser.smarty | 19 ++++++++++--------- templates/ktstandard/subscriptions/manage.smarty | 13 +++++++------ 46 files changed, 323 insertions(+), 289 deletions(-) diff --git a/templates/kt3/document/edit.smarty b/templates/kt3/document/edit.smarty index e46c5e2..2c9dbaa 100644 --- a/templates/kt3/document/edit.smarty +++ b/templates/kt3/document/edit.smarty @@ -11,7 +11,7 @@ {$context->oPage->requireCSSResource('resources/css/kt-treewidget.css')} -

Editing: {$document->getName()}

+

{i18n}Editing{/i18n}: {$document->getName()}

FIXME: do we need assisting text here?

@@ -25,5 +25,5 @@
- -
\ No newline at end of file + + diff --git a/templates/kt3/document/metadata_history.smarty b/templates/kt3/document/metadata_history.smarty index fd82714..78d1e66 100644 --- a/templates/kt3/document/metadata_history.smarty +++ b/templates/kt3/document/metadata_history.smarty @@ -1,16 +1,16 @@ -

Metadata History: {$document->getName()}

+

{i18n}Metadata History{/i18n}: {$document->getName()}

-

This lists the older versions of the document, as the metadata about it has been changed.

+

{i18n}This lists the older versions of the document, as the metadata about it has been changed.{/i18n}

- +
- - - - + + + + @@ -19,7 +19,7 @@ - + {foreach item=oVersion from=$versions} @@ -27,7 +27,7 @@ - + {/foreach} diff --git a/templates/kt3/document/view.smarty b/templates/kt3/document/view.smarty index f0775c2..878ff16 100644 --- a/templates/kt3/document/view.smarty +++ b/templates/kt3/document/view.smarty @@ -1,6 +1,9 @@

{$document->getName()}

-

showing information for version {$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}

+{capture assign=version} +{$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()} +{/capture} +

{i18n arg_version=$version}showing information for version #version#{/i18n}

{foreach item=oFieldset from=$fieldsets} {$oFieldset->render($document_data)} -{/foreach} \ No newline at end of file +{/foreach} diff --git a/templates/kt3/fields/base.smarty b/templates/kt3/fields/base.smarty index 8022e27..08c33f5 100644 --- a/templates/kt3/fields/base.smarty +++ b/templates/kt3/fields/base.smarty @@ -1,5 +1,5 @@
- +

{$description}

{if ($has_errors)} {foreach item=sError from=$errors} @@ -12,4 +12,4 @@ {/if} -
\ No newline at end of file + diff --git a/templates/kt3/fields/checkbox.smarty b/templates/kt3/fields/checkbox.smarty index 847855c..3300bdc 100644 --- a/templates/kt3/fields/checkbox.smarty +++ b/templates/kt3/fields/checkbox.smarty @@ -1,5 +1,5 @@
- +

{$description}

{if ($has_errors)} {foreach item=sError from=$errors} @@ -12,4 +12,4 @@ {/if} -
\ No newline at end of file + diff --git a/templates/kt3/fields/fileupload.smarty b/templates/kt3/fields/fileupload.smarty index 1268879..93e2140 100644 --- a/templates/kt3/fields/fileupload.smarty +++ b/templates/kt3/fields/fileupload.smarty @@ -1,5 +1,5 @@
- +

{$description}

{if ($has_errors)} {foreach item=sError from=$errors} diff --git a/templates/kt3/fields/lookup.smarty b/templates/kt3/fields/lookup.smarty index 984060c..8c6f8e5 100644 --- a/templates/kt3/fields/lookup.smarty +++ b/templates/kt3/fields/lookup.smarty @@ -1,5 +1,5 @@
- +

{$description}

{if ($has_errors)} {foreach item=sError from=$errors} @@ -17,4 +17,4 @@ {/foreach} -
\ No newline at end of file +
diff --git a/templates/kt3/fields/password.smarty b/templates/kt3/fields/password.smarty index 66c3a31..e608e9b 100644 --- a/templates/kt3/fields/password.smarty +++ b/templates/kt3/fields/password.smarty @@ -1,5 +1,5 @@
- +

{$description}

{if ($has_errors)} {foreach item=sError from=$errors} @@ -12,4 +12,4 @@ {/if} -
\ No newline at end of file + diff --git a/templates/kt3/fields/statictext.smarty b/templates/kt3/fields/statictext.smarty index d89486a..0cfd427 100644 --- a/templates/kt3/fields/statictext.smarty +++ b/templates/kt3/fields/statictext.smarty @@ -1,5 +1,5 @@
- +

{$description}

{if ($has_errors)} {foreach item=sError from=$errors} diff --git a/templates/kt3/fields/text.smarty b/templates/kt3/fields/text.smarty index b036f2b..543ea0c 100644 --- a/templates/kt3/fields/text.smarty +++ b/templates/kt3/fields/text.smarty @@ -1,5 +1,5 @@
- +

{$description}

{if ($has_errors)} {foreach item=sError from=$errors} diff --git a/templates/kt3/fields/tree.smarty b/templates/kt3/fields/tree.smarty index cc02002..1fabe70 100644 --- a/templates/kt3/fields/tree.smarty +++ b/templates/kt3/fields/tree.smarty @@ -1,5 +1,5 @@
- +

{$description}

{if ($has_errors)} {foreach item=sError from=$errors} @@ -13,4 +13,4 @@ {$options.tree} -
\ No newline at end of file +
diff --git a/templates/kt3/fieldsets/conditional_editable.smarty b/templates/kt3/fieldsets/conditional_editable.smarty index 9c29b0f..3223e82 100644 --- a/templates/kt3/fieldsets/conditional_editable.smarty +++ b/templates/kt3/fieldsets/conditional_editable.smarty @@ -6,11 +6,11 @@

- conditional data. + {i18n}conditional data.{/i18n}
\ No newline at end of file +--> diff --git a/templates/kt3/fieldsets/generic.smarty b/templates/kt3/fieldsets/generic.smarty index 6ce00de..c7f4cca 100644 --- a/templates/kt3/fieldsets/generic.smarty +++ b/templates/kt3/fieldsets/generic.smarty @@ -1,30 +1,31 @@
-

Generic Information

+

{i18n}Generic Information{/i18n}

- The information in this section is stored by the KnowledgeTree™ for every - document. + {i18n}The information in this section is stored by the KnowledgeTree™ for every + document.{/i18n}

-
File is a
+
{i18n}File is a{/i18n}
{$context->_mimeHelper($document->getMimeTypeID())} ({$context->_sizeHelper($document->getSize())})
-
Created by
+
{i18n}Created by{/i18n}
{$creator} ({$creation_date})
-
Last update by
+
{i18n}Last update by{/i18n}
{$last_modified_by} ({$last_modified_date})
-
Document Type
+
{i18n}Document Type{/i18n}
{$document_type}
-
Workflow status
+
{i18n}Workflow status{/i18n}
{if $workflow_state} {$workflow_state->getName()} {else} -No workflow +{i18n}No workflow{/i18n} {/if} -(manage workflow) +({i18n}manage workflow{/i18n})
diff --git a/templates/kt3/fieldsets/generic_versioned.smarty b/templates/kt3/fieldsets/generic_versioned.smarty index 67241ce..a3fcde5 100644 --- a/templates/kt3/fieldsets/generic_versioned.smarty +++ b/templates/kt3/fieldsets/generic_versioned.smarty @@ -1,51 +1,48 @@
-

Generic Information

+

{i18n}Generic Information{/i18n}

- The information in this section is stored by the KnowledgeTree™ for every - document. + {i18n}The information in this section is stored by the KnowledgeTree™ for every + document.{/i18n}

-
File is a
+
{i18n}File is a{/i18n}
{$context->_mimeHelper($document->getMimeTypeID())} ({$context->_sizeHelper($document->getSize())})
-
Created by
+
{i18n}Created by{/i18n}
- {$creator} ({$creation_date}) (this cannot not change between versions) + {$creator} ({$creation_date}) ({i18n}this cannot not change between versions{/i18n})
-
Last update by
+
{i18n}Last update by{/i18n}
{$last_modified_by} ({$last_modified_date})
-
Document Type
+
{i18n}Document Type{/i18n}
{$document_type}
-
Workflow status
+
{i18n}Workflow status{/i18n}
{if $workflow_state} {$workflow_state->getName()} {else} -No workflow +{i18n}No workflow{/i18n} {/if} -(manage -workflow)
diff --git a/templates/kt3/fieldsets/simple.smarty b/templates/kt3/fieldsets/simple.smarty index 7c1a024..b175023 100644 --- a/templates/kt3/fieldsets/simple.smarty +++ b/templates/kt3/fieldsets/simple.smarty @@ -1,16 +1,19 @@

{$fieldset->getName()}

- This is the data assigned to the {$fieldset->getName()} aspect of this document. +{capture assign=name} +{$fieldset->getName()} +{/capture} + {i18n arg_name=$name}This is the data assigned to the #name# aspect of this document.{/i18n}

{foreach item=aFieldPair from=$fieldset_values}
{$aFieldPair.field->getName()}
{if ($aFieldPair.value !== null)}{$aFieldPair.value} - {else}no value{/if}
+ {else}{i18n}no value{/i18n}{/if} {/foreach}
-
\ No newline at end of file +
diff --git a/templates/kt3/fieldsets/simple_versioned.smarty b/templates/kt3/fieldsets/simple_versioned.smarty index bcd5e5c..5f29b6b 100644 --- a/templates/kt3/fieldsets/simple_versioned.smarty +++ b/templates/kt3/fieldsets/simple_versioned.smarty @@ -1,7 +1,11 @@

{$fieldset->getName()}

- This is the data assigned to the {$fieldset->getName()} aspect of this document. + {capture assign=name} + {$fieldset->getName()} + {/capture + {i18n arg_name=$name}This is the data assigned to the +#name# aspect of this document.{/i18n}

@@ -19,4 +23,4 @@
-
\ No newline at end of file +
diff --git a/templates/kt3/notifications/subscriptions.smarty b/templates/kt3/notifications/subscriptions.smarty index 3d0d860..9f82a76 100644 --- a/templates/kt3/notifications/subscriptions.smarty +++ b/templates/kt3/notifications/subscriptions.smarty @@ -4,12 +4,12 @@ {if ($info.event_type == 'AddDocument')} The document "{$info.object_name}" was added{if ($info.location_name !== null)} to "{$info.location_name}"{/if}.
- Read Document | - Clear Alert + {i18n}Read Document{/i18n} | + {i18n}Clear Alert{/i18n}
{else} {/if}
- Clear Alert + {i18n}Clear Alert{/i18n}
- \ No newline at end of file + diff --git a/templates/kt3/portlets/search_portlet.smarty b/templates/kt3/portlets/search_portlet.smarty index e65662a..9b871fa 100644 --- a/templates/kt3/portlets/search_portlet.smarty +++ b/templates/kt3/portlets/search_portlet.smarty @@ -1,6 +1,6 @@ - + diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty index 8219a51..a71f81f 100644 --- a/templates/kt3/standard_page.smarty +++ b/templates/kt3/standard_page.smarty @@ -73,7 +73,7 @@
UserMetadata VersionContent VersionCompare{i18n}User{/i18n}{i18n}Metadata Version{/i18n}{i18n}Content Version{/i18n}{i18n}Compare{/i18n}
{$context->getUserForId($document->getModifiedUserId())} {$document->getMetadataVersion()} {$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}Current{i18n}Current{/i18n}
{$context->getUserForId($oVersion->getModifiedUserId())} {$oVersion->getMetadataVersion()} {$oVersion->getMajorVersionNumber()}.{$oVersion->getMinorVersionNumber()}compare with current{i18n}compare with current{/i18n}
+
- - - - - + + + + + diff --git a/templates/ktcore/authentication/manage.smarty b/templates/ktcore/authentication/manage.smarty index 80b00f6..a2037db 100644 --- a/templates/ktcore/authentication/manage.smarty +++ b/templates/ktcore/authentication/manage.smarty @@ -1,8 +1,8 @@ -

Authentication Sources

+

{i18n}Authentication Sources{/i18n}

{if $providers} -
Add an authentication source +
{i18n}Add an authentication source{/i18n} {foreach from=$fields item=oWidget} @@ -10,14 +10,14 @@ {/foreach}
- +
{/if} {if $sources} -

Existing sources

+

{i18n}Existing sources{/i18n}

    {foreach from=$sources item=oSource} diff --git a/templates/ktcore/authentication/viewsource.smarty b/templates/ktcore/authentication/viewsource.smarty index c018958..49eca06 100644 --- a/templates/ktcore/authentication/viewsource.smarty +++ b/templates/ktcore/authentication/viewsource.smarty @@ -1,20 +1,20 @@ -
    Standard configuration +
    {i18n}Standard configuration{/i18n}
    -
    Name
    +
    {i18n}Name{/i18n}
    {$source->getName()}
    -
    Provider
    +
    {i18n}Provider{/i18n}
    {$provider->getName()}
    -Edit standard configuration +{i18n}Edit standard configuration{/i18n}
    {assign var=provider_stuff value=$provider->showSource($source)} {if $provider_stuff} -
    Provider configuration +
    {i18n}Provider configuration{/i18n} {$provider_stuff} -Edit provider configuration +{i18n}Edit provider configuration{/i18n}
    {/if} diff --git a/templates/ktcore/boolean_search.smarty b/templates/ktcore/boolean_search.smarty index f92e42a..7b112f7 100644 --- a/templates/ktcore/boolean_search.smarty +++ b/templates/ktcore/boolean_search.smarty @@ -44,27 +44,36 @@ legend { border: 1px dotted #999;} -

    {$title|default:"Boolean Search"}

    +{capture assign=defaulttitle} +{i18n}Boolean Search{/i18n} +{/capture} +

    {$title|default:$defaulttitle}

    {if $sNameTitle} {$sNameTitle}:
    {/if} - -

    Return items which match   of the criteria groups specified.

    + +{capture assign=options} + +{/capture} + +

    {i18n arg_options=$options}Return items which match  #options# of the criteria groups specified.{/i18n}

    - Criteria Group + {i18n}Criteria Group{/i18n} -

    Return items which match   of the criteria specified.

    + {capture assign=options} + + {/capture} +

    {i18n arg_options=$options}Return items which match  #options# of the criteria specified.{/i18n}

UserActionDateContent versionComment{i18n}User{/i18n}{i18n}Action{/i18n}{i18n}Date{/i18n}{i18n}Content version{/i18n}{i18n}Comment{/i18n}
- - + + @@ -74,18 +83,21 @@ name="boolean_search[join]"> - + +
CriteriaValues{i18n}Criteria{/i18n}{i18n}Values{/i18n}  

first select a type of query

{i18n}first select a type of query{/i18n}
- + - +{capture assign=defaultsubmit} +{i18n}Search{/i18n} +{/capture} + -

Assign to behaviour

+

{i18n}Assign to behaviour{/i18n}


- or to a new behaviour called
+ {i18n}or to a new behaviour called{/i18n}
- +
-

Edit Behaviour

+

{i18n}Edit Behaviour{/i18n}

- Select a behaviour from this list to change the - items which are available. + {i18n}Select a behaviour from this list to change the + items which are available.{/i18n}


- Change Assignments for this field. + {i18n}Change Assignments for this field.{/i18n}
{/foreach} diff --git a/templates/ktcore/metadata/conditional/editsimple.smarty b/templates/ktcore/metadata/conditional/editsimple.smarty index 9755a8d..249eeb8 100644 --- a/templates/ktcore/metadata/conditional/editsimple.smarty +++ b/templates/ktcore/metadata/conditional/editsimple.smarty @@ -59,7 +59,7 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId})); -

Editing Fieldset Rules (Simple)

+

{i18n}Editing Fieldset Rules (Simple){/i18n}

@@ -74,7 +74,7 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId})); {foreach from=$aFields item=oField} -

This field is not controlled by the currently active group.

+

{i18n}This field is not controlled by the currently active group.{/i18n}

Field: {$oField->getName()}

- - - + + +
diff --git a/templates/ktcore/metadata/conditional/manageConditional.smarty b/templates/ktcore/metadata/conditional/manageConditional.smarty index 4a7d0ac..965af13 100644 --- a/templates/ktcore/metadata/conditional/manageConditional.smarty +++ b/templates/ktcore/metadata/conditional/manageConditional.smarty @@ -1,88 +1,88 @@ -

Manage conditional fieldset

+

{i18n}Manage conditional fieldset{/i18n}

{if $sIncomplete || !$oFieldset->getIsComplete()}
-

This conditional fieldset is marked such that it +

{i18n}This conditional fieldset is marked such that it cannot be used. This happens when the fieldset has been edited and has not been set to complete. Setting the fieldset to complete will do a -check to see if the fieldset is usable by the user.

+check to see if the fieldset is usable by the user.{/i18n}

{if $sIncomplete}
-

This error prevents this fieldset from being set -to complete: {$sIncomplete|escape}

+

{i18n}This error prevents this fieldset from being set +to complete{/i18n}: {$sIncomplete|escape}

{else} -Try to set to complete: +{i18n}Try to set to complete{/i18n}: - - - + + + {/if} {/if} -

Conditional type

+

{i18n}Conditional type{/i18n}

{if $oFieldset->getIsComplex()} -Complex: getId()}">Manage -complex conditional +{i18n}Complex{/i18n}: getId()}">{i18n}Manage +complex conditional{/i18n}
- - - + + +
{else} -Simple: getId()}">Manage simple conditional +{i18n}Simple{/i18n}: getId()}">{i18n}Manage simple conditional{/i18n}
- - - + + +
{/if} -

Changing the conditional type set will remove all existing field -ordering!

+

{i18n}Changing the conditional type set will remove all existing field +ordering!{/i18n}

Master field

{if !$oMasterField} -No master field is set, please select the master field: +{i18n}No master field is set, please select the master field{/i18n}:
- - + + {entity_select entities=$oFieldset->getFields() name="fFieldId"} - +
{else}
- - + + {entity_select entities=$oFieldset->getFields() name="fFieldId" selected=$oMasterField->getId()} - +
-

Changing the master field set will remove all existing field -ordering!

+

{i18n}Changing the master field set will remove all existing field +ordering!{/i18n}

-

Field ordering

+

{i18n}Field ordering{/i18n}

{if $aFieldOrders} -

Existing ordering

+

{i18n}Existing ordering{/i18n}