Menu
▾
▴
[Bugzilla-ru-commit] SF.net SVN: bugzilla-ru:[285] bugzilla-ru/template/ru/default
|
From: <fed...@us...> - 2009-12-08 22:56:25
|
Revision: 285
http://bugzilla-ru.svn.sourceforge.net/bugzilla-ru/?rev=285&view=rev
Author: fedrushkov
Date: 2009-12-08 22:56:16 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
Templates synchronized to current CVS
Modified Paths:
--------------
bugzilla-ru/template/ru/default/attachment/create.html.tmpl
bugzilla-ru/template/ru/default/attachment/created.html.tmpl
bugzilla-ru/template/ru/default/attachment/edit.html.tmpl
bugzilla-ru/template/ru/default/attachment/updated.html.tmpl
bugzilla-ru/template/ru/default/bug/create/create.html.tmpl
bugzilla-ru/template/ru/default/bug/create/created.html.tmpl
bugzilla-ru/template/ru/default/bug/format_comment.txt.tmpl
bugzilla-ru/template/ru/default/bug/process/header.html.tmpl
bugzilla-ru/template/ru/default/bug/show.html.tmpl
bugzilla-ru/template/ru/default/global/code-error.html.tmpl
bugzilla-ru/template/ru/default/global/user-error.html.tmpl
bugzilla-ru/template/ru/default/list/edit-multiple.html.tmpl
bugzilla-ru/template/ru/default/request/queue.html.tmpl
bugzilla-ru/template/ru/default/search/form.html.tmpl
Added Paths:
-----------
bugzilla-ru/template/ru/default/bug/show-header.html.tmpl
Modified: bugzilla-ru/template/ru/default/attachment/create.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/attachment/create.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/attachment/create.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -132,4 +132,6 @@
</form>
+[% Hook.process('end') %]
+
[% PROCESS global/footer.html.tmpl %]
Modified: bugzilla-ru/template/ru/default/attachment/created.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/attachment/created.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/attachment/created.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -29,23 +29,9 @@
[% PROCESS global/variables.none.tmpl %]
[% bug = bugs.0 %]
-[% bodyclasses = ['bz_bug',
- "bz_status_$bug.bug_status",
- "bz_product_$bug.product",
- "bz_component_$bug.component",
- "bz_bug_$bug.bug_id"
- ]
-%]
-[% FOREACH group = bug.groups_in %]
- [% bodyclasses.push("bz_group_$group.name") %]
-[% END %]
-
+[% PROCESS "bug/show-header.html.tmpl" %]
[% PROCESS global/header.html.tmpl
title = "Приложение $attachment.id добавлено к $terms.bug_dat $attachment.bug_id"
- bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
- doc_section = "bug_page.html"
%]
<dl>
Modified: bugzilla-ru/template/ru/default/attachment/edit.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/attachment/edit.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/attachment/edit.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -287,4 +287,6 @@
[% END %]
</div>
+[% Hook.process('end') %]
+
[% PROCESS global/footer.html.tmpl %]
Modified: bugzilla-ru/template/ru/default/attachment/updated.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/attachment/updated.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/attachment/updated.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -28,28 +28,10 @@
[% PROCESS global/variables.none.tmpl %]
[% bug = bugs.0 %]
-[% filtered_desc = bug.short_desc FILTER html %]
-[% filtered_timestamp = bug.delta_ts FILTER time %]
-[% bodyclasses = ['bz_bug',
- "bz_status_$bug.bug_status",
- "bz_product_$bug.product",
- "bz_component_$bug.component",
- "bz_bug_$bug.bug_id"
- ]
-%]
-[% FOREACH group = bug.groups_in %]
- [% bodyclasses.push("bz_group_$group.name") %]
-[% END %]
+[% PROCESS "bug/show-header.html.tmpl" %]
[% PROCESS global/header.html.tmpl
title = "Изменения приложения $attachment.id к $terms.bug_obj $attachment.bug_id сохранены"
- header = "$terms.Bug $attachment.bug_id"
- subheader = filtered_desc
- header_addl_info = "Последние изменения: $filtered_timestamp"
- bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
- doc_section = "bug_page.html"
%]
<dl>
Modified: bugzilla-ru/template/ru/default/bug/create/create.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/bug/create/create.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/bug/create/create.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -196,16 +196,20 @@
</tr>
<tr>
- <td colspan="4">
- <a id="expert_fields_controller" class="controller bz_default_hidden"
- href="javascript:TUI_toggle_class('expert_fields')">Скрыть
+ <td colspan="2">
+ <a id="expert_fields_controller" class="controller bz_default_hidden"
+ href="javascript:TUI_toggle_class('expert_fields')">Скрыть
дополнительные поля</a>
[%# Show the link if the browser supports JS %]
<script type="text/javascript">
- YAHOO.util.Dom.removeClass('expert_fields_controller',
- 'bz_default_hidden');
+ YAHOO.util.Dom.removeClass('expert_fields_controller',
+ 'bz_default_hidden');
</script>
</td>
+ <td colspan="2">
+ (<span class="required_star">*</span> =
+ <span class="required_explanation">указание значения обязательно</span>)
+ </td>
</tr>
<tr>
@@ -218,12 +222,13 @@
[%# We can't use the select block in these two cases for various reasons. %]
<tr>
- <th>
+ <th class="required">
<a href="describecomponents.cgi?product=[% product.name FILTER url_quote %]">
Компонент</a>:
</th>
<td>
- <select name="component" onchange="set_assign_to();" size="7">
+ <select name="component" onchange="set_assign_to();" size="7"
+ aria-required="true" class="required">
[%# Build the lists of assignees and QA contacts if "usemenuforusers" is enabled. %]
[% IF Param("usemenuforusers") %]
[% assignees_list = user.get_userlist.clone %]
@@ -484,10 +489,11 @@
<tbody>
<tr>
- <th>Аннотация:</th>
+ <th class="required">Аннотация:</th>
<td colspan="3">
<input name="short_desc" size="70" value="[% short_desc FILTER html %]"
- maxlength="255" spellcheck="true">
+ maxlength="255" spellcheck="true" aria-required="true"
+ class="required">
</td>
</tr>
Modified: bugzilla-ru/template/ru/default/bug/create/created.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/bug/create/created.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/bug/create/created.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -34,15 +34,10 @@
[% PROCESS global/variables.none.tmpl %]
-[% filtered_desc = bug.short_desc FILTER html %]
+[% PROCESS "bug/show-header.html.tmpl" %]
[% PROCESS global/header.html.tmpl
title = "$terms.Bug $id сохранена – $filtered_desc"
header = "$terms.Bug $id сохранена"
- subheader = filtered_desc
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
-
-
%]
[% header_done = 1 %]
Modified: bugzilla-ru/template/ru/default/bug/format_comment.txt.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/bug/format_comment.txt.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/bug/format_comment.txt.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -34,11 +34,6 @@
[% PROCESS 'global/variables.none.tmpl' %]
[% SET comment_body = comment.body %]
-[% IF is_bugmail %]
- [% comment_body = comment_body.replace( 'Created an attachment (\(id=([0-9]+)\))',
- 'Добавлено приложение $1' _ "\n" _ ' --> (' _ urlbase
- _ 'attachment.cgi?id=$2)' ) %]
-[% END %]
[% IF comment.type == constants.CMT_DUPE_OF %]
X[% comment_body %]
@@ -56,6 +51,14 @@
номером новой [% terms.bug %] в другой базе данных.
Когда перемещение будет подтверждено, укажите здесь ссылку на новую [% terms.bug_acc %].
В противном случае откройте эту [% terms.bug_acc %] повторно.
+[% ELSIF comment.type == constants.CMT_ATTACHMENT_CREATED %]
+Добавлено приложение [% comment.extra_data %]
+[% IF is_bugmail %]
+ --> [% urlbase _ "attachment.cgi?id=" _ comment.extra_data %]
+[% END %]
+[%+ comment.attachment.description %]
+
+[%+ comment.body %]
[% ELSE %]
X[% comment_body %]
[% END %]
Modified: bugzilla-ru/template/ru/default/bug/process/header.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/bug/process/header.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/bug/process/header.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -29,6 +29,8 @@
[% USE Bugzilla %]
+[% PROCESS "bug/show-header.html.tmpl" %]
+
[% IF title_tag == "bug_processed" %]
[% title = BLOCK %]
[% IF Bugzilla.cgi.param('id') %]
@@ -44,8 +46,8 @@
[% title = "Измените результаты голосования" %]
[% END %]
-[% PROCESS global/header.html.tmpl
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
- doc_section = "bug_page.html"
+[% PROCESS global/header.html.tmpl
+ # We don't have a bug object at this point, unfortunately, so we can't
+ # actually display all the proper header info.
+ header_addl_info = ''
%]
Added: bugzilla-ru/template/ru/default/bug/show-header.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/bug/show-header.html.tmpl (rev 0)
+++ bugzilla-ru/template/ru/default/bug/show-header.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -0,0 +1,52 @@
+[%# The contents of this file are subject to the Mozilla Public
+ # License Version 1.1 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.mozilla.org/MPL/
+ #
+ # Software distributed under the License is distributed on an "AS
+ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ # implied. See the License for the specific language governing
+ # rights and limitations under the License.
+ #
+ # The Original Code is the Bugzilla Bug Tracking System.
+ #
+ # The Initial Developer of the Original Code is Netscape Communications
+ # Corporation. Portions created by Netscape are
+ # Copyright (C) 1998 Netscape Communications Corporation. All
+ # Rights Reserved.
+ #
+ # Contributor(s): Gervase Markham <ge...@ge...>
+ # Vaskin Kissoyan <vki...@ya...>
+ # Bradley Baetz <bb...@st...>
+ # Max Kanat-Alexander <mk...@bu...>
+ #
+ # Russian translation: Vitaly Fedrushkov <fed...@us...>
+ #%]
+
+[%# This template should be called with PROCESS before processing
+ # "global/header.html.tmpl" in any template that is going to load the
+ # bug form. It expects only a "bug" object, and can even manage to get
+ # along without that. Some of these variables are just defaults that will
+ # be overridden by the calling templates.
+ #%]
+
+[% filtered_desc = bug.short_desc FILTER html %]
+[% subheader = filtered_desc %]
+[% filtered_timestamp = bug.delta_ts FILTER time %]
+[% title = "$terms.Bug $bug.bug_id – $filtered_desc" %]
+[% header = "$terms.Bug $bug.bug_id" %]
+[% header_addl_info = "Последние изменения: $filtered_timestamp" %]
+[% javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] %]
+[% style_urls = [ "skins/standard/yui/calendar.css",
+ "skins/standard/show_bug.css" ] %]
+[% doc_section = "bug_page.html" %]
+
+[% bodyclasses = ['bz_bug',
+ "bz_status_$bug.bug_status",
+ "bz_product_$bug.product",
+ "bz_component_$bug.component",
+ "bz_bug_$bug.bug_id",
+ ] %]
+[% FOREACH group = bug.groups_in %]
+ [% bodyclasses.push("bz_group_$group.name") %]
+[% END %]
Modified: bugzilla-ru/template/ru/default/bug/show.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/bug/show.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/bug/show.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -21,7 +21,6 @@
# Max Kanat-Alexander <mk...@bu...>
#
# Russian translation: Ilya Shevchik <il...@us...>
- # Good <je...@in...>
#%]
[% PROCESS global/variables.none.tmpl %]
@@ -30,28 +29,8 @@
[% bug = bugs.0 %]
[% IF !header_done %]
- [% filtered_desc = bug.short_desc FILTER html %]
- [% filtered_timestamp = bug.delta_ts FILTER time %]
- [% bodyclasses = ['bz_bug',
- "bz_status_$bug.bug_status",
- "bz_product_$bug.product",
- "bz_component_$bug.component",
- "bz_bug_$bug.bug_id"
- ]
- %]
- [% FOREACH group = bug.groups_in %]
- [% bodyclasses.push("bz_group_$group.name") %]
- [% END %]
- [% PROCESS global/header.html.tmpl
- title = "$terms.Bug $bug.bug_id – $filtered_desc"
- header = "$terms.Bug $bug.bug_id"
- subheader = filtered_desc
- header_addl_info = "Последнее изменение: $filtered_timestamp"
- bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
- doc_section = "bug_page.html"
- %]
+ [% PROCESS "bug/show-header.html.tmpl" %]
+ [% PROCESS global/header.html.tmpl %]
[% END %]
[% IF nextbug %]
Modified: bugzilla-ru/template/ru/default/global/code-error.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/global/code-error.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/global/code-error.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -121,6 +121,22 @@
без указания значения по умолчанию или аргумента $set_nulls_to, поскольку
среди текущих значений есть NULL.
+ [% ELSIF error == "comment_extra_data_not_allowed" %]
+ Попытка установить значение аргумента <code>extra_data</code> в
+ '[% extra_data FILTER html %]', в то время как для комментариев типа [% type FILTER html %]
+ аргумент <code>extra_data</code> не поддерживается.
+
+ [% ELSIF error == "comment_extra_data_required" %]
+ Комментарии типа [% type FILTER html %] требуют обязательного указания аргумента <code>extra_data</code>.
+
+ [% ELSIF error == "comment_extra_data_not_numeric" %]
+ Попытка установить значение аргумента <code>extra_data</code> в
+ '[% extra_data FILTER html %]', в то время как для комментариев типа [% type FILTER html %]
+ требуется аргумент <code>extra_data</code> числового типа.
+
+ [% ELSIF error == "comment_type_invalid" %]
+ Недопустимый тип комментария '[% type FILTER html %]'.
+
[% ELSIF error == "db_rename_conflict" %]
Конфликт имен: невозможно переименовать [% old FILTER html %] в
[% new FILTER html %], поскольку [% new FILTER html %] уже существует.
Modified: bugzilla-ru/template/ru/default/global/user-error.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/global/user-error.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/global/user-error.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -1403,19 +1403,21 @@
символов.
[% ELSIF error == "quicksearch_unknown_field" %]
- [% title = "Неизвестный атрибут поиска" %]
- [% IF fields.unique.size == 1 %]
- Атрибут <code>[% fields.first FILTER html %]</code> не определен.
- [% ELSE %]
- Атрибуты
- [% FOREACH field = fields.unique.sort %]
- <code>[% field FILTER html %]</code>
- [% ', ' UNLESS loop.last() %]
- [% END %]
- не определены.
+ [% title = "Ошибка быстрого поиска" %]
+ Ошибка в задании быстрого поиска:
+ [% FOREACH field = unknown %]
+ <p>Атрибут с кодом <code>[% field FILTER html %]</code> не существует.</p>
[% END %]
- Обратитесь к <a href="page.cgi?id=quicksearchhack.html">списку допустимых атрибутов поиска</a>.
+ [% FOREACH field = ambiguous.keys %]
+ <p>Код <code>[% field FILTER html %]</code> соответствует нескольким атрибутам:
+ [%+ ambiguous.${field}.join(', ') FILTER html %]</p>
+ [% END %]
+ [% IF unknown.size %]
+ <p>Обратитесь к
+ <a href="page.cgi?id=quicksearchhack.html">списку допустимых атрибутов поиска</a>.</p>
+ [% END %]
+
[% ELSIF error == "reassign_to_empty" %]
[% title = "Недопустимое назначение" %]
При назначении [% terms.bug_gen %] указание адреса нового исполнителя
Modified: bugzilla-ru/template/ru/default/list/edit-multiple.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/list/edit-multiple.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/list/edit-multiple.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -309,6 +309,8 @@
cols = constants.COMMENT_COLS
%]<br>
+[% Hook.process('before_groups') %]
+
[% IF groups.size > 0 %]
<b>Принадлежность группам:</b><br>
Modified: bugzilla-ru/template/ru/default/request/queue.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/request/queue.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/request/queue.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -176,14 +176,12 @@
</p>
[% ELSE %]
[% FOREACH request = requests %]
- [% IF loop.first %] [% PROCESS start_new_table %] [% END %]
[% IF request.$group_field != group_value %]
[% group_value = request.$group_field %]
- [% UNLESS loop.first %]
- </table>
- [% PROCESS start_new_table %]
- [% END %]
+ [% PROCESS display_buglist UNLESS loop.first %]
+ [% PROCESS start_new_table %]
[% END %]
+ [% buglist.${request.bug_id} = 1 %]
<tr>
[% FOREACH column = display_columns %]
[% NEXT IF column == group_field || excluded_columns.contains(column) %]
@@ -191,12 +189,14 @@
[% END %]
</tr>
[% END %]
- </table>
+ [% PROCESS display_buglist %]
[% END %]
[% PROCESS global/footer.html.tmpl %]
[% BLOCK start_new_table %]
+ [% buglist = {} %]
+
<h3>[% column_headers.$group_field %]:
[%+ (request.$group_field || "Нет") FILTER email FILTER html %]</h3>
<table class="requests" cellspacing="0" cellpadding="4" border="1">
@@ -242,3 +242,8 @@
[% request.created FILTER time %]
[% END %]
+[% BLOCK display_buglist %]
+ </table>
+ [% NEXT UNLESS buglist.keys.size %]
+ <a href="buglist.cgi?bug_id=[% buglist.keys.nsort.join(",") FILTER html %]">(показать список)</a>
+[% END %]
Modified: bugzilla-ru/template/ru/default/search/form.html.tmpl
===================================================================
--- bugzilla-ru/template/ru/default/search/form.html.tmpl 2009-12-01 01:38:24 UTC (rev 284)
+++ bugzilla-ru/template/ru/default/search/form.html.tmpl 2009-12-08 22:56:16 UTC (rev 285)
@@ -156,6 +156,7 @@
<td colspan="4">
<table>
<tr>
+ [% Hook.process('before_selects_top') %]
[% IF Param('useclassification') %]
<td valign="top">
<table>
@@ -245,7 +246,7 @@
<table>
<tr valign="bottom">
<th align="left">
- <label for="target_milestone">Запланировано</label>:
+ <label for="target_milestone">Target</label>:
</th>
</tr>
<tr valign="top">
@@ -255,25 +256,33 @@
</table>
</td>
[% END %]
+ [% Hook.process('after_selects_top') %]
</tr>
</table>
</td>
</tr>
[%# *** Comment URL Whiteboard Keywords *** %]
+[%# FIXME-ru: hot keys %]
- [% FOREACH field = [
+ [% SET freetext_fields = [
{ name => "longdesc", description => "Комментарий",
accesskey => 'c' },
{ name => "bug_file_loc", description => "Ссылка (URL)",
accesskey => 'u' },
{ name => "status_whiteboard", description => "Заметки",
- accesskey => 'w' } ] %]
+ accesskey => 'w' }
+ ] %]
- [% UNLESS field.name == 'status_whiteboard' AND NOT Param('usestatuswhiteboard') %]
+ [% Hook.process('before_freetext_fields') %]
+ [% FOREACH field = freetext_fields %]
+ [% NEXT IF field.name == 'status_whiteboard'
+ AND NOT Param('usestatuswhiteboard')
+ %]
<tr>
<th align="right">
- <label for="[% field.name %]" accesskey="[% field.accesskey %]">[% field.description %]</label>:
+ <label for="[% field.name %]"
+ accesskey="[% field.accesskey %]">[% field.description %]</label>:
</th>
<td>
[% type = field.name _ "_type" %]
@@ -286,7 +295,6 @@
</td>
<td></td>
</tr>
- [% END %]
[% END %]
[% IF use_keywords %]
@@ -324,6 +332,8 @@
</td>
</tr>
[% END %]
+
+ [% Hook.process('after_freetext_fields') %]
</table>
@@ -333,6 +343,7 @@
<table>
<tr>
+ [% Hook.process('before_selects_bottom') %]
<td>
<table>
<tr>
@@ -412,6 +423,7 @@
</tr>
</table>
</td>
+ [% Hook.process('after_selects_bottom') %]
</tr>
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
