diff options
| author | rvelices <rv-github@modusoptimus.com> | 2008-10-02 00:30:34 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2008-10-02 00:30:34 +0000 |
| commit | 73eb979635fcb7ed8863b4fa7b1ad5fc595f895f (patch) | |
| tree | 0b2f07b4529a38a8e8a47fa60c2e2d7851f3d507 | |
| parent | 335ccb7418c9e1a8cce216407c3554d492db1761 (diff) | |
- the optim option conf['compiled_template_cache_language'] works better
git-svn-id: http://piwigo.org/svn/trunk@2636 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/template.class.php | 3 | ||||
| -rw-r--r-- | template/yoga/menubar_identification.tpl | 6 | ||||
| -rw-r--r-- | template/yoga/menubar_links.tpl | 2 | ||||
| -rw-r--r-- | template/yoga/menubar_specials.tpl | 2 | ||||
| -rw-r--r-- | template/yoga/menubar_tags.tpl | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/include/template.class.php b/include/template.class.php index 382071e7a..8ed354f7f 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -405,6 +405,9 @@ class Template { $regex = "~$ldq *\'([^'$]+)\'\|@translate\|~"; $source = preg_replace( $regex.'e', 'isset($lang[\'$1\']) ? \'{\'.var_export($lang[\'$1\'],true).\'|\' : \'$0\'', $source); + $regex = "~($ldq *assign +var=.+ +value=)\'([^'$]+)\'\|@translate~e"; + $source = preg_replace( $regex, 'isset($lang[\'$2\']) ? \'$1\'.var_export($lang[\'$2\'],true) : \'$0\'', $source); + return $source; } } diff --git a/template/yoga/menubar_identification.tpl b/template/yoga/menubar_identification.tpl index 49d2732a9..1cb219cd4 100644 --- a/template/yoga/menubar_identification.tpl +++ b/template/yoga/menubar_identification.tpl @@ -1,4 +1,4 @@ -<dt>{$block->get_title()|@translate}</dt> +<dt>{'identification'|@translate}</dt> <dd> {if isset($USERNAME)} <p>{'hello'|@translate} {$USERNAME} !</p> @@ -41,9 +41,9 @@ </div> {if $AUTHORIZE_REMEMBERING} - <div><label> + <div><label for="remember_me"> {'remember_me'|@translate} - <input type="checkbox" name="remember_me" value="1"> + <input type="checkbox" name="remember_me" id="remember_me" value="1"> </label></div> {/if} diff --git a/template/yoga/menubar_links.tpl b/template/yoga/menubar_links.tpl index 9de94ff7d..eaef54afe 100644 --- a/template/yoga/menubar_links.tpl +++ b/template/yoga/menubar_links.tpl @@ -1,4 +1,4 @@ -<dt>{$block->get_title()|@translate}</dt> +<dt>{'Links'|@translate}</dt> <dd> <ul> {foreach from=$block->data item=link} diff --git a/template/yoga/menubar_specials.tpl b/template/yoga/menubar_specials.tpl index 8bda68402..e551558f6 100644 --- a/template/yoga/menubar_specials.tpl +++ b/template/yoga/menubar_specials.tpl @@ -1,4 +1,4 @@ -<dt>{$block->get_title()|@translate}</dt> +<dt>{'special_categories'|@translate}</dt> <dd> <ul> {foreach from=$block->data item=link} diff --git a/template/yoga/menubar_tags.tpl b/template/yoga/menubar_tags.tpl index 0200eb5b7..82c2f9826 100644 --- a/template/yoga/menubar_tags.tpl +++ b/template/yoga/menubar_tags.tpl @@ -1,4 +1,4 @@ -<dt>{$block->get_title()|@translate}</dt> +<dt>{'Related tags'|@translate}</dt> <dd> <ul id="menuTagCloud"> {foreach from=$block->data item=tag} |