Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '3.2/develop' into 3.3/develop

refs #4150
  • Loading branch information...
commit afd0991707c9231be725fab9eb03d5180b3b46e7 2 parents b6e268e + 08322b6
@Zeelot Zeelot authored
View
12 classes/Kohana/Controller/Userguide.php
@@ -112,13 +112,13 @@ public function action_docs()
// If this module's userguide pages are disabled, show the error page
if ( ! Kohana::$config->load('userguide.modules.'.$module.'.enabled'))
{
- return $this->error(__('That module doesn\'t exist, or has userguide pages disabled.'));
+ return $this->error('That module doesn\'t exist, or has userguide pages disabled.');
}
// Prevent "guide/module" and "guide/module/index" from having duplicate content
if ( $page == 'index')
{
- return $this->error(__('Userguide page not found'));
+ return $this->error('Userguide page not found');
}
// If a module is set, but no page was provided in the url, show the index page
@@ -133,7 +133,7 @@ public function action_docs()
// If it's not found, show the error page
if ( ! $file)
{
- return $this->error(__('Userguide page not found'));
+ return $this->error('Userguide page not found');
}
// Namespace the markdown parser
@@ -159,7 +159,7 @@ public function action_docs()
// Add the breadcrumb trail
$breadcrumb = array();
- $breadcrumb[$this->guide->uri()] = __('User Guide');
+ $breadcrumb[$this->guide->uri()] = 'User Guide';
$breadcrumb[$this->guide->uri(array('module' => $module))] = Kohana::$config->load('userguide.modules.'.$module.'.name');
// TODO try and get parent category names (from menu). Regex magic or javascript dom stuff perhaps?
@@ -183,7 +183,7 @@ public function action_api()
// If no class was passed to the url, display the API index page
if ( ! $class)
{
- $this->template->title = __('Table of Contents');
+ $this->template->title = 'Table of Contents';
$this->template->content = View::factory('userguide/api/toc')
->set('classes', Kodoc::class_methods())
@@ -225,7 +225,7 @@ public function action_api()
// Add the breadcrumb
$breadcrumb = array();
- $breadcrumb[$this->guide->uri(array('page' => NULL))] = __('User Guide');
+ $breadcrumb[$this->guide->uri(array('page' => NULL))] = 'User Guide';
$breadcrumb[$this->request->route()->uri()] = 'API Browser';
$breadcrumb[] = $this->template->title;
}
View
6 i18n/de.php
@@ -1,6 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-return array
-(
- 'User Guide' => 'Handbuch'
-);
View
6 i18n/es.php
@@ -1,6 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-return array
-(
- 'User Guide' => 'Guía de Usuario'
-);
View
7 i18n/fr.php
@@ -1,7 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-return array
-(
- 'User Guide' => 'Guide Utilisateur'
-);
-
View
6 i18n/he.php
@@ -1,6 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-return array
-(
- 'User Guide' => 'מדריך למשתמש'
-);
View
6 i18n/nl.php
@@ -1,6 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-return array
-(
- 'User Guide' => 'Gebruiksaanwijzing'
-);
View
7 i18n/ru.php
@@ -1,7 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-return array
-(
- 'User Guide' => 'Руководство пользователя'
-);
-
View
28 i18n/zh.php
@@ -1,28 +0,0 @@
-<?php defined('SYSPATH') or die('No direct script access.');
-
-return array
-(
- 'User Guide' => '用户手册',
-
- // Errors
- 'Error' => '错误',
- 'Userguide page not found' => '用户手册页面无法找到',
- 'API Reference: Class not found.' => 'API 参考: 没有找到此类。',
- 'That class is hidden' => '那个是隐藏类',
-
- // API
- 'Table of Contents' => '目录',
- 'Available Classes' => '可用的类',
- 'Class Contents' => '类列表',
- 'Constants' => '常量',
- 'Properties' => '属性',
- 'Methods' => '方法',
- 'None' => '',
- 'Parameters' => '参数',
- 'Parameter' => '参数',
- 'Type' => '类型',
- 'Description' => '描述',
- 'Default' => '默认',
- 'Return Values' => '返回值',
- 'Source Code' => '源代码',
-);
View
18 views/userguide/api/class.php
@@ -47,38 +47,38 @@
<div class="toc">
<div class="constants">
- <h3><?php echo __('Constants'); ?></h3>
+ <h3><?php echo 'Constants'; ?></h3>
<ul>
<?php if ($doc->constants): ?>
<?php foreach ($doc->constants as $name => $value): ?>
<li><a href="#constant:<?php echo $name ?>"><?php echo $name ?></a></li>
<?php endforeach ?>
<?php else: ?>
- <li><em><?php echo __('None'); ?></em></li>
+ <li><em><?php echo 'None'; ?></em></li>
<?php endif ?>
</ul>
</div>
<div class="properties">
- <h3><?php echo __('Properties'); ?></h3>
+ <h3><?php echo 'Properties'; ?></h3>
<ul>
<?php if ($properties = $doc->properties()): ?>
<?php foreach ($properties as $prop): ?>
<li><a href="#property:<?php echo $prop->property->name ?>">$<?php echo $prop->property->name ?></a></li>
<?php endforeach ?>
<?php else: ?>
- <li><em><?php echo __('None'); ?></em></li>
+ <li><em><?php echo 'None'; ?></em></li>
<?php endif ?>
</ul>
</div>
<div class="methods">
- <h3><?php echo __('Methods'); ?></h3>
+ <h3><?php echo 'Methods'; ?></h3>
<ul>
<?php if ($methods = $doc->methods()): ?>
<?php foreach ($methods as $method): ?>
<li><a href="#<?php echo $method->method->name ?>"><?php echo $method->method->name ?>()</a></li>
<?php endforeach ?>
<?php else: ?>
- <li><em><?php echo __('None'); ?></em></li>
+ <li><em><?php echo 'None'; ?></em></li>
<?php endif ?>
</ul>
</div>
@@ -88,7 +88,7 @@
<?php if ($doc->constants): ?>
<div class="constants">
-<h1 id="constants"><?php echo __('Constants'); ?></h1>
+<h1 id="constants"><?php echo 'Constants'; ?></h1>
<dl>
<?php foreach ($doc->constants() as $name => $value): ?>
<dt><h4 id="constant:<?php echo $name ?>"><?php echo $name ?></h4></dt>
@@ -99,7 +99,7 @@
<?php endif ?>
<?php if ($properties = $doc->properties()): ?>
-<h1 id="properties"><?php echo __('Properties'); ?></h1>
+<h1 id="properties"><?php echo 'Properties'; ?></h1>
<div class="properties">
<dl>
<?php foreach ($properties as $prop): ?>
@@ -115,7 +115,7 @@
<?php endif ?>
<?php if ($methods = $doc->methods()): ?>
-<h1 id="methods"><?php echo __('Methods'); ?></h1>
+<h1 id="methods"><?php echo 'Methods'; ?></h1>
<div class="methods">
<?php foreach ($methods as $method): ?>
<?php echo View::factory('userguide/api/method')->set('doc', $method)->set('route', $route) ?>
View
4 views/userguide/api/method.php
@@ -27,7 +27,7 @@
<?php if ($doc->tags) echo View::factory('userguide/api/tags')->set('tags', $doc->tags) ?>
<?php if ($doc->return): ?>
-<h4><?php echo __('Return Values'); ?></h4>
+<h4><?php echo 'Return Values'; ?></h4>
<ul class="return">
<?php foreach ($doc->return as $set): list($type, $text) = $set; ?>
<li><code><?php echo HTML::chars($type) ?></code><?php if ($text) echo ' - '.HTML::chars(ucfirst($text)) ?></li>
@@ -37,7 +37,7 @@
<?php if ($doc->source): ?>
<div class="method-source">
-<h4><?php echo __('Source Code'); ?></h4>
+<h4><?php echo 'Source Code'; ?></h4>
<pre><code><?php echo HTML::chars($doc->source) ?></code></pre>
</div>
<?php endif ?>
View
2  views/userguide/api/toc.php
@@ -1,4 +1,4 @@
-<h1><?php echo __('Available Classes') ?></h1>
+<h1><?php echo 'Available Classes' ?></h1>
<label>Filter:</label>
<input type="text" id="kodoc-api-filter-box" />
View
2  views/userguide/error.php
@@ -1,3 +1,3 @@
-<h1>Kodoc - <?php echo __('Error'); ?></h1>
+<h1>Kodoc - <?php echo 'Error'; ?></h1>
<p><?php echo $message ?></p>
View
10 views/userguide/template.php
@@ -1,9 +1,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $l = substr(I18n::$lang, 0, 2) ?>" lang="<?php echo $l ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title><?php echo $title ?> | Kohana <?php echo __('User Guide'); ?></title>
+<title><?php echo $title ?> | Kohana <?php echo 'User Guide'; ?></title>
<?php foreach ($styles as $style => $media) echo HTML::style($style, array('media' => $media), NULL, TRUE), "\n" ?>
@@ -23,11 +23,11 @@
<div id="kodoc-menu">
<ul>
<li class="guide first">
- <a href="<?php echo Route::url('docs/guide') ?>"><?php echo __('User Guide') ?></a>
+ <a href="<?php echo Route::url('docs/guide') ?>">User Guide</a>
</li>
<?php if (Kohana::$config->load('userguide.api_browser')): ?>
<li class="api">
- <a href="<?php echo Route::url('docs/api') ?>"><?php echo __('API Browser') ?></a>
+ <a href="<?php echo Route::url('docs/api') ?>">API Browser</a>
</li>
<?php endif ?>
</ul>
@@ -67,7 +67,7 @@
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
- <noscript><?php echo __('Please enable JavaScript to view the :anchor_open comments powered by Disqus.:anchor_close', array(':anchor_open' => '<a href="http://disqus.com/?ref_noscript=kohana">', ':anchor_close' => '</a>')); ?></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript=kohana">comments powered by Disqus.</a></noscript>
<a href="http://disqus.com" class="dsq-brlink">Documentation comments powered by <span class="logo-disqus">Disqus</span></a>
<?php endif ?>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.