summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2001-09-17 18:06:41 +0000
committerPablo Saratxaga <pablo@mandriva.com>2001-09-17 18:06:41 +0000
commit41ee4eb8a31f9dccdbf5b4087f841607933bbe56 (patch)
tree8cd3733cf86f9fb23e8cdfccb5f77271187ee8d6
parent35b91f867935bb7542b0f7322dada6e580ecebf7 (diff)
downloaddrakx-backup-do-not-use-41ee4eb8a31f9dccdbf5b4087f841607933bbe56.tar
drakx-backup-do-not-use-41ee4eb8a31f9dccdbf5b4087f841607933bbe56.tar.gz
drakx-backup-do-not-use-41ee4eb8a31f9dccdbf5b4087f841607933bbe56.tar.bz2
drakx-backup-do-not-use-41ee4eb8a31f9dccdbf5b4087f841607933bbe56.tar.xz
drakx-backup-do-not-use-41ee4eb8a31f9dccdbf5b4087f841607933bbe56.zip
Added choice of "English|Ireland (euro)" so people wanting English language but also euro symbol can choose it.
-rw-r--r--perl-install/keyboard.pm1
-rw-r--r--perl-install/lang.pm2
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 69a70f64c..68eca596b 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -50,6 +50,7 @@ my %lang2keyboard =
'en' => 'us:90 us_intl:50',
'en_US'=> 'us:90 us_intl:50',
'en_GB'=> 'uk:90 us:60 us_intl:50',
+'en_IE'=> 'uk:90 us:60 us_intl:50',
'eo' => 'us_intl:90 dvorak:20',
'es' => 'es:90 la:80 us_intl:50',
'es@tr'=> 'es:90 la:80 us_intl:50',
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 1d335540c..b6d404792 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -27,6 +27,7 @@ use log;
my %languages = (
'en_US' => [ 'English|United States', 'iso-8859-1', 'en', 'en_US:en' ],
'en_GB' => [ 'English|United Kingdom', 'iso-8859-1', 'en', 'en_GB:en' ],
+'en_IE@euro' => [ 'English|Ireland (euro)','iso-8859-15', 'en', 'en_IE:en_GB:en' ],
'af' => [ 'Afrikaans', 'iso-8859-1', 'af', 'af:en_ZA' ],
'ar' => [ 'Arabic', 'iso-8859-6', 'ar', 'ar' ],
'az_AZ.UTF-8'=> [ 'Azeri (Latin)', 'iso-8859-9e','az', 'az:tr' ],
@@ -334,6 +335,7 @@ sub set {
my $packer = new packdrake("$ENV{SHARE_PATH}/locale.cz2", quiet => 1);
# "UTF-8" locale directory is always needed
$packer->extract_archive("$ENV{SHARE_PATH}/locale", "UTF-8");
+ $packer->extract_archive("$ENV{SHARE_PATH}/locale", $languages{$lang}[2]);
$packer->extract_archive("$ENV{SHARE_PATH}/locale", split(":", $languages{$lang}[3]));
};
}