Skip to content

Commit

Permalink
Merge pull request bottlepy#488 from myzhan/master
Browse files Browse the repository at this point in the history
Keep zh_CN doc update-to-date
  • Loading branch information
defnull committed Apr 22, 2013
2 parents 085177a + a0df19f commit b4c243e
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 30 deletions.
7 changes: 6 additions & 1 deletion docs/_locale/zh_CN/api.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bottle 0.12-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-16 21:45\n"
"POT-Creation-Date: 2013-04-18 23:40\n"
"PO-Revision-Date: 2012-11-09 16:39+0800\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -731,6 +731,11 @@ msgstr ""
msgid "The bottle :class:`Route` object that matches this request."
msgstr ""

# 0aeb079900744334aebdf19893cc043c
#: ../../../bottle.py:docstring of bottle.BaseRequest.url_args:1
msgid "The arguments extracted from the URL."
msgstr ""

# 037aee056fb248628a52cf2447ab4c82
#: ../../../bottle.py:docstring of bottle.BaseRequest.path:1
msgid ""
Expand Down
3 changes: 2 additions & 1 deletion docs/_locale/zh_CN/recipes.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Bottle 0.12-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-16 21:45\n"
"POT-Creation-Date: 2013-02-17 01:11\n"
"PO-Revision-Date: 2013-02-17 01:52+0800\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down
9 changes: 5 additions & 4 deletions docs/_locale/zh_CN/stpl.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Bottle 0.12-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-11-09 18:23\n"
"PO-Revision-Date: 2012-11-09 17:54+0800\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-04-20 16:35\n"
"PO-Revision-Date: 2013-04-20 16:43+0800\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"

# 5fc6bab7b7204b6ca1f300b3b00efa24
#: ../../stpl.rst:3
Expand Down Expand Up @@ -347,4 +348,4 @@ msgstr ""
# 404c1aa1c5d4489688aaeeeb8abfdff1
#: ../../stpl.rst:231
msgid "Multi-line strings are not supported yet."
msgstr "不支持多行字符串(译者注:\"\"\" \"\"\"这样的字符串)"
msgstr "不支持多行字符串"
11 changes: 6 additions & 5 deletions docs/_locale/zh_CN/tutorial.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Bottle 0.12-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-17 01:11\n"
"PO-Revision-Date: 2013-02-17 02:22+0800\n"
"POT-Creation-Date: 2013-04-18 23:40\n"
"PO-Revision-Date: 2013-04-20 16:28+0800\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
"X-Generator: Poedit 1.5.5\n"

# 2cfce930fec043468539792502c72326
#: ../../tutorial.rst:24
Expand Down Expand Up @@ -1124,7 +1125,7 @@ msgstr ""
# 36ea0be70fe44886bfec49f8263868e1
#: ../../tutorial.rst:505
msgid ""
"**Atribute access**: All values in the dictionary are also accessible as "
"**Attribute access**: All values in the dictionary are also accessible as "
"attributes. These virtual attributes return unicode strings, even if the "
"value is missing or unicode decoding fails. In that case, the string is "
"empty, but still present::"
Expand Down Expand Up @@ -1427,7 +1428,7 @@ msgid ""
":attr:`FileUpload.filename` contains the name of the file on the clients "
"file system, but is cleaned up and normalized to prevent bugs caused by "
"unsupported characters or path segments in the filename. If you need the "
"unmodified name as send by the client, have a look at :attr:`FileUpload."
"unmodified name as sent by the client, have a look at :attr:`FileUpload."
"raw_filename`."
msgstr ""
":attr:`FileUpload.filename` 包含客户端传上来的文件的文件名,但为了防止异常字"
Expand Down
40 changes: 21 additions & 19 deletions docs/_locale/zh_CN/tutorial_app.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Bottle 0.12-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-11-09 18:23\n"
"PO-Revision-Date: 2012-11-09 18:14+0800\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2013-04-18 23:40\n"
"PO-Revision-Date: 2013-04-20 16:33+0800\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"

