[Fluxbox-devel] utf-8 support for fluxbox-generate_menu

[shin2s2 <sh...@gm...>]

Hi, I'm centos5 user.

$ rpm -q fluxbox
fluxbox-1.0.0-0.1.rc3.fc6
$ echo "$LANG,$LC_ALL,"
ja_JP.UTF-8,,
$ fluxbox-generate_menu
Menu successfully generated: /home/hoge/.fluxbox/menu
Use fluxbox-generate_menu -h to read about all the latest features.
$ file ~/.fluxbox/menu
/home/hoge/.fluxbox/menu: ASCII English text
$ env LC_ALL="$LANG" fluxbox-generate_menu >/dev/null
$ nkf --guess ~/.fluxbox/menu
EUC-JP

This patch is for utf-8 user.
=========
diff -u fluxbox-generate_menu.in.r4888 fluxbox-generate_menu.in
--- fluxbox-generate_menu.in.r4888	2007-05-22 21:52:43.000000000 +0900
+++ fluxbox-generate_menu.in	2007-05-22 23:23:42.000000000 +0900
@@ -600,7 +600,9 @@
 XUTILSMENU='X-utils'

 # Check translation
-case ${LC_ALL} in
+MENULANG="${LC_ALL}"
+[ -z "$MENULANG" ] && MENULANG="${LANG}"
+case ${MENULANG} in
     ru_RU*) #Russian locales

 # Ah my Russian hero. Please help me update the translation
@@ -1556,6 +1558,13 @@

 echo "[begin] (${MENUTITLE})" >> ${MENUFILENAME}

+if [ "`echo $MENULANG | grep UTF-8`" ] && \
+     [ "`echo $MENU_ENCODING | grep -v UTF-8`" ] && \
+     [ -x "`which iconv 2>/dev/null`" ] ;then
+  OLDMENUENC=$MENU_ENCODING
+  MENU_ENCODING=UTF-8
+fi
+
 if [ -n "$MENU_ENCODING" ]; then
     append_menu "[encoding] {$MENU_ENCODING}"
 fi
@@ -1902,6 +1911,11 @@
 sed 's/(\(.*\)(\(.*\)))/(\1 (\2\\))/' $MENUFILENAME > menu.tmp
 mv -f menu.tmp $MENUFILENAME

+if [ -n "$OLDMENUENC" ];then
+  iconv -f $OLDMENUENC -t UTF-8 $MENUFILENAME > menu.tmp
+  mv -f menu.tmp $MENUFILENAME
+fi
+
 if [ -z "$INSTALL" ]; then
     if [ -z "$CHECKINIT" ]; then
         INITMENUFILENAME=`awk '/menuFile/ {print $2}' $HOME/.fluxbox/init`
======