diff options
| author | lpsolit%gmail.com <> | 2008-04-04 02:05:36 +0200 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2008-04-04 02:05:36 +0200 |
| commit | 8ab64629d3a091a0ccb6af52c48ee7bb9fd8834d (patch) | |
| tree | eb8bd3bdb7a2d3b520f18938364268c6ab4858ed /Bugzilla/Install | |
| parent | 59d76227caa0d8304f243bd8d2d8534ed6d80e81 (diff) | |
| download | bugzilla-8ab64629d3a091a0ccb6af52c48ee7bb9fd8834d.tar.gz bugzilla-8ab64629d3a091a0ccb6af52c48ee7bb9fd8834d.tar.xz | |
Bug 182975: Bugzilla directory structure to be adopted to l10n needs - Patch by A.A. Shimono (himorin) <shimono@mozilla.gr.jp> r=LpSolit r=mkanat a=LpSolit
Diffstat (limited to 'Bugzilla/Install')
| -rw-r--r-- | Bugzilla/Install/Filesystem.pm | 15 | ||||
| -rw-r--r-- | Bugzilla/Install/Util.pm | 14 |
2 files changed, 21 insertions, 8 deletions
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index a24dc28ca..55a5abce9 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -117,8 +117,9 @@ sub FILESYSTEM { 'install-module.pl' => { perms => $owner_executable }, 'docs/makedocs.pl' => { perms => $owner_executable }, - 'docs/rel_notes.txt' => { perms => $ws_readable }, - 'docs/README.docs' => { perms => $owner_readable }, + 'docs/style.css' => { perms => $ws_readable }, + 'docs/*/rel_notes.txt' => { perms => $ws_readable }, + 'docs/*/README.docs' => { perms => $owner_readable }, "$datadir/bugzilla-update.xml" => { perms => $ws_writeable }, "$datadir/params" => { perms => $ws_writeable }, "$datadir/mailer.testfile" => { perms => $ws_writeable }, @@ -168,17 +169,17 @@ sub FILESYSTEM { dirs => $ws_dir_readable }, t => { files => $owner_readable, dirs => $owner_dir_readable }, - 'docs/html' => { files => $ws_readable, + 'docs/*/html' => { files => $ws_readable, dirs => $ws_dir_readable }, - 'docs/pdf' => { files => $ws_readable, + 'docs/*/pdf' => { files => $ws_readable, dirs => $ws_dir_readable }, - 'docs/txt' => { files => $ws_readable, + 'docs/*/txt' => { files => $ws_readable, dirs => $ws_dir_readable }, - 'docs/images' => { files => $ws_readable, + 'docs/*/images' => { files => $ws_readable, dirs => $ws_dir_readable }, 'docs/lib' => { files => $owner_readable, dirs => $owner_dir_readable }, - 'docs/xml' => { files => $owner_readable, + 'docs/*/xml' => { files => $owner_readable, dirs => $owner_dir_readable }, ); diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm index 9aeeca486..4c3754964 100644 --- a/Bugzilla/Install/Util.pm +++ b/Bugzilla/Install/Util.pm @@ -38,6 +38,7 @@ our @EXPORT_OK = qw( get_version_and_os indicate_progress install_string + include_languages template_include_path vers_cmp get_console_locale @@ -123,7 +124,7 @@ sub install_string { return $string_template; } -sub template_include_path { +sub include_languages { my ($params) = @_; $params ||= {}; @@ -171,7 +172,12 @@ sub template_include_path { if (!grep($_ eq 'en', @usedlanguages)) { push(@usedlanguages, 'en'); } + + return @usedlanguages; +} +sub template_include_path { + my @usedlanguages = include_languages(@_); # Now, we add template directories in the order they will be searched: # First, we add extension template directories, because extension templates @@ -516,6 +522,12 @@ Each extension has its own directory. Note that languages are sorted by the user's preference (as specified in their browser, usually), and extensions are sorted alphabetically. +=item C<include_languages> + +Used by L<Bugzilla::Template> to determine the languages' list which +are compiled with the browser's I<Accept-Language> and the languages +of installed templates. + =item C<vers_cmp> =over |