# 33f6efd9369c46beb47afc690cadc6aa
#: ../../tutorial_app.rst:20
Expand Down Expand Up @@ -293,8 +294,8 @@ msgid ""
"important point is the `decorator statement`_ ``@route('/todo')`` right "
"before the ``def todo_list()`` statement. By doing this, we bind this "
"function to the route ``/todo``, so every time the browsers calls ``http://"
"localhost:8080/todo``, Bottle returns the result of the function ``todo_list"
"()``. That is how routing within bottle works."
"localhost:8080/todo``, Bottle returns the result of the function "
"``todo_list()``. That is how routing within bottle works."
msgstr ""
"来看看我们写的代码。导入了必须的 ``sqlite3`` 模块,从Bottle中导入 ``route`` "
"和 ``run`` 。``run()`` 函数启动了Bottle的内置开发服务器,默认情况下,开发服务"
Expand Down Expand Up @@ -413,8 +414,8 @@ msgstr ""
# 480e31a5104a47d896b7b97d9b67039b
#: ../../tutorial_app.rst:154
msgid ""
"A further quiet nice feature is auto-reloading, which is enabled by "
"modifying the ``run()`` statement to"
"Another quite nice feature is auto-reloading, which is enabled by modifying "
"the ``run()`` statement to"
msgstr "另外一个十分有用的功能是自动加载,可修改 ``run()`` 语句来开启。"

# 071cfe7d8836472487497e32f1640e30
Expand All @@ -428,8 +429,8 @@ msgstr "这样会自动检测对脚本的修改,并自动重启服务器来使
# 456c2314e499418181dc936efc631ae6
#: ../../tutorial_app.rst:162
msgid ""
"Again, the feature is mainly supposed to be used while development, not on "
"productive systems."
"Again, the feature is mainly supposed to be used while developing, not on "
"production systems."
msgstr "同上,这个功能并不建议在生产环境中使用。"

# 13bb322f8d344ecea4c265986221d2bb
Expand Down Expand Up @@ -603,11 +604,11 @@ msgstr "让我们先来添加一个接受GET请求的route。"
#: ../../tutorial_app.rst:241
msgid ""
"To access GET (or POST) data, we need to import ``request`` from Bottle. To "
"assign the actual data to a variable, we use the statement ``request.GET.get"
"('task','').strip()`` statement, where ``task`` is the name of the GET data "
"we want to access. That's all. If your GET data has more than one variable, "
"multiple ``request.GET.get()`` statements can be used and assigned to other "
"variables."
"assign the actual data to a variable, we use the statement ``request.GET."
"get('task','').strip()`` statement, where ``task`` is the name of the GET "
"data we want to access. That's all. If your GET data has more than one "
"variable, multiple ``request.GET.get()`` statements can be used and assigned "
"to other variables."
msgstr ""
"为了访问GET(或POST)中的数据,我们需要从Bottle中导入 ``request`` ,通过 "
"``request.GET.get('task', '').strip()`` 来获取表单中 ``task`` 字段的数据。可"
Expand Down Expand Up @@ -829,7 +830,7 @@ msgid ""
"Of course, this example is somehow artificially constructed - it would be "
"easier to use a plain dynamic route only combined with a validation. "
"Nevertheless, we want to see how regular expression routes work: the line "
"``@route(/item:item_#[1-9]+#)`` starts like a normal route, but the part "
"``@route(/item:item_#[0-9]+#)`` starts like a normal route, but the part "
"surrounded by # is interpreted as a regular expression, which is the dynamic "
"part of the route. So in this case, we want to match any digit between 0 and "
"9. The following function \"show_item\" just checks whether the given item "
Expand All @@ -839,10 +840,11 @@ msgid ""
"a string, even if it is a plain integer number, like in this case."
msgstr ""
"当然,这个例子是我们想象出来的,去掉\"item1\"中的\"item\",直接使用\"1\"会更"
"简单。虽然如此,我们还是想为你展示在route的正则表达式: ``@route(/item:item_#"
"[1-9]+#)`` 和一个普通的route差不多,但是在两个\"#\"中的字符就是一个正则表达"
"式,匹配从0到9的数字。在处理\"/item9\"这样的请求的时候,正则表达式会匹配到"
"\"9\",然后将\"9\"做为item参数传递给show_item函数,而不是\"item9\"。"
"简单。虽然如此,我们还是想为你展示在route的正则表达式: ``@route(/item:"
"item_#[1-9]+#)`` 和一个普通的route差不多,但是在两个\"#\"中的字符就是一个正则"
"表达式,是该route中的动态部分,匹配从0到9的数字。在处理\"/item9\"这样的请求的"
"时候,正则表达式会匹配到\"9\",然后将\"9\"做为item参数传递给show_item函数,而"
"不是\"item9\"。注意,这里传给show_item函数的\"9\",是一个字符串。"

# d81b6fe2653d46959569c07980a6e833
#: ../../tutorial_app.rst:390
Expand Down

0 comments on commit b4c243e

Please sign in to comment.