[maemo-commits] [maemo-commits] r15565 - in projects/haf/trunk/osso-af-startup: . debian services

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-05-17 09:36:11 +0300 (Sat, 17 May 2008)
New Revision: 15565

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
  * Set default language to en_US on RX-48
  * Fixes: NB#85539


Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-05-16 13:39:31 UTC (rev 15564)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-05-17 06:36:11 UTC (rev 15565)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.54)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.55)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-05-16 13:39:31 UTC (rev 15564)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-05-17 06:36:11 UTC (rev 15565)
@@ -1,3 +1,10 @@
+osso-af-startup (1.55-1) unstable; urgency=low
+
+  * Set default language to en_US on RX-48
+  * Fixes: NB#85539
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed, 14 May 2008 13:56:47 +0300
+
 osso-af-startup (1.54-1) unstable; urgency=low
 
   * Do not create /tmp/.opi.tmp when running inside scratchbox

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-05-16 13:39:31 UTC (rev 15564)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-05-17 06:36:11 UTC (rev 15565)
@@ -25,6 +25,12 @@
 # cancel 'set -e' because grep may return non-zero
 set +e
 
+if [ "x$USER" = "xroot" ]; then
+  _SUDO=''
+else
+  _SUDO='sudo'
+fi
+
 export AF_INIT_DIR=/etc/osso-af-init
 # user name is appended for multi-user Scratchbox
 USER=`whoami`
@@ -38,6 +44,25 @@
 
 # these could have changed since last sourcing
 source $AF_INIT_DIR/locale
+
+if [ -e $HOME/first-boot-flag ]; then
+  OSSO_PRODUCT_HARDWARE=`$_SUDO /usr/bin/osso-product-info -q OSSO_PRODUCT_HARDWARE`
+  if [ "x$OSSO_PRODUCT_HARDWARE" = "xRX-48" ]; then
+    # Recreate $AF_INIT_DIR/locale with en_US
+    cp -f $AF_INIT_DIR/locale /tmp
+
+    echo -n '' > /tmp/locale
+    echo 'unset LC_ALL' >> /tmp/locale
+    echo 'unset LANGUAGE' >> /tmp/locale
+    echo 'export LANG=en_US' >> /tmp/locale
+    echo 'export LC_MESSAGES=en_US' >> /tmp/locale
+
+    mv -f /tmp/locale $AF_INIT_DIR/locale
+
+    source $AF_INIT_DIR/locale
+  fi
+fi
+
 if [ -r $SESSION_BUS_ADDRESS_FILE ]; then
   source $SESSION_BUS_ADDRESS_FILE
 fi
@@ -120,11 +145,6 @@
 
   if [ ! -d /scratchbox ]; then
     if [ ! -e /tmp/.opi.tmp -a -x /usr/bin/osso-product-info ]; then
-      if [ "x$USER" = "xroot" ]; then
-        _SUDO=''
-      else
-        _SUDO='sudo'
-      fi
       $_SUDO /usr/bin/osso-product-info 1> /tmp/.opi.tmp.tmp 2> /dev/null
       $_SUDO /bin/mv -f /tmp/.opi.tmp.tmp /tmp/.opi.tmp 2> /dev/null
       unset _SUDO