cvs: smarty /docs/ru/designers language-builtin-functions.xml language-custom-functions.xml language-modifiers.xml /docs/ru/designers/language-basic-syntax language-math.xml language-syntax-attributes.xml language-syntax-comments.xml
[email protected] ("George Miroshnikov") Fri, 02 Dec 2005 15:34:39 -0000
| Newsgroups | php.smarty.cvs |
|---|---|
| Message-ID | <cvsfreespace1133537679@cvsserver> |
freespace Fri Dec 2 10:34:39 2005 EDT
Modified files:
/smarty/docs/ru/designers/language-basic-syntax language-math.xml
language-syntax-attributes.xml
language-syntax-comments.xml
/smarty/docs/ru/designers language-builtin-functions.xml
language-custom-functions.xml
language-modifiers.xml
Log:
sync with EN
freespace-20051202103439.txt
(text/plain, 10.7 KB)
http://cvs.php.net/diff.php/smarty/docs/ru/designers/language-basic-syntax/language-math.xml?r1=1.2&r2=1.3&ty=u
Index: smarty/docs/ru/designers/language-basic-syntax/language-math.xml
diff -u smarty/docs/ru/designers/language-basic-syntax/language-math.xml:1.2 smarty/docs/ru/designers/language-basic-syntax/language-math.xml:1.3
--- smarty/docs/ru/designers/language-basic-syntax/language-math.xml:1.2 Sun Aug 28 12:51:14 2005
+++ smarty/docs/ru/designers/language-basic-syntax/language-math.xml Fri Dec 2 10:34:38 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.3 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
<sect1 id="language.math">
<title>Àðèôìåòè÷åñêèå îïåðàöèè</title>
<para>
@@ -27,7 +27,8 @@
</programlisting>
</example>
<para>
- Ñì. òàêæå ôóíêöèþ <link linkend="language.function.math">{math}</link>.
+ Ñì. òàêæå ôóíêöèþ <link linkend="language.function.math">{math}</link> äëÿ
+ ñëîæíûõ âû÷èñëåíèé.
</para>
</sect1>
<!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/smarty/docs/ru/designers/language-basic-syntax/language-syntax-attributes.xml?r1=1.5&r2=1.6&ty=u
Index: smarty/docs/ru/designers/language-basic-syntax/language-syntax-attributes.xml
diff -u smarty/docs/ru/designers/language-basic-syntax/language-syntax-attributes.xml:1.5 smarty/docs/ru/designers/language-basic-syntax/language-syntax-attributes.xml:1.6
--- smarty/docs/ru/designers/language-basic-syntax/language-syntax-attributes.xml:1.5 Sun Aug 28 12:51:14 2005
+++ smarty/docs/ru/designers/language-basic-syntax/language-syntax-attributes.xml Fri Dec 2 10:34:38 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.3 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.6 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
<sect1 id="language.syntax.attributes">
<title>Ïàðàìåòðû</title>
<para>
@@ -24,18 +24,20 @@
<title>ñèíòàêñèñ ïàðàìåòðîâ ôóíêöèè</title>
<programlisting>
<![CDATA[
-{include file="header.tpl"}
+{include file='header.tpl'}
-{include file="header.tpl" attrib_name="attrib value"}
+{include file='header.tpl' attrib_name='attrib value'}
{include file=$includeFile}
-{include file=#includeFile# title="Smarty is cool"}
+{include file=#includeFile# title='Smarty is cool'}
{html_select_date display_days=yes}
-<select name="company">
- {html_options options=$choices selected=$selected}
+{mailto address='[email protected]'}
+
+<select name='company_id'>
+ {html_options options=$companies selected=$company_id}
</select>
]]>
</programlisting>
http://cvs.php.net/diff.php/smarty/docs/ru/designers/language-basic-syntax/language-syntax-comments.xml?r1=1.6&r2=1.7&ty=u
Index: smarty/docs/ru/designers/language-basic-syntax/language-syntax-comments.xml
diff -u smarty/docs/ru/designers/language-basic-syntax/language-syntax-comments.xml:1.6 smarty/docs/ru/designers/language-basic-syntax/language-syntax-comments.xml:1.7
--- smarty/docs/ru/designers/language-basic-syntax/language-syntax-comments.xml:1.6 Sun Aug 28 12:51:14 2005
+++ smarty/docs/ru/designers/language-basic-syntax/language-syntax-comments.xml Fri Dec 2 10:34:38 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.6 $ -->
-<!-- EN-Revision: 1.3 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.7 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
<sect1 id="language.syntax.comments">
<title>Êîììåíòàðèè</title>
<para>
@@ -16,6 +16,8 @@
<programlisting>
<![CDATA[
<body>
+{* îäíîñòðî÷íûé êîììåíòàðèé *}
+
{* ýòîò ìíîãîñòðî÷íûé êîììåíòàðèé
íå îòïðàâëÿåòñÿ â áðàçóåð
*}
@@ -25,15 +27,17 @@
{* Ïðèìå÷àíèå ðàçðàáîò÷èêà: $includeFile íàçíà÷àåòñÿ â ñêðèïòå foo.php *}
-<!-- ýòîò html-êîììåíòàðèé áóäåò îòïðàâëåí áðàóçåðó -->
+<!-- ýòîò HTML-êîììåíòàðèé áóäåò îòïðàâëåí áðàóçåðó -->
{include file=$includeFile}
{include file=#includeFile#}
-{* îòîáðàæàåì âûïàäàþùåå ìåíþ *}
+{* ýòîò áëîê <select> íåíóæåí *}
+{*
<select name="company">
{html_options options=$vals selected=$selected_id}
</select>
+*}
</body>
]]>
</programlisting>
http://cvs.php.net/diff.php/smarty/docs/ru/designers/language-builtin-functions.xml?r1=1.7&r2=1.8&ty=u
Index: smarty/docs/ru/designers/language-builtin-functions.xml
diff -u smarty/docs/ru/designers/language-builtin-functions.xml:1.7 smarty/docs/ru/designers/language-builtin-functions.xml:1.8
--- smarty/docs/ru/designers/language-builtin-functions.xml:1.7 Thu Nov 25 18:26:12 2004
+++ smarty/docs/ru/designers/language-builtin-functions.xml Fri Dec 2 10:34:38 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.7 $ -->
-<!-- EN-Revision: 1.3 Maintainer: tony2001 Status: ready -->
+<!-- $Revision: 1.8 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
<chapter id="language.builtin.functions">
<title>Âñòðîåííûå ôóíêöèè</title>
<para>
@@ -13,10 +13,10 @@
&designers.language-builtin-functions.language-function-capture;
&designers.language-builtin-functions.language-function-config-load;
&designers.language-builtin-functions.language-function-foreach;
+&designers.language-builtin-functions.language-function-if;
&designers.language-builtin-functions.language-function-include;
&designers.language-builtin-functions.language-function-include-php;
&designers.language-builtin-functions.language-function-insert;
-&designers.language-builtin-functions.language-function-if;
&designers.language-builtin-functions.language-function-ldelim;
&designers.language-builtin-functions.language-function-literal;
&designers.language-builtin-functions.language-function-php;
http://cvs.php.net/diff.php/smarty/docs/ru/designers/language-custom-functions.xml?r1=1.5&r2=1.6&ty=u
Index: smarty/docs/ru/designers/language-custom-functions.xml
diff -u smarty/docs/ru/designers/language-custom-functions.xml:1.5 smarty/docs/ru/designers/language-custom-functions.xml:1.6
--- smarty/docs/ru/designers/language-custom-functions.xml:1.5 Thu Nov 25 18:26:12 2004
+++ smarty/docs/ru/designers/language-custom-functions.xml Fri Dec 2 10:34:38 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.5 Maintainer: tony2001 Status: ready -->
+<!-- $Revision: 1.6 $ -->
+<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
<chapter id="language.custom.functions">
<title>Ïîëüçîâàòåëüñêèå Ôóíêöèè</title>
<para>
@@ -21,10 +21,10 @@
&designers.language-custom-functions.language-function-html-select-date;
&designers.language-custom-functions.language-function-html-select-time;
&designers.language-custom-functions.language-function-html-table;
-&designers.language-custom-functions.language-function-math;
&designers.language-custom-functions.language-function-mailto;
-&designers.language-custom-functions.language-function-popup-init;
+&designers.language-custom-functions.language-function-math;
&designers.language-custom-functions.language-function-popup;
+&designers.language-custom-functions.language-function-popup-init;
&designers.language-custom-functions.language-function-textformat;
</chapter>
http://cvs.php.net/diff.php/smarty/docs/ru/designers/language-modifiers.xml?r1=1.8&r2=1.9&ty=u
Index: smarty/docs/ru/designers/language-modifiers.xml
diff -u smarty/docs/ru/designers/language-modifiers.xml:1.8 smarty/docs/ru/designers/language-modifiers.xml:1.9
--- smarty/docs/ru/designers/language-modifiers.xml:1.8 Sun Aug 28 12:51:14 2005
+++ smarty/docs/ru/designers/language-modifiers.xml Fri Dec 2 10:34:39 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.8 $ -->
-<!-- EN-Revision: 1.18 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.9 $ -->
+<!-- EN-Revision: 1.19 Maintainer: freespace Status: ready -->
<chapter id="language.modifiers">
<title>Ìîäèôèêàòîðû ïåðåìåííûõ</title>
<para>
@@ -43,6 +43,27 @@
<literal>@</literal>. Ïðèìåð: <literal>{$articleTitle|@count}</literal> âûâåäåò
êîëè÷åñòâî åëåìåíòîâ â ìàññèâå $articleTitle.
</para>
+
+ <para>
+ Ìîäèôèêàòîðû ìîãóò àâòîìàòè÷åñêè çàãðóæàòüñÿ èç âàøåé äèðåêòîðèè
+ <link linkend="variable.plugins.dir">$plugins_dir</link> (ñì. òàêæå:
+ <link linkend="plugins.naming.conventions">Ñîãëàøåíèå îá èìåíàõ</link>)
+ èëè ìîãóò ðåãèñòðèðîâàòüñÿ ÿâíî (ñì.: <link
+ linkend="api.register.modifier">register_modifier</link>).
+ </para>
+
+ <para>
+ Ê òîìó æå, ëþáàÿ PHP-ôóíêöèÿ ìîæåò áûòü ÿâíî èñïîëüçîâàíà â êà÷åñòâå ìîäèôèêàòîðà.
+ (Ïðåäûäóùèé ïðèìåð ñ <literal>@count</literal> íà ñàìîì äåëå èñïîëüçóåò ôóíêöèþ
+ PHP, à íå ìîäèôèêàòîð Smarty). Èñïîëüçîâàíèå PHP-ôóíêöèé â êà÷åñòâå ìîäèôèêàòîðîâ
+ èìååò äâå ìàëåíüêèå "ëîâóøêè": Âî-ïåðâûõ, èíîãäà ïîðÿäîê àðãóìåíòîâ ôóíêöèè
+ íå ñàìûé óäîáíûé (<literal>{"%2.f"|sprintf:$float}</literal> - ýòî ðàáî÷èé, íî
+ íå ñîâñåì óäîáíûé âàðèàíò. Áîëüøå ïîäîéäåò <literal>{$float|string_format:"%2.f"}</literal>,
+ êîòîðûé îáåñïå÷èâàåòñÿ äèñòðèáóòèâîì Smarty). Âî-âòîðûõ, â ñëó÷àå âêëþ÷åíèÿ <link
+ linkend="variable.security">$security</link>, âñå PHP-ôóíêöèè, êîòîðûå áóäóò
+ èñïîëüçîâàíû êàê ìîäèôèêàòîðû, äîëæíû áûòü îáúÿâëåíû "áåçîïàñíûìè"
+ â ìàññèâå <link linkend="variable.security.settings">$security_settings['MODIFIER_FUNCS']</link>.
+ </para>
<para>
Ñì. òàêæå
@@ -50,7 +71,7 @@
<link linkend="api.register.function">register_function()</link>,
<link linkend="plugins">Ïëàãèíû - ðàñøèðåíèå ôóíêöèîíàëüíîñòè Smarty</link>
è
- <link linkend="plugins.modifiers">ìîäèôèêàòîðû</link>,
+ <link linkend="plugins.modifiers">ìîäèôèêàòîðû</link>.
</para>
&designers.language-modifiers.language-modifier-capitalize;