From 038a66f113ebb06277744f6770bf5fd4c1380622 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 19 Aug 2022 09:06:57 -0300 Subject: [PATCH] Bug 30941: (QA follow-up) Import methods explicitly By explicitly importing the Koha::I18N methods, I get rid of this error: kohadev-koha@kohadevbox:/kohadevbox/koha$ qa -c 2 --run-tests testing 2 commit(s) (applied to 9b2bf04 '09 Bug 30507: Value builder for field') Processing files before patches |========================>| 12 / 12 (100.00%) An error occurred : Inconsistent hierarchy during C3 merge of class 'Koha::I18N': current merge results [ Koha::I18N, ] merging failed on 'Exporter' at /kohadevbox/qa-test-tools/koha-qa.pl line 112. This happens because the Koha::I18N library is exporting all its methods explicitly and, by design, the __ methods used in value builders cannot determine which of the imported methods to use i.e. if Koha::I118N::__ or Koha::CodeList::Unimarc::MediumOfPerformance:__ Signed-off-by: Tomas Cohen Arazi --- Koha/CodeList/Unimarc/MediumOfPerformance.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Koha/CodeList/Unimarc/MediumOfPerformance.pm b/Koha/CodeList/Unimarc/MediumOfPerformance.pm index 12ba763420..e839ec02a0 100644 --- a/Koha/CodeList/Unimarc/MediumOfPerformance.pm +++ b/Koha/CodeList/Unimarc/MediumOfPerformance.pm @@ -18,7 +18,7 @@ package Koha::CodeList::Unimarc::MediumOfPerformance; use Modern::Perl; use utf8; -use Koha::I18N; +use Koha::I18N qw( N__ N__p ); sub voices { return { -- 2.11.0