From 5b2217d6b5a0f336e1c187137be44c5db0227f84 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Tue, 27 Jul 2021 16:10:23 +0700 Subject: [PATCH 1/2] Fix YAML output example and code formatting Fix #1083 --- doc/reference/interactive_console.rst | 86 ++++++++++++++++++--------- 1 file changed, 59 insertions(+), 27 deletions(-) diff --git a/doc/reference/interactive_console.rst b/doc/reference/interactive_console.rst index bf134ed092..c2bfb73ac9 100644 --- a/doc/reference/interactive_console.rst +++ b/doc/reference/interactive_console.rst @@ -4,14 +4,16 @@ Interactive console -------------------------------------------------------------------------------- -The "interactive console" is Tarantool's basic "command-line interface" for entering requests -and seeing results. It is what users see when they start the server +The interactive console is Tarantool's basic command-line interface for entering requests +and seeing results. +It is what users see when they start the server without an :ref:`instance file `, or start :ref:`tarantoolctl ` with ``enter``. -It is often called the Lua console to distinguish it from the administrative console, +The interactive console is often called the Lua console to distinguish it from the administrative console, but in fact it can handle both Lua and SQL input. + The majority of examples in this manual show what users see with the -interactive console, including the prompt (which can be "tarantool> "), +interactive console, including the prompt (which can be ``tarantool>``), the instruction (which can be a Lua request or an SQL statement), and the response (which can be a display in either YAML format or Lua format). @@ -58,33 +60,63 @@ and it may be Lua if the last :ref:`set_default_output ` call was ``console.set_default_output('lua')``. -.. container:: table +.. container:: table .. rst-class:: left-align-column-1 .. rst-class:: left-align-column-2 .. rst-class:: left-align-column-3 .. rst-class:: left-align-column-4 + .. rst-class:: left-align-column-5 + + .. list-table:: + :widths: 15 15 15 20 35 + :header-rows: 1 + + * - Type + - Lua input + - Lua output + - YAML output + - MsgPack storage + + * - scalar + - :code:`1` + - :code:`1` + + - | :code:`---` + | :code:`- 1` + | :code:`...` + + - :code:`\x01` + + * - scalar sequence + - :code:`1, 2, 3` + - :code:`1, 2, 3` + + - | :code:`---` + | :code:`- 1` + | :code:`- 2` + | :code:`- 3` + | :code:`...` + + - :code:`\x01 \x02 \x03` + + * - 2-element table + - :code:`{1, 2}` + - :code:`{1, 2}` + + - | :code:`---` + | :code:`- - 1` + | :literal:`\ - 2` + | :code:`...` + + - :code:`0x92 0x01 0x02` + + * - map + - :code:`{key = 1}` + - :code:`{key = 1}` - +-----------------+-----------------+-----------------+-----------------------+---------------------------------------+ - | Type | Lua input | Lua output | YAML output | MsgPack storage | - +=================+=================+=================+=======================+=======================================+ - | scalar | :code:`1` | :code:`1` | :code:`---` |br| | :code:`\x01` | - | | | | :code:`- 1` |br| | | - | | | | :code:`...` | | - +-----------------+-----------------+-----------------+-----------------------+---------------------------------------+ - | scalar sequence | :code:`1,2,3` | :code:`1,2,3` | :code:`---` |br| | :code:`\x01 \x02 \x03` | - | | | | :code:`- 1` |br| | | - | | | | :code:`- 2` |br| | | - | | | | :code:`- 3` |br| | | - | | | | :code:`...` | | - +-----------------+-----------------+-----------------+-----------------------+---------------------------------------+ - | 2-element table | :code:`{1,2}` | :code:`{1,2}` | :code:`---` |br| | :code:`0x92 0x01 0x02` | - | | | | :code:`- - 1` |br| | | - | | | | :code:`- - 2` |br| | | - | | | | :code:`...` | | - +-----------------+-----------------+-----------------+-----------------------+---------------------------------------+ - | map | :code:`{key=1}` | :code:`{key=1}` | :code:`---` |br| | :code:`\x81 \xa3 \x6b \x65 \x79 \x01` | - | | | | :code:`- key: 1` |br| | | - | | | | :code:`...` | | - +-----------------+-----------------+-----------------+-----------------------+---------------------------------------+ + - | :code:`---` + | :code:`- key: 1` + | :code:`...` + - :code:`\x81 \xa3 \x6b \x65 \x79 \x01` From 216e48a2ce680602cc001d7e5e9a627932333f08 Mon Sep 17 00:00:00 2001 From: ainoneko Date: Wed, 11 Aug 2021 11:23:49 +0000 Subject: [PATCH 2/2] Update translations --- .../reference/interactive_console.po | 53 ++++++++++++------- .../reference_lua/box_space/bsize.po | 2 +- locale/ru/LC_MESSAGES/release/new-policy.po | 2 +- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/locale/ru/LC_MESSAGES/reference/interactive_console.po b/locale/ru/LC_MESSAGES/reference/interactive_console.po index a386e8c01e..5a66698254 100644 --- a/locale/ru/LC_MESSAGES/reference/interactive_console.po +++ b/locale/ru/LC_MESSAGES/reference/interactive_console.po @@ -3,16 +3,19 @@ msgid "Interactive console" msgstr "" msgid "" -"The \"interactive console\" is Tarantool's basic \"command-line interface\" " -"for entering requests and seeing results. It is what users see when they " -"start the server without an :ref:`instance file `, or " -"start :ref:`tarantoolctl ` with ``enter``. It is often called " -"the Lua console to distinguish it from the administrative console, but in " -"fact it can handle both Lua and SQL input. The majority of examples in this " -"manual show what users see with the interactive console, including the " -"prompt (which can be \"tarantool> \"), the instruction (which can be a Lua " -"request or an SQL statement), and the response (which can be a display in " -"either YAML format or Lua format)." +"The interactive console is Tarantool's basic command-line interface for " +"entering requests and seeing results. It is what users see when they start " +"the server without an :ref:`instance file `, or start " +":ref:`tarantoolctl ` with ``enter``. The interactive console " +"is often called the Lua console to distinguish it from the administrative " +"console, but in fact it can handle both Lua and SQL input." +msgstr "" + +msgid "" +"The majority of examples in this manual show what users see with the " +"interactive console, including the prompt (which can be ``tarantool>``), the" +" instruction (which can be a Lua request or an SQL statement), and the " +"response (which can be a display in either YAML format or Lua format)." msgstr "" msgid "" @@ -88,8 +91,14 @@ msgstr "скалярный" msgid ":code:`1`" msgstr "" -msgid ":code:`---` |br| :code:`- 1` |br| :code:`...`" -msgstr "" +msgid ":code:`---`" +msgstr ":code:`---`" + +msgid ":code:`- 1`" +msgstr ":code:`- 1`" + +msgid ":code:`...`" +msgstr ":code:`...`" msgid ":code:`\\x01`" msgstr "" @@ -97,12 +106,13 @@ msgstr "" msgid "scalar sequence" msgstr "" -msgid ":code:`1,2,3`" +msgid ":code:`1, 2, 3`" msgstr "" -msgid "" -":code:`---` |br| :code:`- 1` |br| :code:`- 2` |br| :code:`- 3` |br| " -":code:`...`" +msgid ":code:`- 2`" +msgstr "" + +msgid ":code:`- 3`" msgstr "" msgid ":code:`\\x01 \\x02 \\x03`" @@ -111,10 +121,13 @@ msgstr "" msgid "2-element table" msgstr "" -msgid ":code:`{1,2}`" +msgid ":code:`{1, 2}`" +msgstr "" + +msgid ":code:`- - 1`" msgstr "" -msgid ":code:`---` |br| :code:`- - 1` |br| :code:`- - 2` |br| :code:`...`" +msgid ":literal:`\\ - 2`" msgstr "" msgid ":code:`0x92 0x01 0x02`" @@ -123,10 +136,10 @@ msgstr "" msgid "map" msgstr "map (ассоциативный массив)" -msgid ":code:`{key=1}`" +msgid ":code:`{key = 1}`" msgstr "" -msgid ":code:`---` |br| :code:`- key: 1` |br| :code:`...`" +msgid ":code:`- key: 1`" msgstr "" msgid ":code:`\\x81 \\xa3 \\x6b \\x65 \\x79 \\x01`" diff --git a/locale/ru/LC_MESSAGES/reference/reference_lua/box_space/bsize.po b/locale/ru/LC_MESSAGES/reference/reference_lua/box_space/bsize.po index 326c594d0f..e8e3774c90 100644 --- a/locale/ru/LC_MESSAGES/reference/reference_lua/box_space/bsize.po +++ b/locale/ru/LC_MESSAGES/reference/reference_lua/box_space/bsize.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Количество байтов в спейсе. Это число, которое хранится во внутренней памяти" " Tarantool'а, представляет собой общее количество байтов во всех кортежах, " -"включая ключи индекса. Для получения информации об измерении размера " +"не включая ключи индекса. Для получения информации об измерении размера " "индекса, см. :doc:`/reference/reference_lua/box_index/bsize`." msgid "**Example:**" diff --git a/locale/ru/LC_MESSAGES/release/new-policy.po b/locale/ru/LC_MESSAGES/release/new-policy.po index 9468739952..92023b6c97 100644 --- a/locale/ru/LC_MESSAGES/release/new-policy.po +++ b/locale/ru/LC_MESSAGES/release/new-policy.po @@ -146,7 +146,7 @@ msgid "" "the second version number:" msgstr "" "В минорном релизе могут вводиться новые функциональные возможности. Тем не " -"менее она гарантированно будет совместима с более ранними версиями серии. " +"менее он гарантированно будет совместим с более ранними версиями серии. " "Могут быть также исправлены ошибки. Каждый следующий минорный релиз получает" " номер, в котором изменено второе число:"