Bugzilla – Attachment 27748 Details for
Bug 11848
Make Koha::I18N easier to use
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 11848: Make Koha::I18N easier to use
PASSED-QA-Bug-11848-Make-KohaI18N-easier-to-use.patch (text/plain), 2.74 KB, created by
Katrin Fischer
on 2014-04-28 21:24:39 UTC
(
hide
)
Description:
[PASSED QA] Bug 11848: Make Koha::I18N easier to use
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-04-28 21:24:39 UTC
Size:
2.74 KB
patch
obsolete
>From be7abe58b9b3cd63efe04351ac30bae2120ae833 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Wed, 26 Feb 2014 16:45:59 +0100 >Subject: [PATCH] [PASSED QA] Bug 11848: Make Koha::I18N easier to use > >Instead of writing > > use CGI; > use Koha::I18N; > my $cgi = new CGI; > my $lh = Koha::I18N->get_handle_from_context($cgi, 'intranet'); > print $lh->maketext('my translatable text'); > >you can now write > > use Koha::I18N; > print gettext('my translatable text'); > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >No errors > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > Koha/I18N.pm | 36 +++++++++++++++++++++--------------- > misc/translator/LangInstaller.pm | 2 +- > 2 files changed, 22 insertions(+), 16 deletions(-) > >diff --git a/Koha/I18N.pm b/Koha/I18N.pm >index c1dffed..1d6188b 100644 >--- a/Koha/I18N.pm >+++ b/Koha/I18N.pm >@@ -18,10 +18,10 @@ package Koha::I18N; > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > use Modern::Perl; >-use base qw(Locale::Maketext); >+use base qw(Locale::Maketext Exporter); > >-use C4::Templates; >-use C4::Context; >+use CGI; >+use C4::Languages; > > use Locale::Maketext::Lexicon { > 'en' => ['Auto'], >@@ -31,22 +31,28 @@ use Locale::Maketext::Lexicon { > . '/misc/translator/po/*-messages.po' > ], > '_AUTO' => 1, >+ '_style' => 'gettext', > }; > >-sub get_handle_from_context { >- my ($class, $cgi, $interface) = @_; >- >- my $lh; >- my $lang = C4::Templates::getlanguage($cgi, $interface); >- if ($lang) { >- $lh = $class->get_handle($lang) >- or die "No language handle for '$lang'"; >- } else { >- $lh = $class->get_handle() >- or die "Can't get a language handle"; >+our @EXPORT = qw( gettext ); >+ >+my %language_handles; >+ >+sub get_language_handle { >+ my $cgi = new CGI; >+ my $language = C4::Languages::getlanguage; >+ >+ if (not exists $language_handles{$language}) { >+ $language_handles{$language} = __PACKAGE__->get_handle($language) >+ or die "No language handle for '$language'"; > } > >- return $lh; >+ return $language_handles{$language}; >+} >+ >+sub gettext { >+ my $lh = get_language_handle; >+ $lh->maketext(@_); > } > > 1; >diff --git a/misc/translator/LangInstaller.pm b/misc/translator/LangInstaller.pm >index 95fd406..b89aaa8 100644 >--- a/misc/translator/LangInstaller.pm >+++ b/misc/translator/LangInstaller.pm >@@ -476,7 +476,7 @@ sub extract_messages { > } > > my $xgettext_cmd = "$self->{xgettext} -L Perl --from-code=UTF-8 " . >- "-kmaketext -o $Bin/$self->{domain}.pot -D $intranetdir"; >+ "-o $Bin/$self->{domain}.pot -D $intranetdir"; > $xgettext_cmd .= " $_" foreach (@files_to_scan); > > if (system($xgettext_cmd) != 0) { >-- >1.8.3.2
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 11848
:
25664
|
25665
|
26426
|
26494
|
26495
|
26496
|
27747
| 27748 |
27749