Mageia Bugzilla – Attachment 7471 Details for
Bug 12808
Localedrake doesn't work for regular users
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
A patched version of initscripts-mgaconf.patch
initscripts-mgaconf-patch.diff (text/plain), 1.43 KB, created by
Nicolas Salguero
on 2016-02-18 16:24:41 CET
(
hide
)
Description:
A patched version of initscripts-mgaconf.patch
Filename:
MIME Type:
Creator:
Nicolas Salguero
Created:
2016-02-18 16:24:41 CET
Size:
1.43 KB
patch
obsolete
>--- initscripts-mgaconf.patch~ 2014-08-30 17:46:59.000000000 +0200 >+++ initscripts-mgaconf.patch 2016-02-18 16:19:31.983837805 +0100 >@@ -395,7 +395,7 @@ > index 4a759f5..f90c079 100755 > --- a/lang.sh > +++ b/lang.sh >-@@ -1,19 +1,28 @@ >+@@ -1,19 +1,27 @@ > # /etc/profile.d/lang.sh - set i18n stuff > > -sourced=0 >@@ -409,12 +409,11 @@ > - for langfile in /etc/locale.conf "$HOME/.i18n" ; do > - [ -f $langfile ] && . $langfile && sourced=1 > - done >++unset LC_SOURCED > +# revert special console/X11 settings if needed > +if [ "$LC_SOURCED_CONSOLE" = 1 -a -n "$DISPLAY" ]; then >-+ unset LC_SOURCED > + unset LC_SOURCED_CONSOLE > +elif [ "$LC_SOURCED_X11" = 1 -a -z "$DISPLAY" ]; then >-+ unset LC_SOURCED > + unset LC_SOURCED_X11 > fi > >@@ -436,7 +435,7 @@ > [ -n "$LANG" ] && export LANG || unset LANG > [ -n "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS > [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE >-@@ -38,18 +47,55 @@ if [ "$sourced" = 1 ]; then >+@@ -38,18 +46,55 @@ if [ "$sourced" = 1 ]; then > fi > [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE > [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS >@@ -492,7 +491,7 @@ > case $LANG in > ja*) LANG=en_US.UTF-8 ;; > ko*) LANG=en_US.UTF-8 ;; >-@@ -78,13 +124,34 @@ if [ "$sourced" = 1 ]; then >+@@ -78,13 +123,34 @@ if [ "$sourced" = 1 ]; then > en_IN*) ;; > *_IN*) LANG=en_US ;; > esac
--- initscripts-mgaconf.patch~ 2014-08-30 17:46:59.000000000 +0200 +++ initscripts-mgaconf.patch 2016-02-18 16:19:31.983837805 +0100 @@ -395,7 +395,7 @@ index 4a759f5..f90c079 100755 --- a/lang.sh +++ b/lang.sh -@@ -1,19 +1,28 @@ +@@ -1,19 +1,27 @@ # /etc/profile.d/lang.sh - set i18n stuff -sourced=0 @@ -409,12 +409,11 @@ - for langfile in /etc/locale.conf "$HOME/.i18n" ; do - [ -f $langfile ] && . $langfile && sourced=1 - done ++unset LC_SOURCED +# revert special console/X11 settings if needed +if [ "$LC_SOURCED_CONSOLE" = 1 -a -n "$DISPLAY" ]; then -+ unset LC_SOURCED + unset LC_SOURCED_CONSOLE +elif [ "$LC_SOURCED_X11" = 1 -a -z "$DISPLAY" ]; then -+ unset LC_SOURCED + unset LC_SOURCED_X11 fi @@ -436,7 +435,7 @@ [ -n "$LANG" ] && export LANG || unset LANG [ -n "$LC_ADDRESS" ] && export LC_ADDRESS || unset LC_ADDRESS [ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE -@@ -38,18 +47,55 @@ if [ "$sourced" = 1 ]; then +@@ -38,18 +46,55 @@ if [ "$sourced" = 1 ]; then fi [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS @@ -492,7 +491,7 @@ case $LANG in ja*) LANG=en_US.UTF-8 ;; ko*) LANG=en_US.UTF-8 ;; -@@ -78,13 +124,34 @@ if [ "$sourced" = 1 ]; then +@@ -78,13 +123,34 @@ if [ "$sourced" = 1 ]; then en_IN*) ;; *_IN*) LANG=en_US ;; esac
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 12808
: 7471