diff options
| author | lsces <lester@lsces.co.uk> | 2026-03-27 16:10:13 +0000 |
|---|---|---|
| committer | lsces <lester@lsces.co.uk> | 2026-03-27 16:10:13 +0000 |
| commit | 4e45633db67de8570243e44de0531bf2102b9da9 (patch) | |
| tree | 5f8596da9e130ea414964c04548ff6a2811ded23 | |
| parent | 3ecf21bb66221dd9211558fe3e5b887011d6dd29 (diff) | |
| download | languages-4e45633db67de8570243e44de0531bf2102b9da9.tar.gz languages-4e45633db67de8570243e44de0531bf2102b9da9.tar.bz2 languages-4e45633db67de8570243e44de0531bf2102b9da9.zip | |
Figured what has been causing a problem with using && and || in smarty templates and related to mistake in processing {2} elements that should use curly brackets and not revert to square ones.
| -rw-r--r-- | templates/babelfish.tpl | 6 | ||||
| -rwxr-xr-x | templates/edit_languages.tpl | 2 | ||||
| -rw-r--r-- | templates/footer_inc.tpl | 2 | ||||
| -rwxr-xr-x | templates/translate_strings.tpl | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/templates/babelfish.tpl b/templates/babelfish.tpl index 01368fc..0ba564e 100644 --- a/templates/babelfish.tpl +++ b/templates/babelfish.tpl @@ -1,6 +1,6 @@ {* $Header$ *} -{if $gBitSystem->isFeatureActive( 'babelfish' ) and $gBitSystem->isFeatureActive( 'babelfish_logo' )} +{if $gBitSystem->isFeatureActive( 'babelfish' ) && $gBitSystem->isFeatureActive( 'babelfish_logo' )} <div class="display babelfish"> <table> @@ -23,7 +23,7 @@ </table> </div> -{elseif $gBitSystem->isFeatureActive( 'babelfish' ) and !$gBitSystem->isFeatureActive( 'babelfish_logo' )} +{elseif $gBitSystem->isFeatureActive( 'babelfish' ) && !$gBitSystem->isFeatureActive( 'babelfish_logo' )} <div class="babelfish"> <table> @@ -35,7 +35,7 @@ </table> </div> -{elseif !$gBitSystem->isFeatureActive( 'babelfish' ) and $gBitSystem->isFeatureActive( 'babelfish_logo' )} +{elseif !$gBitSystem->isFeatureActive( 'babelfish' ) && $gBitSystem->isFeatureActive( 'babelfish_logo' )} <div class="babelfish"> {$babelfish_logo} diff --git a/templates/edit_languages.tpl b/templates/edit_languages.tpl index 8cde5bf..240bbe7 100755 --- a/templates/edit_languages.tpl +++ b/templates/edit_languages.tpl @@ -35,7 +35,7 @@ </div> <div class="form-group"> {forminput label="checkbox"} - <input type="checkbox" name="is_disabled" id="is_disabled" {if $isDisabled or $defaults.is_disabled}checked="checked"{/if} value="y" />Disabled + <input type="checkbox" name="is_disabled" id="is_disabled" {if $isDisabled || $defaults.is_disabled}checked="checked"{/if} value="y" />Disabled {formhelp note="Disabling a language will remove it from available language menus."} {/forminput} </div> diff --git a/templates/footer_inc.tpl b/templates/footer_inc.tpl index 6ecf3f2..691f906 100644 --- a/templates/footer_inc.tpl +++ b/templates/footer_inc.tpl @@ -1,4 +1,4 @@ -{if $gBitSystem->isFeatureActive( 'i18n_interactive_translation' ) and $gBitUser->hasPermission( 'p_languages_edit' )} +{if $gBitSystem->isFeatureActive( 'i18n_interactive_translation' ) && $gBitUser->hasPermission( 'p_languages_edit' )} <div class="translation box"> <h3>{tr}Translation Links{/tr}</h3> {foreach from=$gBitTranslationHash item=hash key=key} diff --git a/templates/translate_strings.tpl b/templates/translate_strings.tpl index f0adba2..06b3e32 100755 --- a/templates/translate_strings.tpl +++ b/templates/translate_strings.tpl @@ -30,8 +30,8 @@ {if $editLang} {legend legend=$languages.$lang.full_name} {foreach from=$tranStrings key=sourceHash item=tran} - {if $allTrans or (!$gBitSystem->isFeatureActive( 'i18n_track_translation_usage' ) or $tran.version)} - <div class="{if !$tran.version and !allTrans} warning{/if}"> + {if $allTrans || (!$gBitSystem->isFeatureActive( 'i18n_track_translation_usage' ) || $tran.version)} + <div class="{if !$tran.version && !allTrans} warning{/if}"> {forminput} <a href="{$smarty.const.LANGUAGES_PKG_URL}master_strings.php?source_hash={$sourceHash}">{$tran.source|escape|nl2br}</a><br/> {if $tran.textarea} |