- update german and russian bugzilla templates to official new versions

- remove hotfixes from german templates

Feature safe: yes

3 files changed, 7 insertions, 125 deletions

diff --git a/german/bugzilla42/Makefile b/german/bugzilla42/Makefile
index 2dd3efc6914d..6a68ccfe7594 100644
--- a/german/bugzilla42/Makefile
+++ b/german/bugzilla42/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugzilla
-PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTVERSION=	4.2.4
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -21,10 +20,10 @@ NO_WRKSUBDIR=	yes
 
 LANGDIR=	${WWWDIR}/template/de
 
-post-patch:
-	@${REINPLACE_CMD} -i '' -e 's/4.2.3/4.2.4/' \
-		${WRKDIR}/de/default/global/gzversion.html.tmpl
-	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
+#post-patch:
+#	@${REINPLACE_CMD} -i '' -e 's/4.2.3/4.2.4/' \
+#		${WRKDIR}/de/default/global/gzversion.html.tmpl
+#	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
diff --git a/german/bugzilla42/distinfo b/german/bugzilla42/distinfo
index 7ea4adfdc8d7..60a6c8a0ffc7 100644
--- a/german/bugzilla42/distinfo
+++ b/german/bugzilla42/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/germzilla-4.2.3-1.utf-8.tar.gz) = 4eafbf1e16322c647c31a606c4007ea84bdff336362297bed5bd7eead50a0b2e
-SIZE (bugzilla/germzilla-4.2.3-1.utf-8.tar.gz) = 271170
+SHA256 (bugzilla/germzilla-4.2.4-1.utf-8.tar.gz) = 02e2c3c4414002355e68797a2ac35bf59fd0a44b88e814f377881badf035297b
+SIZE (bugzilla/germzilla-4.2.4-1.utf-8.tar.gz) = 271153
diff --git a/german/bugzilla42/files/patch-4.2.3_4.2.4 b/german/bugzilla42/files/patch-4.2.3_4.2.4
deleted file mode 100644
index 9f296697b565..000000000000
--- a/german/bugzilla42/files/patch-4.2.3_4.2.4
+++ /dev/null
@@ -1,117 +0,0 @@
---- ./de/default/bug/edit.html.tmpl.orig
-+++ ./de/default/bug/edit.html.tmpl
-@@ -32,8 +32,8 @@
- 
- [% PROCESS bug/time.html.tmpl %]
- 
--  <script type="text/javascript">
--  <!--
-+<script type="text/javascript">
-+<!--
- 
-   /* Outputs a link to call replyToComment(); used to reduce HTML output */
-   function addReplyLink(id, real_id) {
-@@ -121,6 +121,7 @@
- 
- [% END %]
- 
-+[% IF user.id %]
-   /* Index all classifications so we can keep track of the classification
-    * for the selected product, which could control field visibility.
-    */
-@@ -130,8 +131,9 @@
-           [%- product.classification.name FILTER js %]';
-   [%- END %]
- 
--  //-->
--  </script>
-+[%- END %]
-+//-->
-+</script>
- 
- <form name="changeform" id="changeform" method="post" action="process_bug.cgi">
- 
---- ./de/default/filterexceptions.pl.orig
-+++ ./de/default/filterexceptions.pl
-@@ -108,7 +108,6 @@
-   'other_format.name',
-   'sizeurl',
-   'switchbase',
--  'format',
-   'cumulate',
- ],
- 
-@@ -214,7 +213,6 @@
- 
- 'global/confirm-user-match.html.tmpl' => [
-   'script',
--  'fields.${field_name}.flag_type.name',
- ],
- 
- 'global/site-navigation.html.tmpl' => [
---- ./de/default/global/code-error.html.tmpl.orig
-+++ ./de/default/global/code-error.html.tmpl
-@@ -263,8 +263,7 @@
-     [%+ constants.bz_locations.localconfig FILTER html %].
- 
-   [% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
--    Anhang [% attach_id FILTER html %] (<em>[% description FILTER html %]</em>)
--    gehört zu [% terms.bug %] [%+ attach_bug_id FILTER html %],
-+    Anhang [% attach_id FILTER html %] gehört zu [% terms.bug %],
-     daher ist es nicht möglich, ihn während der Anlage eines
-     Anhangs zu einem anderen [% terms.bug %] (in Ihrem
-     Fall [% terms.bug %] [%+ my_bug_id FILTER html %]) als obsolet zu markieren.
---- ./de/default/global/confirm-user-match.html.tmpl.orig
-+++ ./de/default/global/confirm-user-match.html.tmpl
-@@ -209,7 +209,7 @@
-   [% ELSIF field_labels.$field_name %]
-     [% field_labels.$field_name FILTER html %]
-   [% ELSIF field_name.match("^requestee") %]
--    [% fields.${field_name}.flag_type.name %] Anfrager
-+    [% fields.${field_name}.flag_type.name FILTER html %] Anfrager
-   [% ELSE %]
-     [% field_name FILTER html %]
-   [% END %]
---- ./de/default/global/field-descs.none.tmpl.orig
-+++ ./de/default/global/field-descs.none.tmpl
-@@ -134,6 +134,7 @@
-      "setting"                 => "Einstellungstyp",
-      "settings"                => "Einstellungstypen",
-      "short_desc"              => "Kurzbeschreibung",
-+     "short_short_desc"        => "Kurzbeschreibung",
-      "status_whiteboard"       => "Statusnotiz",
-      "tag.name"                => "Schlagwörter",
-      "target_milestone"        => "Ziel-Meilenstein",
---- ./de/default/global/user-error.html.tmpl.orig
-+++ ./de/default/global/user-error.html.tmpl
-@@ -1970,7 +1970,7 @@
- 
-     [% FOREACH q = Bugzilla.user.queries %]
-       [% IF q.name == namedcmd %]
--        or <a href="query.cgi?[% q.url FILTER uri %]">bearbeiten</a>
-+        or <a href="query.cgi?[% q.url FILTER html %]">bearbeiten</a>
-       [% END %]
-     [% END %].
-   </p>
---- ./de/default/reports/report-table.html.tmpl.orig
-+++ ./de/default/reports/report-table.html.tmpl
-@@ -104,7 +104,7 @@
-   var myColumnDefs = [
-         {key:"row_title", label:"", sortable:true, sortOptions: { sortFunction:totalNumberSorter }},
-         [% FOREACH col = col_names %]
--          {key:"[% col FILTER js %]", label:"[% display_value(col_field, col) FILTER js %]", sortable:true,
-+          {key:"[% col FILTER js %]", label:"[% display_value(col_field, col) FILTER html FILTER js %]", sortable:true,
-            formatter:this.Linkify, sortOptions: { defaultDir: YAHOO.widget.DataTable.CLASS_DESC, sortFunction:totalNumberSorter }},
-         [% END %]
-         {key:"total", label:"Gesamt", sortable:true, formatter:this.LinkifyTotal,
---- ./de/default/reports/report.html.tmpl.orig
-+++ ./de/default/reports/report.html.tmpl
-@@ -172,7 +172,7 @@
-       zu diesem Bericht ändern</a>
-     [% ELSE %]
-       <a href="query.cgi?[% switchbase %]&amp;chart_format=
--        [% format %]&amp;format=report-graph&amp;cumulate=[% cumulate %]">
-+        [% format FILTER uri %]&amp;format=report-graph&amp;cumulate=[% cumulate %]">
-         Abfrage zu diesem Bericht ändern
-       </a>
-     [% END %]