diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-06-28 16:15:53 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-06-28 16:15:53 +0000 |
| commit | fd824398b11fa129726a6d7fc99c31175ee18b02 (patch) | |
| tree | 4ec7d1572a3a5c5a624876c4aba2e5e0d5a25eec | |
| parent | 90f8406ba21657b75f123e483b0cea7724cb0d8d (diff) | |
| download | drakx-fd824398b11fa129726a6d7fc99c31175ee18b02.tar drakx-fd824398b11fa129726a6d7fc99c31175ee18b02.tar.gz drakx-fd824398b11fa129726a6d7fc99c31175ee18b02.tar.bz2 drakx-fd824398b11fa129726a6d7fc99c31175ee18b02.tar.xz drakx-fd824398b11fa129726a6d7fc99c31175ee18b02.zip | |
centralize common textdomains in a single common place, thus ensuring they'll be binded (#31580)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/mygtk2.pm | 4 | ||||
| -rw-r--r-- | perl-install/standalone.pm | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index c2a7448b9..c1c5905dc 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- centralize common textdomains in a single common place, thus ensuring they'll be binded (#31580) + Version 10.4.140 - 27 June 2007, by Thierry Vignaud - merge "ide" and "all_ide" categories since we now use fully diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index 91e38c306..d885df298 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -18,7 +18,9 @@ unless ($::no_ugtk_init) { $::one_message_has_been_translated and warn("N() was called from $::one_message_has_been_translated BEFORE gtk2 initialisation, replace it with a N_() AND a translate() later.\n"), c::_exit(1); Gtk2->init; - Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'), @::textdomains; + Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'), + 'drakx-net', 'drakx-kbd-mouse-x11', # shared translation + @::textdomains; } Gtk2->croak_execeptions if (!$::no_ugtk_init || $::isInstall) && 0.95 < $Gtk2::VERSION; diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index a03f7a68a..b611d784a 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -17,7 +17,6 @@ $ENV{SHARE_PATH} ||= "/usr/share"; eval { #- allow standalone.pm to be used in drakxtools-backend without perl-Locale-gettext c::init_setlocale(); - push @::textdomains, 'libDrakX-standalone', 'drakx-net', 'drakx-kbd-mouse-x11'; Locale::gettext::bindtextdomain('libDrakX', "/usr/share/locale"); }; |