Puppy Linux Discussion Forum Forum Index Puppy Linux Discussion Forum
Puppy HOME page : puppylinux.com
"THE" alternative forum : puppylinux.info
 
 FAQFAQ   SearchSearch   MemberlistMemberlist   UsergroupsUsergroups   RegisterRegister 
 ProfileProfile   Log in to check your private messagesLog in to check your private messages   Log inLog in 

The time now is Thu 20 Jun 2013, 00:58
All times are UTC - 4

 Forum index » Advanced Topics » Puppy Projects » Next Puppy Development » 5.x » Bugs (5.x dev)
chooselocale doesn't work on X
Moderators: BarryK, Lobster
Post new topic   Reply to topic View previous topic :: View next topic
Page 1 of 1 [1 Post]  
Author Message
shinobar


Joined: 28 May 2009
Posts: 2271
Location: Japan
PostPosted: Thu 11 Jun 2009, 05:57    Post subject:  chooselocale doesn't work on X
Subject description: working on X and some other problems		  
see the next patch against chooselocale upup-476
# diff -u /usr/sbin/chooselocale.org /usr/sbin/chooselocale
Code:
--- /usr/sbin/chooselocale.org   2009-05-14 18:36:15.000000000 +0900
+++ /usr/sbin/chooselocale   2009-06-11 19:02:47.000000000 +0900
@@ -5,6 +5,8 @@
 #w004 checkbox for utf8. w019 fixup.
 #w470 $1=composeonly option, when call from 3builddistro.
 #w473 disable en_US.utf8 generation, hangs PC if low RAM (64MB system).
+# 11jun09 by Mayaki Shinomiya <shino@pos.to> : check the existing dialog_table usable or not
+# 11jun09 : 'utf8' can be 'UTF-8'
 
 LANG=C #Xdialog seems to need this.
 export LANG
@@ -17,9 +19,9 @@
 CURRLANG="`grep '^LANG=' /etc/profile | cut -f 2 -d '='`"
 
 UTF8=''
-[ "`echo -n "$CURRLANG" | grep 'utf8'`" != "" ] && UTF8='.utf8'
+[ "`echo -n "$CURRLANG" | grep -i 'utf'`" != "" ] && UTF8='.utf8'
 
-BASELANG="`basename $CURRLANG .utf8`"
+BASELANG=$(echo $CURRLANG|cut -d'.' -f1)   # "`basename $CURRLANG .utf8`"
 CURRENTWM="`cat /etc/windowmanager`"
 XSTATUS="no"
 [ -z $DISPLAY ] || XSTATUS="yes"
@@ -34,10 +36,16 @@
  #[ ! -d /usr/lib/locale/en_US.utf8 ] && localedef -f UTF-8 -i en_US --no-archive en_US.utf8 >/dev/null
 fi
 
-LANGUAGEDESCR='aa:Afar ab:Abkhazian af:Africaans sq:Albanian ar:Arabic hy:Armenian az:Azeri eu:Basque be:Belarusian bn:Bengali bs:Bosnian pt:Brazilian bg:Bulgarian ca:Catalan zh:Chinese hr:Croatian el:Cypriotic cs:Czech da:Danish dv:Divehi nl:Dutch en:English et:Estonian fo:Faeroese fa:Farsi fi:Finnish fr:French mk:Fyrom gl:Galician de:German el:Greek gu:Gujarati he:Hebrew hi:Hindi hu:Hungarian is:Icelandic id:Indonesian ga:Irish it:Italian ja:Japanese kn:Kannada kk:Kazakh kok:Konkani ko:Korean ky:Kyrgyz lv:Latvian ms:Malay ml:Malayalam mt:Maltese mi:Maori mr:Marathi es:Mexican mn:Mongolian nb:Norgwegian nn:Norwegian pa:Pashto fa:Persian pl:Polish pt:Portuguese pa:Punjabi quz:Quechua ro:Romania ru:Russian smn:Sami smj:Sami se:Sami sms:Sami sma:Sami sa:Sanskrit rs:Serbian sr:Srpski sl:Slovenian es:Spanish sw:Swahili sv:Swedish syr:Syriac ta:Tamil tt:Tatar te:Telugu tr:Turkish uk:Ukrainian ur:Urdu uz:Uzbek vi:Vietnamese wa:Walloon cy:Welsh xh:Xhosa zu:Zulu'
+LANGUAGEDESCR='aa:Afar ab:Abkhazian af:Africaans sq:Albanian ar:Arabic hy:Armenian az:Azeri eu:Basque be:Belarusian bn:Bengali bs:Bosnian bg:Bulgarian ca:Catalan zh:Chinese hr:Croatian el:Cypriotic cs:Czech da:Danish dv:Divehi nl:Dutch en:English et:Estonian fo:Faeroese fa:Farsi fi:Finnish fr:French mk:Fyrom gl:Galician de:German el:Greek gu:Gujarati he:Hebrew hi:Hindi hu:Hungarian is:Icelandic id:Indonesian ga:Irish it:Italian ja:Japanese kn:Kannada kk:Kazakh kok:Konkani ko:Korean ky:Kyrgyz lv:Latvian ms:Malay ml:Malayalam mt:Maltese mi:Maori mr:Marathi mn:Mongolian nb:Norgwegian nn:Norwegian pa:Pashto fa:Persian pl:Polish pt:Portuguese pa:Punjabi quz:Quechua ro:Romania ru:Russian smn:Sami smj:Sami se:Sami sms:Sami sma:Sami sa:Sanskrit rs:Serbian sr:Srpski sl:Slovenian es:Spanish sw:Swahili sv:Swedish syr:Syriac ta:Tamil tt:Tatar te:Telugu tr:Turkish uk:Ukrainian ur:Urdu uz:Uzbek vi:Vietnamese wa:Walloon cy:Welsh xh:Xhosa zu:Zulu'
 REGIONDESCR='AA:ArabicCountries AE:UAE AL:Yugoslavia AR:Argentina AT:Austria AU:Australia BE:Belgium BG:Bularia BH:Bahrain BN:Brunei BO:Bolvia BR:Brazil BZ:Belize CA:Canada CH:Switzerland CL:Chile CN:PeoplesRepublicChina CO:Columbia CR:CostaRica CY:Cyprus CZ:CzechRepublic DE:Germany DK:Denmark DO:DominicanRepublic EC:Ecuador EE:Estonia ES:Spain DO:Dominican DZ:Algeria EC:Ecuador EG:Egypt FI:Finland FR:France GB:GreatBritain GR:Greece GT:Guatemalia HK:HongKong HN:Honduras HR:Croatia HU:Hungary ID:Indonesia IE:Ireland IL:Israel IN:India IQ:Iraq IS:Iceland IT:Italy JM:Jamaica JO:Jordan JP:Japan KR:Korea KW:Kuwait KZ:Kazakhstan LB:Lebanon LI:Liechtenstein LU:Luxembourg LY:Libya MA:Morocco MC:Monaco MK:Macedonia MO:Macau MY:Malasia MX:Mexico NI:Nicaragua NL:Netherlands NO:Norway NZ:NewZealand OM:Oman PA:Panama PE:Peru PH:Philippines PL:Poland PR:PuertoRico PT:Portugal PY:Paraguay QA:Qatar RO:Romania RU:Russia SA:SaudiArabia SE:Sweden SG:Singapore SK:Slovakia SY:Syria TH:Thailand TN:Tunisia TR:Turkey TW:Taiwan ZA:SouthAfrica TT:Trinidad US:USA PE:Peru SV:ElSalvador MX:Mexico NI:Nicaragua UY:Uruguay VE:Venezuela YE:Yemen YU:Yugoslavia ZA:SouthAfrica'
