diff --git a/Change.log b/Change.log index c4700c3..b8c6869 100644 --- a/Change.log +++ b/Change.log @@ -15,6 +15,7 @@ CHANGE LOG * Added acpid daemon for laptop and livecd. * Added support backlight and eject keys for Sony Vaio. * Added xdm patch for nox boot parameter. +* Added removal of unused localizations. 1.3.9 * Add change partition id for system installation. diff --git a/install/calculate b/install/calculate index deac260..9a3a30f 100755 --- a/install/calculate +++ b/install/calculate @@ -1436,16 +1436,19 @@ sub checksystem{ #---------------------------------------------------------------------- #system: locale, keymap, dumpkeys_charset, consolefont, consoletranslation, xkblayout #KDE: kb_groups, kb_layout, country, language, dictionary + #system: langdir my %lang = ( #Belarussian 'be_BY' => ["be_BY.UTF-8", "by", "koi8-u", "Cyr_a8x16", "", "us,by", - "by(winkeys):us", "us,by(winkeys)", "by", "ru", "ru"], + "by(winkeys):us", "us,by(winkeys)", "by", "ru", "ru", + "ru"], #Belgian 'fr_BE' => ["fr_BE.UTF-8", "be-latin1", "", "lat9w-16", "", "us,be", "", "us,be", "be", "en_US", "en"], #Brazilian Portuguese 'pt_BR' => ["pt_BR.UTF-8", "br-abnt2", "", "lat9w-16", "", "pt,us", - "", "us,pt", "br", "pt_BR", "en"], + "", "us,pt", "br", "pt_BR", "en", + "pt-BR"], #Canadian French 'fr_CA' => ["fr_CA.UTF-8", "cf", "", "default8x16", "8859-1_to_uni", "us,ca_enhanced", "", "us,ca(fr)", "ca", "en_US", "en"], @@ -1454,34 +1457,41 @@ sub checksystem{ "", "us,dk", "dk", "da", "da"], #French 'fr_FR' => ["fr_FR.UTF-8", "fr-latin9", "", "lat0-16", "", "fr,us", - "", "us,fr(latin9)", "fr", "en_US", "en"], + "", "us,fr(latin9)", "fr", "en_US", "en", + "fr"], #German 'de_DE' => ["de_DE.UTF-8", "de-latin1", "", "lat9w-16", "", "de,us", - "", "us,de", "de", "de", "de"], + "", "us,de", "de", "de", "de", + "de"], #Icelandic 'is_IS' => ["is_IS.UTF-8", "is-latin1", "", "cp850-8x16", "8859-1_to_uni", "us,is", "", "us,is", "is", "en_US", "en"], #Italian 'it_IT' => ["it_IT.UTF-8", "it", "", "default8x16", "8859-15_to_uni", "us,it", - "", "us,it", "it", "it", "it"], + "", "us,it", "it", "it", "it", + "it"], #Norwegian 'nn_NO' => ["nn_NO.UTF-8", "no-latin1", "", "lat9w-16", "", "us,no", "", "us,no", "no", "nn", "en"], #Polish 'pl_PL' => ["pl_PL.UTF-8", "pl", "", "lat2-16", "8859-2_to_uni", "us,pl", - "", "us,pl", "pl", "pl", "pl"], + "", "us,pl", "pl", "pl", "pl", + "pl"], #Russian 'ru_RU' => ["ru_RU.UTF-8", "-u ruwin_cplk-UTF-8", "", "ter-k14n", "", "us,ru(winkeys)", - "ru(winkeys):us", "us,ru(winkeys)", "ru", "ru", "en"], + "ru(winkeys):us", "us,ru(winkeys)", "ru", "ru", "en", + "ru"], #Spanish 'es_ES' => ["es_ES.UTF-8", "es euro2", "", "lat0-16", "", "es,us", - "", "us,es", "es", "es", "es"], + "", "us,es", "es", "es", "es", + "es"], #Swedish 'sv_SE' => ["sv_SE.UTF-8", "sv-latin1", "", "lat0-16", "", "us,se", "", "us,se", "se", "sv", "sv"], #Ukrainian 'uk_UA' => ["uk_UA.UTF-8", "ua-utf", "koi8-u", "ter-v14n", "", "us,ua", - "ua(winkeys):us", "us,ua(winkeys)", "ua", "uk", "uk"], + "ua(winkeys):us", "us,ua(winkeys)", "ua", "uk", "uk", + "uk"], #United Kingdom/British 'en_GB' => ["en_GB.UTF-8", "uk", "", "LatArCyrHeb-16", "", "us,gb", "", "us,gb", "gb", "en_US", "en_GB"], @@ -1563,6 +1573,12 @@ sub checksystem{ $data{'country'}, ) = @{$lang{$changekb}}[1..8]; + #неиспользуемые языки + foreach(sort keys %lang){ + if($lang{$_}[11] ne $data{language} && $lang{$_}[11]){ + push(@{$data{clearlang}}, $lang{$_}[10]); + } } + printmes(" ".gettext('Language')); printmes(": $data{lang}\n"); printmes(" ".gettext('Keymap')); printmes(": $changekb\n"); @@ -3537,16 +3553,13 @@ sub setup{ } } #---------------------------------------------------------------------- - # Перенесем статистику preload + # Удалим файлы неиспользуемых локализаций #---------------------------------------------------------------------- - #{ - # my $state = "/var/lib/preload"; - # if(-e $state){ - # printmes(" ".gettext('Copy preload state')); printmes("..."); - # system "$data{path} mkdir -p $data{'chroot'}$data{scratch_ws}$state"; - # system "$data{path} cp -a $state/preload.state $data{'chroot'}$data{scratch_ws}$state"; - # printmes(" ".gettext('done').".\n"); - #} } + { + printmes(" ".gettext('Remove unused localization')); printmes("..."); + clearlang(); + printmes(" ".gettext('done').".\n"); + } #---------------------------------------------------------------------- # Сохраним диск, с которого произвелась установка @@ -7146,3 +7159,26 @@ sub uuid{ return $info; } +#------------------------------------------------------------------------------ +# Удалим файлы не используемую локализацию +#------------------------------------------------------------------------------ +sub clearlang{ + my @remote; + + foreach( + @{$data{clearlang}} + ){ + my $lang = $_; + foreach( + '/usr/lib/openoffice', + '/usr/share/apps', + '/usr/share/doc', + '/usr/share/locale', + '/usr/share/man', + '/usr/share/vim' + ){ + foreach(`find $data{'chroot'}$_ -type d -name $lang`){ + chomp; + system "rm -rf $_"; +} } } } + diff --git a/install/i18n/ru_RU/LC_MESSAGES/calculate.mo b/install/i18n/ru_RU/LC_MESSAGES/calculate.mo index f795a63..e777065 100644 Binary files a/install/i18n/ru_RU/LC_MESSAGES/calculate.mo and b/install/i18n/ru_RU/LC_MESSAGES/calculate.mo differ diff --git a/install/i18n/ru_RU/LC_MESSAGES/calculate.po b/install/i18n/ru_RU/LC_MESSAGES/calculate.po index d366e4b..6526ae0 100644 --- a/install/i18n/ru_RU/LC_MESSAGES/calculate.po +++ b/install/i18n/ru_RU/LC_MESSAGES/calculate.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: support.ru\n" -"POT-Creation-Date: 2010-03-23 09:50+0300\n" +"POT-Creation-Date: 2010-03-31 18:36+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -594,6 +594,9 @@ msgstr "Пропишем ядро в автозагрузку" msgid "Remove the user from groups" msgstr "Удалим пользователя из групп" +msgid "Remove unused localization" +msgstr "Удалим неиспользуемые локализации" + msgid "Removing old image of system" msgstr "Удалим предыдущий образ системы"