diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/views/kohana/template.php | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/views/kohana/template.php')
| -rw-r--r-- | system/views/kohana/template.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/views/kohana/template.php b/system/views/kohana/template.php index b090fd88..84ddbff5 100644 --- a/system/views/kohana/template.php +++ b/system/views/kohana/template.php @@ -5,7 +5,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title><?php echo html::specialchars($title) ?></title> + <title><?php echo html::chars(__($title)) ?></title> <style type="text/css"> html { background: #83c018 url(<?php echo url::base(FALSE) ?>kohana.png) 50% 0 no-repeat; } @@ -24,11 +24,11 @@ </head> <body> - <h1><?php echo html::specialchars($title) ?></h1> + <h1><?php echo html::chars(__($title)) ?></h1> <?php echo $content ?> <p class="copyright"> - Rendered in {execution_time} seconds, using {memory_usage} of memory<br /> + <?php echo __('Rendered in {execution_time} seconds, using {memory_usage} of memory')?><br /> Copyright ©2007–2008 Kohana Team </p> |