-
-if [ ! -f /usr/share/i18n/dialog_table ];then
+# 11Jun09: dialog_table is for Xdialog?
+DIALOGTABLE=/usr/share/i18n/dialog_table
+if [ -f $DIALOGTABLE ];then
+   grep -q "off" $DIALOGTABLE && FORX="yes" || FORX="no"
+   [ "$XSTATUS" = "yes" ] && [ "$FORX" != "yes" ] && rm $DIALOGTABLE
+   [ "$XSTATUS" != "yes" ] &&  [ "$FORX" = "yes" ] && rm $DIALOGTABLE
+fi
+if [ ! -f $DIALOGTABLE ];then
  CHOICES=""; ON=""; OFF=""
  [ "$XSTATUS" = "yes" ] && ON="on"
  [ "$XSTATUS" = "yes" ] && OFF="off"
@@ -75,7 +83,7 @@
 
 if [ "$XSTATUS" = "yes" ];then
  echo "#!/bin/sh
-Xdialog --left --stdout --wrap --title \"Country setup\" --check \"UTF-8 encoding (apps faster without)\" ${CHECKUTF8} --radiolist \"The locale setting provides money, date and font localization for your country. The current choice is ${BASELANG}. Make a choice to suit your country...\" 0 46 0 $CHOICES >/tmp/chooselocale-choice
+Xdialog --left --stdout --wrap --title \"Country setup\" --check \"UTF-8 encoding (apps faster without)\" ${CHECKUTF8} --radiolist \"The locale setting provides money, date and font localization for your country. The current choice is ${BASELANG}. Make a choice to suit your country...\" 0 46 10 $CHOICES >/tmp/chooselocale-choice
 exit \$?" > /tmp/xdialog-chooselocale
 else
  echo "#!/bin/sh
@@ -89,7 +97,7 @@
 LANGCHOICE="`cat /tmp/chooselocale-choice | head -n 1`"
 
 UTF8CHOICE="`cat /tmp/chooselocale-choice | tail -n 1`"
-UTF8=''
+[ "$XSTATUS" = "yes" ] && UTF8=''
 if [ "$UTF8CHOICE" = "checked" ];then
  UTF8='.utf8'
  #if the user has chosen something like nl_BE@euro, need to chop...
@@ -130,7 +138,7 @@
  fi
 
  if [ "$OLDLANG" != "$NEWLANG" ];then
-  langPATTERN="s/${OLDLANG}/${NEWLANG}/"
+  langPATTERN="s/^[ ]*${OLDLANG}/${NEWLANG}/"
   sed -e "$langPATTERN" /etc/profile > /tmp/profile
   cp -f /tmp/profile /etc/profile
  fi
Back to top
View user's profile Send private message Visit poster's website 
Display posts from previous:   Sort by:   
Page 1 of 1 [1 Post]  
Post new topic   Reply to topic View previous topic :: View next topic
 Forum index » Advanced Topics » Puppy Projects » Next Puppy Development » 5.x » Bugs (5.x dev)
Jump to:  


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
You cannot attach files in this forum
You can download files in this forum


Powered by phpBB © 2001, 2005 phpBB Group

[ Time: 0.0619s ][ Queries: 11 (0.0153s) ][ GZIP on ]