From d495a972854500ce323f15d024605ec395fab155 Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Mon, 1 Feb 2010 13:39:54 -0800 Subject: Fix the data in the bzr repo to match the data in the CVS repo. During the CVS imports into Bzr, there were some inconsistencies introduced (mostly that files that were deleted in CVS weren't being deleted in Bzr). So this checkin makes the bzr repo actually consistent with the CVS repo, including fixing permissions of files. --- Bugzilla/Auth/Verify/RADIUS.pm | 0 Bugzilla/Config/L10n.pm | 72 ------------------------------------------ Bugzilla/Template/Parser.pm | 66 -------------------------------------- Bugzilla/User/Setting/Lang.pm | 0 Bugzilla/User/Setting/Skin.pm | 0 Bugzilla/WebService/Product.pm | 0 6 files changed, 138 deletions(-) mode change 100755 => 100644 Bugzilla/Auth/Verify/RADIUS.pm delete mode 100644 Bugzilla/Config/L10n.pm delete mode 100755 Bugzilla/Template/Parser.pm mode change 100755 => 100644 Bugzilla/User/Setting/Lang.pm mode change 100755 => 100644 Bugzilla/User/Setting/Skin.pm mode change 100755 => 100644 Bugzilla/WebService/Product.pm (limited to 'Bugzilla') diff --git a/Bugzilla/Auth/Verify/RADIUS.pm b/Bugzilla/Auth/Verify/RADIUS.pm old mode 100755 new mode 100644 diff --git a/Bugzilla/Config/L10n.pm b/Bugzilla/Config/L10n.pm deleted file mode 100644 index 5a18e9d58..000000000 --- a/Bugzilla/Config/L10n.pm +++ /dev/null @@ -1,72 +0,0 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- -# -# 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): Terry Weissman -# Dawn Endico -# Dan Mosedale -# Joe Robins -# Jacob Steenhagen -# J. Paul Reed -# Bradley Baetz -# Joseph Heenan -# Erik Stambaugh -# Frédéric Buclin -# - -package Bugzilla::Config::L10n; - -use strict; - -use File::Spec; # for find_languages - -use Bugzilla::Constants; -use Bugzilla::Config::Common; - -$Bugzilla::Config::L10n::sortkey = "08"; - -sub get_param_list { - my $class = shift; - my @param_list = ( - { - name => 'languages' , - extra_desc => { available_languages => find_languages() }, - type => 't' , - default => 'en' , - checker => \&check_languages - } ); - return @param_list; -} - -sub find_languages { - my @languages = (); - opendir(DIR, bz_locations()->{'templatedir'}) - || return "Can't open 'template' directory: $!"; - foreach my $dir (readdir(DIR)) { - next unless $dir =~ /^([a-z-]+)$/i; - my $lang = $1; - next if($lang =~ /^CVS$/i); - my $deft_path = File::Spec->catdir('template', $lang, 'default'); - my $cust_path = File::Spec->catdir('template', $lang, 'custom'); - push(@languages, $lang) if(-d $deft_path or -d $cust_path); - } - closedir DIR; - return join(', ', @languages); -} - -1; diff --git a/Bugzilla/Template/Parser.pm b/Bugzilla/Template/Parser.pm deleted file mode 100755 index 0965e078e..000000000 --- a/Bugzilla/Template/Parser.pm +++ /dev/null @@ -1,66 +0,0 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- -# -# 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 Marc Schumann. -# Portions created by Marc Schumann are Copyright (C) 2008 Marc Schumann. -# All Rights Reserved. -# -# Contributor(s): Marc Schumann - - -package Bugzilla::Template::Parser; - -use strict; - -use base qw(Template::Parser); - -sub parse { - my ($self, $text, @params) = @_; - if (Bugzilla->params->{'utf8'}) { - utf8::is_utf8($text) || utf8::decode($text); - } - return $self->SUPER::parse($text, @params); -} - -1; - -__END__ - -=head1 NAME - -Bugzilla::Template::Parser - Wrapper around the Template Toolkit -C object - -=head1 DESCRIPTION - -This wrapper makes the Template Toolkit aware of UTF-8 templates. - -=head1 SUBROUTINES - -=over - -=item C - -Description: Parses template text using Template::Parser::parse(), -converting the text to UTF-8 encoding before, if necessary. - -Params: C<$text> - Text to pass to Template::Parser::parse(). - -Returns: Parsed text as returned by Template::Parser::parse(). - -=back - -=head1 SEE ALSO - -L