Bugzilla – Attachment 28293 Details for
Bug 7841
Several warnings on language from webinstaller
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 7841: Tweaks to remove floody messages from tests.
PASSED-QA-Bug-7841-Tweaks-to-remove-floody-message.patch (text/plain), 2.92 KB, created by
Kyle M Hall
on 2014-05-16 11:17:03 UTC
(
hide
)
Description:
[PASSED QA] Bug 7841: Tweaks to remove floody messages from tests.
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2014-05-16 11:17:03 UTC
Size:
2.92 KB
patch
obsolete
>From f7e5ba958d58b5bbc67c2c6ee71c8ef1f72c88dd Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Wed, 14 May 2014 23:51:20 -0400 >Subject: [PATCH] [PASSED QA] Bug 7841: Tweaks to remove floody messages from tests. > >This modifies lines in C4/Languages.pm such that when the tests >are run, they no longer generate errors. > >TEST PLAN >--------- >1) Apply first patch >2) prove -v t/db_dependent/Languages.t > -- There will be uninitialized string messages, etc. >3) Apply second patch (this one) >4) prove -v t/db_dependent/Languages.t > -- Only one carp message will remain. > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Test pass, no warnings, no koha-qa errors > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/Languages.pm | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > >diff --git a/C4/Languages.pm b/C4/Languages.pm >index 930db2b..78d54a9 100644 >--- a/C4/Languages.pm >+++ b/C4/Languages.pm >@@ -269,7 +269,7 @@ sub _get_themes { > my $interface = shift; > my $htdocs; > my @themes; >- if ( $interface eq 'intranet' ) { >+ if ( $interface && $interface eq 'intranet' ) { > $htdocs = C4::Context->config('intrahtdocs'); > } > else { >@@ -292,6 +292,8 @@ Internal function, returns an array of directory names, excluding non-language d > > sub _get_language_dirs { > my ($htdocs,$theme) = @_; >+ $htdocs //= ''; >+ $theme //= ''; > my @lang_strings; > opendir D, "$htdocs/$theme"; > for my $lang_string ( readdir D ) { >@@ -318,6 +320,7 @@ FIXME: this could be rewritten and simplified using map > > sub _build_languages_arrayref { > my ($translated_languages,$current_language,$enabled_languages) = @_; >+ $current_language //= ''; > my @translated_languages = @$translated_languages; > my @languages_loop; # the final reference to an array of hashrefs > my @enabled_languages = @$enabled_languages; >@@ -355,7 +358,7 @@ sub _build_languages_arrayref { > my $enabled; > for my $enabled_language (@enabled_languages) { > my $regex_enabled_language = regex_lang_subtags($enabled_language); >- $enabled = 1 if $key eq $regex_enabled_language->{language}; >+ $enabled = 1 if $key eq ($regex_enabled_language->{language} // ''); > } > push @languages_loop, { > # this is only use if there is one >@@ -364,7 +367,7 @@ sub _build_languages_arrayref { > language => $key, > sublanguages_loop => $value, > plural => $track_language_groups->{$key} >1 ? 1 : 0, >- current => $current_language_regex->{language} eq $key ? 1 : 0, >+ current => ($current_language_regex->{language} // '') eq $key ? 1 : 0, > group_enabled => $enabled, > }; > } >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7841
:
28267
|
28268
|
28272
|
28273
|
28292
| 28293