summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-08-27 22:27:03 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-08-27 22:27:03 +0000
commit4823f325ace3a0d2d6aa2b86ccb0b51d1f396990 (patch)
treea5d06612371030b4fca701e9c1d919453bc207f1 /perl-install
parent02b7d8190c2165d2d345d4bf259d3ecafeb22b9f (diff)
downloaddrakx-4823f325ace3a0d2d6aa2b86ccb0b51d1f396990.tar
drakx-4823f325ace3a0d2d6aa2b86ccb0b51d1f396990.tar.gz
drakx-4823f325ace3a0d2d6aa2b86ccb0b51d1f396990.tar.bz2
drakx-4823f325ace3a0d2d6aa2b86ccb0b51d1f396990.tar.xz
drakx-4823f325ace3a0d2d6aa2b86ccb0b51d1f396990.zip
- When doing automatic queue setup with windows on the user's screen,
do not only source the users .i18n, but also the system's /etc/sysconfig/i18n, so that the language is also correct when the user uses the system's default language.
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/autosetupprintqueues4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/autosetupprintqueues b/perl-install/standalone/autosetupprintqueues
index 50e906e87..2fba78bac 100755
--- a/perl-install/standalone/autosetupprintqueues
+++ b/perl-install/standalone/autosetupprintqueues
@@ -65,9 +65,9 @@ if ($gui ne "nogui") {
chomp $userhome;
my $errfile = "/dev/null";
if (-r "$userhome/.Xauthority") {
- system "export DISPLAY=\"localhost:0.0\"; export USER=$desktopuser; [ -r $userhome/.i18n ] >> $errfile 2>&1 && for l in `cat $userhome/.i18n`; do export \$l; done >> $errfile 2>&1; export XAUTHORITY=$userhome/.Xauthority; /usr/sbin/printerdrake --onlyautoqueue >> $errfile 2>&1;";
+ system "export DISPLAY=\"localhost:0.0\"; export USER=$desktopuser; [ -r /etc/sysconfig/i18n ] >> $errfile 2>&1 && for l in `cat /etc/sysconfig/i18n`; do export \$l; done >> $errfile 2>&1; [ -r $userhome/.i18n ] >> $errfile 2>&1 && for l in `cat $userhome/.i18n`; do export \$l; done >> $errfile 2>&1; export XAUTHORITY=$userhome/.Xauthority; /usr/sbin/printerdrake --onlyautoqueue >> $errfile 2>&1;";
} else {
- system "export DISPLAY=\"localhost:0.0\"; export USER=$desktopuser; [ -r $userhome/.i18n ] >> $errfile 2>&1 && for l in `cat $userhome/.i18n`; do export \$l; done >> $errfile 2>&1; /bin/su $desktopuser -c \"/usr/X11R6/bin/xhost +localhost >> $errfile 2>&1\"; /usr/sbin/printerdrake --onlyautoqueue >> $errfile 2>&1; /bin/su $desktopuser -c \"/usr/X11R6/bin/xhost -localhost >> $errfile 2>&1\"";
+ system "export DISPLAY=\"localhost:0.0\"; export USER=$desktopuser; [ -r /etc/sysconfig/i18n ] >> $errfile 2>&1 && for l in `cat /etc/sysconfig/i18n`; do export \$l; done >> $errfile 2>&1; [ -r $userhome/.i18n ] >> $errfile 2>&1 && for l in `cat $userhome/.i18n`; do export \$l; done >> $errfile 2>&1; /bin/su $desktopuser -c \"/usr/X11R6/bin/xhost +localhost >> $errfile 2>&1\"; /usr/sbin/printerdrake --onlyautoqueue >> $errfile 2>&1; /bin/su $desktopuser -c \"/usr/X11R6/bin/xhost -localhost >> $errfile 2>&1\"";
}
exit 0;
}