Changeset 495 for trunk/modules/user_guide

Timestamp:

09/03/2007 09:41:27 PM (15 months ago)

Author:

Shadowhand

Message:

Even better i18n handling, by adding the language segment to the URI

Location:

trunk/modules/user_guide

Files:

• controllers/user_guide.php (modified) (1 diff)
• i18n/en/User_guide_menu.php (modified) (1 diff)
• views/user_guide/template.php (modified) (3 diffs)

trunk/modules/user_guide/controllers/user_guide.php

@@ -21 +21 @@
                         )
                 );
+                
+                if ($this->uri->segment(2) == FALSE)
+                        url::redirect('user_guide/'.Config::item('core.locale').'/kohana/about');
         }
 
         public function _remap()
         {
-                $category = strtolower($this->uri->segment(2));
-                $section  = strtolower($this->uri->segment(3));
+                $language = strtolower($this->uri->segment(2));
+                $category = strtolower($this->uri->segment(3));
+                $section  = strtolower($this->uri->segment(4));
 
                 // Media resource loading
-                if ($category === 'js' OR $category === 'css')
+                if ($language === 'js' OR $language === 'css')
                 {
-                        return $this->$category($section);
+                        return $this->$language($category);
+                }
+                elseif ($section == FALSE)
+                {
+                        url::redirect('user_guide/'.$language.'/kohana/about');
                 }
 
                 // Set the view that will be loaded
                 $category = ($category == FALSE)  ? 'kohana' : $category;
-                $content  = rtrim('user_guide/'.Config::item('core.locale', TRUE).$category.'/'.$section, '/');
+                $content  = 'user_guide/'.$language.'/'.$category.'/'.$section;
+                $content  = rtrim($content, '/');
 
-                // Display output
-                $this->load->view('user_guide/template', array
-                (
-                        'active_category' => $category,
-                        'active_section'  => $section,
-                        'content'         => $this->load->view($content)->render(FALSE, array($this, '_tags'))
-                ))->render(TRUE);
+                try
+                {
+                        // Display output
+                        $this->load->view('user_guide/template', array
+                        (
+                                'category' => $category,
+                                'section'  => $section,
+                                'language' => $language,
+                                'content'  => $this->load->view($content)->render(FALSE, array($this, '_tags'))
+                        ))->render(TRUE);
+                }
+                catch (Kohana_Exception $exception)
+                {
+                        trigger_error('The Kohana User Guide has not been translated into the requested language.', E_USER_ERROR);
+                }
         }
 

trunk/modules/user_guide/i18n/en/User_guide_menu.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
-/* $Id: user_guide.php 485 2007-09-04 00:12:20Z Shadowhand $ */
-
 /**
 * Kohana User Guide Menu
-* Topics in Categories (Eg, General, Libraries)
-* Articles in Sections (Eg, Installation)
-* Libraries and Helpers are in alphabetic order
-* Other Categories are in logical order
+* 
+* Topics in Categories (eg: Kohana, General, Libraries)
+* Articles in Sections (eg: Installation, Configuration, Pagination)
+* Libraries and helpers are in alphabetical order
+* Other categories are in logical order
+*
+* $Id: user_guide.php 485 2007-09-04 00:12:20Z Shadowhand $
 */
 $lang = array

trunk/modules/user_guide/views/user_guide/template.php

@@ -37 +37 @@
 <?php
 
-foreach(Kohana::lang('user_guide_menu') as $category => $menu):
+foreach(Kohana::lang('user_guide_menu') as $cat => $menu):
 
-        $active = (strtolower($category) == $active_category) ? ' active' : '';
+        $active = (strtolower($cat) == $category) ? ' active' : '';
 
 ?>
-<li class="first<?php echo $active ?>"><span><?php echo $category ?></span><ul>
+<li class="first<?php echo $active ?>"><span><?php echo $cat ?></span><ul>
 <?php
 
-        foreach($menu as $section):
+        foreach($menu as $sec):
 
-                $active = (strtolower($section) == $active_section) ? 'lite' : '';
+                $active = (strtolower($sec) == $section) ? 'lite' : '';
 
 ?>
-<li class="<?php echo $active ?>"><?php echo html::anchor(strtolower('user_guide/'.$category.'/'.$section), $section) ?></li>
+<li class="<?php echo $active ?>"><?php echo html::anchor(strtolower('user_guide/'.$language.'/'.$cat.'/'.$sec), $sec) ?></li>
 <?php
 
@@ -65 +65 @@
 </div>
 <!-- @end Menu -->
+
 <!-- @start Body -->
 <div id="body">
@@ -70 +71 @@
 </div>
 <!-- @end Body -->
+
 <!-- @start Footer -->
 <div id="footer"><p id="copyright"><?php echo sprintf(Kohana::lang('user_guide.copyright'), date('Y')) ?></p></div>