Permalink
Browse files

Automated merge with https://www.knowledgetap.com/hg/pylons-dev

--HG--
branch : trunk
  • Loading branch information...
2 parents d2bc1b5 + fa7fc74 commit c15aca7b440dae8fbcd90783b7500bc120054e31 @bbangert bbangert committed Feb 11, 2009
Showing with 12 additions and 11 deletions.
  1. +5 −5 pylons/docs/en/concepts.rst
  2. +1 −1 pylons/docs/en/controllers.rst
  3. +4 −5 pylons/docs/ja/gettingstarted.rst
  4. +2 −0 pylons/docs/ja/views.rst
@@ -74,7 +74,7 @@ a class) with two arguments, and handling a response as shown above, is used
throughout Pylons as a standard interface for passing control to the next
component.
-Inside a new projects :file:`config/middleware.py`, the `make_app` function is
+Inside a new project's :file:`config/middleware.py`, the `make_app` function is
responsible for creating a WSGI application, wrapping it in WSGI middleware
(explained below) and returning it so that it may handle requests from a
HTTP server.
@@ -112,7 +112,7 @@ base WSGI application. In Pylons, the 'base' WSGI Application is the
`environ` dict that was passed in (from the Routes Middleware).
To see how this functionality is created, consider a small class that
-looks at the `HTTP_REFERER` header to see if its Google:
+looks at the `HTTP_REFERER` header to see if it's Google:
.. code-block :: python
@@ -135,7 +135,7 @@ are built up in the `WSGI Stack` that is configured for a new Pylons project.
Some of the layers, like the Session, Routes, and Cache middleware, only add
objects to the `environ` dict, or add HTTP headers to the response (the Session middleware for example adds the session cookie header). Others, such
as the Status Code Redirect, and the Error Handler may fully intercept the
-request entirely, and change how its responded to.
+request entirely, and change how it's responded to.
*******************
@@ -153,12 +153,12 @@ HelloController). Upon finding a controller, its then called like any other
WSGI application using the same WSGI interface that
:class:`~pylons.wsgiapp.PylonsApp` was called with.
-This is why the BaseController that resides in a projects
+This is why the BaseController that resides in a project's
:file:`lib/base.py` module inherits from
:class:`~pylons.controllers.core.WSGIController` and has a `__call__`
method that takes the `environ` and `start_response`. The
:class:`~pylons.controllers.core.WSGIController` locates a method in the
-class the corresponds to the `action` that Routes found, calls it, and
+class that corresponds to the `action` that Routes found, calls it, and
returns the response completing the request.
@@ -13,7 +13,7 @@ Controllers
In the :term:`MVC` paradigm the *controller* interprets the inputs, commanding
the model and/or the view to change as appropriate. Under Pylons, this concept
is extended slightly in that a Pylons controller is not directly interpreting
-the clients request, but is acting to determine the appropriate way to
+the client's request, but is acting to determine the appropriate way to
assemble data from the model, and render it with the correct template.
The controller interprets requests from the user and calls portions of the model and view as necessary to fulfill the request. So when the user clicks a Web link or submits an HTML form, the controller itself doesn’t output anything or perform any real processing. It takes the request and determines which model components to invoke and which formatting to apply to the resulting data.
@@ -421,14 +421,13 @@ World" という短いテキスト文字列があるはずです。(必要なら
.. The :term:`request` variable in templates is used to get
-.. information about the current request. `template globals
-.. <../modules/templating/#template-globals>`_ lists all the
-.. variables Pylons makes available for use in templates.
+.. information about the current request. :ref:`Template globals
+.. <template-globals>` lists all the variables Pylons makes available
+.. for use in templates.
テンプレートの中の :term:`request` 変数は、現在のリクエストの情報を得る
ために使用されます。 Pylons においてテンプレートの中で使えるすべての変
-数は、 `template グローバル変数
-<../modules/templating/#template-globals>`_ にリストされています。
+数は、 `template グローバル変数 <template-globals>` にリストされています。
.. Next, update the :file:`controllers/hello.py` module so that the
@@ -275,6 +275,8 @@ Pylons は `Mako`__ 、 `Genshi`__ 、 `Jinja2`__ テンプレートレンダリ
.. Default Template Variables
+.. _template-globals:
+
**************************
デフォルトテンプレート変数
**************************

0 comments on commit c15aca7

Please sign in to comment.